← Back to branch summary

~vcs-imports/escript-finley/trunk

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to escript/src/DataFactory.cpp

Committer: jfenwick
Date: 2010-10-11 01:48:14 UTC
Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259

Merging dudley and scons updates from branches

files added:
dudley

dudley/benchmarks

dudley/benchmarks/dudleybench.py

dudley/benchmarks/runbenchmark.py

dudley/inc

dudley/lib

dudley/lib/.keep

dudley/lib/py_src

dudley/lib/py_src/.keep

dudley/py_src

dudley/py_src/SConscript

dudley/py_src/__init__.py

dudley/py_src/dudley.py

dudley/py_src/readers.py

dudley/src

dudley/src/Assemble.h

dudley/src/Assemble_AverageElementData.c

dudley/src/Assemble_CopyElementData.c

dudley/src/Assemble_CopyNodalData.c

dudley/src/Assemble_LumpedSystem.c

dudley/src/Assemble_NodeCoordinates.c

dudley/src/Assemble_PDE.c

dudley/src/Assemble_PDE_Single2_1D.c

dudley/src/Assemble_PDE_Single2_2D.c

dudley/src/Assemble_PDE_Single2_3D.c

dudley/src/Assemble_PDE_System2_1D.c

dudley/src/Assemble_PDE_System2_2D.c

dudley/src/Assemble_PDE_System2_3D.c

dudley/src/Assemble_addToSystemMatrix.c

dudley/src/Assemble_getAssembleParameters.c

dudley/src/Assemble_getSize.c

dudley/src/Assemble_gradient.c

dudley/src/Assemble_integrate.c

dudley/src/Assemble_interpolate.c

dudley/src/Assemble_jacobeans.c

dudley/src/Assemble_setNormal.c

dudley/src/CPPAdapter

dudley/src/CPPAdapter/DudleyAdapterException.cpp

dudley/src/CPPAdapter/DudleyAdapterException.h

dudley/src/CPPAdapter/DudleyError.cpp

dudley/src/CPPAdapter/DudleyError.h

dudley/src/CPPAdapter/MeshAdapter.cpp

dudley/src/CPPAdapter/MeshAdapter.h

dudley/src/CPPAdapter/MeshAdapterFactory.cpp

dudley/src/CPPAdapter/MeshAdapterFactory.h

dudley/src/CPPAdapter/SystemMatrixAdapter.cpp

dudley/src/CPPAdapter/SystemMatrixAdapter.h

dudley/src/CPPAdapter/TransportProblemAdapter.cpp

dudley/src/CPPAdapter/TransportProblemAdapter.h

dudley/src/CPPAdapter/dudleycpp.cpp

dudley/src/CPPAdapter/system_dep.h

dudley/src/Dudley.c

dudley/src/Dudley.h

dudley/src/DudleyVersion.h

dudley/src/ElementFile.c

dudley/src/ElementFile.h

dudley/src/ElementFile_allocTable.c

dudley/src/ElementFile_copyTable.c

dudley/src/ElementFile_createColoring.c

dudley/src/ElementFile_distributeByRankOfDOF.c

dudley/src/ElementFile_gather.c

dudley/src/ElementFile_jacobeans.c

dudley/src/ElementFile_markNodes.c

dudley/src/ElementFile_optimizeOrdering.c

dudley/src/ElementFile_relableNodes.c

dudley/src/ElementFile_scatter.c

dudley/src/ElementFile_setCoordinates.c

dudley/src/ElementFile_setNodeRange.c

dudley/src/ElementFile_setTags.c

dudley/src/ElementType.c

dudley/src/ElementType.h

dudley/src/IndexList.c

dudley/src/IndexList.h

dudley/src/Mesh.c

dudley/src/Mesh.h

dudley/src/Mesh_createNodeFileMappings.c

dudley/src/Mesh_distributeByRankOfDOF.c

dudley/src/Mesh_findMatchingFaces.c

dudley/src/Mesh_getPattern.c

dudley/src/Mesh_markNodes.c

dudley/src/Mesh_optimizeDOFDistribution.c

