![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 13623
- Timestamp:
- 10/11/12 11:26:37 (12 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 183 edited
-
Container/Constraints.h (modified) (2 diffs)
-
Container/DataSet.h (modified) (1 diff)
-
Container/Inputs.h (modified) (1 diff)
-
Container/Observations.h (modified) (1 diff)
-
Container/Options.h (modified) (1 diff)
-
Container/Parameters.h (modified) (1 diff)
-
Container/Results.h (modified) (1 diff)
-
classes/DofIndexing.h (modified) (2 diffs)
-
classes/FemModel.h (modified) (1 diff)
-
classes/IoModel.h (modified) (2 diffs)
-
classes/Patch.h (modified) (2 diffs)
-
classes/bamg/AdjacentTriangle.h (modified) (1 diff)
-
classes/bamg/Direction.h (modified) (1 diff)
-
classes/bamg/Edge.h (modified) (2 diffs)
-
classes/bamg/Geometry.h (modified) (1 diff)
-
classes/classes.h (modified) (1 diff)
-
classes/dakota/DakotaPlugin.h (modified) (2 diffs)
-
classes/gauss/GaussPenta.h (modified) (1 diff)
-
classes/gauss/GaussTria.h (modified) (1 diff)
-
classes/matrix/ElementMatrix.h (modified) (1 diff)
-
classes/matrix/ElementVector.h (modified) (3 diffs)
-
classes/matrix/Matrix.h (modified) (1 diff)
-
classes/matrix/Vector.h (modified) (14 diffs)
-
classes/matrix/matrixobjects.h (modified) (2 diffs)
-
classes/objects/Constraints/Constraint.h (modified) (1 diff)
-
classes/objects/DependentObject.h (modified) (3 diffs)
-
classes/objects/ElementResults/BoolElementResult.h (modified) (1 diff)
-
classes/objects/ElementResults/DoubleElementResult.h (modified) (1 diff)
-
classes/objects/ElementResults/ElementResult.h (modified) (1 diff)
-
classes/objects/ElementResults/PentaP1ElementResult.h (modified) (1 diff)
-
classes/objects/ElementResults/TriaP1ElementResult.h (modified) (1 diff)
-
classes/objects/Elements/Element.h (modified) (4 diffs)
-
classes/objects/Elements/Penta.h (modified) (2 diffs)
-
classes/objects/Elements/PentaHook.h (modified) (1 diff)
-
classes/objects/Elements/PentaRef.h (modified) (1 diff)
-
classes/objects/Elements/Tria.h (modified) (2 diffs)
-
classes/objects/Elements/TriaHook.h (modified) (2 diffs)
-
classes/objects/Elements/TriaRef.h (modified) (2 diffs)
-
classes/objects/ExternalResults/ExternalResult.h (modified) (2 diffs)
-
classes/objects/ExternalResults/GenericExternalResult.h (modified) (8 diffs)
-
classes/objects/IndependentObject.h (modified) (3 diffs)
-
classes/objects/Inputs/BoolInput.h (modified) (1 diff)
-
classes/objects/Inputs/ControlInput.h (modified) (1 diff)
-
classes/objects/Inputs/DatasetInput.h (modified) (1 diff)
-
classes/objects/Inputs/DoubleInput.h (modified) (1 diff)
-
classes/objects/Inputs/Input.h (modified) (3 diffs)
-
classes/objects/Inputs/IntInput.h (modified) (1 diff)
-
classes/objects/Inputs/PentaP1Input.h (modified) (1 diff)
-
classes/objects/Inputs/TransientInput.h (modified) (1 diff)
-
classes/objects/Inputs/TriaP1Input.h (modified) (1 diff)
-
classes/objects/KML/KMLFileReadUtils.h (modified) (1 diff)
-
classes/objects/KML/KML_Attribute.h (modified) (1 diff)
-
classes/objects/KML/KML_ColorStyle.h (modified) (1 diff)
-
classes/objects/KML/KML_Comment.h (modified) (1 diff)
-
classes/objects/KML/KML_Container.h (modified) (1 diff)
-
classes/objects/KML/KML_Document.h (modified) (1 diff)
-
classes/objects/KML/KML_Feature.h (modified) (1 diff)
-
classes/objects/KML/KML_File.h (modified) (1 diff)
-
classes/objects/KML/KML_Folder.h (modified) (1 diff)
-
classes/objects/KML/KML_Geometry.h (modified) (1 diff)
-
classes/objects/KML/KML_GroundOverlay.h (modified) (1 diff)
-
classes/objects/KML/KML_Icon.h (modified) (1 diff)
-
classes/objects/KML/KML_LatLonBox.h (modified) (1 diff)
-
classes/objects/KML/KML_LineString.h (modified) (1 diff)
-
classes/objects/KML/KML_LineStyle.h (modified) (1 diff)
-
classes/objects/KML/KML_LinearRing.h (modified) (1 diff)
-
classes/objects/KML/KML_MultiGeometry.h (modified) (1 diff)
-
classes/objects/KML/KML_Object.h (modified) (1 diff)
-
classes/objects/KML/KML_Overlay.h (modified) (1 diff)
-
classes/objects/KML/KML_Placemark.h (modified) (1 diff)
-
classes/objects/KML/KML_Point.h (modified) (1 diff)
-
classes/objects/KML/KML_PolyStyle.h (modified) (1 diff)
-
classes/objects/KML/KML_Polygon.h (modified) (1 diff)
-
classes/objects/KML/KML_Style.h (modified) (1 diff)
-
classes/objects/KML/KML_StyleSelector.h (modified) (1 diff)
-
classes/objects/KML/KML_SubStyle.h (modified) (1 diff)
-
classes/objects/KML/KML_Unknown.h (modified) (1 diff)
-
classes/objects/Loads/Friction.h (modified) (1 diff)
-
classes/objects/Loads/Pengrid.h (modified) (3 diffs)
-
classes/objects/Loads/Penpair.h (modified) (1 diff)
-
classes/objects/Loads/Riftfront.h (modified) (2 diffs)
-
classes/objects/Materials/Material.h (modified) (1 diff)
-
classes/objects/Node.h (modified) (1 diff)
-
classes/objects/Object.h (modified) (1 diff)
-
classes/objects/Options/GenericOption.h (modified) (2 diffs)
-
classes/objects/Options/Option.h (modified) (1 diff)
-
classes/objects/Options/OptionUtilities.h (modified) (1 diff)
-
classes/objects/Params/BoolParam.h (modified) (2 diffs)
-
classes/objects/Params/DataSetParam.h (modified) (1 diff)
-
classes/objects/Params/DoubleMatArrayParam.h (modified) (1 diff)
-
classes/objects/Params/DoubleMatParam.h (modified) (1 diff)
-
classes/objects/Params/DoubleParam.h (modified) (1 diff)
-
classes/objects/Params/DoubleTransientMatParam.h (modified) (1 diff)
-
classes/objects/Params/DoubleVecParam.h (modified) (2 diffs)
-
classes/objects/Params/FileParam.h (modified) (1 diff)
-
classes/objects/Params/GenericParam.h (modified) (1 diff)
-
classes/objects/Params/IntMatParam.h (modified) (1 diff)
-
classes/objects/Params/IntParam.h (modified) (1 diff)
-
classes/objects/Params/IntVecParam.h (modified) (2 diffs)
-
classes/objects/Params/MatrixParam.h (modified) (1 diff)
-
classes/objects/Params/Param.h (modified) (2 diffs)
-
classes/objects/Params/StringArrayParam.h (modified) (2 diffs)
-
classes/objects/Params/StringParam.h (modified) (1 diff)
-
classes/objects/Params/VectorParam.h (modified) (1 diff)
-
classes/objects/Profiler.h (modified) (1 diff)
-
classes/objects/Vertex.h (modified) (1 diff)
-
include/globals.h (modified) (1 diff)
-
include/typedefs.h (modified) (1 diff)
-
modules/AverageFilterx/AverageFilterx.h (modified) (1 diff)
-
modules/Chacox/Chacox.h (modified) (1 diff)
-
modules/ComputeBasalStressx/ComputeBasalStressx.h (modified) (1 diff)
-
modules/ComputeStrainRatex/ComputeStrainRatex.h (modified) (1 diff)
-
modules/ConstraintsStatex/ConstraintsStateLocal.h (modified) (1 diff)
-
modules/ConstraintsStatex/ConstraintsStatex.h (modified) (1 diff)
-
modules/ContourToMeshx/ContourToMeshx.h (modified) (2 diffs)
-
modules/ElementConnectivityx/ElementConnectivityx.h (modified) (1 diff)
-
modules/ElementResponsex/ElementResponsex.h (modified) (1 diff)
-
modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (modified) (1 diff)
-
modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (modified) (1 diff)
-
modules/GetVectorFromInputsx/GetVectorFromInputsx.h (modified) (1 diff)
-
modules/HoleFillerx/HoleFillerx.h (modified) (2 diffs)
-
modules/InputConvergencex/InputConvergencex.h (modified) (1 diff)
-
modules/InputDuplicatex/InputDuplicatex.h (modified) (1 diff)
-
modules/InputScalex/InputScalex.h (modified) (1 diff)
-
modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (modified) (1 diff)
-
modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (modified) (1 diff)
-
modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h (modified) (1 diff)
-
modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (modified) (1 diff)
-
modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h (modified) (1 diff)
-
modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h (modified) (1 diff)
-
modules/InterpFromMesh2dx/InterpFromMesh2dx.h (modified) (1 diff)
-
modules/MassFluxx/MassFluxx.h (modified) (1 diff)
-
modules/MaxAbsVxx/MaxAbsVxx.h (modified) (1 diff)
-
modules/MaxAbsVyx/MaxAbsVyx.h (modified) (1 diff)
-
modules/MaxAbsVzx/MaxAbsVzx.h (modified) (1 diff)
-
modules/MaxVelx/MaxVelx.h (modified) (1 diff)
-
modules/MaxVxx/MaxVxx.h (modified) (1 diff)
-
modules/MaxVyx/MaxVyx.h (modified) (1 diff)
-
modules/MaxVzx/MaxVzx.h (modified) (1 diff)
-
modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h (modified) (1 diff)
-
modules/MeshPartitionx/MeshPartitionx.h (modified) (4 diffs)
-
modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h (modified) (2 diffs)
-
modules/MinVelx/MinVelx.h (modified) (1 diff)
-
modules/MinVxx/MinVxx.h (modified) (1 diff)
-
modules/MinVyx/MinVyx.h (modified) (1 diff)
-
modules/MinVzx/MinVzx.h (modified) (1 diff)
-
modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
-
modules/NodalValuex/NodalValuex.h (modified) (1 diff)
-
modules/NodeConnectivityx/NodeConnectivityx.h (modified) (1 diff)
-
modules/Orthx/Orthx.h (modified) (1 diff)
-
modules/OutputResultsx/OutputResultsx.h (modified) (1 diff)
-
modules/OutputRiftsx/OutputRiftsx.h (modified) (1 diff)
-
modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h (modified) (2 diffs)
-
modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h (modified) (1 diff)
-
modules/Reducevectorgtofx/Reducevectorgtofx.h (modified) (1 diff)
-
modules/Reducevectorgtosx/Reducevectorgtosx.h (modified) (1 diff)
-
modules/RequestedDependentsx/RequestedDependentsx.h (modified) (1 diff)
-
modules/RequestedOutputsx/RequestedOutputsx.h (modified) (1 diff)
-
modules/ResetConstraintsx/ResetConstraintsx.h (modified) (1 diff)
-
modules/Scotchx/Scotchx.h (modified) (1 diff)
-
modules/Solverx/Solverx.h (modified) (1 diff)
-
modules/SurfaceAreax/SurfaceAreax.h (modified) (1 diff)
-
modules/TimeAdaptx/TimeAdaptx.h (modified) (1 diff)
-
modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h (modified) (1 diff)
-
modules/VerticesDofx/VerticesDofx.h (modified) (1 diff)
-
python/include/python_macros.h (modified) (5 diffs)
-
shared/Alloc/xNewDelete.h (modified) (2 diffs)
-
shared/Bamg/shared.h (modified) (1 diff)
-
shared/Exceptions/exceptions.h (modified) (1 diff)
-
shared/Exp/exp.h (modified) (4 diffs)
-
shared/MemOps/xMemCpy.h (modified) (1 diff)
-
shared/String/sharedstring.h (modified) (1 diff)
-
shared/Threads/issm_threads.h (modified) (1 diff)
-
toolkits/issm/SeqMat.h (modified) (1 diff)
-
toolkits/issm/SeqVec.h (modified) (1 diff)
-
toolkits/mpi/patches/mpipatches.h (modified) (1 diff)
-
toolkits/petsc/objects/PetscMat.h (modified) (1 diff)
-
toolkits/petsc/objects/PetscVec.h (modified) (2 diffs)
-
toolkits/petsc/patches/SolverEnum.h (modified) (1 diff)
-
toolkits/plapack/plapackincludes.h (modified) (2 diffs)
-
toolkits/python/pythonincludes.h (modified) (2 diffs)
-
toolkits/scalapack/FortranMapping.h (modified) (2 diffs)
-
toolkits/triangle/triangleincludes.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/Container/Constraints.h
r12365 r13623 16 16 class Inputs; 17 17 18 19 18 class Constraints: public DataSet{ 20 19 … … 31 30 }; 32 31 33 34 32 #endif //ifndef _CONSTRAINTS_H_ 35 -
issm/trunk-jpl/src/c/Container/DataSet.h
r12832 r13623 23 23 24 24 class DataSet{ 25 25 26 26 public: 27 27 28 28 /*internals: */ 29 29 std::vector<Object*> objects; 30 30 31 31 /*type of dataset: */ 32 32 int enum_type; 33 33 34 34 /*sorting: */ 35 35 int sorted; -
issm/trunk-jpl/src/c/Container/Inputs.h
r12466 r13623 42 42 IssmDouble Min(int enumtype); 43 43 IssmDouble MinAbs(int enumtype); 44 44 45 45 void GetInputAverage(IssmDouble* pvalue, int enum_type); 46 46 void GetInputValue(bool* pvalue,int enum_type); -
issm/trunk-jpl/src/c/Container/Observations.h
r13216 r13623 37 37 }; 38 38 #endif //ifndef _OBSERVATIONS_H_ 39 -
issm/trunk-jpl/src/c/Container/Options.h
r13385 r13623 22 22 int AddOption(Option* in_oobject); 23 23 Option* GetOption(const char* name); 24 25 24 26 25 template <class OptionType> void Get(OptionType* pvalue,const char* name){ /*{{{*/ 27 26 -
issm/trunk-jpl/src/c/Container/Parameters.h
r13425 r13623 45 45 void FindParam(FILE** pfid,int enum_type); 46 46 void FindParam(DataSet** pdataset, int enum_type); 47 47 48 48 void SetParam(bool boolean,int enum_type); 49 49 void SetParam(int integer,int enum_type); -
issm/trunk-jpl/src/c/Container/Results.h
r12365 r13623 30 30 }; 31 31 #endif //ifndef _RESULTS_H_ 32 -
issm/trunk-jpl/src/c/classes/DofIndexing.h
r13413 r13623 9 9 10 10 class DofIndexing{ 11 11 12 12 public: 13 13 … … 27 27 /*types of dofs: */ 28 28 int *doftype; //approximation type of the dofs (used only for coupling), size g_size 29 29 30 30 /*list of degrees of freedom: */ 31 31 int *gdoflist; //dof list in g_set -
issm/trunk-jpl/src/c/classes/FemModel.h
r13589 r13623 21 21 class Profiler; 22 22 /*}}}*/ 23 24 23 25 24 class FemModel { -
issm/trunk-jpl/src/c/classes/IoModel.h
r13432 r13623 20 20 private: 21 21 Parameters *constants; //this dataset holds all IssmDouble, int, bool and char from input 22 22 23 23 public: 24 24 IssmDouble **data; //this dataset holds temporary data, memory intensive. 25 25 26 26 /*This data needs to stay memory resident at all time, even if it's memory intensive: */ 27 27 FILE *fid; //pointer to input file … … 36 36 int loadcounter; //keep track of how many loads are being created in each analysis type 37 37 int constraintcounter; //keep track of how many constraints are being created in each analysis type 38 38 39 39 /*for AD mode: to keep track of our independent variables we fetch:*/ 40 40 bool* independents; -
issm/trunk-jpl/src/c/classes/Patch.h
r13413 r13623 4 4 5 5 /*A Patch object is used to store all results held in elements, in a serial way, and to dump them to disk. 6 6 7 7 Each row of the Patch object is made of the following information: 8 8 - the result enum_type, … … 12 12 - the vertices ids, 13 13 - and the values at the nodes (could be different from the vertices). 14 14 15 15 For ex: 16 16 1. on a Beam element, Vx, at step 1, time .5, element id 1, interpolation type P0 (constant), vertices ids 1 and 2, one constant value 4.5 -
issm/trunk-jpl/src/c/classes/bamg/AdjacentTriangle.h
r12821 r13623 44 44 } 45 45 #endif 46 -
issm/trunk-jpl/src/c/classes/bamg/Direction.h
r12821 r13623 19 19 } 20 20 #endif 21 -
issm/trunk-jpl/src/c/classes/bamg/Edge.h
r12821 r13623 12 12 //classes 13 13 class Mesh; 14 14 15 15 class Edge { 16 16 … … 36 36 } 37 37 #endif 38 -
issm/trunk-jpl/src/c/classes/bamg/Geometry.h
r12821 r13623 64 64 void WriteGeometry(BamgGeom *bamggeom, BamgOpts*bamgopts); 65 65 }; 66 66 67 67 } 68 68 #endif -
issm/trunk-jpl/src/c/classes/classes.h
r13609 r13623 5 5 #ifndef ALL_CLASSES_H_ 6 6 #define ALL_CLASSES_H_ 7 8 7 9 8 /*Objects derived classes, which are used in our containers: */ -
issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h
r12836 r13623 4 4 #ifndef _DAKOTAPLUGIN_H 5 5 #define _DAKOTAPLUGIN_H 6 7 6 8 7 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in. … … 49 48 #endif //only works if dakota library has been compiled in. 50 49 51 52 50 #endif -
issm/trunk-jpl/src/c/classes/gauss/GaussPenta.h
r12822 r13623 28 28 double coord3; 29 29 double coord4; 30 30 31 31 public: 32 32 -
issm/trunk-jpl/src/c/classes/gauss/GaussTria.h
r13073 r13623 25 25 IssmDouble coord2; 26 26 IssmDouble coord3; 27 27 28 28 public: 29 29 -
issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.h
r13216 r13623 22 22 23 23 public: 24 24 25 25 int nrows; 26 26 int ncols; -
issm/trunk-jpl/src/c/classes/matrix/ElementVector.h
r13216 r13623 22 22 23 23 public: 24 24 25 25 int nrows; 26 26 IssmDouble* values; 27 27 28 28 //gset 29 29 int* gglobaldoflist; … … 33 33 int* flocaldoflist; 34 34 int* fglobaldoflist; 35 35 36 36 /*ElementVector constructors, destructors {{{*/ 37 37 ElementVector(); … … 51 51 }; 52 52 #endif //#ifndef _ELEMENT_VECTOR_H_ 53 -
issm/trunk-jpl/src/c/classes/matrix/Matrix.h
r13220 r13623 306 306 else _error_("Matrix type: " << type << " not supported yet!"); 307 307 308 309 308 return output; 310 309 } -
issm/trunk-jpl/src/c/classes/matrix/Vector.h
r13229 r13623 61 61 type=in_type; 62 62 63 64 63 if(type==PetscVecType){ 65 64 #ifdef _HAVE_PETSC_ … … 171 170 void SetValues(int ssize, int* list, doubletype* values, InsMode mode){ 172 171 173 174 172 if(type==PetscVecType){ 175 173 #ifdef _HAVE_PETSC_ … … 183 181 } 184 182 else _error_("Vector type: " << type << " not supported yet!"); 185 186 187 183 188 184 } … … 207 203 /*FUNCTION GetValue{{{*/ 208 204 void GetValue(doubletype* pvalue,int dof){ 209 210 205 211 206 if(type==PetscVecType){ … … 256 251 void GetLocalSize(int* pM){ 257 252 258 259 253 if(type==PetscVecType){ 260 254 #ifdef _HAVE_PETSC_ … … 276 270 Vector* output=NULL; 277 271 278 279 272 if(type==PetscVecType){ 280 273 #ifdef _HAVE_PETSC_ … … 298 291 void Set(doubletype value){ 299 292 300 301 293 if(type==PetscVecType){ 302 294 #ifdef _HAVE_PETSC_ … … 316 308 void AXPY(Vector* X, doubletype a){ 317 309 318 319 310 if(type==PetscVecType){ 320 311 #ifdef _HAVE_PETSC_ … … 334 325 void AYPX(Vector* X, doubletype a){ 335 326 336 337 327 if(type==PetscVecType){ 338 328 #ifdef _HAVE_PETSC_ … … 346 336 } 347 337 else _error_("Vector type: " << type << " not supported yet!"); 348 349 338 350 339 } … … 374 363 void Copy(Vector* to){ 375 364 376 377 365 if(type==PetscVecType){ 378 366 #ifdef _HAVE_PETSC_ … … 386 374 } 387 375 else _error_("Vector type: " << type << " not supported yet!"); 388 389 376 390 377 } … … 413 400 void Scale(doubletype scale_factor){ 414 401 415 416 402 if(type==PetscVecType){ 417 403 #ifdef _HAVE_PETSC_ … … 451 437 void PointwiseDivide(Vector* x,Vector* y){ 452 438 453 454 439 if(type==PetscVecType){ 455 440 #ifdef _HAVE_PETSC_ -
issm/trunk-jpl/src/c/classes/matrix/matrixobjects.h
r12832 r13623 6 6 #define ALL_MATRIX_OBJECTS_H_ 7 7 8 9 8 /*Numerics:*/ 10 9 #include "./ElementMatrix.h" … … 13 12 #include "./Matrix.h" 14 13 15 16 14 #endif -
issm/trunk-jpl/src/c/classes/objects/Constraints/Constraint.h
r13414 r13623 18 18 19 19 public: 20 20 21 21 virtual ~Constraint(){}; 22 22 virtual void ConstrainNode(Nodes* nodes,Parameters* parameters)=0; -
issm/trunk-jpl/src/c/classes/objects/DependentObject.h
r13608 r13623 10 10 #include "../../shared/shared.h" 11 11 /*}}}*/ 12 12 13 13 class Elements; 14 14 class Nodes; … … 19 19 20 20 class DependentObject: public Object{ 21 21 22 22 public: 23 23 … … 25 25 int type; /*0: scalar, 1: vertex*/ 26 26 int index; /*0: scalar, 1: vertex*/ 27 27 28 28 /*DependentObject constructors, destructors {{{*/ 29 29 DependentObject(); -
issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.h
r13414 r13623 3 3 * A boll result object is just derived from a BoolInput object, with additional time and step information. 4 4 */ 5 6 5 7 6 #ifndef _BOOLELEMENTRESULT_H_ -
issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.h
r13414 r13623 3 3 * A IssmDouble result object is just derived from a DoubleInput object, with additional time and step information. 4 4 */ 5 6 5 7 6 #ifndef _DOUBLEELEMENTRESULT_H_ -
issm/trunk-jpl/src/c/classes/objects/ElementResults/ElementResult.h
r13414 r13623 14 14 15 15 public: 16 16 17 17 virtual ~ElementResult(){}; 18 18 virtual ElementResult* SpawnTriaElementResult(int* indices)=0; -
issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.h
r13414 r13623 3 3 * this object is just a PentaP1Input with additional time and step info. 4 4 */ 5 6 5 7 6 #ifndef _PENTAP1ELEMENTRESULT_H_ -
issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.h
r13414 r13623 2 2 * \brief: header file for TriaP1ElementResult object 3 3 */ 4 5 4 6 5 #ifndef _TRIAP1ELEMENTRESULT_H_ -
issm/trunk-jpl/src/c/classes/objects/Elements/Element.h
r13216 r13623 4 4 * It is derived from Element, so DataSets can contain them. 5 5 */ 6 7 6 8 7 #ifndef _ELEMENT_H_ … … 25 24 26 25 public: 27 26 28 27 virtual ~Element(){}; 29 28 30 29 virtual void Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters)=0; 31 30 virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters)=0; … … 43 42 virtual void GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue)=0; 44 43 virtual void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype)=0; 45 44 46 45 virtual IssmDouble SurfaceArea(void)=0; 47 46 virtual void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum)=0; … … 59 58 virtual void ProcessResultsUnits(void)=0; 60 59 virtual void RequestedOutput(int output_enum,int step,IssmDouble time)=0; 61 60 62 61 virtual int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units)=0; 63 62 virtual void InputScale(int enum_type,IssmDouble scale_factor)=0; -
issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h
r13414 r13623 90 90 void GetVectorFromInputs(Vector<IssmDouble>* vector,int name_enum); 91 91 void GetVectorFromResults(Vector<IssmDouble>* vector,int offset,int name_enum,int interp); 92 92 93 93 int Sid(); 94 94 void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max); … … 99 99 void InputDuplicate(int original_enum,int new_enum); 100 100 void InputScale(int enum_type,IssmDouble scale_factor); 101 101 102 102 void InputToResult(int enum_type,int step,IssmDouble time); 103 103 void MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding); -
issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.h
r13129 r13623 29 29 }; 30 30 31 32 31 #endif //ifndef _PENTAHOOK_H_ 33 -
issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.h
r13036 r13623 4 4 */ 5 5 6 7 6 #ifndef _PENTAREF_H_ 8 7 #define _PENTAREF_H_ 9 8 10 9 class PentaRef{ 11 12 10 13 11 public: 14 12 int* element_type_list; //P1CG, P1DG, MINI, P2... 15 13 int element_type; 16 14 17 15 PentaRef(); 18 16 PentaRef(const int nummodels); -
issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h
r13414 r13623 136 136 #endif 137 137 138 139 138 #ifdef _HAVE_CONTROL_ 140 139 IssmDouble DragCoefficientAbsGradient(bool process_units,int weight_index); … … 202 201 void SetClone(int* minranks); 203 202 void SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]); 204 203 205 204 #ifdef _HAVE_DIAGNOSTIC_ 206 205 ElementMatrix* CreateKMatrixDiagnosticMacAyeal(void); -
issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.h
r13129 r13623 17 17 Hook* hmatpar; // 1 material parameter 18 18 19 20 19 /*FUNCTION constructors, destructors {{{*/ 21 20 TriaHook(); … … 27 26 }; 28 27 29 30 28 #endif //ifndef _TRIAHOOK_H_ 31 -
issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.h
r12471 r13623 3 3 * strain rate generation, etc ... 4 4 */ 5 6 5 7 6 #ifndef _TRIAREF_H_ … … 11 10 12 11 class TriaRef{ 13 14 12 15 13 public: 16 14 int* element_type_list; //P1CG, P1DG, MINI, P2... 17 15 int element_type; 18 16 19 17 TriaRef(); 20 18 TriaRef(const int nummodels); -
issm/trunk-jpl/src/c/classes/objects/ExternalResults/ExternalResult.h
r12365 r13623 2 2 * \brief abstract class for ExternalResult object 3 3 */ 4 5 4 6 5 #ifndef _EXTERNALRESULT_H_ … … 23 22 24 23 public: 25 24 26 25 virtual ~ExternalResult(){}; 27 26 /*Virtual functions:{{{*/ -
issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h
r13612 r13623 35 35 int step; 36 36 IssmDouble time; 37 37 38 38 public: 39 39 /*Diverse: must be in front, as it is used in what follows*/ … … 109 109 /*GenericExternalResult management: */ 110 110 void WriteData(FILE* fid,bool io_gather){ /*{{{*/ 111 111 112 112 int my_rank; 113 113 int type; 114 114 int size; 115 115 IssmPDouble passiveDouble; 116 116 117 117 /*recover my_rank:*/ 118 118 my_rank=IssmComm::GetRank(); … … 208 208 int type; 209 209 int length; 210 210 211 211 /*recover my_rank:*/ 212 212 my_rank=IssmComm::GetRank(); … … 238 238 M=in_M; 239 239 N=in_N; 240 240 241 241 step=in_step; 242 242 time=in_time; … … 257 257 } /*}}}*/ 258 258 template <> inline void GenericExternalResult<IssmPDouble*>::Echo(void){ /*{{{*/ 259 259 260 260 int i,j; 261 261 … … 266 266 } /*}}}*/ 267 267 template <> inline void GenericExternalResult<IssmPDouble*>::DeepEcho(void){ /*{{{*/ 268 268 269 269 int i,j; 270 270 271 271 _printLine_("GenericExternalResult<IssmPDouble*>:"); 272 272 this->GenericEcho(); 273 273 274 274 _printLine_(" matrix size: " << this->M << "-" << this->N); 275 275 for (i=0;i<this->M;i++){ … … 286 286 } /*}}}*/ 287 287 template <> inline void GenericExternalResult<IssmPDouble*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/ 288 288 289 289 int my_rank; 290 290 int length; … … 293 293 char *name = NULL; 294 294 IssmPDouble passiveDouble; 295 295 296 296 /*recover my_rank:*/ 297 297 my_rank=IssmComm::GetRank(); -
issm/trunk-jpl/src/c/classes/objects/IndependentObject.h
r13608 r13623 5 5 #ifndef _INDEPENDENTOBJECT_H_ 6 6 #define _INDEPENDENTOBJECT_H_ 7 8 7 9 8 /*{{{*/ … … 14 13 15 14 class IndependentObject: public Object{ 16 15 17 16 public: 18 17 … … 20 19 int type; /*0: scalar, 1: vertex*/ 21 20 int numberofvertices; 22 21 23 22 /*IndependentObject constructors, destructors {{{*/ 24 23 IndependentObject(); -
issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h
r13414 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _BOOLINPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h
r13414 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _CONTROLINPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h
r13414 r13623 2 2 * \brief: header file for datasetinput object 3 3 */ 4 5 4 6 5 #ifndef _DATASETINPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h
r13414 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _DOUBLEINPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/Input.h
r13216 r13623 2 2 * \brief abstract class for Input object 3 3 */ 4 5 4 6 5 #ifndef _INPUT_H_ … … 19 18 20 19 public: 21 20 22 21 virtual ~Input(){}; 23 22 … … 60 59 virtual void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist)=0; 61 60 virtual void GetValuesPtr(IssmDouble** pvalues,int* pnum_values)=0; 62 61 63 62 virtual Input* SpawnTriaInput(int* indices)=0; 64 63 virtual Input* PointwiseDivide(Input* inputB)=0; -
issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.h
r13414 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _INTINPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h
r13414 r13623 2 2 * \brief: header file for PentaP1Input object 3 3 */ 4 5 4 6 5 #ifndef _PENTAP1INPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h
r13414 r13623 2 2 * \brief: header file for transientinput object 3 3 */ 4 5 4 6 5 #ifndef _TRANSIENTINPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h
r13414 r13623 2 2 * \brief: header file for TriaP1Input object 3 3 */ 4 5 4 6 5 #ifndef _TRIAP1INPUT_H_ -
issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.h
r12912 r13623 55 55 56 56 #endif /* _KMLFILEREADUTILS_H */ 57 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h
r13414 r13623 44 44 }; 45 45 #endif /* _KML_ATTRIBUTE_H */ 46 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h
r13414 r13623 43 43 }; 44 44 #endif /* _KML_COLORSTYLE_H */ 45 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.h
r13414 r13623 44 44 }; 45 45 #endif /* _KML_COMMENT_H */ 46 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h
r13414 r13623 40 40 }; 41 41 #endif /* _KML_CONTAINER_H */ 42 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.h
r13414 r13623 37 37 }; 38 38 #endif /* _KML_DOCUMENT_H */ 39 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.h
r13414 r13623 51 51 }; 52 52 #endif /* _KML_FEATURE_H */ 53 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_File.h
r13414 r13623 38 38 }; 39 39 #endif /* _KML_FILE_H */ 40 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.h
r13414 r13623 37 37 }; 38 38 #endif /* _KML_FOLDER_H */ 39 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h
r13414 r13623 36 36 }; 37 37 #endif /* _KML_GEOMETRY_H */ 38 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h
r13414 r13623 43 43 }; 44 44 #endif /* _KML_GROUNDOVERLAY_H */ 45 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h
r13414 r13623 51 51 }; 52 52 #endif /* _KML_ICON_H */ 53 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h
r13414 r13623 42 42 }; 43 43 #endif /* _KML_LATLONBOX_H */ 44 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h
r13414 r13623 45 45 }; 46 46 #endif /* _KML_LINESTRING_H */ 47 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h
r13414 r13623 38 38 }; 39 39 #endif /* _KML_LINESTYLE_H */ 40 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h
r13414 r13623 45 45 }; 46 46 #endif /* _KML_LINEARRING_H */ 47 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h
r13414 r13623 41 41 }; 42 42 #endif /* _KML_MULTIGEOMETRY_H */ 43 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.h
r13414 r13623 50 50 }; 51 51 #endif /* _KML_OBJECT_H */ 52 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h
r13414 r13623 43 43 }; 44 44 #endif /* _KML_OVERLAY_H */ 45 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h
r13414 r13623 41 41 }; 42 42 #endif /* _KML_PLACEMARK_H */ 43 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h
r13414 r13623 43 43 }; 44 44 #endif /* _KML_POINT_H */ 45 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h
r13414 r13623 39 39 }; 40 40 #endif /* _KML_POLYSTYLE_H */ 41 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h
r13414 r13623 47 47 }; 48 48 #endif /* _KML_POLYGON_H */ 49 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.h
r13414 r13623 45 45 }; 46 46 #endif /* _KML_STYLE_H */ 47 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h
r13414 r13623 36 36 }; 37 37 #endif /* _KML_STYLESELECTOR_H */ 38 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h
r13414 r13623 36 36 }; 37 37 #endif /* _KML_SUBSTYLE_H */ 38 -
issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h
r13414 r13623 39 39 }; 40 40 #endif /* _KML_UNKNOWN_H */ 41 -
issm/trunk-jpl/src/c/classes/objects/Loads/Friction.h
r12424 r13623 25 25 Friction(const char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type); 26 26 ~Friction(); 27 27 28 28 void Echo(void); 29 29 void GetAlpha2(IssmDouble* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum); -
issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.h
r13414 r13623 20 20 int id; 21 21 int analysis_type; 22 22 23 23 /*Hooks*/ 24 24 Hook* hnode; //hook to 1 node … … 33 33 Parameters* parameters; //pointer to solution parameters 34 34 Inputs* inputs; 35 35 36 36 /*internals: */ 37 37 int active; … … 96 96 97 97 #endif /* _PENGRID_H_ */ 98 99 -
issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.h
r13414 r13623 71 71 72 72 #endif /* _PENPAIR_H_ */ 73 74 -
issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.h
r13414 r13623 25 25 Hook* helements; 26 26 Hook* hmatpar; 27 27 28 28 /*Corresponding fields*/ 29 29 Matpar *matpar; … … 45 45 Parameters *parameters; //pointer to solution parameters 46 46 Inputs *inputs; 47 48 47 49 48 /*Riftfrontconstructors,destructors: {{{*/ -
issm/trunk-jpl/src/c/classes/objects/Materials/Material.h
r13216 r13623 2 2 * \brief abstract class for Material object 3 3 */ 4 5 4 6 5 #ifndef _MATERIAL_H_ -
issm/trunk-jpl/src/c/classes/objects/Node.h
r13414 r13623 27 27 int id; //unique arbitrary id. 28 28 int sid; //"serial" id (rank of this node if the dataset was serial on 1 cpu) 29 29 30 30 DofIndexing indexing; 31 31 Hook *hvertex; -
issm/trunk-jpl/src/c/classes/objects/Object.h
r13413 r13623 7 7 * DataSet. 8 8 */ 9 10 9 11 10 #ifndef _OBJECT_H_ -
issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h
r13414 r13623 44 44 size =NULL; 45 45 46 47 46 } /*}}}*/ 48 47 ~GenericOption(){ /*{{{*/ … … 83 82 int ObjectEnum(){return GenericOptionEnum;}; 84 83 Object* copy(){_error_("Not implemented yet");}; 85 84 86 85 /*GenericOption functions: */ 87 86 char* Name(){return name;}; -
issm/trunk-jpl/src/c/classes/objects/Options/Option.h
r13414 r13623 17 17 18 18 public: 19 19 20 20 /*Option constructors, destructors*/ 21 21 Option(){}; -
issm/trunk-jpl/src/c/classes/objects/Options/OptionUtilities.h
r12832 r13623 22 22 23 23 #endif /* _OPTIONUTILITIES_H */ 24 -
issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _BOOLPARAM_H_ … … 71 70 void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} 72 71 void UnitConversion(int direction_enum); 73 72 74 73 void GetParameterName(char**pname); 75 74 /*}}}*/ -
issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.h
r13608 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _DATASETPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.h
r13425 r13623 2 2 * \brief: header file for object holding an array of serial matrices 3 3 */ 4 5 4 6 5 #ifndef _DOUBLEMATARRAYPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _DOUBLEMATPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _DOUBLEPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/DoubleTransientMatParam.h
r12832 r13623 2 2 * \brief: header file for DoubleTransientMatParam object 3 3 */ 4 5 4 6 5 #ifndef _DOUBLETRANSIENTMATPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _DOUBLEVECPARAM_H_ … … 72 71 void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} 73 72 void UnitConversion(int direction_enum); 74 73 75 74 void GetParameterName(char**pname); 76 75 /*}}}*/ -
issm/trunk-jpl/src/c/classes/objects/Params/FileParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _FILEPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/GenericParam.h
r13425 r13623 99 99 }; 100 100 101 102 101 #endif /* GENERICPARAM_H_ */ -
issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _INTMATPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/IntParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _INTPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _INTVECPARAM_H_ … … 73 72 void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} 74 73 void UnitConversion(int direction_enum); 75 74 76 75 void GetParameterName(char**pname); 77 76 /*}}}*/ -
issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.h
r13425 r13623 2 2 * \brief: header file for MatrixParam object 3 3 */ 4 5 4 6 5 #ifndef _MATRIXPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/Param.h
r13425 r13623 2 2 * \brief abstract class for Param object 3 3 */ 4 5 4 6 5 #ifndef _PARAM_H_ … … 42 41 virtual void GetParameterValue(FILE** pfid)=0; 43 42 virtual void GetParameterValue(DataSet** pdataset)=0; 44 43 45 44 virtual void SetValue(bool boolean)=0; 46 45 virtual void SetValue(int integer)=0; -
issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _STRINGARRAYPARAM_H_ … … 27 26 char** value; 28 27 int numstrings; 29 30 28 31 29 public: -
issm/trunk-jpl/src/c/classes/objects/Params/StringParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _STRINGPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.h
r13425 r13623 2 2 * \brief: header file for triavertexinput object 3 3 */ 4 5 4 6 5 #ifndef _VECTORPARAM_H_ -
issm/trunk-jpl/src/c/classes/objects/Profiler.h
r13540 r13623 25 25 Finish 26 26 }; 27 28 27 29 28 class Profiler: public Object{ -
issm/trunk-jpl/src/c/classes/objects/Vertex.h
r13414 r13623 17 17 18 18 /*}}}*/ 19 20 19 21 20 class Vertex: public Object{ -
issm/trunk-jpl/src/c/include/globals.h
r13610 r13623 6 6 #define GLOBALS_H_ 7 7 8 9 8 #include "./types.h" 10 9 #include "../classes/IssmComm.h" -
issm/trunk-jpl/src/c/include/typedefs.h
r12427 r13623 36 36 #define INFINITY (DBL_MAX+DBL_MAX) 37 37 #define NAN (INFINITY-INFINITY) 38 38 39 39 #endif 40 40 -
issm/trunk-jpl/src/c/modules/AverageFilterx/AverageFilterx.h
r3109 r13623 11 11 /* local prototypes: */ 12 12 int AverageFilterx(double** pimageout,double* imagein, int lines,int samp,int smooth); 13 13 14 14 #endif /* AVERAGEFILTERX_H */ 15 -
issm/trunk-jpl/src/c/modules/Chacox/Chacox.h
r12832 r13623 44 44 #define __FUNCT__ "Chacox" 45 45 46 47 46 #endif /* _CHACOX_H */ -
issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h
r13216 r13623 13 13 14 14 #endif /* _COMPUTEBASALSTRESSX_H */ 15 -
issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h
r13216 r13623 13 13 14 14 #endif /* _COMPUTESTRAINRATEX_H */ 15 -
issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h
r12832 r13623 27 27 28 28 #endif /* _CONSTRAINTSSTATEX_H */ 29 -
issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.h
r12832 r13623 15 15 16 16 #endif /* _CONSTRAINTSSTATEX_H */ 17 -
issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h
r13229 r13623 2 2 ContourToMeshx.h 3 3 */ 4 5 4 6 5 #ifndef _CONTOURTOMESHX_H … … 22 21 } ContourToMeshxThreadStruct; 23 22 24 25 23 /* local prototypes: */ 26 24 int ContourToMeshx(SeqVec<double>** pin_nods,SeqVec<double>** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue); -
issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.h
r1105 r13623 10 10 11 11 #endif /* _ELEMENTCONNECTIVITYX_H */ 12 -
issm/trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.h
r13073 r13623 13 13 14 14 #endif /* _ELEMENTRESPONSEX_H */ 15 -
issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h
r13216 r13623 13 13 14 14 #endif /* _GETSOLUTIONFROMINPUTSXX_H */ 15 -
issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h
r13216 r13623 13 13 14 14 #endif /* _GETVECTORFROMCONTROLINPUTSXX_H */ 15 -
issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h
r13216 r13623 13 13 14 14 #endif /* _GETVECTORFROMINPUTSXX_H */ 15 -
issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.h
r3110 r13623 2 2 HoleFillerx.h 3 3 */ 4 5 4 6 5 #ifndef HOLEFILLERX_H … … 12 11 /* local prototypes: */ 13 12 int HoleFillerx(double** pimageout,double* imagein, int lines,int samp,int smooth); 14 13 15 14 #endif /* HOLEFILLERX_H */ 16 -
issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.h
r12470 r13623 11 11 12 12 #endif /* _INPUTCONVERGENCEX_H */ 13 -
issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.h
r4236 r13623 12 12 13 13 #endif /* _INPUTDUPLICATEX_H */ 14 -
issm/trunk-jpl/src/c/modules/InputScalex/InputScalex.h
r12470 r13623 12 12 13 13 #endif /* _SCALEINPUTX_H */ 14 -
issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h
r12832 r13623 15 15 16 16 #endif /* _UPDATEINPUTSFROMCONSTANTXX_H */ 17 -
issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h
r12832 r13623 12 12 13 13 #endif /* _INPUTUPDATEFROMDAKOTAXX_H */ 14 -
issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h
r12832 r13623 13 13 14 14 #endif /* _UPDATEINPUTSFROMMATRIXDAKOTAXX_H */ 15 -
issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h
r13216 r13623 18 18 19 19 #endif /* _UPDATEINPUTSFROMSOLUTIONXX_H */ 20 -
issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h
r13216 r13623 16 16 17 17 #endif /* _UPDATEINPUTSFROMVECTORDAKOTAXX_H */ 18 -
issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h
r13216 r13623 16 16 17 17 #endif /* _UPDATEINPUTSFROMVECTORXX_H */ 18 -
issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.h
r13229 r13623 29 29 double *incontour; 30 30 31 32 31 } InterpFromMesh2dxThreadStruct; 33 32 -
issm/trunk-jpl/src/c/modules/MassFluxx/MassFluxx.h
r13073 r13623 12 12 void MassFluxx(IssmDouble* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,bool process_units); 13 13 14 15 14 #endif /* _MASSFLUXX_H */ 16 -
issm/trunk-jpl/src/c/modules/MaxAbsVxx/MaxAbsVxx.h
r13073 r13623 13 13 14 14 #endif /* _MAXABSVXX_H */ 15 -
issm/trunk-jpl/src/c/modules/MaxAbsVyx/MaxAbsVyx.h
r13073 r13623 13 13 14 14 #endif /* _MAXABSVYX_H */ 15 -
issm/trunk-jpl/src/c/modules/MaxAbsVzx/MaxAbsVzx.h
r13073 r13623 13 13 14 14 #endif /* _MAXABSVZX_H */ 15 -
issm/trunk-jpl/src/c/modules/MaxVelx/MaxVelx.h
r13073 r13623 13 13 14 14 #endif /* _MAXVELX_H */ 15 -
issm/trunk-jpl/src/c/modules/MaxVxx/MaxVxx.h
r13073 r13623 12 12 13 13 #endif /* _MAXVXX_H */ 14 -
issm/trunk-jpl/src/c/modules/MaxVyx/MaxVyx.h
r13073 r13623 13 13 14 14 #endif /* _MAXVYX_H */ 15 -
issm/trunk-jpl/src/c/modules/MaxVzx/MaxVzx.h
r13073 r13623 13 13 14 14 #endif /* _MAXVZX_H */ 15 -
issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h
r13216 r13623 12 12 13 13 #endif /* _MERGESOLUTIONFROMFTOGX_H */ 14 -
issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h
r13317 r13623 8 8 #include "../../include/include.h" 9 9 #include "../../EnumDefinitions/EnumDefinitions.h" 10 11 10 12 11 /* local prototypes: */ … … 89 88 /*Extrude epart2d to epart, using numlayers: */ 90 89 epart=xNew<int>(numberofelements); 91 90 92 91 count=0; 93 92 for(i=0;i<(numlayers-1);i++){ … … 100 99 /*Extrude npart2d to npart, using numlayers: */ 101 100 npart=xNew<int>(numberofnodes); 102 101 103 102 count=0; 104 103 for(i=0;i<(numlayers);i++){ … … 109 108 } 110 109 } 111 110 112 111 /*Assign output pointer:*/ 113 112 *pepart=epart; -
issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h
r13220 r13623 2 2 MeshProfileIntersectionx.h 3 3 */ 4 5 4 6 5 #ifndef _MESHPROFILEINTERSECTIONX_H … … 19 18 20 19 #endif /* _MESHPROFILEINTERSECTIONX_H */ 21 -
issm/trunk-jpl/src/c/modules/MinVelx/MinVelx.h
r13073 r13623 13 13 14 14 #endif /* _MINVELX_H */ 15 -
issm/trunk-jpl/src/c/modules/MinVxx/MinVxx.h
r13073 r13623 13 13 14 14 #endif /* _MINVX_H */ 15 -
issm/trunk-jpl/src/c/modules/MinVyx/MinVyx.h
r13073 r13623 13 13 14 14 #endif /* _MINVYX_H */ 15 -
issm/trunk-jpl/src/c/modules/MinVzx/MinVzx.h
r13073 r13623 13 13 14 14 #endif /* _MINVZX_H */ 15 -
issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h
r13277 r13623 109 109 void UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, Constraints** pconstraints); 110 110 111 112 111 /*Distribution of dofs: */ 113 112 void DistributeNumDofs(DofIndexing* index,int analysis_type,IssmDouble* vertices_type); -
issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.h
r12832 r13623 13 13 14 14 #endif /* _NODALVALUEX_H */ 15 -
issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.h
r1105 r13623 10 10 11 11 #endif /* _NODECONNECTIVITYX_H */ 12 -
issm/trunk-jpl/src/c/modules/Orthx/Orthx.h
r13216 r13623 14 14 15 15 #endif /* _ORTHX_H */ 16 -
issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.h
r12011 r13623 17 17 18 18 #endif /* _OUTPUTRESULTS_H */ 19 -
issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.h
r4236 r13623 12 12 13 13 #endif /* _OUTPUTRIFTSX_H */ 14 -
issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h
r13229 r13623 2 2 PointCloudFindNeighborsx.h 3 3 */ 4 5 4 6 5 #ifndef _POINTCLOUDFLAGNEIGHBORSX_H … … 26 25 void* PointCloudFindNeighborsxt(void* vPointCloudFindNeighborsThreadStruct); 27 26 28 29 27 #endif /* _POINTCLOUDFLAGNEIGHBORSX_H */ 30 -
issm/trunk-jpl/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h
r4236 r13623 11 11 12 12 #endif /* _PROPAGATEFLAGSFROMCONNECTIVITYX_H */ 13 -
issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.h
r13216 r13623 13 13 14 14 #endif /* _REDUCEVECTORGTOFX_H */ 15 -
issm/trunk-jpl/src/c/modules/Reducevectorgtosx/Reducevectorgtosx.h
r13216 r13623 13 13 14 14 #endif /* _REDUCEVECTORGTOSX_H */ 15 -
issm/trunk-jpl/src/c/modules/RequestedDependentsx/RequestedDependentsx.h
r13283 r13623 12 12 13 13 #endif /* _INPUTTORESULTX_H */ 14 -
issm/trunk-jpl/src/c/modules/RequestedOutputsx/RequestedOutputsx.h
r11827 r13623 12 12 13 13 #endif /* _INPUTTORESULTX_H */ 14 -
issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.h
r12832 r13623 14 14 15 15 #endif /* _RESETCONSTRAINTSX_H */ 16 -
issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.h
r12832 r13623 5 5 #ifndef _SCOTCHX_H 6 6 #define _SCOTCHX_H 7 8 7 9 8 #undef __FUNCT__ -
issm/trunk-jpl/src/c/modules/Solverx/Solverx.h
r13294 r13623 38 38 39 39 #endif /* _SOLVERX_H */ 40 -
issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.h
r12832 r13623 13 13 14 14 #endif /* _SURFACEAREAX_H */ 15 -
issm/trunk-jpl/src/c/modules/TimeAdaptx/TimeAdaptx.h
r12832 r13623 12 12 13 13 #endif /* _TIMEADAPTX_H */ 14 -
issm/trunk-jpl/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h
r4236 r13623 12 12 13 13 #endif /* _UPDATEVERTEXPOSITIONSXX_H */ 14 -
issm/trunk-jpl/src/c/modules/VerticesDofx/VerticesDofx.h
r12832 r13623 13 13 14 14 #endif /* _VERTICESDOFX_H */ 15 -
issm/trunk-jpl/src/c/python/include/python_macros.h
r13365 r13623 45 45 /* WRAPPER 3.2 {{{*/ 46 46 #define WRAPPER(modulename,...) \ 47 \ 47 48 48 static PyObject* modulename(PyObject* self,PyObject* args);\ 49 49 static PyMethodDef modulename##_funcs[] = {\ … … 51 51 {NULL,NULL,0,NULL}\ 52 52 };\ 53 \ 53 54 54 static struct PyModuleDef modulename##module= {\ 55 55 PyModuleDef_HEAD_INIT,\ … … 60 60 modulename##_funcs\ 61 61 };\ 62 \ 62 63 63 PyMODINIT_FUNC PyInit_##modulename(void){\ 64 \ 64 65 65 import_array();\ 66 66 return PyModule_Create(&modulename##module);\ 67 67 }\ 68 \ 68 69 69 static PyObject* modulename(PyObject* self,PyObject* args) 70 70 /*}}}*/ … … 72 72 /* WRAPPER 2.7 {{{*/ 73 73 #define WRAPPER(modulename,...) \ 74 \ 74 75 75 static PyObject* modulename(PyObject* self,PyObject* args);\ 76 76 static PyMethodDef modulename##_funcs[] = {\ … … 78 78 {NULL,NULL,0,NULL}\ 79 79 };\ 80 \ 80 81 81 PyMODINIT_FUNC init##modulename(void){\ 82 \ 82 83 83 import_array();\ 84 84 (void) Py_InitModule(#modulename, modulename##_funcs);\ 85 85 }\ 86 \ 86 87 87 static PyObject* modulename(PyObject* self,PyObject* args) 88 88 /*}}}*/ -
issm/trunk-jpl/src/c/shared/Alloc/xNewDelete.h
r13459 r13623 7 7 8 8 #include <cassert> 9 10 9 11 10 // memory management of types … … 154 153 155 154 #endif 156 -
issm/trunk-jpl/src/c/shared/Bamg/shared.h
r3913 r13623 2 2 * \brief: header file for all shared routines. 3 3 */ 4 5 4 6 5 #ifndef _SHAREDBamg_H_ -
issm/trunk-jpl/src/c/shared/Exceptions/exceptions.h
r13363 r13623 16 16 /*We derive our classes from the c++ exception class: */ 17 17 class ErrorException: public exception { 18 18 19 19 string what_str; 20 20 string function_name; -
issm/trunk-jpl/src/c/shared/Exp/exp.h
r13357 r13623 60 60 template <class doubletype> 61 61 int DomainOutlineRead(int* pnprof,int** pprofnvertices,doubletype*** ppprofx,doubletype*** ppprofy,bool** pclosed,char* domainname){ 62 62 63 63 /*indexing: */ 64 64 int i,counter; … … 100 100 nprof++; 101 101 } 102 102 103 103 /*Allocate and initialize all the profiles: */ 104 104 profnvertices = xNew<int>(nprof); … … 121 121 fscanf(fid,"%256s %256s\n",chardummy,chardummy); 122 122 fscanf(fid,"%256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy); 123 123 124 124 /*Get number of profile vertices: */ 125 125 fscanf(fid,"%20u %256s\n",&n,chardummy); 126 126 127 127 /*Skip next line: */ 128 128 fscanf(fid,"%256s %256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy,chardummy); … … 131 131 x=xNew<doubletype>(n); 132 132 y=xNew<doubletype>(n); 133 133 134 134 /*Read vertices: */ 135 135 for (i=0;i<n;i++){ -
issm/trunk-jpl/src/c/shared/MemOps/xMemCpy.h
r12355 r13623 17 17 18 18 #endif 19 -
issm/trunk-jpl/src/c/shared/String/sharedstring.h
r13539 r13623 13 13 14 14 #endif //ifndef _SHAREDSTRING_H_ 15 -
issm/trunk-jpl/src/c/shared/Threads/issm_threads.h
r2549 r13623 14 14 } pthread_handle; 15 15 16 17 16 /*routine that launches "function" in a multi-threaded way if requested, 18 17 * or just serially if not requested: */ -
issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h
r13216 r13623 30 30 31 31 public: 32 32 33 33 int M,N; 34 34 doubletype* matrix; /*here, doubletype is either IssmDouble or IssmPDouble*/ -
issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h
r13229 r13623 29 29 30 30 public: 31 31 32 32 doubletype* vector; 33 33 int M; -
issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h
r13602 r13623 2 2 * \brief: prototype header for all ISSM add-ons to MPI 3 3 */ 4 5 4 6 5 #ifndef MPI_PATCHES_H_ -
issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h
r12850 r13623 53 53 54 54 }; 55 55 56 56 #endif //#ifndef _PETSCMAT_H_ -
issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h
r12850 r13623 19 19 #include "../../../include/include.h" 20 20 21 22 21 /*}}}*/ 23 22 … … 30 29 IssmDouble* avector; 31 30 #endif 32 33 31 34 32 /*PetscVec constructors, destructors {{{*/ -
issm/trunk-jpl/src/c/toolkits/petsc/patches/SolverEnum.h
r9291 r13623 15 15 } EXTERNALPACKAGES; 16 16 17 18 17 #endif //ifndef _SOLVERENUM_H_ 19 -
issm/trunk-jpl/src/c/toolkits/plapack/plapackincludes.h
r11695 r13623 12 12 #endif 13 13 14 15 14 #include "PLA.h" 16 15 … … 23 22 #endif 24 23 25 26 24 #endif 27 -
issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h
r12128 r13623 5 5 #ifndef _PYTHON_INCLUDES_H_ 6 6 #define _PYTHON_INCLUDES_H_ 7 8 7 9 8 #ifdef HAVE_CONFIG_H … … 32 31 #endif 33 32 34 35 33 #endif -
issm/trunk-jpl/src/c/toolkits/scalapack/FortranMapping.h
r831 r13623 5 5 * Description: Fortran to C define to use Scalapack in a C program 6 6 */ 7 8 7 9 8 /*We transform every call to Fortran functions into their real symbolic name in the Scalapack, Blacs, Lapack and Blas libraries. … … 22 21 #define PDGETRF(...) pdgetrf_(__VA_ARGS__) 23 22 #define PDGETRI(...) pdgetri_(__VA_ARGS__) 24 25 23 26 24 /*Here, we clobber the fortran definition of these routines. Remember, every variable in fortran is passed by a pointer, and the -
issm/trunk-jpl/src/c/toolkits/triangle/triangleincludes.h
r12018 r13623 11 11 #endif //#ifdef _C_ 12 12 13 14 13 #endif
Note:
See TracChangeset
for help on using the changeset viewer.
