/[escript]/trunk/finley/src/CPPAdapter/MeshAdapter.cpp
ViewVC logotype

Log of /trunk/finley/src/CPPAdapter/MeshAdapter.cpp

Parent Directory Parent Directory | Revision Log Revision Log


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

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

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 1464 - (view) (annotate) - [select for diffs]
Modified Tue Apr 1 23:27:09 2008 UTC (11 years ago) by gross
File length: 85698 byte(s)
Diff to previous 1455 , to selected 1204
bug for interpoltion from reduced solution to elements in MPI fixed.

Revision 1455 - (view) (annotate) - [select for diffs]
Modified Thu Feb 28 17:19:44 2008 UTC (11 years, 1 month ago) by phornby
File length: 85670 byte(s)
Diff to previous 1407 , to selected 1204
Merge of branches/windows_from_1431_trunk.

Revamp of the exception system.
Fix unused vars and signed/unsigned comparisons.
defined a macro THROW(ARG) in the system_dep.h's to
deal with the expectations of declarations on different architectures.

Details in the logs of branches/windows_from_1431_trunk.

pre-merge snapshot of the trunk in tags/trunk_at_1452



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

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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 3 months ago) by trankine
Original Path: temp/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 86045 byte(s)
Diff to previous 1384 , to selected 1204
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, 3 months ago) by phornby
Original Path: temp_trunk_copy/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 86045 byte(s)
Diff to previous 1375 , to selected 1204
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, 3 months ago) by gross
File length: 86045 byte(s)
Diff to previous 1370 , to selected 1204
bug in interpolation at reduced face elements fixed.

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

Revision 1367 - (view) (annotate) - [select for diffs]
Modified Wed Dec 19 02:45:07 2007 UTC (11 years, 4 months ago) by gross
File length: 86121 byte(s)
Diff to previous 1366 , to selected 1204
finley can now assemble a transport problem.

Revision 1366 - (view) (annotate) - [select for diffs]
Modified Tue Dec 18 05:49:17 2007 UTC (11 years, 4 months ago) by gross
File length: 83950 byte(s)
Diff to previous 1361 , to selected 1204
finley can create a TransportProblem now

Revision 1361 - (view) (annotate) - [select for diffs]
Modified Fri Dec 14 09:26:51 2007 UTC (11 years, 4 months ago) by gross
File length: 82498 byte(s)
Diff to previous 1347 , to selected 1204
first steps towards a flux controlled transport solver.

Revision 1347 - (view) (annotate) - [select for diffs]
Modified Fri Nov 16 05:37:07 2007 UTC (11 years, 5 months ago) by ksteube
File length: 82429 byte(s)
Diff to previous 1346 , to selected 1204
Completed mesh.dump(file) and mesh=LoadMesh(file) by adding TagMap and
implementing MPI parallelism.
Now allocating ElementFile for ContactElements even if there are none.
Removed file Mesh_dump.c since dump/loadMesh are in CPPAdapter/MeshAdapter*.cpp.


Revision 1346 - (view) (annotate) - [select for diffs]
Modified Wed Nov 14 22:48:12 2007 UTC (11 years, 5 months ago) by ksteube
File length: 80790 byte(s)
Diff to previous 1345 , to selected 1204
dump/LoadMesh methods work except for TagMap, Point elements probably OK but are untested.


Revision 1345 - (view) (annotate) - [select for diffs]
Modified Wed Nov 14 07:53:34 2007 UTC (11 years, 5 months ago) by ksteube
File length: 80145 byte(s)
Diff to previous 1344 , to selected 1204
Created LoadMesh to read a mesh from a distributed NetCDF file.
Can read nodes but not elements yet.


Revision 1344 - (view) (annotate) - [select for diffs]
Modified Wed Nov 14 04:28:25 2007 UTC (11 years, 5 months ago) by ksteube
File length: 79785 byte(s)
Diff to previous 1343 , to selected 1204
Now using TMPMEMFREE but still thrashes memory for very large mesh.
Future solution will be to use NetCDF subsetting and less temp memory.


Revision 1343 - (view) (annotate) - [select for diffs]
Modified Wed Nov 14 02:48:02 2007 UTC (11 years, 5 months ago) by ksteube
File length: 79640 byte(s)
Diff to previous 1339 , to selected 1204
First cut implementation of mesh.dump() using NetCDF.  TagMap not
saved yet.  The code for Points probably works but has not been tested.


Revision 1339 - (view) (annotate) - [select for diffs]
Modified Wed Nov 7 01:53:12 2007 UTC (11 years, 5 months ago) by ksteube
File length: 58871 byte(s)
Diff to previous 1326 , to selected 1204
Modified scons target release_src to include lib/ and include/ since
their presence is required for a build.  Modified
mydomain.print_mesh_info(True) to include more useful info about a
distributed domain.  Added mypde.getOperator().print_matrix_info(True)
to tell about a distributed matrix.