dudley/src/Mesh_optimizeDOFLabeling.c

dudley/src/Mesh_prepare.c

dudley/src/Mesh_print.c

dudley/src/Mesh_read.c

dudley/src/Mesh_readGmsh.c

dudley/src/Mesh_relableElementNodes.c

dudley/src/Mesh_resolveNodeIds.c

dudley/src/Mesh_saveDX.c

dudley/src/Mesh_saveVTK.c

dudley/src/Mesh_setCoordinates.c

dudley/src/Mesh_tagmaps.c

dudley/src/Mesh_tet4.c

dudley/src/Mesh_tri3.c

dudley/src/Mesh_write.c

dudley/src/NodeFile.c

dudley/src/NodeFile.h

dudley/src/NodeFile_allocTable.c

dudley/src/NodeFile_copyTable.c

dudley/src/NodeFile_createDenseLabelings.c

dudley/src/NodeFile_gather.c

dudley/src/NodeFile_scatter.c

dudley/src/NodeFile_setCoordinates.c

dudley/src/NodeFile_setIdRange.c

dudley/src/NodeFile_setTags.c

dudley/src/NodeMapping.c

dudley/src/NodeMapping.h

dudley/src/SConscript

dudley/src/ShapeTable.c

dudley/src/ShapeTable.h

dudley/src/TagMap.c

dudley/src/TagMap.h

dudley/src/TriangularMesh.h

dudley/src/Util.c

dudley/src/Util.h

dudley/src/generateReferenceElementList.py

dudley/src/vtkCellType.h

dudley/test

dudley/test/MeshAdapterTestCase.cpp

dudley/test/MeshAdapterTestCase.h

dudley/test/SConscript

dudley/test/dudley_UnitTests.cpp

dudley/test/python

dudley/test/python/FCT_benchmark.py

dudley/test/python/FCT_test1.py

dudley/test/python/FCT_test2.py

dudley/test/python/OutTest.py

dudley/test/python/PoissonSolverTest.py

dudley/test/python/RT2D.py

dudley/test/python/RecTest.py

dudley/test/python/SConscript

dudley/test/python/axisymm-movie.py

dudley/test/python/axisymm-splitB.py

dudley/test/python/blocktest.py

dudley/test/python/brick.py

dudley/test/python/convection.py

dudley/test/python/convection_viz.py

dudley/test/python/data_meshes

dudley/test/python/data_meshes/brick_8x10x12.fly

dudley/test/python/data_meshes/rectangle_8x10.fly

dudley/test/python/data_meshes/tet10.fly

dudley/test/python/data_meshes/tet10_gmsh.msh

dudley/test/python/data_meshes/tet4.fly

dudley/test/python/data_meshes/tet4_gmsh.msh

dudley/test/python/data_meshes/tet_2D_o1_boundary_s.xml

dudley/test/python/data_meshes/tet_2D_o1_boundary_t.xml

dudley/test/python/data_meshes/tet_2D_o1_boundary_v.xml

dudley/test/python/data_meshes/tet_2D_o1_cell_s.xml

dudley/test/python/data_meshes/tet_2D_o1_cell_t.xml

dudley/test/python/data_meshes/tet_2D_o1_cell_v.xml

dudley/test/python/data_meshes/tet_2D_o1_node_3xs.xml

dudley/test/python/data_meshes/tet_2D_o1_node_s.xml

dudley/test/python/data_meshes/tet_2D_o1_node_t.xml

dudley/test/python/data_meshes/tet_2D_o1_node_v.xml

dudley/test/python/data_meshes/tet_2D_order1.fly

dudley/test/python/data_meshes/tet_3D_o1_boundary_s.xml

dudley/test/python/data_meshes/tet_3D_o1_boundary_t.xml

dudley/test/python/data_meshes/tet_3D_o1_boundary_v.xml

dudley/test/python/data_meshes/tet_3D_o1_cell_s.xml

dudley/test/python/data_meshes/tet_3D_o1_cell_t.xml

dudley/test/python/data_meshes/tet_3D_o1_cell_v.xml

dudley/test/python/data_meshes/tet_3D_o1_node_s.xml

