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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 2551 - (view) (annotate) - [select for diffs]
Modified Thu Jul 23 09:19:15 2009 UTC (10 years, 2 months ago) by gross
File length: 18685 byte(s)
Diff to previous 2548
a problem with the sparse matrix unrolling fixed.

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

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


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

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 1562 - (view) (annotate) - [select for diffs]
Modified Wed May 21 13:04:40 2008 UTC (11 years, 5 months ago) by gross
File length: 18673 byte(s)
Diff to previous 1552
The algebraic upwinding with MPI. The case of boundary constraint needs still some attention. 



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

Revision 1410 - (view) (annotate) - [select for diffs]
Modified Thu Feb 7 04:24:00 2008 UTC (11 years, 8 months ago) by gross
File length: 21643 byte(s)
Diff to previous 1408
a new version of the algebric upwinding a. flux limiter

Revision 1408 - (view) (annotate) - [select for diffs]
Modified Mon Feb 4 07:19:50 2008 UTC (11 years, 8 months ago) by gross
File length: 14864 byte(s)
Diff to previous 1407
some problems with openmp fixed.

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

Revision 1401 - (view) (annotate) - [select for diffs]
Modified Fri Jan 25 04:31:18 2008 UTC (11 years, 8 months ago) by gross
File length: 8328 byte(s)
Diff to previous 1400
rewrite antidiffusion calculation to avoid coloring for OPENMP parallelization

Revision 1400 - (view) (annotate) - [select for diffs]
Modified Thu Jan 24 06:04:31 2008 UTC (11 years, 8 months ago) by gross
File length: 9647 byte(s)
Diff to previous 1388
better test example for upwinding added

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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 9 months ago) by trankine
Original Path: temp/paso/src/SolverFCT_FluxControl.c
File length: 9535 byte(s)
Diff to previous 1384
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, 9 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/SolverFCT_FluxControl.c
File length: 9535 byte(s)
Diff to previous 1375
Make a temp copy of the trunk before checking in the windows changes



Revision 1375 - (view) (annotate) - [select for diffs]
Modified Wed Jan 9 00:15:05 2008 UTC (11 years, 9 months ago) by gross
File length: 9535 byte(s)
Diff to previous 1371
bug in interpolation at reduced face elements fixed.

Revision 1371 - (view) (annotate) - [select for diffs]
Modified Thu Jan 3 06:11:21 2008 UTC (11 years, 9 months ago) by gross
File length: 9534 byte(s)
Diff to previous 1370
some bugs in the updwing scheme but there are still problem with the cross wind direction.

Revision 1370 - (view) (annotate) - [select for diffs]
Modified Wed Jan 2 09:21:43 2008 UTC (11 years, 9 months ago) by gross
File length: 9045 byte(s)
Diff to previous 1363
explicit upwinding scheme added.

Revision 1363 - (view) (annotate) - [select for diffs]
Modified Mon Dec 17 03:42:03 2007 UTC (11 years, 10 months ago) by gross
File length: 8304 byte(s)
Diff to previous 1362
initialization for FCT solver added.

Revision 1362 - (view) (annotate) - [select for diffs]
Modified Mon Dec 17 02:28:16 2007 UTC (11 years, 10 months ago) by gross
File length: 8293 byte(s)
Copied from: trunk/paso/src/Solver_FluxControl.c revision 1361
Diff to previous 1361
and more on FCT solver

Revision 1361 - (view) (annotate) - [select for diffs]
Added Fri Dec 14 09:26:51 2007 UTC (11 years, 10 months ago) by gross
Original Path: trunk/paso/src/Solver_FluxControl.c
File length: 10444 byte(s)
first steps towards a flux controlled transport solver.

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