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

Log of /trunk/paso/src/SolverFCT_solve.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, 4 months ago) by gross
File length: 15375 byte(s)
Diff to previous 2548 , to selected 1628
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, 4 months ago) by jfenwick
File length: 15369 byte(s)
Diff to previous 2351 , to selected 1628
Updating copyright notices

Revision 2351 - (view) (annotate) - [select for diffs]
Modified Tue Mar 31 08:26:41 2009 UTC (10 years, 7 months ago) by gross
File length: 15369 byte(s)
Diff to previous 2247 , to selected 1628
some fixes in the transport solver

Revision 2247 - (view) (annotate) - [select for diffs]
Modified Thu Feb 5 07:39:20 2009 UTC (10 years, 9 months ago) by gross
File length: 15370 byte(s)
Diff to previous 2197 , to selected 1628
output control fixed.

Revision 2197 - (view) (annotate) - [select for diffs]
Modified Thu Jan 8 05:49:16 2009 UTC (10 years, 10 months ago) by gross
File length: 15511 byte(s)
Diff to previous 2078 , to selected 1628
modifications to the way cosntraints are handeled in the Transport problem



Revision 2078 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 16:10:10 2008 UTC (11 years ago) by phornby
File length: 15464 byte(s)
Diff to previous 1981 , to selected 1628
Two changes.

1. Move blocktimer from escript to esysUtils.
2. Make it possible to link to paso as a DLL or .so.

Should have no effect on 'nix's

In respect of 1., blocktimer had begun to spring up everywhere, so
for the moment I thought it best to move it to the only other library that
pops up all over the place.

In respect of 2., paso needed to be a DLL in order to use the windows intelc /fast
option, which does aggressive multi-file optimisations. Even in its current form, it either
vectorises or parallelises  hundreds more loops in the esys system than appear in the pragmas.

In achieving 2. I have not been too delicate in adding

PASO_DLL_API

declarations to the .h files in paso/src. Only toward the end of the process of
the conversion, when the number of linker errors dropped below 20, say, did I choosy about what
functions in a header I declared PASO_DLL_API. As a result, there are likely to be many routines
declared as external functions symbols that are in fact internal to the paso DLL. 
Why is this an issue?  It prevents the intelc compiler from getting aggressive on the paso module.
With pain there is sometimes gain. At least all the DLL rules in windows give good
(non-microsoft) compiler writers a chance to really shine.

So, if you should see a PASO_DLL_API on a function in a paso header file,
and think to yourself, "that function is only called in paso, why export it?", then feel free to
delete the PASO_DLL_API export declaration.

Here's hoping for no breakage.....

Revision 1981 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 05:27:33 2008 UTC (11 years ago) by jfenwick
File length: 15462 byte(s)
Diff to previous 1917 , to selected 1628
More warning removal.


Revision 1917 - (view) (annotate) - [select for diffs]
Modified Thu Oct 23 09:09:31 2008 UTC (11 years, 1 month ago) by phornby
File length: 15460 byte(s)
Diff to previous 1812 , to selected 1628
Remove unused vars, do a bit of standardising of indentation, and use the new Pattern_coupling.h to eliminate some implicit function declarations in Solver_AMG.c

Revision 1812 - (view) (annotate) - [select for diffs]
Modified Fri Sep 26 00:19:18 2008 UTC (11 years, 1 month ago) by ksteube
File length: 15558 byte(s)
Diff to previous 1811 , to selected 1628
Re-ordered the methods in paso/src/SolverFCT_solve.c and resolved several compiler warnings


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: 15554 byte(s)
Diff to previous 1804 , to selected 1628
Copyright updated in all files


Revision 1804 - (view) (annotate) - [select for diffs]
Modified Wed Sep 24 07:52:19 2008 UTC (11 years, 1 month ago) by gross
File length: 15546 byte(s)
Diff to previous 1670 , to selected 1628
a robister version of the upwinding scheme

Revision 1670 - (view) (annotate) - [select for diffs]
Modified Thu Jul 24 04:30:43 2008 UTC (11 years, 4 months ago) by ksteube
File length: 15832 byte(s)
Diff to previous 1661 , to selected 1628
Fix variable declaration to compile under MPI