dudley/test/python/data_meshes/tet_3D_o1_node_t.xml

dudley/test/python/data_meshes/tet_3D_o1_node_v.xml

dudley/test/python/data_meshes/tet_3D_order1.fly

dudley/test/python/data_meshes/tri3.fly

dudley/test/python/data_meshes/tri3_gmsh.msh

dudley/test/python/fixme_run_generators.py

dudley/test/python/generate_dumps.py

dudley/test/python/generate_meshes.py

dudley/test/python/linearElastic.py

dudley/test/python/rayleigh_taylor_instabilty.py

dudley/test/python/rectangle.py

dudley/test/python/run_escriptOnDudley.py

dudley/test/python/run_inputOutput.py

dudley/test/python/run_linearPDEsOnDudley1.py

dudley/test/python/run_linearPDEsOnDudley2.py

dudley/test/python/run_models.py

dudley/test/python/run_simplesolve.py

dudley/test/python/run_utilOnDudley.py

dudley/test/python/run_visualization_interface.py

dudley/test/python/seismic_wave.py

dudley/test/python/slip_stress.py

dudley/test/python/slip_stress_mesh_old.py

dudley/test/python/slip_stress_old.py

dudley/test/python/stokes_problems.py

dudley/test/python/subduction1.py

dudley/test/python/subduction1_gen.py

dudley/test/python/time_chunks.py

dudley/test/python/tp.py

esysUtils/src/Esys_MPI.c

esysUtils/src/Esys_MPI.h

esysUtils/src/error.c

esysUtils/src/error.h

esysUtils/src/index.h

esysUtils/src/maths.h

esysUtils/src/mem.h

esysUtils/src/mpi_C.h

esysUtils/src/types.h

scons/TEMPLATE_linux.py

scons/TEMPLATE_windows.py

site_scons

site_scons/grouptest.py

site_scons/site_init.py

files modified:
SConstruct

bin/run-escript

doc/SConscript

doc/cookbook/SConscript

doc/doxygen/SConscript

doc/epydoc/SConscript

doc/examples/SConscript

doc/examples/cookbook/example01a.py

doc/examples/cookbook/example01b.py

doc/examples/cookbook/example01c.py

doc/examples/cookbook/example02.py

doc/examples/cookbook/example03a.py

doc/examples/cookbook/example03b.py

doc/examples/cookbook/example04a.py

doc/examples/cookbook/example04b.py

doc/examples/cookbook/example09m.py

doc/examples/cookbook/example09n.py

doc/examples/geotutorial/backward_euler.py

doc/examples/geotutorial/forward_euler.py

doc/examples/geotutorial/myfirstscript.py

doc/examples/geotutorial/steadystate.py

doc/examples/geotutorial/steadystate_variablek.py

doc/examples/usersguide/wave.py

doc/install/SConscript

doc/user/SConscript

escript/py_src/SConscript

escript/py_src/levelset.py

escript/py_src/linearPDEs.py

escript/py_src/mountains.py

escript/src/AbstractContinuousDomain.cpp

escript/src/AbstractContinuousDomain.h

escript/src/AbstractDomain.cpp

escript/src/AbstractDomain.h

escript/src/AbstractSystemMatrix.h

escript/src/AbstractTransportProblem.h

escript/src/Data.cpp

escript/src/Data.h

escript/src/DataConstant.cpp

escript/src/DataExpanded.cpp

escript/src/DataFactory.cpp

escript/src/DataLazy.cpp

escript/src/DataTagged.cpp

escript/src/NullDomain.cpp

escript/src/NullDomain.h

escript/src/SConscript

escript/src/TestDomain.cpp

escript/src/Utils.cpp

escript/src/escriptcpp.cpp

escript/test/DataTaggedTestCase.cpp

escript/test/SConscript

escript/test/escript_UnitTest.cpp

escript/test/python/SConscript

escript/test/python/test_assemblage.py

escript/test/python/test_linearPDEs.py

escript/test/python/test_objects.py

escript/test/python/test_pdetools.py

esysUtils/src/SConscript

