/[escript]/branches/arrayview_from_1695_trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
ViewVC logotype

Log of /branches/arrayview_from_1695_trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 1781 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 05:03:14 2008 UTC (10 years, 11 months ago) by jfenwick
File length: 33350 byte(s)
Diff to previous 1696
Branch commit

Merged changes from trunk version 1695 up to and including version 1779.



Revision 1696 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 03:33:40 2008 UTC (11 years ago) by jfenwick
File length: 33100 byte(s)
Diff to previous 1634
Branching to perform experiments on removing DataArrayView


Revision 1634 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 09:08:33 2008 UTC (11 years, 1 month ago) by phornby
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 33100 byte(s)
Diff to previous 1628
linux_gcc_eg_options.py:
remove the std99 option, it is no longer needed as the code compiles without
C 1999 extension (need for these extensions elinminated in windows port).
Turn on all warnings except unknown pragmas. Should catch a lot of stuff.

SConstruct:
Impassioned plea

system_dep.h:
Add the standard incantation for dealing with const declarations
in C code called from C and C++

blocktimer:
Get the calling interface right for C code called from C and C++
and use __const as defined in system_dep.h
(Should be re-factored into compiler_dep.h file).

MeshAdapterFactory.cpp:
Since we have (effectively) no control over netCDF policy,
cast const char *'s to char *'s



Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 1 month ago) by phornby
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 32956 byte(s)
Diff to previous 1388

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
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 32390 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, 7 months ago) by trankine
Original Path: temp/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 32390 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, 7 months ago) by phornby
Original Path: temp_trunk_copy/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 32390 byte(s)
Diff to previous 1360
Make a temp copy of the trunk before checking in the windows changes



Revision 1360 - (view) (annotate) - [select for diffs]
Modified Thu Dec 13 05:05:00 2007 UTC (11 years, 8 months ago) by ksteube
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 32390 byte(s)
Diff to previous 1347
Partial implementation of ReadMeshMPI.
Will eventually replace ReadMesh but for now has a different name.


Revision 1347 - (view) (annotate) - [select for diffs]
Modified Fri Nov 16 05:37:07 2007 UTC (11 years, 9 months ago) by ksteube
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 31498 byte(s)
Diff to previous 1346
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, 9 months ago) by ksteube
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 29590 byte(s)
Diff to previous 1345
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, 9 months ago) by ksteube
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 14836 byte(s)
Diff to previous 1312
Created LoadMesh to read a mesh from a distributed NetCDF file.
Can read nodes but not elements yet.


Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 11 months ago) by ksteube
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 7588 byte(s)
Diff to previous 1062
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 1062 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 06:17:53 2007 UTC (12 years, 4 months ago) by gross
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 9683 byte(s)
Diff to previous 1059
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, 5 months ago) by gross
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 9374 byte(s)
Diff to previous 934
first steps toward reduced element integration order. The escript bit is done but the finley part still needs work.

Revision 934 - (view) (annotate) - [select for diffs]
Modified Tue Jan 23 09:52:45 2007 UTC (12 years, 7 months ago) by gross
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 8999 byte(s)
Diff to previous 817
gmsh file reader for finley

Revision 817 - (view) (annotate) - [select for diffs]
Modified Sat Aug 26 03:08:52 2006 UTC (12 years, 11 months ago) by ksteube
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 7941 byte(s)
Diff to previous 782
Can now compile and run with MPI on shake71



Revision 782 - (view) (annotate) - [select for diffs]
Modified Tue Jul 18 00:47:47 2006 UTC (13 years, 1 month ago) by bcumming
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 7901 byte(s)
Diff to previous 759
Large number of changes to Finley for meshing in MPI.

- optimisation and neatening up of rectcanglular mesh generation code
- first and second order 1D, 2D and 3D rectangular meshes are now
  available in finley and escript using MPI.
- reduced meshes now generated in MPI, and interpolation to and from 
  reduced data types now supported.  


Revision 759 - (view) (annotate) - [select for diffs]
Modified Thu Jun 29 01:53:23 2006 UTC (13 years, 1 month ago) by bcumming
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 8195 byte(s)
Diff to previous 757
- added directory pythonMPI to the source tree. this directory contains
  the c++ wrapper that is used to run python scripts in parallel for the
  MPI version of escript/finley
- updated the SConstruct and ./scons/ess_options.py for conditional MPI
  compilation. To compile the MPI version on ESS uncomment the #define
  PASO_MPI in ./paso/src/Paso.h and add the command line option
  useMPI=yes when running scons.
- fixed a compile time error in the MPI build in  
  finley/src/CPPAdapter/MeshAdapterFactory.cpp 
     


Revision 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 1 month ago) by woo409
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 8193 byte(s)
Diff to previous 751
+ 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 (13 years, 1 month ago) by bcumming
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 7969 byte(s)
Diff to previous 480
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 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 6655 byte(s)
Diff to previous 472
rationalise #includes and forward declarations


Revision 472 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:50:59 2006 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
File length: 6573 byte(s)
Diff to previous 471
rationalise all #includes


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/CPPAdapter/MeshAdapterFactory.cpp
File length: 6756 byte(s)
Diff to previous 203
reorganise finley src tree to remove inc dir and src/finley directory


Revision 203 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:36:15 2005 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/finley/src/finley/CPPAdapter/MeshAdapterFactory.cpp
File length: 6756 byte(s)
Diff to previous 201
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, 9 months ago) by jgs
Original Path: trunk/finley/src/finley/CPPAdapter/MeshAdapterFactory.cpp
File length: 6837 byte(s)
Diff to previous 155
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/CPPAdapter/MeshAdapterFactory.cpp
File length: 6837 byte(s)
Diff to previous 110
move all directories from trunk/esys2 into trunk and remove esys2


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


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/CPPAdapter/MeshAdapterFactory.cpp
File length: 5366 byte(s)
Diff to previous 100
*** 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/CPPAdapter/MeshAdapterFactory.cpp
File length: 5289 byte(s)
Diff to previous 97
*** 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/CPPAdapter/MeshAdapterFactory.cpp
File length: 5366 byte(s)
Diff to previous 82
*** empty log message ***


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