/[escript]/trunk/finley/src/Assemble_LumpedSystem.c
ViewVC logotype

Log of /trunk/finley/src/Assemble_LumpedSystem.c

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 2748 - (view) (annotate) - [select for diffs]
Modified Tue Nov 17 07:32:59 2009 UTC (9 years, 9 months ago) by gross
File length: 15192 byte(s)
Diff to previous 2548 , to selected 751
Macro elements are implemented now. VTK writer for macro elements still needs testing.

Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (10 years, 1 month ago) by jfenwick
File length: 15092 byte(s)
Diff to previous 2271 , to selected 751
Updating copyright notices

Revision 2271 - (view) (annotate) - [select for diffs]
Modified Mon Feb 16 05:08:29 2009 UTC (10 years, 6 months ago) by jfenwick
File length: 15092 byte(s)
Diff to previous 1811 , to selected 751
Merging version 2269 to trunk


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


Revision 1650 - (view) (annotate) - [select for diffs]
Modified Tue Jul 15 08:58:22 2008 UTC (11 years, 1 month ago) by phornby
File length: 14975 byte(s)
Diff to previous 1645 , to selected 751
more care with m_t and diagS needed in the pragmas.

Revision 1645 - (view) (annotate) - [select for diffs]
Modified Tue Jul 15 05:26:38 2008 UTC (11 years, 1 month ago) by phornby
File length: 14865 byte(s)
Diff to previous 1628 , to selected 751
unused vars.

Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 1 month ago) by phornby
File length: 14838 byte(s)
Diff to previous 1388 , to selected 751

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 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 7 months ago) by trankine
File length: 14943 byte(s)
Diff to previous 1387 , to selected 751
And get the *(&(*&(* name right

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



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 11 months ago) by ksteube
File length: 14943 byte(s)
Diff to previous 1221 , to selected 751
The MPI branch is hereby closed. All future work should be in trunk.

Previously in revision 1295 I merged the latest changes to trunk into trunk-mpi-branch.
In this revision I copied all files from trunk-mpi-branch over the corresponding
trunk files. I did not use 'svn merge', it was a copy.


Revision 1221 - (view) (annotate) - [select for diffs]
Modified Fri Aug 3 00:27:20 2007 UTC (12 years ago) by ksteube
File length: 15940 byte(s)
Diff to previous 1220 , to selected 751
Disabled HRZ lumping until the tests pass


Revision 1220 - (view) (annotate) - [select for diffs]
Modified Thu Aug 2 04:46:20 2007 UTC (12 years ago) by btully
File length: 15898 byte(s)
Diff to previous 1204 , to selected 751
Included HRZ lumping scheme for the LUMPED solver.


Revision 1204 - (view) (annotate) - [select for diffs]
Modified Sat Jun 23 11:43:12 2007 UTC (12 years, 2 months ago) by gross
File length: 10214 byte(s)
Copied from: trunk/finley/src/Assemble_PDE.c revision 1203
Diff to previous 1072 , to selected 751
a frame for an improved lumping procedure added.

Revision 1072 - (view) (annotate) - [select for diffs]
Modified Thu Mar 29 06:44:30 2007 UTC (12 years, 4 months ago) by gross
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 17053 byte(s)
Diff to previous 1028 , to selected 751
PDE assemblage for reduced integration order + tests added.



Revision 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (12 years, 5 months ago) by gross
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 16674 byte(s)
Diff to previous 971 , to selected 751
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 971 - (view) (annotate) - [select for diffs]
Modified Wed Feb 14 04:40:49 2007 UTC (12 years, 6 months ago) by ksteube
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 16661 byte(s)
Diff to previous 969 , to selected 751
Had to undo commit to new MPI branch. The changes went into the original and
not the branch. The files committed here are exactly the same as revision 969.



Revision 969 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 23:02:23 2007 UTC (12 years, 6 months ago) by ksteube
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 17139 byte(s)
Diff to previous 798 , to selected 751
Parallelization using MPI for solution of implicit problems.

Parallelization for explicit problems has already been accomplished in
the main SVN branch.

This is incomplete and is not ready for use.



Revision 798 - (view) (annotate) - [select for diffs]
Modified Fri Aug 4 01:05:36 2006 UTC (13 years ago) by gross
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 16661 byte(s)
Diff to previous 751
Reimplementation of the assemblage with persistent jacobeans.
There are also a few changes to the tests which has now
dramatically reduced the memory demand.



Revision 751 - (view) (annotate) - [selected]
Modified Mon Jun 26 01:46:34 2006 UTC (13 years, 2 months ago) by bcumming
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 17136 byte(s)
Diff to previous 616
Changes relating to the MPI version of escript
The standard OpenMP version of escript is unchanged

- updated data types (Finley_Mesh, Finley_NodeFile, etc) to store meshes
  over multiple MPI processes.
- added CommBuffer code in Paso for communication of Data associated
  with distributed meshes
- updates in Finley and Escript to support distributed data and operations
  on distributed data (such as interpolation).
- construction of RHS in MPI, so that simple explicit schemes (such as
  /docs/examples/wave.py without IO and the Locator) can run in MPI.
- updated mesh generation for first order line, rectangle and brick
  meshes and second order line meshes in MPI.        
- small changes to trunk/SConstruct and trunk/scons/ess_options.py to
  build the MPI version, these changes are turned off by default.


Revision 616 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:46:56 2006 UTC (13 years, 5 months ago) by elspeth
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 16853 byte(s)
Diff to previous 532 , to selected 751
Copyright added to more source files.


Revision 532 - (view) (annotate) - [select for diffs]
Modified Wed Feb 15 09:45:53 2006 UTC (13 years, 6 months ago) by gross
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 17175 byte(s)
Diff to previous 471 , to selected 751
first steps towards the reuse of the element jacobians

Revision 471 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:33:02 2006 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/finley/src/Assemble_PDE.c
File length: 16827 byte(s)
Copied from: trunk/finley/src/finley/Assemble_PDE.c revision 469
Diff to previous 201 , to selected 751
reorganise finley src tree to remove inc dir and src/finley directory


Revision 201 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:10:21 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/finley/src/finley/Assemble_PDE.c
File length: 16827 byte(s)
Copied from: trunk/finley/src/finleyC/Assemble_PDE.c revision 175
Diff to previous 155 , to selected 751
copy finleyC and CPPAdapter to finley and finley/CPPAdapter to
facilitate scons builds


Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/finley/src/finleyC/Assemble_PDE.c
File length: 16827 byte(s)
Diff to previous 150 , to selected 751
move all directories from trunk/esys2 into trunk and remove esys2


Revision 150 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 03:44:45 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 16827 byte(s)
Diff to previous 149 , to selected 751
Merge of development branch dev-02 back to main trunk on 2005-09-15


Revision 149 - (view) (annotate) - [select for diffs]
Modified Thu Sep 1 03:31:39 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 15842 byte(s)
Diff to previous 147 , to selected 751
Merge of development branch dev-02 back to main trunk on 2005-09-01


Revision 147 - (view) (annotate) - [select for diffs]
Modified Fri Aug 12 01:45:47 2005 UTC (14 years ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 15539 byte(s)
Diff to previous 123 , to selected 751
erge of development branch dev-02 back to main trunk on 2005-08-12


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (14 years, 1 month ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 15293 byte(s)
Diff to previous 102 , to selected 751
Merge of development branch back to main trunk on 2005-07-08


Revision 102 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 07:08:39 2004 UTC (14 years, 8 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 14917 byte(s)
Diff to previous 100 , to selected 751
*** empty log message ***


Revision 100 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 03:48:48 2004 UTC (14 years, 8 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 15344 byte(s)
Diff to previous 97 , to selected 751
*** empty log message ***


Revision 97 - (view) (annotate) - [select for diffs]
Modified Tue Dec 14 05:39:33 2004 UTC (14 years, 8 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 15429 byte(s)
Diff to previous 82 , to selected 751
*** empty log message ***


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/finley/src/finleyC/Assemble_PDE.c
File length: 15251 byte(s)
Diff to selected 751
Initial revision


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