esysUtils/src/blocktimer.c

esysUtils/test/EsysExceptionTest.cpp

esysUtils/test/SConscript

finley/py_src/SConscript

finley/src/Assemble.h

finley/src/Assemble_CopyNodalData.c

finley/src/Assemble_LumpedSystem.c

finley/src/Assemble_PDE.c

finley/src/Assemble_PDE_Single2_1D.c

finley/src/Assemble_PDE_Single2_2D.c

finley/src/Assemble_PDE_Single2_3D.c

finley/src/Assemble_PDE_Single2_C.c

finley/src/Assemble_PDE_System2_1D.c

finley/src/Assemble_PDE_System2_2D.c

finley/src/Assemble_PDE_System2_3D.c

finley/src/Assemble_PDE_System2_C.c

finley/src/Assemble_getAssembleParameters.c

finley/src/Assemble_integrate.c

finley/src/Assemble_jacobeans.c

finley/src/CPPAdapter/FinleyError.cpp

finley/src/CPPAdapter/MeshAdapter.cpp

finley/src/CPPAdapter/MeshAdapter.h

finley/src/CPPAdapter/MeshAdapterFactory.cpp

finley/src/CPPAdapter/SystemMatrixAdapter.cpp

finley/src/CPPAdapter/TransportProblemAdapter.cpp

finley/src/CPPAdapter/finleycpp.cpp

finley/src/ElementFile.c

finley/src/ElementFile.h

finley/src/ElementFile_allocTable.c

finley/src/ElementFile_distributeByRankOfDOF.c

finley/src/ElementFile_jacobeans.c

finley/src/Finley.c

finley/src/Finley.h

finley/src/Mesh.c

finley/src/Mesh.h

finley/src/Mesh_createNodeFileMappings.c

finley/src/Mesh_distributeByRankOfDOF.c

finley/src/Mesh_getPattern.c

finley/src/Mesh_hex20.c

finley/src/Mesh_hex8.c

finley/src/Mesh_merge.c

finley/src/Mesh_optimizeDOFDistribution.c

finley/src/Mesh_optimizeDOFLabeling.c

finley/src/Mesh_prepare.c

finley/src/Mesh_read.c

finley/src/Mesh_readGmsh.c

finley/src/Mesh_rec4.c

finley/src/Mesh_rec8.c

finley/src/Mesh_resolveNodeIds.c

finley/src/Mesh_saveDX.c

finley/src/Mesh_saveVTK.c

finley/src/NodeFile.c

finley/src/NodeFile.h

finley/src/NodeFile_createDenseLabelings.c

finley/src/NodeFile_gather.c

finley/src/NodeFile_setIdRange.c

finley/src/NodeMapping.c

finley/src/NodeMapping.h

finley/src/Quadrature.c

finley/src/ReferenceElementSets.c

finley/src/ReferenceElementSets.h

finley/src/ReferenceElements.c

finley/src/ReferenceElements.h

finley/src/SConscript

finley/src/ShapeFunctions.c

finley/src/TagMap.c

finley/src/Util.c

finley/src/Util.h

finley/test/SConscript

finley/test/finley_UnitTests.cpp

finley/test/python/SConscript

finley/test/python/run_escriptOnFinley.py

finley/test/python/run_linearPDEsOnFinley1.py

modellib/py_src/SConscript

modellib/py_src/geometry.py

modellib/test/python/SConscript

modellib/test/python/run_convection.py

paso/profiling/SConscript

paso/src/AMG.c

paso/src/AMLI.c

paso/src/BiCGStab.c

paso/src/BlockOps.h

paso/src/Coarsening.c

paso/src/Common.h

paso/src/Coupler.c

paso/src/Coupler.h

paso/src/Distribution.c

paso/src/Distribution.h

paso/src/FCTSolver.c

paso/src/FCTSolver_Function.c

paso/src/FCTSolver_util.c

paso/src/Functions.c

paso/src/Functions.h

paso/src/GMRES.c

paso/src/ILU.c

paso/src/MINRES.c

paso/src/MKL.c

paso/src/Options.h

paso/src/Options_getPackage.c

