Changeset 3681
- Timestamp:
- 05/10/10 14:30:44 (15 years ago)
- Location:
- issm/trunk/src/c/objects
- Files:
-
- 39 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Contour.cpp
r1 r3681 9 9 #endif 10 10 11 #include "./ Contour.h"11 #include "./objects.h" 12 12 #include "../include/macros.h" 13 13 #include "../shared/Matlab/matlabshared.h" -
issm/trunk/src/c/objects/DofIndexing.cpp
r3567 r3681 10 10 11 11 #include "stdio.h" 12 #include "./ DofIndexing.h"12 #include "./objects.h" 13 13 #include <string.h> 14 14 #include "../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/objects/DofObject.h
r3637 r3681 8 8 9 9 /*Headers:*/ 10 /*{{{1*/11 #include "./Object.h"12 10 #include "../toolkits/toolkits.h" 13 /*}}}*/14 11 15 12 class DofObject{ -
issm/trunk/src/c/objects/DofVec.cpp
r3673 r3681 9 9 #endif 10 10 11 #include "./ DofVec.h"11 #include "./objects.h" 12 12 #include "../shared/shared.h" 13 13 #include "../include/macros.h" -
issm/trunk/src/c/objects/FemModel.cpp
r3673 r3681 12 12 #include "../shared/shared.h" 13 13 #include "../include/macros.h" 14 #include "./ FemModel.h"14 #include "./objects.h" 15 15 16 16 /*constructors/destructors*/ -
issm/trunk/src/c/objects/FemModel.h
r3673 r3681 8 8 /*Headers:*/ 9 9 /*{{{1*/ 10 #include "./Object.h" 11 #include "../toolkits/toolkits.h" 10 12 class DataSet; 13 class Parameters; 11 14 class DofVec; 12 #include "./Object.h" 13 #include "../DataSet/DataSet.h" 14 #include "../DataSet/Parameters.h" 15 #include "./DofVec.h" 16 #include "../toolkits/toolkits.h" 17 #include "../parallel/parallel.h" 15 class NodeSets; 18 16 /*}}}*/ 19 17 -
issm/trunk/src/c/objects/Hook.cpp
r3673 r3681 12 12 #include "stdio.h" 13 13 #include <string.h> 14 #include "./ Object.h"14 #include "./objects.h" 15 15 #include "../DataSet/DataSet.h" 16 #include "./Hook.h"17 16 #include "../EnumDefinitions/EnumDefinitions.h" 18 17 #include "../shared/shared.h" -
issm/trunk/src/c/objects/Hook.h
r3673 r3681 11 11 /*Headers:*/ 12 12 /*{{{1*/ 13 #include "./Object.h" 13 14 class DataSet; 14 class Object;15 #include "./Object.h"16 #include "../DataSet/DataSet.h"17 #include "../toolkits/toolkits.h"18 15 /*}}}*/ 19 16 -
issm/trunk/src/c/objects/Model.cpp
r3673 r3681 3 3 */ 4 4 5 #include "../issm.h"6 5 7 6 #ifdef HAVE_CONFIG_H … … 11 10 #endif 12 11 13 #include "./Model.h" 12 #include "stdio.h" 13 #include "../DataSet/DataSet.h" 14 #include "../ModelProcessorx/ModelProcessorx.h" 15 #include "./objects.h" 16 #include "../include/types.h" 14 17 #include "../EnumDefinitions/EnumDefinitions.h" 15 #include "stdio.h" 18 #include "../modules.h" 19 16 20 17 21 /*Object constructors and destructor*/ -
issm/trunk/src/c/objects/Node.cpp
r3673 r3681 11 11 12 12 #include "stdio.h" 13 #include "./Vertex.h"14 #include "./Node.h"15 #include "./Hook.h"16 #include "./DofIndexing.h"17 13 #include <string.h> 14 #include "./objects.h" 15 #include "../DataSet/DataSet.h" 18 16 #include "../EnumDefinitions/EnumDefinitions.h" 19 17 #include "../shared/shared.h" -
issm/trunk/src/c/objects/Node.h
r3673 r3681 8 8 /*Headers:*/ 9 9 /*{{{1*/ 10 /*indefinitions: */11 10 #include "./Object.h" 12 11 #include "./DofObject.h" 13 #include "../DataSet/Inputs.h" 14 #include "./Hook.h" 15 #include "./DofIndexing.h" 16 #include "../ModelProcessorx/IoModel.h" 12 class Inputs; 13 class Hook; 14 class DofIndexing; 15 class IoModel; 16 class DataSet; 17 17 /*}}}*/ 18 18 -
issm/trunk/src/c/objects/NodeSets.h
r3637 r3681 8 8 /*Headers:*/ 9 9 /*{{{1*/ 10 #include "../toolkits/toolkits.h"11 10 /*}}}*/ 12 11 -
issm/trunk/src/c/objects/OptArgs.h
r3612 r3681 3 3 */ 4 4 5 #ifndef OPTARGS_H_6 #define OPTARGS_H_5 #ifndef _OPTARGS_H_ 6 #define _OPTARGS_H_ 7 7 8 8 #ifdef _SERIAL_ … … 23 23 }; 24 24 #else 25 25 class Model; 26 26 struct OptArgs{ 27 27 Model* model; -
issm/trunk/src/c/objects/Result.cpp
r3673 r3681 11 11 12 12 #include "stdio.h" 13 #include "./Result.h"14 13 #include <string.h> 14 #include "./objects.h" 15 15 #include "../EnumDefinitions/EnumDefinitions.h" 16 16 #include "../include/macros.h" -
issm/trunk/src/c/objects/Vertex.cpp
r3673 r3681 11 11 12 12 #include <string.h> 13 #include "./ Vertex.h"13 #include "./objects.h" 14 14 #include "../EnumDefinitions/EnumDefinitions.h" 15 15 #include "../include/macros.h" … … 17 17 #include "../include/typedefs.h" 18 18 #include "../include/macros.h" 19 #include "../ModelProcessorx/IoModel.h"20 19 /*}}}*/ 21 20 -
issm/trunk/src/c/objects/Vertex.h
r3673 r3681 8 8 /*Headers:*/ 9 9 /*{{{1*/ 10 class Object;11 class DofObject;12 13 #include "../ModelProcessorx/IoModel.h"14 10 #include "./Object.h" 15 11 #include "./DofObject.h" 12 class IoModel; 16 13 /*}}}*/ 17 14 -
issm/trunk/src/c/objects/objects.h
r3673 r3681 6 6 #define ALL_OBJECTS_H_ 7 7 8 /*Abstract class : */8 /*Abstract classes: */ 9 9 #include "./Object.h" 10 10 11 /*C++ Objects: */ 12 #include "./Material.h" 13 #include "./Matice.h" 14 #include "./Matpar.h" 11 12 /*Objects: */ 13 #include "./Hook.h" 14 #include "./DofIndexing.h" 15 #include "./Vertex.h" 15 16 #include "./Node.h" 16 #include "./Penta.h"17 #include "./Tria.h"18 #include "./Sing.h"19 #include "./Beam.h"20 #include "./Spc.h"21 #include "./Result.h"22 #include "./Rgb.h"23 #include "./Icefront.h"24 #include "./Riftfront.h"25 #include "./Penpair.h"26 #include "./Pengrid.h"27 #include "./Numericalflux.h"28 #include "./Param.h"29 #include "./DoubleParam.h"30 #include "./Element.h"31 17 #include "./NodeSets.h" 32 18 #include "./Model.h" 33 #include "./Input.h" 34 #include "./TriaVertexInput.h" 35 #include "./Vertex.h" 36 #include "./BoolInput.h" 37 #include "./IntInput.h" 38 #include "./DoubleInput.h" 19 #include "./Result.h" 20 #include "./IoModel.h" 21 22 /*Constraints: */ 23 #include "./Constraints/Spc.h" 24 #include "./Constraints/Rgb.h" 25 26 /*Loads: */ 27 #include "./Loads/Friction.h" 28 #include "./Loads/Icefront.h" 29 #include "./Loads/Numericalflux.h" 30 #include "./Loads/Riftfront.h" 31 #include "./Loads/Penpair.h" 32 #include "./Loads/Pengrid.h" 33 34 /*Elements: */ 35 #include "./Elements/Beam.h" 36 #include "./Elements/Element.h" 37 #include "./Elements/Penta.h" 38 #include "./Elements/Tria.h" 39 #include "./Elements/Sing.h" 40 41 /*Inputs: */ 42 #include "./Inputs/Input.h" 43 #include "./Inputs/BoolInput.h" 44 #include "./Inputs/DoubleInput.h" 45 #include "./Inputs/IntInput.h" 46 #include "./Inputs/BeamVertexInput.h" 47 #include "./Inputs/PentaVertexInput.h" 48 #include "./Inputs/SingVertexInput.h" 49 #include "./Inputs/TriaVertexInput.h" 50 51 /*Materials: */ 52 #include "./Materials/Material.h" 53 #include "./Materials/Matice.h" 54 #include "./Materials/Matpar.h" 55 56 57 /*Params: */ 58 #include "./Params/BoolParam.h" 59 #include "./Params/DoubleMatParam.h" 60 #include "./Params/DoubleParam.h" 61 #include "./Params/DoubleVecParam.h" 62 #include "./Params/IntParam.h" 63 #include "./Params/Param.h" 64 #include "./Params/PetscMatParam.h" 65 #include "./Params/PetscVecParam.h" 66 #include "./Params/StringArrayParam.h" 67 #include "./Params/StringParam.h" 39 68 40 69 /*C objects: */ 41 70 #include "./Contour.h" 42 #include "./Friction.h"43 71 #include "./SolverEnum.h" 44 72 #include "./FemModel.h" 45 73 #include "./OptArgs.h" 46 74 #include "./OptPars.h" 47 #include "./BamgGeom.h" 48 #include "./BamgMesh.h" 49 #include "./BamgOpts.h" 75 #include "./DofVec.h" 76 77 /*Bamg: */ 78 #include "./Bamg/BamgGeom.h" 79 #include "./Bamg/BamgMesh.h" 80 #include "./Bamg/BamgOpts.h" 50 81 51 82 #endif
Note:
See TracChangeset
for help on using the changeset viewer.