Revision 1326 - (view) (annotate) - [select for diffs]
Modified Mon Oct 1 08:10:41 2007 UTC (11 years, 6 months ago) by ksteube
File length: 58844 byte(s)
Diff to previous 1312 , to selected 1204
Implemented domain.print_mesh_info() so we can see the distribution of elements & nodes.
Implemented -DBOUNDS_CHECK to catch an error with periodicN=True.


Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 7 months ago) by ksteube
File length: 58752 byte(s)
Diff to previous 1204
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 1204 - (view) (annotate) - [selected]
Modified Sat Jun 23 11:43:12 2007 UTC (11 years, 10 months ago) by gross
File length: 56656 byte(s)
Diff to previous 1137
a frame for an improved lumping procedure added.

Revision 1137 - (view) (annotate) - [select for diffs]
Modified Thu May 10 08:11:31 2007 UTC (11 years, 11 months ago) by gross
File length: 56150 byte(s)
Diff to previous 1116 , to selected 1204
This version passes the tests on windows except for 

   * vtk
   * netCDF

The version needs to be tested on altix and linux

Revision 1116 - (view) (annotate) - [select for diffs]
Modified Mon Apr 23 03:36:34 2007 UTC (12 years ago) by gross
File length: 56126 byte(s)
Diff to previous 1080 , to selected 1204
Interporpolation from full to reduced integration order added.



Revision 1080 - (view) (annotate) - [select for diffs]
Modified Wed Apr 11 06:07:30 2007 UTC (12 years ago) by gross
File length: 55228 byte(s)
Diff to previous 1064 , to selected 1204
small typo fixed.

Revision 1064 - (view) (annotate) - [select for diffs]
Modified Tue Mar 27 06:21:02 2007 UTC (12 years, 1 month ago) by gross
File length: 55232 byte(s)
Diff to previous 1062 , to selected 1204
test for reduced integration order for grad, interpolate and integrate added.
Bug shown by the tests have been fixed.



Revision 1062 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 06:17:53 2007 UTC (12 years, 1 month ago) by gross
File length: 55217 byte(s)
Diff to previous 1059 , to selected 1204
reduced integration schemes are implemented now for grad, integrate, etc. Tests still to be added.

Revision 1059 - (view) (annotate) - [select for diffs]
Modified Fri Mar 23 11:01:53 2007 UTC (12 years, 1 month ago) by gross
File length: 44072 byte(s)
Diff to previous 1044 , to selected 1204
first steps toward reduced element integration order. The escript bit is done but the finley part still needs work.

Revision 1044 - (view) (annotate) - [select for diffs]
Modified Mon Mar 19 07:29:31 2007 UTC (12 years, 1 month ago) by gross
File length: 42856 byte(s)
Diff to previous 971 , to selected 1204
clear name tagging is supported now.

Revision 971 - (view) (annotate) - [select for diffs]
Modified Wed Feb 14 04:40:49 2007 UTC (12 years, 2 months ago) by ksteube
File length: 41890 byte(s)
Diff to previous 969 , to selected 1204
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, 2 months ago) by ksteube
File length: 42220 byte(s)
Diff to previous 967 , to selected 1204
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 967 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 09:40:12 2007 UTC (12 years, 2 months ago) by gross
File length: 41890 byte(s)
Diff to previous 964 , to selected 1204
dump and load of expanded data via netCDF added. some test are still missing.

Revision 964 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:10:26 2007 UTC (12 years, 2 months ago) by gross
File length: 42261 byte(s)
Diff to previous 817 , to selected 1204
The set/getRefVal functions of Data objects have been removed (mainly to avoid later problems with MPI).
Moreover, a faster access to the reference id of samples has been introduced. I don't think that anybody will
profit form this at this stage but it will allow a faster dump of data objects.



Revision 817 - (view) (annotate) - [select for diffs]
Modified Sat Aug 26 03:08:52 2006 UTC (12 years, 8 months ago) by ksteube
File length: 42220 byte(s)
Diff to previous 798 , to selected 1204
Can now compile and run with MPI on shake71



Revision 798 - (view) (annotate) - [select for diffs]
Modified Fri Aug 4 01:05:36 2006 UTC (12 years, 8 months ago) by gross
File length: 42180 byte(s)
Diff to previous 793 , to selected 1204
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 793 - (view) (annotate) - [select for diffs]
Modified Sat Jul 29 19:40:22 2006 UTC (12 years, 8 months ago) by dhawcroft
File length: 42672 byte(s)
Diff to previous 767 , to selected 1204
Preliminary MPI version of saveVTK. Needs testers. Works for point data and should work for cell centered data.