Revision 1661 - (view) (annotate) - [select for diffs]
Modified Mon Jul 21 22:08:27 2008 UTC (11 years, 4 months ago) by gross
File length: 15791 byte(s)
Diff to previous 1660 , to selected 1628
some improvements on level set

Revision 1660 - (view) (annotate) - [select for diffs]
Modified Mon Jul 21 03:23:46 2008 UTC (11 years, 4 months ago) by ksteube
File length: 15792 byte(s)
Diff to previous 1637 , to selected 1628
Some variables were not declared as a result of recent cleanup


Revision 1637 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 05:34:59 2008 UTC (11 years, 4 months ago) by ksteube
File length: 15756 byte(s)
Diff to previous 1628
Resolved some compiler warnings
Changed blocktimer to not use strdup, intead malloc and strcpy


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

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 1570 - (view) (annotate) - [select for diffs]
Modified Sat May 24 21:31:04 2008 UTC (11 years, 5 months ago) by gross
File length: 15770 byte(s)
Diff to previous 1562 , to selected 1628
modifications to PCG to support dynamic scheduling

Revision 1562 - (view) (annotate) - [select for diffs]
Modified Wed May 21 13:04:40 2008 UTC (11 years, 6 months ago) by gross
File length: 15787 byte(s)
Diff to previous 1552 , to selected 1628
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, 6 months ago) by gross
File length: 13707 byte(s)
Diff to previous 1513 , to selected 1628
some changes to make the implementatiopn of a upwind MPI version easier

Revision 1513 - (view) (annotate) - [select for diffs]
Modified Tue Apr 15 08:47:57 2008 UTC (11 years, 7 months ago) by gross
File length: 13878 byte(s)
Diff to previous 1417 , to selected 1628
pragma ivdep removed. icc produced wrong code.

Revision 1417 - (view) (annotate) - [select for diffs]
Modified Mon Feb 25 04:45:48 2008 UTC (11 years, 8 months ago) by gross
File length: 13880 byte(s)
Diff to previous 1415 , to selected 1628
some more work on the transport solver.

Revision 1415 - (view) (annotate) - [select for diffs]
Modified Thu Feb 21 04:57:17 2008 UTC (11 years, 9 months ago) by ksteube
File length: 13882 byte(s)
Diff to previous 1410 , to selected 1628
Recent fixes have remedied problems with running OpenMP/MPI mixed mode programming.


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

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: 14676 byte(s)
Diff to previous 1401 , to selected 1628
new upwinding algorithm (still fails)

Revision 1401 - (view) (annotate) - [select for diffs]
Modified Fri Jan 25 04:31:18 2008 UTC (11 years, 9 months ago) by gross
File length: 10956 byte(s)
Diff to previous 1400 , to selected 1628
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, 9 months ago) by gross
File length: 10955 byte(s)
Diff to previous 1388 , to selected 1628
better test example for upwinding added

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: 6892 byte(s)
Diff to previous 1387 , to selected 1628
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/SolverFCT_solve.c
File length: 6892 byte(s)
Diff to previous 1384 , to selected 1628
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/SolverFCT_solve.c
File length: 6892 byte(s)
Diff to previous 1375 , to selected 1628
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, 10 months ago) by gross
File length: 6892 byte(s)
Diff to previous 1372 , to selected 1628
bug in interpolation at reduced face elements fixed.

Revision 1372 - (view) (annotate) - [select for diffs]
Modified Thu Jan 3 06:30:47 2008 UTC (11 years, 10 months ago) by gross
File length: 6782 byte(s)
Diff to previous 1371 , to selected 1628
some OMP related compile problems fixed.

Revision 1371 - (view) (annotate) - [select for diffs]
Modified Thu Jan 3 06:11:21 2008 UTC (11 years, 10 months ago) by gross
File length: 6941 byte(s)
Diff to previous 1370 , to selected 1628
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, 10 months ago) by gross
File length: 6950 byte(s)
Diff to previous 1364 , to selected 1628
explicit upwinding scheme added.

Revision 1364 - (view) (annotate) - [select for diffs]
Modified Mon Dec 17 07:22:45 2007 UTC (11 years, 11 months ago) by gross
File length: 1778 byte(s)
Diff to previous 1363 , to selected 1628
finley interface to paso's transport solver added.

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

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