paso/src/Options_getSolver.c

paso/src/PCG.c

paso/src/Paso.h

paso/src/PasoUtil.c

paso/src/PasoUtil.h

paso/src/Pattern.c

paso/src/Pattern_getSubpattern.c

paso/src/Pattern_mis.c

paso/src/Pattern_reduceBandwidth.c

paso/src/Pattern_unrollBlocks.c

paso/src/Preconditioner.c

paso/src/RILU.c

paso/src/ReactiveSolver.c

paso/src/SConscript

paso/src/SharedComponents.c

paso/src/SharedComponents.h

paso/src/Smoother.c

paso/src/Solver.c

paso/src/Solver_Function.c

paso/src/SparseMatrix.c

paso/src/SparseMatrix_AMGcomponents.c

paso/src/SparseMatrix_getSubmatrix.c

paso/src/SparseMatrix_invMain.c

paso/src/SparseMatrix_saveHB.c

paso/src/SystemMatrix.c

paso/src/SystemMatrix.h

paso/src/SystemMatrixPattern.c

paso/src/SystemMatrixPattern.h

paso/src/SystemMatrixPattern_unrollBlocks.c

paso/src/SystemMatrix_MIS.c

paso/src/SystemMatrix_MatrixVector.c

paso/src/SystemMatrix_borrowNormalization.c

paso/src/SystemMatrix_getSystemMatrixTypeId.c

paso/src/SystemMatrix_loadMM.c

paso/src/SystemMatrix_nullifyRows.c

paso/src/SystemMatrix_nullifyRowsAndCols.c

paso/src/SystemMatrix_rowSum.c

paso/src/SystemMatrix_saveHB.c

paso/src/SystemMatrix_saveMM.c

paso/src/TFQMR.c

paso/src/Transport.c

paso/src/Transport.h

paso/src/Transport_solve.c

paso/src/UMFPACK.c

paso/src/performance.c

paso/src/solve.c

pycad/py_src/SConscript

pycad/py_src/transformations.py

pycad/test/python/SConscript

pycad/test/python/run_pycad_test.py

pythonMPI/src/SConscript

pythonMPI/src/ScriptMPI.cpp

pythonMPI/src/ScriptMPIredirect.cpp

pyvisi/py_src/SConscript

pyvisi/test/python/SConscript

scons/badger_options.py

scons/cgisrv3_options.py

scons/guineapig_options.py

scons/savanna_options.py

scons/shake24_options.py

scons/shake34_options.py

scons/shake59_options.py

scons/shake75_options.py

scons/sunzi_options.py

scons/windows_intelc_options.py

scons/windows_mscv90_options.py

tools/CppUnitTest/src/SConscript

tools/escriptconvert/SConscript

tools/escriptconvert/escriptconvert.cpp

weipa/py_src/SConscript

weipa/src/DataVar.cpp

weipa/src/EscriptDataset.cpp

weipa/src/FinleyDomain.cpp

weipa/src/FinleyDomain.h

weipa/src/FinleyElements.cpp

weipa/src/FinleyElements.h

weipa/src/FinleyNodes.cpp

weipa/src/FinleyNodes.h

weipa/src/SConscript

weipa/src/VisItControl.cpp

weipa/src/weipa.h

weipa/test/SConscript

weipa/test/weipa_UnitTest.cpp

Show diffs side-by-side

added added

removed removed

escript/src/DataFactory.cpp

21

21

#ifdef USE_NETCDF

22

22

#include <netcdfcpp.h>

23

23

#endif

24

#ifdef PASO_MPI

24

#ifdef ESYS_MPI

25

25

#include <mpi.h>

26

26

#endif

27

27

185

185

NcError err(NcError::silent_nonfatal);

186

186

int mpi_iam=0, mpi_num=1;

187

187

// Create the file.

188

#ifdef PASO_MPI

188

#ifdef ESYS_MPI

189

189

MPI_Comm_rank(MPI_COMM_WORLD, &mpi_iam);

190

190

MPI_Comm_size(MPI_COMM_WORLD, &mpi_num);

191

191

#endif

Older »