Revision 767 - (view) (annotate) - [select for diffs]
Modified Fri Jun 30 07:29:08 2006 UTC (12 years, 9 months ago) by gross
File length: 42549 byte(s)
Diff to previous 757 , to selected 1204
new FunctionSpace method setTags added

Revision 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (12 years, 10 months ago) by woo409
File length: 41135 byte(s)
Diff to previous 751 , to selected 1204
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 751 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 01:46:34 2006 UTC (12 years, 10 months ago) by bcumming
File length: 39985 byte(s)
Diff to previous 682 , to selected 1204
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 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 1 month ago) by robwdcock
File length: 37983 byte(s)
Diff to previous 547 , to selected 1204
+ NEW BUILD SYSTEM

This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.

ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows

module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3



Revision 547 - (view) (annotate) - [select for diffs]
Modified Tue Feb 21 06:10:54 2006 UTC (13 years, 2 months ago) by gross
File length: 37967 byte(s)
Diff to previous 532 , to selected 1204
solution and reduced solution can have reference numbers now!

Revision 532 - (view) (annotate) - [select for diffs]
Modified Wed Feb 15 09:45:53 2006 UTC (13 years, 2 months ago) by gross
File length: 40307 byte(s)
Diff to previous 480 , to selected 1204
first steps towards the reuse of the element jacobians

Revision 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (13 years, 2 months ago) by jgs
File length: 40318 byte(s)
Diff to previous 472 , to selected 1204
rationalise #includes and forward declarations


Revision 472 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:50:59 2006 UTC (13 years, 2 months ago) by jgs
File length: 39959 byte(s)
Diff to previous 471 , to selected 1204
rationalise all #includes


Revision 471 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:33:02 2006 UTC (13 years, 2 months ago) by jgs
File length: 40445 byte(s)
Diff to previous 467 , to selected 1204
reorganise finley src tree to remove inc dir and src/finley directory


Revision 467 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 05:43:46 2006 UTC (13 years, 3 months ago) by jgs
Original Path: trunk/finley/src/finley/CPPAdapter/MeshAdapter.cpp
File length: 40445 byte(s)
Diff to previous 203 , to selected 1204
adjustments to includes to allow for new paso src tree structure

Revision 203 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:36:15 2005 UTC (13 years, 5 months ago) by jgs
Original Path: trunk/finley/src/finley/CPPAdapter/MeshAdapter.cpp
File length: 40450 byte(s)
Diff to previous 201 , to selected 1204
adjust include file names to allow for new finley source tree structure


Revision 201 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:10:21 2005 UTC (13 years, 5 months ago) by jgs
Original Path: trunk/finley/src/finley/CPPAdapter/MeshAdapter.cpp
File length: 40582 byte(s)
Diff to previous 155 , to selected 1204
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, 5 months ago) by jgs
File length: 40582 byte(s)
Diff to previous 153 , to selected 1204
move all directories from trunk/esys2 into trunk and remove esys2


Revision 153 - (view) (annotate) - [select for diffs]
Modified Tue Oct 25 01:51:20 2005 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 40582 byte(s)
Diff to previous 150 , to selected 1204
Merge of development branch dev-02 back to main trunk on 2005-10-25


Revision 150 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 03:44:45 2005 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 38207 byte(s)
Diff to previous 149 , to selected 1204
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, 7 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 38304 byte(s)
Diff to previous 148 , to selected 1204
Merge of development branch dev-02 back to main trunk on 2005-09-01


Revision 148 - (view) (annotate) - [select for diffs]
Modified Tue Aug 23 01:24:31 2005 UTC (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 38264 byte(s)
Diff to previous 147 , to selected 1204
Merge of development branch dev-02 back to main trunk on 2005-08-23


Revision 147 - (view) (annotate) - [select for diffs]
Modified Fri Aug 12 01:45:47 2005 UTC (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 38202 byte(s)
Diff to previous 123 , to selected 1204
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 (13 years, 9 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 37731 byte(s)
Diff to previous 121 , to selected 1204
Merge of development branch back to main trunk on 2005-07-08


Revision 121 - (view) (annotate) - [select for diffs]
Modified Fri May 6 04:26:16 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 37807 byte(s)
Diff to previous 110 , to selected 1204
Merge of development branch back to main trunk on 2005-05-06


Revision 110 - (view) (annotate) - [select for diffs]
Modified Mon Feb 14 04:14:42 2005 UTC (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 37679 byte(s)
Diff to previous 104 , to selected 1204
*** empty log message ***


Revision 104 - (view) (annotate) - [select for diffs]
Modified Fri Dec 17 07:43:12 2004 UTC (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 35046 byte(s)
Diff to previous 102 , to selected 1204
*** empty log message ***


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


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


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


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (14 years, 6 months ago) by jgs
Original Path: trunk/esys2/finley/src/CPPAdapter/MeshAdapter.cpp
File length: 34463 byte(s)
Diff to selected 1204
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