Changeset 3913


Ignore:
Timestamp:
05/23/10 00:19:16 (15 years ago)
Author:
Eric.Larour
Message:

Moved all objects in Bamg to objects directory.
Moved all solutions from parallel to solutoins.
Moved all modules from top c/ directory to c/modules directory
cleaned up all object dependencies in Bamg/objects (fiouh!)
That will do for the week-end:)

Location:
issm/trunk/src
Files:
58 added
251 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Makefile.am

    r3895 r3913  
    3434                                        ./objects/Bamg/BamgOpts.h\
    3535                                        ./objects/Bamg/BamgOpts.cpp\
     36                                        ./objects/Bamg/CrackedEdge.h\
     37                                        ./objects/Bamg/CrackedEdge.cpp\
     38                                        ./objects/Bamg/Curve.h\
     39                                        ./objects/Bamg/Curve.cpp\
     40                                        ./objects/Bamg/Direction.h\
     41                                        ./objects/Bamg/Direction.cpp\
     42                                        ./objects/Bamg/DoubleAndInt.h\
     43                                        ./objects/Bamg/Edge.h\
     44                                        ./objects/Bamg/Edge.cpp\
     45                                        ./objects/Bamg/GeometricalEdge.h\
     46                                        ./objects/Bamg/GeometricalEdge.cpp\
     47                                        ./objects/Bamg/GeometricalSubDomain.h\
     48                                        ./objects/Bamg/GeometricalSubDomain.cpp\
     49                                        ./objects/Bamg/GeometricalVertex.h\
     50                                        ./objects/Bamg/GeometricalVertex.cpp\
     51                                        ./objects/Bamg/Geometry.cpp\
     52                                        ./objects/Bamg/Geometry.h\
     53                                        ./objects/Bamg/ListofIntersectionTriangles.cpp\
     54                                        ./objects/Bamg/ListofIntersectionTriangles.h\
     55                                        ./objects/Bamg/MatVVP2x2.cpp\
     56                                        ./objects/Bamg/Metric.cpp\
     57                                        ./objects/Bamg/Metric.h\
     58                                        ./objects/Bamg/QuadTree.cpp\
     59                                        ./objects/Bamg/QuadTree.h\
     60                                        ./objects/Bamg/R2.h\
     61                                        ./objects/Bamg/SetOfE4.cpp\
     62                                        ./objects/Bamg/SetOfE4.h\
     63                                        ./objects/Bamg/SubDomain.h\
     64                                        ./objects/Bamg/SubDomain.cpp\
     65                                        ./objects/Bamg/TriangleAdjacent.h\
     66                                        ./objects/Bamg/TriangleAdjacent.cpp\
     67                                        ./objects/Bamg/Triangle.cpp\
     68                                        ./objects/Bamg/Triangle.h\
     69                                        ./objects/Bamg/Triangles.cpp\
     70                                        ./objects/Bamg/Triangles.h\
     71                                        ./objects/Bamg/MeshVertex.cpp\
     72                                        ./objects/Bamg/MeshVertex.h\
     73                                        ./objects/Bamg/VertexOnEdge.h\
     74                                        ./objects/Bamg/VertexOnEdge.cpp\
     75                                        ./objects/Bamg/VertexOnGeom.h\
     76                                        ./objects/Bamg/VertexOnGeom.cpp\
     77                                        ./objects/Bamg/VertexOnVertex.h\
     78                                        ./objects/Bamg/VertexOnVertex.cpp\
    3679                                        ./objects/Element.h\
    3780                                        ./objects/Model.h\
     
    184227                                        ./shared/String/isdistributed.cpp\
    185228                                        ./shared/String/sharedstring.h\
     229                                        ./shared/Bamg/Abs.h \
     230                                        ./shared/Bamg/BigPrimeNumber.h\
     231                                        ./shared/Bamg/BigPrimeNumber.cpp\
     232                                        ./shared/Bamg/BinaryRand.h \
     233                                        ./shared/Bamg/det.h \
     234                                        ./shared/Bamg/Exchange.h \
     235                                        ./shared/Bamg/extrema.h \
     236                                        ./shared/Bamg/HeapSort.h \
     237                                        ./shared/Bamg/Norm.h \
     238                                        ./shared/Bamg/OppositeAngle.h \
    186239                                        ./toolkits/petsc\
    187240                                        ./toolkits/petsc/patches\
     
    238291                                        ./EnumDefinitions/EnumAsString.cpp\
    239292                                        ./EnumDefinitions/StringAsEnum.cpp\
    240                                         ./ModelProcessorx/ModelProcessorx.h\
    241                                         ./ModelProcessorx/Partitioning.cpp\
    242                                         ./ModelProcessorx/CreateDataSets.cpp\
    243                                         ./ModelProcessorx/CreateParameters.cpp\
    244                                         ./ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
    245                                         ./ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
    246                                         ./ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \
    247                                         ./ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\
    248                                         ./ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\
    249                                         ./ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \
    250                                         ./ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\
    251                                         ./ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp\
    252                                         ./ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
    253                                         ./ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
    254                                         ./ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp\
    255                                         ./ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
    256                                         ./ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
    257                                         ./ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp\
    258                                         ./ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp \
    259                                         ./ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
    260                                         ./ModelProcessorx/Control/CreateParametersControl.cpp\
    261                                         ./ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp\
    262                                         ./ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\
    263                                         ./ModelProcessorx/Thermal/CreateLoadsThermal.cpp\
    264                                         ./ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\
    265                                         ./ModelProcessorx/Melting/CreateConstraintsMelting.cpp\
    266                                         ./ModelProcessorx/Melting/CreateLoadsMelting.cpp\
    267                                         ./ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\
    268                                         ./ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\
    269                                         ./ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\
    270                                         ./ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\
    271                                         ./ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\
    272                                         ./ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\
    273                                         ./ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\
    274                                         ./ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\
    275                                         ./ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\
    276                                         ./ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\
    277                                         ./ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\
    278                                         ./ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\
    279                                         ./ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\
    280                                         ./ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\
    281                                         ./ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\
    282                                         ./ModelProcessorx/Qmu/CreateParametersQmu.cpp\
    283                                         ./Dofx/Dofx.h\
    284                                         ./Dofx/Dofx.cpp\
    285                                         ./Dux/Dux.h\
    286                                         ./Dux/Dux.cpp\
    287                                         ./ControlConstrainx/ControlConstrainx.h\
    288                                         ./ControlConstrainx/ControlConstrainx.cpp\
    289                                         ./SurfaceAreax/SurfaceAreax.h\
    290                                         ./SurfaceAreax/SurfaceAreax.cpp\
    291                                         ./Misfitx/Misfitx.h\
    292                                         ./Misfitx/Misfitx.cpp\
    293                                         ./CostFunctionx/CostFunctionx.h\
    294                                         ./CostFunctionx/CostFunctionx.cpp\
    295                                         ./Orthx/Orthx.h\
    296                                         ./Orthx/Orthx.cpp\
    297                                         ./Gradjx/Gradjx.h\
    298                                         ./Gradjx/Gradjx.cpp\
    299                                         ./SplitSolutionVectorx/SplitSolutionVectorx.h\
    300                                         ./SplitSolutionVectorx/SplitSolutionVectorx.cpp\
    301                                         ./UpdateInputsFromConstantx/UpdateInputsFromConstantx.h\
    302                                         ./UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp\
    303                                         ./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
    304                                         ./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
    305                                         ./GetSolutionFromInputsx/GetSolutionFromInputsx.h\
    306                                         ./GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\
    307                                         ./UpdateInputsFromVectorx/UpdateInputsFromVectorx.h\
    308                                         ./UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp\
    309                                         ./UpdateGeometryx/UpdateGeometryx.h\
    310                                         ./UpdateGeometryx/UpdateGeometryx.cpp\
    311                                         ./UpdateVertexPositionsx/UpdateVertexPositionsx.h\
    312                                         ./UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\
    313                                         ./ConfigureObjectsx/ConfigureObjectsx.h\
    314                                         ./ConfigureObjectsx/ConfigureObjectsx.cpp\
    315                                         ./ComputeBasalStressx/ComputeBasalStressx.h\
    316                                         ./ComputeBasalStressx/ComputeBasalStressx.cpp\
    317                                         ./ComputePressurex/ComputePressurex.h\
    318                                         ./ComputePressurex/ComputePressurex.cpp\
    319                                         ./ComputeStrainRatex/ComputeStrainRatex.h\
    320                                         ./ComputeStrainRatex/ComputeStrainRatex.cpp\
    321                                         ./BuildNodeSetsx/BuildNodeSetsx.h\
    322                                         ./BuildNodeSetsx/BuildNodeSetsx.cpp\
    323                                         ./BuildNodeSetsx/PartitionSets.cpp\
    324                                         ./SpcNodesx/SpcNodesx.h\
    325                                         ./SpcNodesx/SpcNodesx.cpp\
    326                                         ./MpcNodesx/MpcNodesx.h\
    327                                         ./MpcNodesx/MpcNodesx.cpp\
    328                                         ./InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
    329                                         ./InterpFromGridToMeshx/InterpFromGridToMeshx.h\
    330                                         ./InterpFromGridToMeshx/InterpFromGridToMeshxt.cpp\
    331                                         ./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
    332                                         ./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\
    333                                         ./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
    334                                         ./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\
    335                                         ./InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
    336                                         ./InterpFromMeshToGridx/InterpFromMeshToGridx.h\
    337                                         ./HoleFillerx/HoleFillerx.cpp\
    338                                         ./HoleFillerx/HoleFillerx.h\
    339                                         ./AverageFilterx/AverageFilterx.cpp\
    340                                         ./AverageFilterx/AverageFilterx.h\
    341                                         ./MeshPartitionx/MeshPartitionx.cpp\
    342                                         ./MeshPartitionx/MeshPartitionx.h\
    343                                         ./ContourToMeshx/ContourToMeshx.cpp\
    344                                         ./ContourToMeshx/ContourToMeshxt.cpp\
    345                                         ./ContourToMeshx/ContourToMeshx.h\
    346                                         ./ContourToNodesx/ContourToNodesx.cpp\
    347                                         ./ContourToNodesx/ContourToNodesx.h\
    348                                         ./Reducevectorgtosx/Reducevectorgtosx.cpp\
    349                                         ./Reducevectorgtosx/Reducevectorgtosx.h\
    350                                         ./Reducevectorgtofx/Reducevectorgtofx.cpp\
    351                                         ./Reducevectorgtofx/Reducevectorgtofx.h\
    352                                         ./Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\
    353                                         ./Reducematrixfromgtofx/Reducematrixfromgton.cpp\
    354                                         ./Reducematrixfromgtofx/Reducematrixfromgtofx.h\
    355                                         ./Reduceloadfromgtofx/Reduceloadfromgtofx.h\
    356                                         ./Reduceloadfromgtofx/Reduceloadfromgtofx.cpp\
    357                                         ./NormalizeConstraintsx/NormalizeConstraintsx.cpp\
    358                                         ./NormalizeConstraintsx/NormalizeConstraintsx.h\
    359                                         ./NodeConnectivityx/NodeConnectivityx.cpp\
    360                                         ./NodeConnectivityx/NodeConnectivityx.h\
    361                                         ./ElementConnectivityx/ElementConnectivityx.cpp\
    362                                         ./ElementConnectivityx/ElementConnectivityx.h\
    363                                         ./MassFluxx/MassFluxx.cpp\
    364                                         ./MassFluxx/MassFluxx.h\
    365                                         ./SystemMatricesx/SystemMatricesx.cpp\
    366                                         ./SystemMatricesx/SystemMatricesx.h\
    367                                         ./PenaltyConstraintsx/PenaltyConstraintsx.cpp\
    368                                         ./PenaltyConstraintsx/PenaltyConstraintsx.h\
    369                                         ./PenaltyConstraintsx/RiftConstraints.cpp\
    370                                         ./PenaltyConstraintsx/RiftConstraints.h\
    371                                         ./PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\
    372                                         ./PenaltySystemMatricesx/PenaltySystemMatricesx.h\
    373                                         ./Solverx/Solverx.cpp\
    374                                         ./Solverx/Solverx.h\
    375                                         ./Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
    376                                         ./Mergesolutionfromftogx/Mergesolutionfromftogx.h\
    377                                         ./ProcessParamsx/ProcessParamsx.cpp\
    378                                         ./ProcessParamsx/ProcessParamsx.h\
    379                                         ./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\
    380                                         ./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h\
    381                                         ./Qmux/Qmux.h\
    382                                         ./Qmux/Qmux.cpp\
    383                                         ./Qmux/SpawnCore.cpp\
    384                                         ./Qmux/SpawnCoreSerial.cpp\
    385                                         ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
    386                                         ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
    387                                         ./FieldDepthAveragex/FieldDepthAveragex.cpp\
    388                                         ./FieldDepthAveragex/FieldDepthAveragex.h\
    389                                         ./DepthAverageInputx/DepthAverageInputx.cpp\
    390                                         ./DepthAverageInputx/DepthAverageInputx.h\
    391                                         ./FieldExtrudex/FieldExtrudex.cpp\
    392                                         ./FieldExtrudex/FieldExtrudex.h\
    393                                         ./InputToResultx/InputToResultx.cpp\
    394                                         ./InputToResultx/InputToResultx.h\
    395                                         ./ExtrudeInputx/ExtrudeInputx.cpp\
    396                                         ./ExtrudeInputx/ExtrudeInputx.h\
    397                                         ./OutputRiftsx/OutputRiftsx.h\
    398                                         ./OutputRiftsx/OutputRiftsx.cpp\
    399                                         ./Bamgx/Bamgx.cpp\
    400                                         ./Bamgx/Bamgx.h\
    401                                         ./Bamgx/include/include.h \
    402                                         ./Bamgx/include/macros.h \
    403                                         ./Bamgx/include/typedefs.h \
    404                                         ./Bamgx/objects/BamgObjects.h \
    405                                         ./Bamgx/objects/CrackedEdge.h\
    406                                         ./Bamgx/objects/CrackedEdge.cpp\
    407                                         ./Bamgx/objects/Curve.h\
    408                                         ./Bamgx/objects/Curve.cpp\
    409                                         ./Bamgx/objects/Direction.h\
    410                                         ./Bamgx/objects/Direction.cpp\
    411                                         ./Bamgx/objects/DoubleAndInt.h\
    412                                         ./Bamgx/objects/Edge.h\
    413                                         ./Bamgx/objects/Edge.cpp\
    414                                         ./Bamgx/objects/GeometricalEdge.h\
    415                                         ./Bamgx/objects/GeometricalEdge.cpp\
    416                                         ./Bamgx/objects/GeometricalSubDomain.h\
    417                                         ./Bamgx/objects/GeometricalSubDomain.cpp\
    418                                         ./Bamgx/objects/GeometricalVertex.h\
    419                                         ./Bamgx/objects/GeometricalVertex.cpp\
    420                                         ./Bamgx/objects/Geometry.cpp\
    421                                         ./Bamgx/objects/Geometry.h\
    422                                         ./Bamgx/objects/ListofIntersectionTriangles.cpp\
    423                                         ./Bamgx/objects/ListofIntersectionTriangles.h\
    424                                         ./Bamgx/objects/MatVVP2x2.cpp\
    425                                         ./Bamgx/objects/Metric.cpp\
    426                                         ./Bamgx/objects/Metric.h\
    427                                         ./Bamgx/objects/QuadTree.cpp\
    428                                         ./Bamgx/objects/QuadTree.h\
    429                                         ./Bamgx/objects/R2.h\
    430                                         ./Bamgx/objects/SetOfE4.cpp\
    431                                         ./Bamgx/objects/SetOfE4.h\
    432                                         ./Bamgx/objects/SubDomain.h\
    433                                         ./Bamgx/objects/SubDomain.cpp\
    434                                         ./Bamgx/objects/TriangleAdjacent.h\
    435                                         ./Bamgx/objects/TriangleAdjacent.cpp\
    436                                         ./Bamgx/objects/Triangle.cpp\
    437                                         ./Bamgx/objects/Triangle.h\
    438                                         ./Bamgx/objects/Triangles.cpp\
    439                                         ./Bamgx/objects/Triangles.h\
    440                                         ./Bamgx/objects/MeshVertex.cpp\
    441                                         ./Bamgx/objects/MeshVertex.h\
    442                                         ./Bamgx/objects/VertexOnEdge.h\
    443                                         ./Bamgx/objects/VertexOnEdge.cpp\
    444                                         ./Bamgx/objects/VertexOnGeom.h\
    445                                         ./Bamgx/objects/VertexOnGeom.cpp\
    446                                         ./Bamgx/objects/VertexOnVertex.h\
    447                                         ./Bamgx/objects/VertexOnVertex.cpp\
    448                                         ./Bamgx/shared/Abs.h \
    449                                         ./Bamgx/shared/BigPrimeNumber.h\
    450                                         ./Bamgx/shared/BigPrimeNumber.cpp\
    451                                         ./Bamgx/shared/BinaryRand.h \
    452                                         ./Bamgx/shared/det.h \
    453                                         ./Bamgx/shared/Exchange.h \
    454                                         ./Bamgx/shared/extrema.h \
    455                                         ./Bamgx/shared/HeapSort.h \
    456                                         ./Bamgx/shared/Norm.h \
    457                                         ./Bamgx/shared/OppositeAngle.h \
    458                                         ./Bamgx/shared/shared.h\
    459                                         ./BamgConvertMeshx/BamgConvertMeshx.cpp\
    460                                         ./BamgConvertMeshx/BamgConvertMeshx.h
     293                                        ./modules/ModelProcessorx/ModelProcessorx.h\
     294                                        ./modules/ModelProcessorx/Partitioning.cpp\
     295                                        ./modules/ModelProcessorx/CreateDataSets.cpp\
     296                                        ./modules/ModelProcessorx/CreateParameters.cpp\
     297                                        ./modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
     298                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
     299                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \
     300                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\
     301                                        ./modules/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\
     302                                        ./modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \
     303                                        ./modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\
     304                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp\
     305                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
     306                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
     307                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp\
     308                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
     309                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
     310                                        ./modules/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp\
     311                                        ./modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp \
     312                                        ./modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
     313                                        ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
     314                                        ./modules/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp\
     315                                        ./modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\
     316                                        ./modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp\
     317                                        ./modules/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\
     318                                        ./modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp\
     319                                        ./modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp\
     320                                        ./modules/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\
     321                                        ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\
     322                                        ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\
     323                                        ./modules/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\
     324                                        ./modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\
     325                                        ./modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\
     326                                        ./modules/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\
     327                                        ./modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\
     328                                        ./modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\
     329                                        ./modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\
     330                                        ./modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\
     331                                        ./modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\
     332                                        ./modules/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\
     333                                        ./modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\
     334                                        ./modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\
     335                                        ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\
     336                                        ./modules/Dofx/Dofx.h\
     337                                        ./modules/Dofx/Dofx.cpp\
     338                                        ./modules/Dux/Dux.h\
     339                                        ./modules/Dux/Dux.cpp\
     340                                        ./modules/ControlConstrainx/ControlConstrainx.h\
     341                                        ./modules/ControlConstrainx/ControlConstrainx.cpp\
     342                                        ./modules/SurfaceAreax/SurfaceAreax.h\
     343                                        ./modules/SurfaceAreax/SurfaceAreax.cpp\
     344                                        ./modules/Misfitx/Misfitx.h\
     345                                        ./modules/Misfitx/Misfitx.cpp\
     346                                        ./modules/CostFunctionx/CostFunctionx.h\
     347                                        ./modules/CostFunctionx/CostFunctionx.cpp\
     348                                        ./modules/Orthx/Orthx.h\
     349                                        ./modules/Orthx/Orthx.cpp\
     350                                        ./modules/Gradjx/Gradjx.h\
     351                                        ./modules/Gradjx/Gradjx.cpp\
     352                                        ./modules/SplitSolutionVectorx/SplitSolutionVectorx.h\
     353                                        ./modules/SplitSolutionVectorx/SplitSolutionVectorx.cpp\
     354                                        ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.h\
     355                                        ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp\
     356                                        ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
     357                                        ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
     358                                        ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\
     359                                        ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\
     360                                        ./modules/UpdateInputsFromVectorx/UpdateInputsFromVectorx.h\
     361                                        ./modules/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp\
     362                                        ./modules/UpdateGeometryx/UpdateGeometryx.h\
     363                                        ./modules/UpdateGeometryx/UpdateGeometryx.cpp\
     364                                        ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\
     365                                        ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\
     366                                        ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
     367                                        ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\
     368                                        ./modules/ComputeBasalStressx/ComputeBasalStressx.h\
     369                                        ./modules/ComputeBasalStressx/ComputeBasalStressx.cpp\
     370                                        ./modules/ComputePressurex/ComputePressurex.h\
     371                                        ./modules/ComputePressurex/ComputePressurex.cpp\
     372                                        ./modules/ComputeStrainRatex/ComputeStrainRatex.h\
     373                                        ./modules/ComputeStrainRatex/ComputeStrainRatex.cpp\
     374                                        ./modules/BuildNodeSetsx/BuildNodeSetsx.h\
     375                                        ./modules/BuildNodeSetsx/BuildNodeSetsx.cpp\
     376                                        ./modules/BuildNodeSetsx/PartitionSets.cpp\
     377                                        ./modules/SpcNodesx/SpcNodesx.h\
     378                                        ./modules/SpcNodesx/SpcNodesx.cpp\
     379                                        ./modules/MpcNodesx/MpcNodesx.h\
     380                                        ./modules/MpcNodesx/MpcNodesx.cpp\
     381                                        ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
     382                                        ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h\
     383                                        ./modules/InterpFromGridToMeshx/InterpFromGridToMeshxt.cpp\
     384                                        ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
     385                                        ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\
     386                                        ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
     387                                        ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\
     388                                        ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
     389                                        ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h\
     390                                        ./modules/HoleFillerx/HoleFillerx.cpp\
     391                                        ./modules/HoleFillerx/HoleFillerx.h\
     392                                        ./modules/AverageFilterx/AverageFilterx.cpp\
     393                                        ./modules/AverageFilterx/AverageFilterx.h\
     394                                        ./modules/MeshPartitionx/MeshPartitionx.cpp\
     395                                        ./modules/MeshPartitionx/MeshPartitionx.h\
     396                                        ./modules/ContourToMeshx/ContourToMeshx.cpp\
     397                                        ./modules/ContourToMeshx/ContourToMeshxt.cpp\
     398                                        ./modules/ContourToMeshx/ContourToMeshx.h\
     399                                        ./modules/ContourToNodesx/ContourToNodesx.cpp\
     400                                        ./modules/ContourToNodesx/ContourToNodesx.h\
     401                                        ./modules/Reducevectorgtosx/Reducevectorgtosx.cpp\
     402                                        ./modules/Reducevectorgtosx/Reducevectorgtosx.h\
     403                                        ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\
     404                                        ./modules/Reducevectorgtofx/Reducevectorgtofx.h\
     405                                        ./modules/Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\
     406                                        ./modules/Reducematrixfromgtofx/Reducematrixfromgton.cpp\
     407                                        ./modules/Reducematrixfromgtofx/Reducematrixfromgtofx.h\
     408                                        ./modules/Reduceloadfromgtofx/Reduceloadfromgtofx.h\
     409                                        ./modules/Reduceloadfromgtofx/Reduceloadfromgtofx.cpp\
     410                                        ./modules/NormalizeConstraintsx/NormalizeConstraintsx.cpp\
     411                                        ./modules/NormalizeConstraintsx/NormalizeConstraintsx.h\
     412                                        ./modules/NodeConnectivityx/NodeConnectivityx.cpp\
     413                                        ./modules/NodeConnectivityx/NodeConnectivityx.h\
     414                                        ./modules/ElementConnectivityx/ElementConnectivityx.cpp\
     415                                        ./modules/ElementConnectivityx/ElementConnectivityx.h\
     416                                        ./modules/MassFluxx/MassFluxx.cpp\
     417                                        ./modules/MassFluxx/MassFluxx.h\
     418                                        ./modules/SystemMatricesx/SystemMatricesx.cpp\
     419                                        ./modules/SystemMatricesx/SystemMatricesx.h\
     420                                        ./modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp\
     421                                        ./modules/PenaltyConstraintsx/PenaltyConstraintsx.h\
     422                                        ./modules/PenaltyConstraintsx/RiftConstraints.cpp\
     423                                        ./modules/PenaltyConstraintsx/RiftConstraints.h\
     424                                        ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\
     425                                        ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h\
     426                                        ./modules/Solverx/Solverx.cpp\
     427                                        ./modules/Solverx/Solverx.h\
     428                                        ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
     429                                        ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\
     430                                        ./modules/ProcessParamsx/ProcessParamsx.cpp\
     431                                        ./modules/ProcessParamsx/ProcessParamsx.h\
     432                                        ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\
     433                                        ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h\
     434                                        ./modules/Qmux/Qmux.h\
     435                                        ./modules/Qmux/Qmux.cpp\
     436                                        ./modules/Qmux/SpawnCore.cpp\
     437                                        ./modules/Qmux/SpawnCoreSerial.cpp\
     438                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
     439                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
     440                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
     441                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.h\
     442                                        ./modules/DepthAverageInputx/DepthAverageInputx.cpp\
     443                                        ./modules/DepthAverageInputx/DepthAverageInputx.h\
     444                                        ./modules/FieldExtrudex/FieldExtrudex.cpp\
     445                                        ./modules/FieldExtrudex/FieldExtrudex.h\
     446                                        ./modules/InputToResultx/InputToResultx.cpp\
     447                                        ./modules/InputToResultx/InputToResultx.h\
     448                                        ./modules/ExtrudeInputx/ExtrudeInputx.cpp\
     449                                        ./modules/ExtrudeInputx/ExtrudeInputx.h\
     450                                        ./modules/OutputRiftsx/OutputRiftsx.h\
     451                                        ./modules/OutputRiftsx/OutputRiftsx.cpp\
     452                                        ./modules/Bamgx/Bamgx.cpp\
     453                                        ./modules/Bamgx/Bamgx.h\
     454                                        ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
     455                                        ./modules/BamgConvertMeshx/BamgConvertMeshx.h
    461456
    462457libISSM_a_CXXFLAGS = -fPIC -DMATLAB -D_SERIAL_ -ansi -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXOPTFLAGS)
     
    483478                                        ./objects/Bamg/BamgOpts.h\
    484479                                        ./objects/Bamg/BamgOpts.cpp\
     480                                        ./objects/Bamg/BamgObjects.h \
     481                                        ./objects/Bamg/CrackedEdge.h\
     482                                        ./objects/Bamg/CrackedEdge.cpp\
     483                                        ./objects/Bamg/Curve.h\
     484                                        ./objects/Bamg/Curve.cpp\
     485                                        ./objects/Bamg/Direction.h\
     486                                        ./objects/Bamg/Direction.cpp\
     487                                        ./objects/Bamg/DoubleAndInt.h\
     488                                        ./objects/Bamg/Edge.h\
     489                                        ./objects/Bamg/Edge.cpp\
     490                                        ./objects/Bamg/GeometricalEdge.h\
     491                                        ./objects/Bamg/GeometricalEdge.cpp\
     492                                        ./objects/Bamg/GeometricalSubDomain.h\
     493                                        ./objects/Bamg/GeometricalSubDomain.cpp\
     494                                        ./objects/Bamg/GeometricalVertex.h\
     495                                        ./objects/Bamg/GeometricalVertex.cpp\
     496                                        ./objects/Bamg/Geometry.cpp\
     497                                        ./objects/Bamg/Geometry.h\
     498                                        ./objects/Bamg/ListofIntersectionTriangles.cpp\
     499                                        ./objects/Bamg/ListofIntersectionTriangles.h\
     500                                        ./objects/Bamg/MatVVP2x2.cpp\
     501                                        ./objects/Bamg/Metric.cpp\
     502                                        ./objects/Bamg/Metric.h\
     503                                        ./objects/Bamg/QuadTree.cpp\
     504                                        ./objects/Bamg/QuadTree.h\
     505                                        ./objects/Bamg/R2.h\
     506                                        ./objects/Bamg/SetOfE4.cpp\
     507                                        ./objects/Bamg/SetOfE4.h\
     508                                        ./objects/Bamg/SubDomain.h\
     509                                        ./objects/Bamg/SubDomain.cpp\
     510                                        ./objects/Bamg/TriangleAdjacent.h\
     511                                        ./objects/Bamg/TriangleAdjacent.cpp\
     512                                        ./objects/Bamg/Triangle.cpp\
     513                                        ./objects/Bamg/Triangle.h\
     514                                        ./objects/Bamg/Triangles.cpp\
     515                                        ./objects/Bamg/Triangles.h\
     516                                        ./objects/Bamg/MeshVertex.cpp\
     517                                        ./objects/Bamg/MeshVertex.h\
     518                                        ./objects/Bamg/VertexOnEdge.h\
     519                                        ./objects/Bamg/VertexOnEdge.cpp\
     520                                        ./objects/Bamg/VertexOnGeom.h\
     521                                        ./objects/Bamg/VertexOnGeom.cpp\
     522                                        ./objects/Bamg/VertexOnVertex.h\
    485523                                        ./objects/Element.h\
    486524                                        ./objects/Model.h\
     
    631669                                        ./shared/String/isdistributed.cpp\
    632670                                        ./shared/String/sharedstring.h\
     671                                        ./shared/Bamg/Abs.h \
     672                                        ./shared/Bamg/BigPrimeNumber.h\
     673                                        ./shared/Bamg/BigPrimeNumber.cpp\
     674                                        ./shared/Bamg/BinaryRand.h \
     675                                        ./shared/Bamg/det.h \
     676                                        ./shared/Bamg/Exchange.h \
     677                                        ./shared/Bamg/extrema.h \
     678                                        ./shared/Bamg/HeapSort.h \
     679                                        ./shared/Bamg/Norm.h \
     680                                        ./shared/Bamg/OppositeAngle.h \
    633681                                        ./toolkits/petsc\
    634682                                        ./toolkits/petsc/patches\
     
    684732                                        ./EnumDefinitions/EnumAsString.cpp\
    685733                                        ./EnumDefinitions/StringAsEnum.cpp\
    686                                         ./ModelProcessorx/ModelProcessorx.h\
    687                                         ./ModelProcessorx/Partitioning.cpp\
    688                                         ./ModelProcessorx/CreateDataSets.cpp\
    689                                         ./ModelProcessorx/CreateParameters.cpp\
    690                                         ./ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
    691                                         ./ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
    692                                         ./ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \
    693                                         ./ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\
    694                                         ./ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\
    695                                         ./ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \
    696                                         ./ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\
    697                                         ./ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp\
    698                                         ./ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
    699                                         ./ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
    700                                         ./ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp\
    701                                         ./ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
    702                                         ./ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
    703                                         ./ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp\
    704                                         ./ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp \
    705                                         ./ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
    706                                         ./ModelProcessorx/Control/CreateParametersControl.cpp\
    707                                         ./ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp\
    708                                         ./ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\
    709                                         ./ModelProcessorx/Thermal/CreateLoadsThermal.cpp\
    710                                         ./ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\
    711                                         ./ModelProcessorx/Melting/CreateConstraintsMelting.cpp\
    712                                         ./ModelProcessorx/Melting/CreateLoadsMelting.cpp\
    713                                         ./ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\
    714                                         ./ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\
    715                                         ./ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\
    716                                         ./ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\
    717                                         ./ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\
    718                                         ./ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\
    719                                         ./ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\
    720                                         ./ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\
    721                                         ./ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\
    722                                         ./ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\
    723                                         ./ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\
    724                                         ./ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\
    725                                         ./ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\
    726                                         ./ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\
    727                                         ./ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\
    728                                         ./ModelProcessorx/Qmu/CreateParametersQmu.cpp\
    729                                         ./Dofx/Dofx.h\
    730                                         ./Dofx/Dofx.cpp\
    731                                         ./Dux/Dux.h\
    732                                         ./Dux/Dux.cpp\
    733                                         ./ControlConstrainx/ControlConstrainx.h\
    734                                         ./ControlConstrainx/ControlConstrainx.cpp\
    735                                         ./SurfaceAreax/SurfaceAreax.h\
    736                                         ./SurfaceAreax/SurfaceAreax.cpp\
    737                                         ./Misfitx/Misfitx.h\
    738                                         ./Misfitx/Misfitx.cpp\
    739                                         ./CostFunctionx/CostFunctionx.h\
    740                                         ./CostFunctionx/CostFunctionx.cpp\
    741                                         ./Orthx/Orthx.h\
    742                                         ./Orthx/Orthx.cpp\
    743                                         ./Gradjx/Gradjx.h\
    744                                         ./Gradjx/Gradjx.cpp\
    745                                         ./SplitSolutionVectorx/SplitSolutionVectorx.h\
    746                                         ./SplitSolutionVectorx/SplitSolutionVectorx.cpp\
    747                                         ./UpdateInputsFromConstantx/UpdateInputsFromConstantx.h\
    748                                         ./UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp\
    749                                         ./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
    750                                         ./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
    751                                         ./GetSolutionFromInputsx/GetSolutionFromInputsx.h\
    752                                         ./GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\
    753                                         ./UpdateInputsFromVectorx/UpdateInputsFromVectorx.h\
    754                                         ./UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp\
    755                                         ./UpdateGeometryx/UpdateGeometryx.h\
    756                                         ./UpdateGeometryx/UpdateGeometryx.cpp\
    757                                         ./UpdateVertexPositionsx/UpdateVertexPositionsx.h\
    758                                         ./UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\
    759                                         ./ConfigureObjectsx/ConfigureObjectsx.h\
    760                                         ./ConfigureObjectsx/ConfigureObjectsx.cpp\
    761                                         ./ComputeBasalStressx/ComputeBasalStressx.h\
    762                                         ./ComputeBasalStressx/ComputeBasalStressx.cpp\
    763                                         ./ComputePressurex/ComputePressurex.h\
    764                                         ./ComputePressurex/ComputePressurex.cpp\
    765                                         ./ComputeStrainRatex/ComputeStrainRatex.h\
    766                                         ./ComputeStrainRatex/ComputeStrainRatex.cpp\
    767                                         ./BuildNodeSetsx/BuildNodeSetsx.h\
    768                                         ./BuildNodeSetsx/BuildNodeSetsx.cpp\
    769                                         ./BuildNodeSetsx/PartitionSets.cpp\
    770                                         ./SpcNodesx/SpcNodesx.h\
    771                                         ./SpcNodesx/SpcNodesx.cpp\
    772                                         ./MpcNodesx/MpcNodesx.h\
    773                                         ./MpcNodesx/MpcNodesx.cpp\
    774                                         ./InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
    775                                         ./InterpFromGridToMeshx/InterpFromGridToMeshx.h\
    776                                         ./InterpFromGridToMeshx/InterpFromGridToMeshxt.cpp\
    777                                         ./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
    778                                         ./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\
    779                                         ./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
    780                                         ./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\
    781                                         ./InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
    782                                         ./InterpFromMeshToGridx/InterpFromMeshToGridx.h\
    783                                         ./HoleFillerx/HoleFillerx.cpp\
    784                                         ./HoleFillerx/HoleFillerx.h\
    785                                         ./AverageFilterx/AverageFilterx.cpp\
    786                                         ./AverageFilterx/AverageFilterx.h\
    787                                         ./MeshPartitionx/MeshPartitionx.cpp\
    788                                         ./MeshPartitionx/MeshPartitionx.h\
    789                                         ./ContourToMeshx/ContourToMeshx.cpp\
    790                                         ./ContourToMeshx/ContourToMeshxt.cpp\
    791                                         ./ContourToMeshx/ContourToMeshx.h\
    792                                         ./Reducevectorgtosx/Reducevectorgtosx.cpp\
    793                                         ./Reducevectorgtosx/Reducevectorgtosx.h\
    794                                         ./Reducevectorgtofx/Reducevectorgtofx.cpp\
    795                                         ./Reducevectorgtofx/Reducevectorgtofx.h\
    796                                         ./Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\
    797                                         ./Reducematrixfromgtofx/Reducematrixfromgton.cpp\
    798                                         ./Reducematrixfromgtofx/Reducematrixfromgtofx.h\
    799                                         ./Reduceloadfromgtofx/Reduceloadfromgtofx.h\
    800                                         ./Reduceloadfromgtofx/Reduceloadfromgtofx.cpp\
    801                                         ./NormalizeConstraintsx/NormalizeConstraintsx.cpp\
    802                                         ./NormalizeConstraintsx/NormalizeConstraintsx.h\
    803                                         ./MassFluxx/MassFluxx.cpp\
    804                                         ./MassFluxx/MassFluxx.h\
    805                                         ./SystemMatricesx/SystemMatricesx.cpp\
    806                                         ./SystemMatricesx/SystemMatricesx.h\
    807                                         ./PenaltyConstraintsx/PenaltyConstraintsx.cpp\
    808                                         ./PenaltyConstraintsx/PenaltyConstraintsx.h\
    809                                         ./PenaltyConstraintsx/RiftConstraints.cpp\
    810                                         ./PenaltyConstraintsx/RiftConstraints.h\
    811                                         ./PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\
    812                                         ./PenaltySystemMatricesx/PenaltySystemMatricesx.h\
    813                                         ./Solverx/Solverx.cpp\
    814                                         ./Solverx/Solverx.h\
    815                                         ./Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
    816                                         ./Mergesolutionfromftogx/Mergesolutionfromftogx.h\
    817                                         ./ProcessParamsx/ProcessParamsx.cpp\
    818                                         ./ProcessParamsx/ProcessParamsx.h\
    819                                         ./Qmux/Qmux.h\
    820                                         ./Qmux/Qmux.cpp\
    821                                         ./Qmux/DakotaResponses.cpp\
    822                                         ./Qmux/SpawnCore.cpp\
    823                                         ./Qmux/SpawnCoreParallel.cpp\
    824                                         ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
    825                                         ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
    826                                         ./FieldDepthAveragex/FieldDepthAveragex.cpp\
    827                                         ./FieldDepthAveragex/FieldDepthAveragex.h\
    828                                         ./DepthAverageInputx/DepthAverageInputx.cpp\
    829                                         ./DepthAverageInputx/DepthAverageInputx.h\
    830                                         ./FieldExtrudex/FieldExtrudex.cpp\
    831                                         ./FieldExtrudex/FieldExtrudex.h\
    832                                         ./InputToResultx/InputToResultx.cpp\
    833                                         ./InputToResultx/InputToResultx.h\
    834                                         ./ExtrudeInputx/ExtrudeInputx.cpp\
    835                                         ./ExtrudeInputx/ExtrudeInputx.h\
    836                                         ./OutputRiftsx/OutputRiftsx.h\
    837                                         ./OutputRiftsx/OutputRiftsx.cpp\
     734                                        ./modules/ModelProcessorx/ModelProcessorx.h\
     735                                        ./modules/ModelProcessorx/Partitioning.cpp\
     736                                        ./modules/ModelProcessorx/CreateDataSets.cpp\
     737                                        ./modules/ModelProcessorx/CreateParameters.cpp\
     738                                        ./modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
     739                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
     740                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \
     741                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\
     742                                        ./modules/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\
     743                                        ./modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \
     744                                        ./modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\
     745                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp\
     746                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
     747                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
     748                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp\
     749                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
     750                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
     751                                        ./modules/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp\
     752                                        ./modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp \
     753                                        ./modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
     754                                        ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
     755                                        ./modules/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp\
     756                                        ./modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\
     757                                        ./modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp\
     758                                        ./modules/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\
     759                                        ./modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp\
     760                                        ./modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp\
     761                                        ./modules/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\
     762                                        ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\
     763                                        ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\
     764                                        ./modules/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\
     765                                        ./modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\
     766                                        ./modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\
     767                                        ./modules/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\
     768                                        ./modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\
     769                                        ./modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\
     770                                        ./modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\
     771                                        ./modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\
     772                                        ./modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\
     773                                        ./modules/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\
     774                                        ./modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\
     775                                        ./modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\
     776                                        ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\
     777                                        ./modules/Dofx/Dofx.h\
     778                                        ./modules/Dofx/Dofx.cpp\
     779                                        ./modules/Dux/Dux.h\
     780                                        ./modules/Dux/Dux.cpp\
     781                                        ./modules/ControlConstrainx/ControlConstrainx.h\
     782                                        ./modules/ControlConstrainx/ControlConstrainx.cpp\
     783                                        ./modules/SurfaceAreax/SurfaceAreax.h\
     784                                        ./modules/SurfaceAreax/SurfaceAreax.cpp\
     785                                        ./modules/Misfitx/Misfitx.h\
     786                                        ./modules/Misfitx/Misfitx.cpp\
     787                                        ./modules/CostFunctionx/CostFunctionx.h\
     788                                        ./modules/CostFunctionx/CostFunctionx.cpp\
     789                                        ./modules/Orthx/Orthx.h\
     790                                        ./modules/Orthx/Orthx.cpp\
     791                                        ./modules/Gradjx/Gradjx.h\
     792                                        ./modules/Gradjx/Gradjx.cpp\
     793                                        ./modules/SplitSolutionVectorx/SplitSolutionVectorx.h\
     794                                        ./modules/SplitSolutionVectorx/SplitSolutionVectorx.cpp\
     795                                        ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.h\
     796                                        ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp\
     797                                        ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
     798                                        ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
     799                                        ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\
     800                                        ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\
     801                                        ./modules/UpdateInputsFromVectorx/UpdateInputsFromVectorx.h\
     802                                        ./modules/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp\
     803                                        ./modules/UpdateGeometryx/UpdateGeometryx.h\
     804                                        ./modules/UpdateGeometryx/UpdateGeometryx.cpp\
     805                                        ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\
     806                                        ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\
     807                                        ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
     808                                        ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\
     809                                        ./modules/ComputeBasalStressx/ComputeBasalStressx.h\
     810                                        ./modules/ComputeBasalStressx/ComputeBasalStressx.cpp\
     811                                        ./modules/ComputePressurex/ComputePressurex.h\
     812                                        ./modules/ComputePressurex/ComputePressurex.cpp\
     813                                        ./modules/ComputeStrainRatex/ComputeStrainRatex.h\
     814                                        ./modules/ComputeStrainRatex/ComputeStrainRatex.cpp\
     815                                        ./modules/BuildNodeSetsx/BuildNodeSetsx.h\
     816                                        ./modules/BuildNodeSetsx/BuildNodeSetsx.cpp\
     817                                        ./modules/BuildNodeSetsx/PartitionSets.cpp\
     818                                        ./modules/SpcNodesx/SpcNodesx.h\
     819                                        ./modules/SpcNodesx/SpcNodesx.cpp\
     820                                        ./modules/MpcNodesx/MpcNodesx.h\
     821                                        ./modules/MpcNodesx/MpcNodesx.cpp\
     822                                        ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
     823                                        ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h\
     824                                        ./modules/InterpFromGridToMeshx/InterpFromGridToMeshxt.cpp\
     825                                        ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
     826                                        ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\
     827                                        ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
     828                                        ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\
     829                                        ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
     830                                        ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h\
     831                                        ./modules/HoleFillerx/HoleFillerx.cpp\
     832                                        ./modules/HoleFillerx/HoleFillerx.h\
     833                                        ./modules/AverageFilterx/AverageFilterx.cpp\
     834                                        ./modules/AverageFilterx/AverageFilterx.h\
     835                                        ./modules/MeshPartitionx/MeshPartitionx.cpp\
     836                                        ./modules/MeshPartitionx/MeshPartitionx.h\
     837                                        ./modules/ContourToMeshx/ContourToMeshx.cpp\
     838                                        ./modules/ContourToMeshx/ContourToMeshxt.cpp\
     839                                        ./modules/ContourToMeshx/ContourToMeshx.h\
     840                                        ./modules/Reducevectorgtosx/Reducevectorgtosx.cpp\
     841                                        ./modules/Reducevectorgtosx/Reducevectorgtosx.h\
     842                                        ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\
     843                                        ./modules/Reducevectorgtofx/Reducevectorgtofx.h\
     844                                        ./modules/Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\
     845                                        ./modules/Reducematrixfromgtofx/Reducematrixfromgton.cpp\
     846                                        ./modules/Reducematrixfromgtofx/Reducematrixfromgtofx.h\
     847                                        ./modules/Reduceloadfromgtofx/Reduceloadfromgtofx.h\
     848                                        ./modules/Reduceloadfromgtofx/Reduceloadfromgtofx.cpp\
     849                                        ./modules/NormalizeConstraintsx/NormalizeConstraintsx.cpp\
     850                                        ./modules/NormalizeConstraintsx/NormalizeConstraintsx.h\
     851                                        ./modules/MassFluxx/MassFluxx.cpp\
     852                                        ./modules/MassFluxx/MassFluxx.h\
     853                                        ./modules/SystemMatricesx/SystemMatricesx.cpp\
     854                                        ./modules/SystemMatricesx/SystemMatricesx.h\
     855                                        ./modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp\
     856                                        ./modules/PenaltyConstraintsx/PenaltyConstraintsx.h\
     857                                        ./modules/PenaltyConstraintsx/RiftConstraints.cpp\
     858                                        ./modules/PenaltyConstraintsx/RiftConstraints.h\
     859                                        ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\
     860                                        ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h\
     861                                        ./modules/Solverx/Solverx.cpp\
     862                                        ./modules/Solverx/Solverx.h\
     863                                        ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
     864                                        ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\
     865                                        ./modules/ProcessParamsx/ProcessParamsx.cpp\
     866                                        ./modules/ProcessParamsx/ProcessParamsx.h\
     867                                        ./modules/Qmux/Qmux.h\
     868                                        ./modules/Qmux/Qmux.cpp\
     869                                        ./modules/Qmux/DakotaResponses.cpp\
     870                                        ./modules/Qmux/SpawnCore.cpp\
     871                                        ./modules/Qmux/SpawnCoreParallel.cpp\
     872                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
     873                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
     874                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
     875                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.h\
     876                                        ./modules/DepthAverageInputx/DepthAverageInputx.cpp\
     877                                        ./modules/DepthAverageInputx/DepthAverageInputx.h\
     878                                        ./modules/FieldExtrudex/FieldExtrudex.cpp\
     879                                        ./modules/FieldExtrudex/FieldExtrudex.h\
     880                                        ./modules/InputToResultx/InputToResultx.cpp\
     881                                        ./modules/InputToResultx/InputToResultx.h\
     882                                        ./modules/ExtrudeInputx/ExtrudeInputx.cpp\
     883                                        ./modules/ExtrudeInputx/ExtrudeInputx.h\
     884                                        ./modules/OutputRiftsx/OutputRiftsx.h\
     885                                        ./modules/OutputRiftsx/OutputRiftsx.cpp\
    838886                                        ./solutions/diagnostic_core.cpp\
    839887                                        ./solutions/diagnostic_core_linear.cpp\
     
    861909                                        ./solutions/steadystate_core.cpp\
    862910                                        ./solutions/OutputResults.cpp\
    863                                         ./Bamgx/Bamgx.cpp\
    864                                         ./Bamgx/Bamgx.h\
    865                                         ./Bamgx/include/include.h \
    866                                         ./Bamgx/include/macros.h \
    867                                         ./Bamgx/include/typedefs.h \
    868                                         ./Bamgx/objects/BamgObjects.h \
    869                                         ./Bamgx/objects/CrackedEdge.h\
    870                                         ./Bamgx/objects/CrackedEdge.cpp\
    871                                         ./Bamgx/objects/Curve.h\
    872                                         ./Bamgx/objects/Curve.cpp\
    873                                         ./Bamgx/objects/Direction.h\
    874                                         ./Bamgx/objects/Direction.cpp\
    875                                         ./Bamgx/objects/DoubleAndInt.h\
    876                                         ./Bamgx/objects/Edge.h\
    877                                         ./Bamgx/objects/Edge.cpp\
    878                                         ./Bamgx/objects/GeometricalEdge.h\
    879                                         ./Bamgx/objects/GeometricalEdge.cpp\
    880                                         ./Bamgx/objects/GeometricalSubDomain.h\
    881                                         ./Bamgx/objects/GeometricalSubDomain.cpp\
    882                                         ./Bamgx/objects/GeometricalVertex.h\
    883                                         ./Bamgx/objects/GeometricalVertex.cpp\
    884                                         ./Bamgx/objects/Geometry.cpp\
    885                                         ./Bamgx/objects/Geometry.h\
    886                                         ./Bamgx/objects/ListofIntersectionTriangles.cpp\
    887                                         ./Bamgx/objects/ListofIntersectionTriangles.h\
    888                                         ./Bamgx/objects/MatVVP2x2.cpp\
    889                                         ./Bamgx/objects/Metric.cpp\
    890                                         ./Bamgx/objects/Metric.h\
    891                                         ./Bamgx/objects/QuadTree.cpp\
    892                                         ./Bamgx/objects/QuadTree.h\
    893                                         ./Bamgx/objects/R2.h\
    894                                         ./Bamgx/objects/SetOfE4.cpp\
    895                                         ./Bamgx/objects/SetOfE4.h\
    896                                         ./Bamgx/objects/SubDomain.h\
    897                                         ./Bamgx/objects/SubDomain.cpp\
    898                                         ./Bamgx/objects/TriangleAdjacent.h\
    899                                         ./Bamgx/objects/TriangleAdjacent.cpp\
    900                                         ./Bamgx/objects/Triangle.cpp\
    901                                         ./Bamgx/objects/Triangle.h\
    902                                         ./Bamgx/objects/Triangles.cpp\
    903                                         ./Bamgx/objects/Triangles.h\
    904                                         ./Bamgx/objects/MeshVertex.cpp\
    905                                         ./Bamgx/objects/MeshVertex.h\
    906                                         ./Bamgx/objects/VertexOnEdge.h\
    907                                         ./Bamgx/objects/VertexOnEdge.cpp\
    908                                         ./Bamgx/objects/VertexOnGeom.h\
    909                                         ./Bamgx/objects/VertexOnGeom.cpp\
    910                                         ./Bamgx/objects/VertexOnVertex.h\
    911                                         ./Bamgx/objects/VertexOnVertex.cpp\
    912                                         ./Bamgx/shared/Abs.h \
    913                                         ./Bamgx/shared/BigPrimeNumber.h\
    914                                         ./Bamgx/shared/BigPrimeNumber.cpp\
    915                                         ./Bamgx/shared/BinaryRand.h \
    916                                         ./Bamgx/shared/det.h \
    917                                         ./Bamgx/shared/Exchange.h \
    918                                         ./Bamgx/shared/extrema.h \
    919                                         ./Bamgx/shared/HeapSort.h \
    920                                         ./Bamgx/shared/Norm.h \
    921                                         ./Bamgx/shared/OppositeAngle.h \
    922                                         ./Bamgx/shared/shared.h\
    923                                         ./BamgConvertMeshx/BamgConvertMeshx.cpp\
    924                                         ./BamgConvertMeshx/BamgConvertMeshx.h
     911                                        ./modules/Bamgx/Bamgx.cpp\
     912                                        ./modules/Bamgx/Bamgx.h\
     913                                        ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
     914                                        ./modules/BamgConvertMeshx/BamgConvertMeshx.h
    925915
    926916libpISSM_a_CXXFLAGS = -fPIC -D_PARALLEL_   -D_C_ $(CXXOPTFLAGS)
  • issm/trunk/src/c/include/macros.h

    r3772 r3913  
    55#ifndef _MACROS_H_
    66#define _MACROS_H_
     7
     8#include "./typedefs.h"
    79
    810#ifdef HAVE_CONFIG_H
     
    6769#endif
    6870
     71
    6972#endif
  • issm/trunk/src/c/modules/AverageFilterx/AverageFilterx.cpp

    r3332 r3913  
    88#include <time.h>
    99#include "./AverageFilterx.h"
    10 #include "../shared/shared.h"
     10#include "../../shared/shared.h"
    1111
    1212int AverageFilterx(double** pimageout,double* image, int lines,int samps,int smooth){
  • issm/trunk/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp

    r3775 r3913  
    44#include "./BamgConvertMeshx.h"
    55
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 
    10 #include "../Bamgx/objects/BamgObjects.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../objects/objects.h"
    1110
    1211using namespace bamg;
  • issm/trunk/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.h

    r3354 r3913  
    66#define _BAMGCONVERTMESHX_H
    77
    8 #include "../objects/objects.h"
     8#include "../../objects/objects.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/BuildNodeSetsx/BuildNodeSetsx.cpp

    r3775 r3913  
    55#include "./BuildNodeSetsx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212int BuildNodeSetsx( NodeSets** pnodesets, DataSet* nodes){
  • issm/trunk/src/c/modules/BuildNodeSetsx/BuildNodeSetsx.h

    r1 r3913  
    66#define _BUILDNODESETSX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/BuildNodeSetsx/PartitionSets.cpp

    r3775 r3913  
    44       
    55#include "stdio.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
    88
    99void PartitionSets(Vec* ppartitionb, Vec* ppartitionc,Vec flags_a,Vec flags_b,Vec flags_c,int gsize){
  • issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp

    r3775 r3913  
    55#include "./ComputeBasalStressx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void    ComputeBasalStressx( Vec* psigma,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters,
  • issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h

    r3673 r3913  
    66#define _COMPUTEBASALSTRESSX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.cpp

    r3848 r3913  
    55#include "./ComputePressurex.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void    ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters,
  • issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.h

    r3673 r3913  
    66#define _COMPUTEPRESSUREX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp

    r3775 r3913  
    55#include "./ComputeStrainRatex.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void    ComputeStrainRatex( Vec* peps,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters,
  • issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h

    r3673 r3913  
    66#define _COMPUTESTRAINRATEX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

    r3775 r3913  
    55#include "./ConfigureObjectsx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters){
  • issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.h

    r3673 r3913  
    66#define _CONFIGUREOBJECTSX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/ContourToMeshx/ContourToMeshx.h

    r2591 r3913  
    77#define _CONTOURTOMESHX_H
    88
    9 #include "../shared/shared.h"
    10 #include "../objects/objects.h"
     9#include "../../shared/shared.h"
     10#include "../../objects/objects.h"
    1111
    1212/*threading: */
  • issm/trunk/src/c/modules/ContourToNodesx/ContourToNodesx.h

    r1105 r3913  
    77#define _CONTOURTONODESX_H
    88
    9 #include "../shared/shared.h"
    10 #include "../objects/objects.h"
     9#include "../../shared/shared.h"
     10#include "../../objects/objects.h"
    1111
    1212/* local prototypes: */
  • issm/trunk/src/c/modules/ControlConstrainx/ControlConstrainx.cpp

    r3775 r3913  
    55#include "./ControlConstrainx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void ControlConstrainx( double* p_g, int numdofnodes, double cm_min, double cm_max,int control_type){
  • issm/trunk/src/c/modules/ControlConstrainx/ControlConstrainx.h

    r3751 r3913  
    66#define _CONTROLCONSTRAINX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/CostFunctionx/CostFunctionx.cpp

    r3775 r3913  
    55#include "./CostFunctionx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
  • issm/trunk/src/c/modules/CostFunctionx/CostFunctionx.h

    r3673 r3913  
    66#define _COSTFUNCTIONX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/DepthAverageInputx/DepthAverageInputx.cpp

    r3869 r3913  
    55#include "./DepthAverageInputx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void DepthAverageInputx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type){
  • issm/trunk/src/c/modules/DepthAverageInputx/DepthAverageInputx.h

    r3791 r3913  
    66#define _DEPTHAVERAGEINPUTX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/Dofx/Dofx.cpp

    r3775 r3913  
    55#include "./Dofx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212int Dofx( DofVec** ppartition, DofVec** ptpartition, DataSet* elements,DataSet* nodes, DataSet* vertices, Parameters* parameters) {
  • issm/trunk/src/c/modules/Dofx/Dofx.h

    r3673 r3913  
    66#define _DOFX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Dux/Dux.cpp

    r3775 r3913  
    55#include "./Dux.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
  • issm/trunk/src/c/modules/Dux/Dux.h

    r3673 r3913  
    66#define _DUX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp

    r3775 r3913  
    1010#include "./ElementConnectivityx.h"
    1111
    12 #include "../shared/shared.h"
    13 #include "../include/include.h"
    14 #include "../toolkits/toolkits.h"
    15 #include "../EnumDefinitions/EnumDefinitions.h"
     12#include "../../shared/shared.h"
     13#include "../../include/include.h"
     14#include "../../toolkits/toolkits.h"
     15#include "../../EnumDefinitions/EnumDefinitions.h"
    1616
    1717int hascommondedge(double* element1,double* element2);
  • issm/trunk/src/c/modules/ExtrudeInputx/ExtrudeInputx.cpp

    r3869 r3913  
    55#include "./ExtrudeInputx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void ExtrudeInputx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type){
  • issm/trunk/src/c/modules/ExtrudeInputx/ExtrudeInputx.h

    r3791 r3913  
    66#define _EXTRUDEINPUTX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp

    r3869 r3913  
    55#include "./FieldAverageOntoVerticesx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void FieldAverageOntoVerticesx(Vec* pfield, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters){
  • issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h

    r3673 r3913  
    66#define _FIELDAVERAGEVERTICESX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/FieldDepthAveragex/FieldDepthAveragex.cpp

    r3775 r3913  
    55#include "./FieldDepthAveragex.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void FieldDepthAveragex( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,char* fieldname){
  • issm/trunk/src/c/modules/FieldDepthAveragex/FieldDepthAveragex.h

    r3673 r3913  
    66#define _FIELDDEPTHAVERAGEX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/FieldExtrudex/FieldExtrudex.cpp

    r3775 r3913  
    55#include "./FieldExtrudex.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void FieldExtrudex( Vec field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,char* field_name,int collapse){
  • issm/trunk/src/c/modules/FieldExtrudex/FieldExtrudex.h

    r3673 r3913  
    66#define _FIELDEXTRUDEX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp

    r3821 r3913  
    44
    55#include "./GetSolutionFromInputsx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 #include "../EnumDefinitions/EnumDefinitions.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    1111void    GetSolutionFromInputsx( Vec* psolution, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters, int analysis_type, int sub_analysis_type){
  • issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h

    r3821 r3913  
    66#define _GETSOLUTIONFROMINPUTSXX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Gradjx/Gradjx.cpp

    r3887 r3913  
    55#include "./Gradjx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void Gradjx( Vec* pgrad_g, int numberofnodes, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,
  • issm/trunk/src/c/modules/Gradjx/Gradjx.h

    r3887 r3913  
    66#define _GRADJX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/HoleFillerx/HoleFillerx.cpp

    r3595 r3913  
    88#include <time.h>
    99#include "./HoleFillerx.h"
    10 #include "../shared/shared.h"
     10#include "../../shared/shared.h"
    1111
    1212int HoleFillerx(double** pimageout,double* image, int lines,int samps,int smooth){
  • issm/trunk/src/c/modules/InputToResultx/InputToResultx.cpp

    r3901 r3913  
    55#include "./InputToResultx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../objects/objects.h"
    9 #include "../include/include.h"
    10 #include "../toolkits/toolkits.h"
    11 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../objects/objects.h"
     9#include "../../include/include.h"
     10#include "../../toolkits/toolkits.h"
     11#include "../../EnumDefinitions/EnumDefinitions.h"
    1212
    1313void InputToResultx(Result** presult,DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters,int enum_type,int id, double time, int step){
  • issm/trunk/src/c/modules/InputToResultx/InputToResultx.h

    r3807 r3913  
    66#define _INPUTTORESULTX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

    r3775 r3913  
    1010
    1111#include "./InterpFromGridToMeshx.h"
    12 #include "../shared/shared.h"
    13 #include "../include/include.h"
     12#include "../../shared/shared.h"
     13#include "../../include/include.h"
    1414
    1515int InterpFromGridToMeshx( Vec* pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value) {
  • issm/trunk/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h

    r2549 r3913  
    66#define _INTERPFROMGRIDTOMESHX_H
    77
    8 #include "../toolkits/toolkits.h"
     8#include "../../toolkits/toolkits.h"
    99
    1010
  • issm/trunk/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshxt.cpp

    r3332 r3913  
    44
    55#include "./InterpFromGridToMeshx.h"
    6 #include "../shared/shared.h"
     6#include "../../shared/shared.h"
    77
    88void* InterpFromGridToMeshxt(void* vpthread_handle){
  • issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp

    r3775 r3913  
    44
    55#include "./InterpFromMeshToGridx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
    88
    99void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double cornereast,double cornernorth,double xposting,double yposting,int nlines,int ncols,double default_value) {
  • issm/trunk/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h

    r2294 r3913  
    66#define _INTERPFROMMESHTOGRIDX_H
    77
    8 #include "../toolkits/toolkits.h"
     8#include "../../toolkits/toolkits.h"
    99
    1010void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double cornereast,double cornernorth,double xposting,double yposting,int nlines,int ncols,double default_value);
  • issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

    r3775 r3913  
    44#include "./InterpFromMeshToMesh2dx.h"
    55
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 
    10 #include "../Bamgx/objects/BamgObjects.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../objects/objects.h"
    1110
    1211using namespace bamg;
  • issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h

    r3126 r3913  
    66#define _INTERPFROMMESHTOMESH2DX_H
    77
    8 #include "../objects/objects.h"
     8#include "../../objects/objects.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp

    r3775 r3913  
    44
    55#include "./InterpFromMeshToMesh3dx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
    88
    99int InterpFromMeshToMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) {
  • issm/trunk/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h

    r2292 r3913  
    66#define _INTERPFROMMESHTOMESH3DX_H
    77
    8 #include "../toolkits/toolkits.h"
     8#include "../../toolkits/toolkits.h"
    99
    1010int InterpFromMeshToMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value);
  • issm/trunk/src/c/modules/MassFluxx/MassFluxx.cpp

    r3851 r3913  
    55#include "./MassFluxx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void MassFluxx(double* pmass_flux, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,  double* segments,int num_segments,double* ug){
  • issm/trunk/src/c/modules/MassFluxx/MassFluxx.h

    r3673 r3913  
    66#define _MASSFLUXX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h

    r1 r3913  
    66#define _MERGESOLUTIONFROMFTOGX_H
    77
    8 #include "../objects/objects.h"
     8#include "../../objects/objects.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.cpp

    r3865 r3913  
    44
    55#include "./MeshPartitionx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 #include "../EnumDefinitions/EnumDefinitions.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    1111int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofgrids,double* elements,
  • issm/trunk/src/c/modules/Misfitx/Misfitx.cpp

    r3775 r3913  
    55#include "./Misfitx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
  • issm/trunk/src/c/modules/Misfitx/Misfitx.h

    r3673 r3913  
    66#define _MISFITX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../io/io.h"
    7 #include "../../toolkits/toolkits.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../io/io.h"
     7#include "../../../toolkits/toolkits.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
     11#include "../../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../io/io.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../io/io.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp

    r3784 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
     11#include "../../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp

    r3784 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../io/io.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../io/io.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/include.h"
     12#include "../../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414
  • issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

    r3775 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
     11#include "../../../include/include.h"
    1212#include "../ModelProcessorx.h"
    1313
  • issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp

    r3775 r3913  
    99#endif
    1010
    11 #include "../objects/objects.h"
    12 #include "../shared/shared.h"
    13 #include "../include/include.h"
    14 #include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "./ModelProcessorx/ModelProcessorx.h"
     11#include "../../objects/objects.h"
     12#include "../../shared/shared.h"
     13#include "../../include/include.h"
     14#include "../../EnumDefinitions/EnumDefinitions.h"
     15#include "./ModelProcessorx.h"
    1616
    1717
  • issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r3779 r3913  
    33 */
    44
    5 #include "../DataSet/DataSet.h"
    6 #include "../toolkits/toolkits.h"
    7 #include "../EnumDefinitions/EnumDefinitions.h"
    8 #include "../objects/objects.h"
    9 #include "../shared/shared.h"
     5#include "../../DataSet/DataSet.h"
     6#include "../../toolkits/toolkits.h"
     7#include "../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../objects/objects.h"
     9#include "../../shared/shared.h"
    1010#include "../MeshPartitionx/MeshPartitionx.h"
    11 #include "../io/io.h"
     11#include "../../io/io.h"
    1212
    1313void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){
  • issm/trunk/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp

    r3872 r3913  
    99#endif
    1010
    11 #include "../shared/shared.h"
    12 #include "../io/io.h"
    13 #include "../include/include.h"
     11#include "../../shared/shared.h"
     12#include "../../io/io.h"
     13#include "../../include/include.h"
    1414#include "./ModelProcessorx.h"
    1515
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/include.h"
     12#include "../../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp

    r3775 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/include.h"
     12#include "../../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
     11#include "../../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp

    r3809 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/include.h"
     12#include "../../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../io/io.h"
    7 #include "../../toolkits/toolkits.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../io/io.h"
     7#include "../../../toolkits/toolkits.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp

    r3878 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../include/include.h"
    10 #include "../../objects/objects.h"
    11 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../include/include.h"
     10#include "../../../objects/objects.h"
     11#include "../../../shared/shared.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

    r3845 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

    r3713 r3913  
    1111class IoModel;
    1212class Parameters;
    13 #include "../io/io.h"
     13#include "../../io/io.h"
    1414
    1515
  • issm/trunk/src/c/modules/ModelProcessorx/Partitioning.cpp

    r3784 r3913  
    1010
    1111#include <string.h>
    12 #include "../objects/objects.h"
    13 #include "../shared/shared.h"
    14 #include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../io/io.h"
    16 #include "../include/include.h"
     12#include "../../objects/objects.h"
     13#include "../../shared/shared.h"
     14#include "../../EnumDefinitions/EnumDefinitions.h"
     15#include "../../io/io.h"
     16#include "../../include/include.h"
    1717#include "../MeshPartitionx/MeshPartitionx.h"
    1818#include "../ModelProcessorx/ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../io/io.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../io/io.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../io/io.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../io/io.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/include.h"
     12#include "../../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp

    r3886 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../io/io.h"
    10 #include "../../shared/shared.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../io/io.h"
     10#include "../../../shared/shared.h"
     11#include "../../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp

    r3784 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../EnumDefinitions/EnumDefinitions.h"
    7 #include "../../objects/objects.h"
    8 #include "../../io/io.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../EnumDefinitions/EnumDefinitions.h"
     7#include "../../../objects/objects.h"
     8#include "../../../io/io.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp

    r3703 r3913  
    44
    55
    6 #include "../../DataSet/DataSet.h"
    7 #include "../../io/io.h"
    8 #include "../../toolkits/toolkits.h"
    9 #include "../../EnumDefinitions/EnumDefinitions.h"
    10 #include "../../objects/objects.h"
    11 #include "../../shared/shared.h"
     6#include "../../../DataSet/DataSet.h"
     7#include "../../../io/io.h"
     8#include "../../../toolkits/toolkits.h"
     9#include "../../../EnumDefinitions/EnumDefinitions.h"
     10#include "../../../objects/objects.h"
     11#include "../../../shared/shared.h"
    1212#include "../ModelProcessorx.h"
    1313
  • issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

    r3775 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../io/io.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../io/io.h"
     11#include "../../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../io/io.h"
    7 #include "../../toolkits/toolkits.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../io/io.h"
     7#include "../../../toolkits/toolkits.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../io/io.h"
    7 #include "../../toolkits/toolkits.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
    11 #include "../../include/include.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../io/io.h"
     7#include "../../../toolkits/toolkits.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
     11#include "../../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp

    r3775 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../io/io.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../io/io.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

    r3703 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../io/io.h"
    7 #include "../../toolkits/toolkits.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../io/io.h"
     7#include "../../../toolkits/toolkits.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../shared/shared.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp

    r3811 r3913  
    33 */
    44
    5 #include "../../DataSet/DataSet.h"
    6 #include "../../toolkits/toolkits.h"
    7 #include "../../io/io.h"
    8 #include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../objects/objects.h"
    10 #include "../../include/include.h"
    11 #include "../../shared/shared.h"
     5#include "../../../DataSet/DataSet.h"
     6#include "../../../toolkits/toolkits.h"
     7#include "../../../io/io.h"
     8#include "../../../EnumDefinitions/EnumDefinitions.h"
     9#include "../../../objects/objects.h"
     10#include "../../../include/include.h"
     11#include "../../../shared/shared.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"
  • issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

    r3804 r3913  
    22 */
    33
    4 #include "../../DataSet/DataSet.h"
    5 #include "../../toolkits/toolkits.h"
    6 #include "../../io/io.h"
    7 #include "../../EnumDefinitions/EnumDefinitions.h"
    8 #include "../../objects/objects.h"
    9 #include "../../shared/shared.h"
    10 #include "../../include/include.h"
     4#include "../../../DataSet/DataSet.h"
     5#include "../../../toolkits/toolkits.h"
     6#include "../../../io/io.h"
     7#include "../../../EnumDefinitions/EnumDefinitions.h"
     8#include "../../../objects/objects.h"
     9#include "../../../shared/shared.h"
     10#include "../../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212
  • issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.cpp

    r3775 r3913  
    55#include "./MpcNodesx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212int MpcNodesx( Mat* pRmg, DataSet* nodes,DataSet* constraints){
  • issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.h

    r1 r3913  
    66#define _MPCNODESX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../toolkits/toolkits.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../toolkits/toolkits.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp

    r3775 r3913  
    1313#include "./NodeConnectivityx.h"
    1414
    15 #include "../shared/shared.h"
    16 #include "../include/include.h"
    17 #include "../toolkits/toolkits.h"
    18 #include "../EnumDefinitions/EnumDefinitions.h"
     15#include "../../shared/shared.h"
     16#include "../../include/include.h"
     17#include "../../toolkits/toolkits.h"
     18#include "../../EnumDefinitions/EnumDefinitions.h"
    1919
    2020void    NodeConnectivityx( double** pconnectivity, int* pwidth, double* elements, int nel, int nods){
  • issm/trunk/src/c/modules/NormalizeConstraintsx/NormalizeConstraintsx.cpp

    r3332 r3913  
    55#include "./NormalizeConstraintsx.h"
    66
    7 #include "../shared/shared.h"
     7#include "../../shared/shared.h"
    88
    99void NormalizeConstraintsx( Mat* pGmn, Mat Rmg, NodeSets* nodesets){
  • issm/trunk/src/c/modules/NormalizeConstraintsx/NormalizeConstraintsx.h

    r1 r3913  
    66#define _NORMALIZECONSTRAINTSX_H_
    77
    8 #include "../objects/objects.h"
     8#include "../../objects/objects.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/Orthx/Orthx.h

    r3775 r3913  
    66#define _ORTHX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../include/include.h"
    10 #include "../shared/shared.h"
     8#include "../../objects/objects.h"
     9#include "../../include/include.h"
     10#include "../../shared/shared.h"
    1111
    1212/* local prototypes: */
  • issm/trunk/src/c/modules/OutputRiftsx/OutputRiftsx.cpp

    r3775 r3913  
    66#include "./OutputRiftsx.h"
    77
    8 #include "../shared/shared.h"
    9 #include "../include/include.h"
    10 #include "../toolkits/toolkits.h"
    11 #include "../EnumDefinitions/EnumDefinitions.h"
     8#include "../../shared/shared.h"
     9#include "../../include/include.h"
     10#include "../../toolkits/toolkits.h"
     11#include "../../EnumDefinitions/EnumDefinitions.h"
    1212
    1313void OutputRiftsx( Vec* priftproperties, DataSet* loads, int numrifts){
  • issm/trunk/src/c/modules/OutputRiftsx/OutputRiftsx.h

    r1805 r3913  
    66#define _OUTPUTRIFTSX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp

    r3889 r3913  
    55#include "./PenaltyConstraintsx.h"
    66#include "./RiftConstraints.h"
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,DataSet* nodes, DataSet* vertices,
  • issm/trunk/src/c/modules/PenaltyConstraintsx/PenaltyConstraintsx.h

    r3673 r3913  
    66#define _PENALTYCONSTRAINTSX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp

    r3775 r3913  
    44
    55#include "./RiftConstraints.h"
    6 #include "../EnumDefinitions/EnumDefinitions.h"
    7 #include "../include/include.h"
    8 #include "../shared/shared.h"
     6#include "../../EnumDefinitions/EnumDefinitions.h"
     7#include "../../include/include.h"
     8#include "../../shared/shared.h"
    99
    1010#define _ZIGZAGCOUNTER_
  • issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.h

    r3673 r3913  
    77#define _RIFTCONSTRAINTS_H_
    88
    9 #include "../objects/objects.h"
    10 #include "../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
     10#include "../../DataSet/DataSet.h"
    1111
    1212int RiftConstraints(int* pconverged, int* pnum_unstable_constraints,DataSet* loads,int min_mechanical_constraints,int analysis_type,int sub_analysis_type);
  • issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp

    r3775 r3913  
    55#include "./PenaltySystemMatricesx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,
  • issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h

    r3673 r3913  
    66#define _PENALTYSYSTEMMATRICESX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/ProcessParamsx/ProcessParamsx.cpp

    r3775 r3913  
    99#include "./ProcessParamsx.h"
    1010
    11 #include "../shared/shared.h"
    12 #include "../include/include.h"
    13 #include "../toolkits/toolkits.h"
    14 #include "../DataSet/DataSet.h"
    15 #include "../EnumDefinitions/EnumDefinitions.h"
     11#include "../../shared/shared.h"
     12#include "../../include/include.h"
     13#include "../../toolkits/toolkits.h"
     14#include "../../DataSet/DataSet.h"
     15#include "../../EnumDefinitions/EnumDefinitions.h"
    1616
    1717void ProcessParamsx( Parameters* parameters, Vec  part){
  • issm/trunk/src/c/modules/ProcessParamsx/ProcessParamsx.h

    r3673 r3913  
    66#define _PROCESSPARAMSX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp

    r3775 r3913  
    44#include "./PropagateFlagsFromConnectivityx.h"
    55
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
    99
    1010void RecursivePropagation(double* pool, double* connectivity,int index, double* flags);
  • issm/trunk/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h

    r2888 r3913  
    55#define _PROPAGATEFLAGSFROMCONNECTIVITYX_H
    66
    7 #include "../DataSet/DataSet.h"
     7#include "../../DataSet/DataSet.h"
    88
    99/* local prototypes: */
  • issm/trunk/src/c/modules/Qmux/DakotaResponses.cpp

    r3775 r3913  
    99#endif
    1010
    11 #include "../DataSet/DataSet.h"   
    12 #include "../shared/shared.h"
    13 #include "../include/include.h"
    14 #include "../EnumDefinitions/EnumDefinitions.h"
     11#include "../../DataSet/DataSet.h"   
     12#include "../../shared/shared.h"
     13#include "../../include/include.h"
     14#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../MassFluxx/MassFluxx.h"
    1616#include "../Misfitx/Misfitx.h"
  • issm/trunk/src/c/modules/Qmux/Qmux.cpp

    r3775 r3913  
    3535#include "./Qmux.h"
    3636
    37 #include "../shared/shared.h"
    38 #include "../include/include.h"
    39 #include "../toolkits/toolkits.h"
    40 #include "../EnumDefinitions/EnumDefinitions.h"
    41 #include "../objects/DakotaPlugin.h"
     37#include "../../shared/shared.h"
     38#include "../../include/include.h"
     39#include "../../toolkits/toolkits.h"
     40#include "../../EnumDefinitions/EnumDefinitions.h"
     41#include "../../objects/DakotaPlugin.h"
    4242
    4343#ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
  • issm/trunk/src/c/modules/Qmux/Qmux.h

    r3673 r3913  
    66#define _QMUX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Qmux/SpawnCore.cpp

    r3775 r3913  
    1010
    1111
    12 #include "../objects/objects.h"
    13 #include "../io/io.h"
    14 #include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../shared/shared.h"
     12#include "../../objects/objects.h"
     13#include "../../io/io.h"
     14#include "../../EnumDefinitions/EnumDefinitions.h"
     15#include "../../shared/shared.h"
    1616#include "./Qmux.h"
    17 #include "../include/include.h"
     17#include "../../include/include.h"
    1818
    1919int SpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* model,int analysis_type,int sub_analysis_type,int counter){
  • issm/trunk/src/c/modules/Qmux/SpawnCoreParallel.cpp

    r3906 r3913  
    2626
    2727
    28 #include "../objects/objects.h"
    29 #include "../io/io.h"
    30 #include "../EnumDefinitions/EnumDefinitions.h"
    31 #include "../shared/shared.h"
     28#include "../../objects/objects.h"
     29#include "../../io/io.h"
     30#include "../../EnumDefinitions/EnumDefinitions.h"
     31#include "../../shared/shared.h"
    3232#include "./Qmux.h"
    33 #include "../include/include.h"
    34 #include "../solutions/solutions.h"
     33#include "../../include/include.h"
     34#include "../../solutions/solutions.h"
    3535
    3636void SpawnCoreParallel(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, Model* model,int analysis_type,int sub_analysis_type,int counter){
  • issm/trunk/src/c/modules/Qmux/SpawnCoreSerial.cpp

    r3775 r3913  
    1212
    1313
    14 #include "../objects/objects.h"
    15 #include "../io/io.h"
    16 #include "../EnumDefinitions/EnumDefinitions.h"
    17 #include "../shared/shared.h"
     14#include "../../objects/objects.h"
     15#include "../../io/io.h"
     16#include "../../EnumDefinitions/EnumDefinitions.h"
     17#include "../../shared/shared.h"
    1818#include "./Qmux.h"
    19 #include "../include/include.h"
     19#include "../../include/include.h"
    2020
    2121void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* model,int analysis_type,int sub_analysis_type,int counter){
  • issm/trunk/src/c/modules/Reduceloadfromgtofx/Reduceloadfromgtofx.h

    r1 r3913  
    66#define _REDUCELOADFROMGTOFX_H
    77
    8 #include "../objects/objects.h"
     8#include "../../objects/objects.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/modules/Reducematrixfromgtofx/Reducematrixfromgtofx.h

    r1 r3913  
    77#define _REDUCEMATRIXFROMGTOFX_H
    88
    9 #include "../objects/objects.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Reducematrixfromgtofx/Reducematrixfromgton.cpp

    r3332 r3913  
    99#endif
    1010
    11 #include "../toolkits/toolkits.h"
     11#include "../../toolkits/toolkits.h"
    1212
    1313void  Reducematrixfromgton(Mat* pKnn,Mat Kgg,Mat Gmn,double* pv_m,int msize, double* pv_n,int nsize,int flag){
  • issm/trunk/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.h

    r1665 r3913  
    77#define _REDUCEVECTORGTOFX_H
    88
    9 #include "../objects/objects.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Reducevectorgtosx/Reducevectorgtosx.h

    r1 r3913  
    77#define _REDUCEVECTORGTOSX_H
    88
    9 #include "../objects/objects.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/Solverx/Solverx.cpp

    r3775 r3913  
    55#include "./Solverx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
    99
    1010#ifdef HAVE_CONFIG_H
  • issm/trunk/src/c/modules/Solverx/Solverx.h

    r1 r3913  
    66#define _SOLVERX_H
    77
    8 #include "../objects/objects.h"
     8#include "../../objects/objects.h"
    99
    1010
  • issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.cpp

    r3775 r3913  
    55#include "./SpcNodesx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void SpcNodesx( DofVec** pyg, DataSet* nodes,DataSet* constraints){
  • issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.h

    r3446 r3913  
    66#define _SPCNODESX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
    10 #include "../toolkits/toolkits.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
     10#include "../../toolkits/toolkits.h"
    1111
    1212/* local prototypes: */
  • issm/trunk/src/c/modules/SplitSolutionVectorx/SplitSolutionVectorx.cpp

    r3775 r3913  
    33
    44#include "./SplitSolutionVectorx.h"
    5 #include "../shared/shared.h"
     5#include "../../shared/shared.h"
    66
    77void SplitSolutionVectorx(Vec u_g,int numberofnodes,int numberofdofs, ...){
  • issm/trunk/src/c/modules/SplitSolutionVectorx/SplitSolutionVectorx.h

    r3775 r3913  
    1212
    1313#include <stdarg.h>
    14 #include "../toolkits/toolkits.h"
     14#include "../../toolkits/toolkits.h"
    1515
    1616void SplitSolutionVectorx(Vec u_g,int numberofnodes,int numberofdofs, ...);
  • issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.cpp

    r3775 r3913  
    55#include "./SurfaceAreax.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters,
  • issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h

    r3673 r3913  
    66#define _SURFACEAREAX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

    r3879 r3913  
    55#include "./SystemMatricesx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void SystemMatricesx(Mat* pKgg, Vec* ppg,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,
  • issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h

    r3879 r3913  
    66#define _SYSTEMMATRICESX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.cpp

    r3775 r3913  
    55#include "./UpdateGeometryx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
    11 #include "../DataSet/DataSet.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
     11#include "../../DataSet/DataSet.h"
    1212
    1313void UpdateGeometryx(Vec* poutthickness,Vec* poutbed,Vec* poutsurface,
  • issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.h

    r3673 r3913  
    66#define _UPDATEGEOMETRYX_H
    77
    8 #include "../DataSet/DataSet.h"
    9 #include "../objects/objects.h"
     8#include "../../DataSet/DataSet.h"
     9#include "../../objects/objects.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp

    r3890 r3913  
    44
    55#include "./UpdateInputsFromConstantx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 #include "../EnumDefinitions/EnumDefinitions.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    1111void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double constant, int name){
  • issm/trunk/src/c/modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.h

    r3890 r3913  
    66#define _UPDATEINPUTSFROMCONSTANTXX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp

    r3775 r3913  
    44
    55#include "./UpdateInputsFromSolutionx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 #include "../EnumDefinitions/EnumDefinitions.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    1111void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){
  • issm/trunk/src/c/modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h

    r3715 r3913  
    66#define _UPDATEINPUTSFROMSOLUTIONXX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp

    r3775 r3913  
    44
    55#include "./UpdateInputsFromVectorx.h"
    6 #include "../shared/shared.h"
    7 #include "../include/include.h"
    8 #include "../toolkits/toolkits.h"
    9 #include "../EnumDefinitions/EnumDefinitions.h"
     6#include "../../shared/shared.h"
     7#include "../../include/include.h"
     8#include "../../toolkits/toolkits.h"
     9#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    1111void UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){
  • issm/trunk/src/c/modules/UpdateInputsFromVectorx/UpdateInputsFromVectorx.h

    r3751 r3913  
    66#define _UPDATEINPUTSFROMVECTORXX_H
    77
    8 #include "../objects/objects.h"
    9 #include "../DataSet/DataSet.h"
     8#include "../../objects/objects.h"
     9#include "../../DataSet/DataSet.h"
    1010
    1111/* local prototypes: */
  • issm/trunk/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp

    r3775 r3913  
    55#include "./UpdateVertexPositionsx.h"
    66
    7 #include "../shared/shared.h"
    8 #include "../include/include.h"
    9 #include "../toolkits/toolkits.h"
    10 #include "../EnumDefinitions/EnumDefinitions.h"
     7#include "../../shared/shared.h"
     8#include "../../include/include.h"
     9#include "../../toolkits/toolkits.h"
     10#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    1212void UpdateVertexPositionsx( DataSet* vertices, Vec thickness,Vec bed){
  • issm/trunk/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h

    r3612 r3913  
    66#define _UPDATEVERTEXPOSITIONSXX_H
    77
    8 #include "../DataSet/DataSet.h"
     8#include "../../DataSet/DataSet.h"
    99
    1010/* local prototypes: */
  • issm/trunk/src/c/objects/DakotaPlugin.cpp

    r3775 r3913  
    2626#include "../include/include.h"
    2727#include "../objects/objects.h"
    28 #include "../Qmux/Qmux.h"
     28#include "../modules/Qmux/Qmux.h"
    2929
    3030/*Standard includes: */
  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r3784 r3913  
    1616#include "../../shared/shared.h"
    1717#include "../../include/include.h"
    18 #include "../../ModelProcessorx/ModelProcessorx.h"
     18#include "../../modules/ModelProcessorx/ModelProcessorx.h"
    1919#include "../objects.h"
    2020/*}}}*/
  • issm/trunk/src/c/objects/Model.cpp

    r3859 r3913  
    1212#include "stdio.h"
    1313#include "../DataSet/DataSet.h"
    14 #include "../ModelProcessorx/ModelProcessorx.h"
     14#include "../modules/ModelProcessorx/ModelProcessorx.h"
    1515#include "./objects.h"
    1616#include "../include/include.h"
    1717#include "../EnumDefinitions/EnumDefinitions.h"
    18 #include "../modules.h"
     18#include "../modules/modules.h"
    1919
    2020
  • issm/trunk/src/c/objects/objects.h

    r3833 r3913  
    7979
    8080/*Bamg: */
     81#include "./Bamg/BamgOpts.h"
    8182#include "./Bamg/BamgGeom.h"
    8283#include "./Bamg/BamgMesh.h"
    83 #include "./Bamg/BamgOpts.h"
     84#include "./Bamg/Metric.h"
     85#include "./Bamg/DoubleAndInt.h"
     86#include "./Bamg/Direction.h"
     87#include "./Bamg/MeshVertex.h"
     88#include "./Bamg/TriangleAdjacent.h"
     89#include "./Bamg/Edge.h"
     90#include "./Bamg/GeometricalVertex.h"
     91#include "./Bamg/GeometricalEdge.h"
     92#include "./Bamg/Curve.h"
     93#include "./Bamg/Triangle.h"
     94#include "./Bamg/ListofIntersectionTriangles.h"
     95#include "./Bamg/GeometricalSubDomain.h"
     96#include "./Bamg/SubDomain.h"
     97#include "./Bamg/VertexOnGeom.h"
     98#include "./Bamg/VertexOnVertex.h"
     99#include "./Bamg/VertexOnEdge.h"
     100#include "./Bamg/CrackedEdge.h"
     101#include "./Bamg/Triangles.h"
     102#include "./Bamg/Geometry.h"
     103#include "./Bamg/QuadTree.h"
     104#include "./Bamg/SetOfE4.h"
     105
    84106
    85107#endif
  • issm/trunk/src/c/shared/shared.h

    r2417 r3913  
    1919#include "String/sharedstring.h" //to avoid confusion with <string.h> standard header file
    2020#include "Threads/issm_threads.h"
     21#include "Bamg/shared.h"
    2122
    2223
  • issm/trunk/src/c/solutions/ControlInitialization.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212void ControlInitialization(Model* model){
  • issm/trunk/src/c/solutions/ControlRestart.cpp

    r3895 r3913  
    55
    66#include "./solutions.h"
    7 #include "../modules.h"
     7#include "../modules/modules.h"
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99
  • issm/trunk/src/c/solutions/balancedthickness.cpp

    r3895 r3913  
    1313#include "../EnumDefinitions/EnumDefinitions.h"
    1414#include "../include/include.h"
    15 #include "../modules.h"
     15#include "../modules/modules.h"
    1616#include "./solutions.h"
    1717
  • issm/trunk/src/c/solutions/balancedthickness2.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/balancedthickness2_core.cpp

    r3895 r3913  
    99#include "../EnumDefinitions/EnumDefinitions.h"
    1010#include "./solutions.h"
    11 #include "../modules.h"
     11#include "../modules/modules.h"
    1212
    1313DataSet* balancedthickness2_core(Model* model){
  • issm/trunk/src/c/solutions/balancedthickness_core.cpp

    r3895 r3913  
    99#include "../EnumDefinitions/EnumDefinitions.h"
    1010#include "./solutions.h"
    11 #include "../modules.h"
     11#include "../modules/modules.h"
    1212
    1313DataSet* balancedthickness_core(Model* model){
  • issm/trunk/src/c/solutions/balancedvelocities.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/balancedvelocities_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* balancedvelocities_core(Model* model){
  • issm/trunk/src/c/solutions/control_core.cpp

    r3895 r3913  
    44
    55#include "./solutions.h"
    6 #include "../modules.h"
     6#include "../modules/modules.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
    88
  • issm/trunk/src/c/solutions/convergence.cpp

    r3820 r3913  
    44
    55#include "../objects/objects.h"
    6 #include "../modules.h"
     6#include "../modules/modules.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
    88
  • issm/trunk/src/c/solutions/diagnostic.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/diagnostic_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111#include "../include/include.h"
    1212
  • issm/trunk/src/c/solutions/diagnostic_core_linear.cpp

    r3889 r3913  
    66#include "../objects/objects.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
    8 #include "../modules.h"
     8#include "../modules/modules.h"
    99
    1010void diagnostic_core_linear(Vec* pug,FemModel* fem,int analysis_type,int sub_analysis_type){
  • issm/trunk/src/c/solutions/diagnostic_core_nonlinear.cpp

    r3895 r3913  
    66#include "../objects/objects.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
    8 #include "../modules.h"
     8#include "../modules/modules.h"
    99#include "./solutions.h"
    1010
  • issm/trunk/src/c/solutions/gradjcompute_core.cpp

    r3895 r3913  
    33 */
    44
    5 #include "../modules.h"
     5#include "../modules/modules.h"
    66#include "./solutions.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
  • issm/trunk/src/c/solutions/objectivefunctionC.cpp

    r3895 r3913  
    33 */
    44
    5 #include "../modules.h"
     5#include "../modules/modules.h"
    66#include "./solutions.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
  • issm/trunk/src/c/solutions/prognostic.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/prognostic2.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/prognostic2_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* prognostic2_core(Model* model){
  • issm/trunk/src/c/solutions/prognostic_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* prognostic_core(Model* model){
  • issm/trunk/src/c/solutions/slope_core.cpp

    r3895 r3913  
    77#include "../objects/objects.h"
    88#include "../EnumDefinitions/EnumDefinitions.h"
    9 #include "../modules.h"
     9#include "../modules/modules.h"
    1010
    1111void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem, int AnalysisEnum){
  • issm/trunk/src/c/solutions/slopecompute_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* slopecompute_core(Model* model){
  • issm/trunk/src/c/solutions/steadystate.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/steadystate_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* steadystate_core(Model* model){
  • issm/trunk/src/c/solutions/thermal.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/thermal_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* thermal_core(Model* model){
  • issm/trunk/src/c/solutions/thermal_core_nonlinear.cpp

    r3879 r3913  
    66#include "../objects/objects.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
    8 #include "../modules.h"
     8#include "../modules/modules.h"
    99
    1010void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,int analysis_type,int sub_analysis_type){
  • issm/trunk/src/c/solutions/transient.cpp

    r3895 r3913  
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/include.h"
    16 #include "../modules.h"
     16#include "../modules/modules.h"
    1717#include "./solutions.h"
    1818
  • issm/trunk/src/c/solutions/transient_core.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* transient_core(Model* model){
  • issm/trunk/src/c/solutions/transient_core_2d.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* transient_core_2d(Model* model){
  • issm/trunk/src/c/solutions/transient_core_3d.cpp

    r3895 r3913  
    88#include "../EnumDefinitions/EnumDefinitions.h"
    99#include "./solutions.h"
    10 #include "../modules.h"
     10#include "../modules/modules.h"
    1111
    1212DataSet* transient_core_3d(Model* model){
  • issm/trunk/src/mex/AverageFilter/AverageFilter.h

    r3712 r3913  
    1111void AverageFilterUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Bamg/Bamg.h

    r3712 r3913  
    99void BamgUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h

    r3712 r3913  
    99void BamgConvertMeshUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h

    r3712 r3913  
    1111void BuildNodeSetsUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h

    r3841 r3913  
    99void ComputeBasalStressUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ComputePressure/ComputePressure.h

    r3841 r3913  
    99void ComputePressureUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h

    r3712 r3913  
    1111void ConfigureObjectsUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ContourToMesh/ContourToMesh.h

    r3712 r3913  
    1111void ContourToMeshUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ContourToNodes/ContourToNodes.h

    r3712 r3913  
    1111void ContourToNodesUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ControlConstrain/ControlConstrain.h

    r3715 r3913  
    1010void ControlConstrainUsage(void);
    1111
    12 #include "../../c/modules.h"
     12#include "../../c/modules/modules.h"
    1313#include "../../c/DataSet/DataSet.h"
    1414#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ControlOptimization/ControlOptimization.h

    r3841 r3913  
    99void ControlOptimizationUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/CostFunction/CostFunction.h

    r3841 r3913  
    99void CostFunctionUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/DepthAverageInput/DepthAverageInput.h

    r3880 r3913  
    99void DepthAverageInputUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Dof/Dof.h

    r3712 r3913  
    1111void DofUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Du/Du.h

    r3841 r3913  
    99void DuUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Echo/Echo.h

    r3712 r3913  
    99void EchoUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h

    r3712 r3913  
    1111void ElementConnectivityUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ExtrudeInput/ExtrudeInput.h

    r3883 r3913  
    99void ExtrudeInputUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h

    r3712 r3913  
    1111void FieldAverageOntoVerticesUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h

    r3712 r3913  
    1111void FieldDepthAverageUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/FieldExtrude/FieldExtrude.h

    r3712 r3913  
    1111void FieldExtrudeUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h

    r3836 r3913  
    99void GetSolutionFromInputsUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Gradj/Gradj.h

    r3841 r3913  
    99void GradjUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/HoleFiller/HoleFiller.h

    r3712 r3913  
    1111void HoleFillerUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h

    r3712 r3913  
    99void InterpFromGridToMeshUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h

    r3712 r3913  
    1111void InterpFromMeshToGridUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

    r3712 r3913  
    99void InterpFromMeshToMesh2dUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

    r3712 r3913  
    99void InterpFromMeshToMesh3dUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/MassFlux/MassFlux.h

    r3715 r3913  
    1111void MassFluxUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h

    r3712 r3913  
    1111void MergesolutionfromftogUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/MeshPartition/MeshPartition.h

    r3712 r3913  
    1111void MeshPartitionUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Misfit/Misfit.h

    r3841 r3913  
    99void MisfitUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ModelProcessor/ModelProcessor.h

    r3712 r3913  
    99void ModelProcessorUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/MpcNodes/MpcNodes.h

    r3712 r3913  
    1111void MpcNodesUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h

    r3712 r3913  
    1111void NodeConnectivityUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h

    r3712 r3913  
    99void NormalizeConstraintsUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Orth/Orth.h

    r3712 r3913  
    1111void OrthUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/OutputRifts/OutputRifts.h

    r3712 r3913  
    1111void OutputRiftsUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ParameterOutput/ParameterOutput.h

    r3841 r3913  
    99void ParameterOutputUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h

    r3841 r3913  
    99void PenaltyConstraintsUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h

    r3841 r3913  
    99void PenaltySystemMatricesUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/ProcessParams/ProcessParams.h

    r3712 r3913  
    1111void ProcessParamsUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

    r3712 r3913  
    1111void PropagateFlagsFromConnectivityUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Qmu/Qmu.h

    r3715 r3913  
    1111void QmuUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h

    r3712 r3913  
    1111void ReduceloadfromgtofUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h

    r3712 r3913  
    1111void ReducematrixfromgtofUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h

    r3712 r3913  
    1111void ReducevectorgtofUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h

    r3712 r3913  
    1111void ReducevectorgtosUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/SetStructureField/SetStructureField.h

    r3712 r3913  
    1313#define OUTPUTHANDLE plhs[0]
    1414
    15 #include "../../c/modules.h"
     15#include "../../c/modules/modules.h"
    1616#include "../../c/DataSet/DataSet.h"
    1717#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Solver/Solver.h

    r3715 r3913  
    1111void SolverUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/SpcNodes/SpcNodes.h

    r3712 r3913  
    1111void SpcNodesUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/SplitSolutionVector/SplitSolutionVector.h

    r3773 r3913  
    1111void SplitSolutionVectorUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/shared/shared.h"
    1515
  • issm/trunk/src/mex/SystemMatrices/SystemMatrices.h

    r3841 r3913  
    99void SystemMatricesUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/Test/Test.h

    r3712 r3913  
    99void TestUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/TriMesh/TriMesh.h

    r3712 r3913  
    1010#include "string.h"
    1111
    12 #include "../../c/modules.h"
     12#include "../../c/modules/modules.h"
    1313#include "../../c/DataSet/DataSet.h"
    1414#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h

    r3712 r3913  
    1010#include "string.h"
    1111
    12 #include "../../c/modules.h"
     12#include "../../c/modules/modules.h"
    1313#include "../../c/DataSet/DataSet.h"
    1414#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h

    r3715 r3913  
    1010#include "string.h"
    1111
    12 #include "../../c/modules.h"
     12#include "../../c/modules/modules.h"
    1313#include "../../c/DataSet/DataSet.h"
    1414#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h

    r3712 r3913  
    1010#include "string.h"
    1111
    12 #include "../../c/modules.h"
     12#include "../../c/modules/modules.h"
    1313#include "../../c/DataSet/DataSet.h"
    1414#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h

    r3712 r3913  
    1111void UpdateGeometryUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/UpdateInputsFromConstant/UpdateInputsFromConstant.h

    r3891 r3913  
    99void UpdateInputsFromConstantUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h

    r3841 r3913  
    99void UpdateInputsFromSolutionUsage(void);
    1010
    11 #include "../../c/modules.h"
     11#include "../../c/modules/modules.h"
    1212#include "../../c/DataSet/DataSet.h"
    1313#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.h

    r3715 r3913  
    1111void UpdateInputsFromVectorUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
  • issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h

    r3712 r3913  
    1111void UpdateVertexPositionsUsage(void);
    1212
    13 #include "../../c/modules.h"
     13#include "../../c/modules/modules.h"
    1414#include "../../c/DataSet/DataSet.h"
    1515#include "../../c/shared/shared.h"
Note: See TracChangeset for help on using the changeset viewer.