/[escript]/trunk/paso/src/Coupler.c
ViewVC logotype

Log of /trunk/paso/src/Coupler.c

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 4345)

Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (10 years, 4 months ago) by jfenwick
File length: 9899 byte(s)
Diff to previous 2385 , to selected 1374
Updating copyright notices

Revision 2385 - (view) (annotate) - [select for diffs]
Modified Wed Apr 15 03:52:38 2009 UTC (10 years, 7 months ago) by gross
File length: 9899 byte(s)
Diff to previous 1811 , to selected 1374
two fixes dealing with zero samples under MPI

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (11 years, 1 month ago) by ksteube
File length: 9897 byte(s)
Diff to previous 1758 , to selected 1374
Copyright updated in all files


Revision 1758 - (view) (annotate) - [select for diffs]
Modified Mon Sep 8 02:29:33 2008 UTC (11 years, 2 months ago) by gross
File length: 10307 byte(s)
Diff to previous 1639 , to selected 1374
uses now memcpy rather than for loop

Revision 1639 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 08:55:25 2008 UTC (11 years, 4 months ago) by gross
File length: 9584 byte(s)
Diff to previous 1628 , to selected 1374


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 4 months ago) by phornby
File length: 9588 byte(s)
Diff to previous 1563 , to selected 1374

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.



Revision 1563 - (view) (annotate) - [select for diffs]
Modified Wed May 21 15:27:34 2008 UTC (11 years, 5 months ago) by gross
File length: 9570 byte(s)
Diff to previous 1562 , to selected 1374
Some stuff added to make the FCT solver work with Dirichlet Boundary conditions for MPI. 
and a memory leak in the coupler fixed.



Revision 1562 - (view) (annotate) - [select for diffs]
Modified Wed May 21 13:04:40 2008 UTC (11 years, 5 months ago) by gross
File length: 9549 byte(s)
Diff to previous 1556 , to selected 1374
The algebraic upwinding with MPI. The case of boundary constraint needs still some attention. 



Revision 1556 - (view) (annotate) - [select for diffs]
Modified Mon May 12 00:54:58 2008 UTC (11 years, 6 months ago) by gross
File length: 8578 byte(s)
Diff to previous 1553 , to selected 1374
Modification to allow mixed mode execution. 
In order to keep the code portable accross platform all MPI calls within
parallel regions have been moved. 



Revision 1553 - (view) (annotate) - [select for diffs]
Modified Thu May 8 09:38:07 2008 UTC (11 years, 6 months ago) by gross
File length: 8667 byte(s)
Diff to previous 1552 , to selected 1374
some small bugs fixed to get MPI going with the modification. MPI version of BiCGStab added.

Revision 1552 - (view) (annotate) - [select for diffs]
Modified Thu May 8 08:52:41 2008 UTC (11 years, 6 months ago) by gross
File length: 8634 byte(s)
Diff to previous 1413 , to selected 1374
some changes to make the implementatiopn of a upwind MPI version easier

Revision 1413 - (view) (annotate) - [select for diffs]
Modified Sun Feb 10 08:45:37 2008 UTC (11 years, 9 months ago) by gross
File length: 7894 byte(s)
Diff to previous 1407 , to selected 1374
bug effecting MPI fixed found while compiling with windows.

Revision 1407 - (view) (annotate) - [select for diffs]
Modified Mon Feb 4 06:45:48 2008 UTC (11 years, 9 months ago) by gross
File length: 7893 byte(s)
Diff to previous 1388 , to selected 1374
new upwinding algorithm (still fails)

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 10 months ago) by trankine
File length: 7888 byte(s)
Diff to previous 1387 , to selected 1374
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 10 months ago) by trankine
Original Path: temp/paso/src/Coupler.c
File length: 7888 byte(s)
Diff to previous 1384 , to selected 1374
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.

Revision 1384 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 02:29:38 2008 UTC (11 years, 10 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/Coupler.c
File length: 7888 byte(s)
Diff to previous 1374
Make a temp copy of the trunk before checking in the windows changes



Revision 1374 - (view) (annotate) - [selected]
Modified Tue Jan 8 09:37:55 2008 UTC (11 years, 10 months ago) by gross
File length: 7888 byte(s)
Diff to previous 1362
some changes to get things going on the cognac.ivec.org.

Revision 1362 - (view) (annotate) - [select for diffs]
Modified Mon Dec 17 02:28:16 2007 UTC (11 years, 11 months ago) by gross
File length: 7888 byte(s)
Diff to previous 1313 , to selected 1374
and more on FCT solver

Revision 1313 - (view) (annotate) - [select for diffs]
Added Tue Sep 25 01:44:26 2007 UTC (12 years, 1 month ago) by ksteube
File length: 7770 byte(s)
Diff to selected 1374
Copied a handful of files from trunk-mpi-branch into trunk


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26