Changeset 3775


Ignore:
Timestamp:
05/17/10 10:47:39 (15 years ago)
Author:
Eric.Larour
Message:

Created include.h header file

Location:
issm/trunk/src
Files:
2 added
217 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/BamgConvertMeshx/BamgConvertMeshx.cpp

    r3558 r3775  
    55
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99

  • issm/trunk/src/c/Bamgx/Bamgx.cpp

    r3713 r3775  
    55#include "../objects/objects.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99#include "./objects/BamgObjects.h"

  • issm/trunk/src/c/Bamgx/objects/CrackedEdge.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212#include "TriangleAdjacent.h"

  • issm/trunk/src/c/Bamgx/objects/Curve.h

    r3280 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "../shared/shared.h"
    1212#include "GeometricalEdge.h"

  • issm/trunk/src/c/Bamgx/objects/Direction.h

    r3280 r3775  
    22#define _DIRECTION_H_
    33
    4 #include "../include/typedefs.h"
    5 #include "../include/macros.h"
     4#include "../include/include.h"
     5#include "../include/include.h"
    66#include "../shared/shared.h"
    77

  • issm/trunk/src/c/Bamgx/objects/DoubleAndInt.h

    r3280 r3775  
    22#define _DOUBLEANDINT_H_
    33
    4 #include "../include/typedefs.h"
    5 #include "../include/macros.h"
     4#include "../include/include.h"
     5#include "../include/include.h"
    66
    77namespace bamg {

  • issm/trunk/src/c/Bamgx/objects/Edge.h

    r3570 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212#include "TriangleAdjacent.h"

  • issm/trunk/src/c/Bamgx/objects/GeometricalEdge.h

    r3326 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "Edge.h"
    1212#include "GeometricalVertex.h"

  • issm/trunk/src/c/Bamgx/objects/GeometricalSubDomain.h

    r3280 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "GeometricalEdge.h"
    1212

  • issm/trunk/src/c/Bamgx/objects/GeometricalVertex.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212

  • issm/trunk/src/c/Bamgx/objects/Geometry.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212#include "Edge.h"

  • issm/trunk/src/c/Bamgx/objects/ListofIntersectionTriangles.h

    r3570 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "Metric.h"
    1212#include "MeshVertex.h"

  • issm/trunk/src/c/Bamgx/objects/MeshVertex.h

    r3420 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "Direction.h"
    1212#include "Metric.h"

  • issm/trunk/src/c/Bamgx/objects/Metric.h

    r3280 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "../shared/shared.h"
    1212#include "R2.h"

  • issm/trunk/src/c/Bamgx/objects/QuadTree.h

    r3570 r3775  
    44
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111
    1212namespace bamg {

  • issm/trunk/src/c/Bamgx/objects/SubDomain.h

    r3280 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "Edge.h"
    1212#include "Triangle.h"

  • issm/trunk/src/c/Bamgx/objects/Triangle.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212#include "TriangleAdjacent.h"

  • issm/trunk/src/c/Bamgx/objects/TriangleAdjacent.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212

  • issm/trunk/src/c/Bamgx/objects/Triangles.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "../shared/shared.h"
    1212#include "Metric.h"

  • issm/trunk/src/c/Bamgx/objects/VertexOnEdge.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212#include "Edge.h"

  • issm/trunk/src/c/Bamgx/objects/VertexOnGeom.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212#include "GeometricalVertex.h"

  • issm/trunk/src/c/Bamgx/objects/VertexOnVertex.h

    r3407 r3775  
    44#include "../../objects/objects.h"
    55#include "../../shared/shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../include/typedefs.h"
    10 #include "../include/macros.h"
     9#include "../include/include.h"
     10#include "../include/include.h"
    1111#include "MeshVertex.h"
    1212

  • issm/trunk/src/c/Bamgx/shared/OppositeAngle.h

    r3280 r3775  
    22#define _OPPOSITEANGLE_H_
    33
    4 #include "../include/macros.h"
     4#include "../include/include.h"
    55
    66/*Return the opposite angle modulo 2 Pi*/

  • issm/trunk/src/c/Bamgx/shared/det.h

    r3280 r3775  
    22#define _BAMGDET_H_
    33
    4 #include "../include/typedefs.h"
     4#include "../include/include.h"
    55
    66namespace bamg {

  • issm/trunk/src/c/BuildNodeSetsx/BuildNodeSetsx.cpp

    r3332 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/BuildNodeSetsx/PartitionSets.cpp

    r3595 r3775  
    55#include "stdio.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.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/ComputeBasalStressx/ComputeBasalStressx.cpp

    r3703 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp

    r3703 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ComputeStrainRatex/ComputeStrainRatex.cpp

    r3703 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ControlConstrainx/ControlConstrainx.cpp

    r3751 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/CostFunctionx/CostFunctionx.cpp

    r3717 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/DataSet/DataSet.cpp

    r3751 r3775  
    1919#include "../objects/objects.h"
    2020#include "../shared/shared.h"
    21 #include "../include/macros.h"
     21#include "../include/include.h"
    2222#include "../EnumDefinitions/EnumDefinitions.h"
    2323

  • issm/trunk/src/c/DataSet/Inputs.cpp

    r3732 r3775  
    1818#include "./DataSet.h"
    1919#include "../shared/shared.h"
    20 #include "../include/macros.h"
     20#include "../include/include.h"
    2121#include "../EnumDefinitions/EnumDefinitions.h"
    2222

  • issm/trunk/src/c/DataSet/Parameters.cpp

    r3767 r3775  
    1818#include "./DataSet.h"
    1919#include "../shared/shared.h"
    20 #include "../include/macros.h"
     20#include "../include/include.h"
    2121#include "../EnumDefinitions/EnumDefinitions.h"
    2222

  • issm/trunk/src/c/Dofx/Dofx.cpp

    r3703 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/Dux/Dux.cpp

    r3717 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ElementConnectivityx/ElementConnectivityx.cpp

    r3332 r3775  
    1111
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414#include "../toolkits/toolkits.h"
    1515#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

    r3764 r3775  
    99
    1010#include "../shared/shared.h"
    11 #include "../include/macros.h"
     11#include "../include/include.h"
    1212#include "./EnumDefinitions.h"
    1313

  • issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

    r3764 r3775  
    99
    1010#include "../shared/shared.h"
    11 #include "../include/macros.h"
     11#include "../include/include.h"
    1212#include "./EnumDefinitions.h"
    1313

  • issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp

    r3703 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/FieldDepthAveragex/FieldDepthAveragex.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/FieldExtrudex/FieldExtrudex.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/Gradjx/Gradjx.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

    r3332 r3775  
    1111#include "./InterpFromGridToMeshx.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.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/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp

    r3332 r3775  
    55#include "./InterpFromMeshToGridx.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.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/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

    r3570 r3775  
    55
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99

  • issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp

    r3332 r3775  
    55#include "./InterpFromMeshToMesh3dx.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.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/Makefile.am

    r3773 r3775  
    2121
    2222#Serial compilation
    23 libISSM_a_SOURCES = ./objects/objects.h\
     23libISSM_a_SOURCES = ./include/macros.h\
     24                                        ./include/typedefs.h\
     25                                        ./include/types.h\
     26                                        ./include/globals.h\
     27                                        ./include/include.h\
     28                                        ./objects/objects.h\
    2429                                        ./objects/Object.h\
    2530                                        ./objects/Bamg/BamgGeom.h\
    … …  
    152157                                        ./shared/Numerics/OptFunc.cpp\
    153158                                        ./shared/Numerics/extrema.cpp\
    154                                         ./shared/Numerics/SplitSolutionVector.h\
    155                                         ./shared/Numerics/SplitSolutionVector.cpp\
    156159                                        ./shared/Exceptions/exceptions.h\
    157160                                        ./shared/Exceptions/Exceptions.cpp\
    … …  
    380383                                        ./Bamgx/Bamgx.cpp\
    381384                                        ./Bamgx/Bamgx.h\
     385                                        ./Bamgx/include/include.h \
    382386                                        ./Bamgx/include/macros.h \
    383387                                        ./Bamgx/include/typedefs.h \
    … …  
    450454
    451455#Parallel compilation
    452 libpISSM_a_SOURCES = ./objects/objects.h\
     456libpISSM_a_SOURCES = ./include/macros.h\
     457                                        ./include/typedefs.h\
     458                                        ./include/types.h\
     459                                        ./include/globals.h\
     460                                        ./include/include.h\
     461                                        ./objects/objects.h\
    453462                                        ./objects/Object.h\
    454463                                        ./objects/Bamg/BamgGeom.h\
    … …  
    712721                                        ./Gradjx/Gradjx.h\
    713722                                        ./Gradjx/Gradjx.cpp\
    714                                         ./shared/Numerics/SplitSolutionVector.h\
    715                                         ./shared/Numerics/SplitSolutionVector.cpp\
     723                                        ./SplitSolutionVectorx/SplitSolutionVectorx.h\
     724                                        ./SplitSolutionVectorx/SplitSolutionVectorx.cpp\
    716725                                        ./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
    717726                                        ./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
    … …  
    822831                                        ./Bamgx/Bamgx.cpp\
    823832                                        ./Bamgx/Bamgx.h\
     833                                        ./Bamgx/include/include.h \
    824834                                        ./Bamgx/include/macros.h \
    825835                                        ./Bamgx/include/typedefs.h \

  • issm/trunk/src/c/MassFluxx/MassFluxx.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/MeshPartitionx/MeshPartitionx.cpp

    r3595 r3775  
    55#include "./MeshPartitionx.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/Misfitx/Misfitx.cpp

    r3717 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp

    r3703 r3775  
    99#include "../../objects/objects.h"
    1010#include "../../shared/shared.h"
    11 #include "../../include/typedefs.h"
     11#include "../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp

    r3703 r3775  
    99#include "../../objects/objects.h"
    1010#include "../../shared/shared.h"
    11 #include "../../include/macros.h"
    12 #include "../../include/typedefs.h"
     11#include "../../include/include.h"
     12#include "../../include/include.h"
    1313#include "../../MeshPartitionx/MeshPartitionx.h"
    1414#include "../ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
    11 #include "../../include/typedefs.h"
     10#include "../../include/include.h"
     11#include "../../include/include.h"
    1212#include "../ModelProcessorx.h"
    1313

  • issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp

    r3703 r3775  
    1010#include "../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/typedefs.h"
     12#include "../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414

  • issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

    r3732 r3775  
    99#include "../../objects/objects.h"
    1010#include "../../shared/shared.h"
    11 #include "../../include/macros.h"
     11#include "../../include/include.h"
    1212#include "../ModelProcessorx.h"
    1313

  • issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp

    r3705 r3775  
    1111#include "../objects/objects.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "./ModelProcessorx/ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp

    r3713 r3775  
    1111#include "../shared/shared.h"
    1212#include "../io/io.h"
    13 #include "../include/macros.h"
    14 #include "../include/typedefs.h"
     13#include "../include/include.h"
     14#include "../include/include.h"
    1515#include "./ModelProcessorx.h"
    1616

  • issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

    r3703 r3775  
    1010#include "../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/typedefs.h"
     12#include "../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414

  • issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp

    r3703 r3775  
    1010#include "../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/typedefs.h"
     12#include "../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414

  • issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp

    r3703 r3775  
    99#include "../../objects/objects.h"
    1010#include "../../shared/shared.h"
    11 #include "../../include/macros.h"
    12 #include "../../include/typedefs.h"
     11#include "../../include/include.h"
     12#include "../../include/include.h"
    1313#include "../../MeshPartitionx/MeshPartitionx.h"
    1414#include "../ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp

    r3703 r3775  
    1010#include "../../shared/shared.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/typedefs.h"
     12#include "../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414

  • issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp

    r3703 r3775  
    77#include "../../io/io.h"
    88#include "../../EnumDefinitions/EnumDefinitions.h"
    9 #include "../../include/typedefs.h"
     9#include "../../include/include.h"
    1010#include "../../objects/objects.h"
    1111#include "../../shared/shared.h"

  • issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/Partitioning.cpp

    r3685 r3775  
    1313#include "../shared/shared.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/macros.h"
     15#include "../include/include.h"
    1616#include "../io/io.h"
    17 #include "../include/typedefs.h"
     17#include "../include/include.h"
    1818#include "../MeshPartitionx/MeshPartitionx.h"
    1919#include "../ModelProcessorx/ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp

    r3703 r3775  
    1010#include "../../io/io.h"
    1111#include "../../MeshPartitionx/MeshPartitionx.h"
    12 #include "../../include/typedefs.h"
     12#include "../../include/include.h"
    1313#include "../ModelProcessorx.h"
    1414

  • issm/trunk/src/c/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp

    r3703 r3775  
    99#include "../../io/io.h"
    1010#include "../../shared/shared.h"
    11 #include "../../include/macros.h"
    12 #include "../../include/typedefs.h"
     11#include "../../include/include.h"
     12#include "../../include/include.h"
    1313#include "../../MeshPartitionx/MeshPartitionx.h"
    1414#include "../ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp

    r3703 r3775  
    88#include "../../io/io.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
    11 #include "../../include/typedefs.h"
     10#include "../../include/include.h"
     11#include "../../include/include.h"
    1212#include "../ModelProcessorx.h"
    1313

  • issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp

    r3703 r3775  
    99#include "../../shared/shared.h"
    1010#include "../../io/io.h"
    11 #include "../../include/macros.h"
     11#include "../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp

    r3703 r3775  
    99#include "../../objects/objects.h"
    1010#include "../../shared/shared.h"
    11 #include "../../include/typedefs.h"
     11#include "../../include/include.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"
    1313#include "../ModelProcessorx.h"

  • issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp

    r3703 r3775  
    88#include "../../EnumDefinitions/EnumDefinitions.h"
    99#include "../../objects/objects.h"
    10 #include "../../include/typedefs.h"
     10#include "../../include/include.h"
    1111#include "../../shared/shared.h"
    1212#include "../../MeshPartitionx/MeshPartitionx.h"

  • issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

    r3703 r3775  
    88#include "../../objects/objects.h"
    99#include "../../shared/shared.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../ModelProcessorx.h"
    1212

  • issm/trunk/src/c/MpcNodesx/MpcNodesx.cpp

    r3332 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/NodeConnectivityx/NodeConnectivityx.cpp

    r3570 r3775  
    1414
    1515#include "../shared/shared.h"
    16 #include "../include/macros.h"
     16#include "../include/include.h"
    1717#include "../toolkits/toolkits.h"
    1818#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/Orthx/Orthx.h

    r3521 r3775  
    77
    88#include "../objects/objects.h"
    9 #include "../include/macros.h"
     9#include "../include/include.h"
    1010#include "../shared/shared.h"
    1111

  • issm/trunk/src/c/OutputRiftsx/OutputRiftsx.cpp

    r3332 r3775  
    77
    88#include "../shared/shared.h"
    9 #include "../include/macros.h"
     9#include "../include/include.h"
    1010#include "../toolkits/toolkits.h"
    1111#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp

    r3703 r3775  
    77
    88#include "../shared/shared.h"
    9 #include "../include/macros.h"
     9#include "../include/include.h"
    1010#include "../toolkits/toolkits.h"
    1111#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/PenaltyConstraintsx/RiftConstraints.cpp

    r3717 r3775  
    55#include "./RiftConstraints.h"
    66#include "../EnumDefinitions/EnumDefinitions.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../shared/shared.h"
    99

  • issm/trunk/src/c/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp

    r3713 r3775  
    1010
    1111#include "../shared/shared.h"
    12 #include "../include/macros.h"
     12#include "../include/include.h"
    1313#include "../toolkits/toolkits.h"
    1414#include "../DataSet/DataSet.h"

  • issm/trunk/src/c/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp

    r3332 r3775  
    55
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99

  • issm/trunk/src/c/Qmux/DakotaResponses.cpp

    r3732 r3775  
    1111#include "../DataSet/DataSet.h"   
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../MassFluxx/MassFluxx.h"
    1616#include "../Misfitx/Misfitx.h"
     17#include "../modules.h"
    1718
    1819void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,Model* model,DataSet* results,DataSet* processed_results,int analysis_type,int sub_analysis_type){
    … …  
    261262                        if(!found)ISSMERROR(" could not find velocity to compute misfit");
    262263
    263                         SplitSolutionVector(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz);
     264                        SplitSolutionVectorx(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz);
    264265
    265266                        /*Add to inputs: */

  • issm/trunk/src/c/Qmux/Qmux.cpp

    r3710 r3775  
    3636
    3737#include "../shared/shared.h"
    38 #include "../include/macros.h"
     38#include "../include/include.h"
    3939#include "../toolkits/toolkits.h"
    4040#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/Qmux/SpawnCore.cpp

    r3673 r3775  
    1515#include "../shared/shared.h"
    1616#include "./Qmux.h"
    17 #include "../include/macros.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/Qmux/SpawnCoreParallel.cpp

    r3732 r3775  
    3131#include "../shared/shared.h"
    3232#include "./Qmux.h"
    33 #include "../include/macros.h"
     33#include "../include/include.h"
    3434#include "../parallel/parallel.h"
    3535

  • issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp

    r3673 r3775  
    1717#include "../shared/shared.h"
    1818#include "./Qmux.h"
    19 #include "../include/macros.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/Solverx/Solverx.cpp

    r3595 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99
    1010#ifdef HAVE_CONFIG_H

  • issm/trunk/src/c/SpcNodesx/SpcNodesx.cpp

    r3332 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.cpp

    r3773 r3775  
    33
    44#include "./SplitSolutionVectorx.h"
     5#include "../shared/shared.h"
    56
    67void SplitSolutionVectorx(Vec u_g,int numberofnodes,int numberofdofs, ...){

  • issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.h

    r3773 r3775  
    1212
    1313#include <stdarg.h>
     14#include "../toolkits/toolkits.h"
    1415
    15 #include "../../shared/shared.h"
    16 #include "../../include/macros.h"
    17 
    18 void SplitSolutionVector(Vec u_g,int numberofnodes,int numberofdofs, ...);
     16void SplitSolutionVectorx(Vec u_g,int numberofnodes,int numberofdofs, ...);
    1917
    2018#endif  /* _SPLITSOLUTIONVECTORX_H */

  • issm/trunk/src/c/SurfaceAreax/SurfaceAreax.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/SystemMatricesx/SystemMatricesx.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/UpdateGeometryx/UpdateGeometryx.cpp

    r3673 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp

    r3703 r3775  
    55#include "./UpdateInputsFromSolutionx.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp

    r3751 r3775  
    55#include "./UpdateInputsFromVectorx.h"
    66#include "../shared/shared.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../toolkits/toolkits.h"
    99#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp

    r3446 r3775  
    66
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../toolkits/toolkits.h"
    1010#include "../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/include/types.h

    r3593 r3775  
    1313#endif
    1414
     15#include "stdio.h"
    1516
    1617/*Define abstract type for I/O: */

  • issm/trunk/src/c/io/FetchData.cpp

    r3332 r3775  
    1111#include "./io.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414
    1515/***************** **************** **************** **************** **************** **************** **************** **************** **************** ****************

  • issm/trunk/src/c/io/FetchParams.cpp

    r3713 r3775  
    1515#include "../objects/objects.h"
    1616#include "../shared/shared.h"
    17 #include "../include/macros.h"
     17#include "../include/include.h"
    1818#include "../EnumDefinitions/EnumDefinitions.h"
    1919

  • issm/trunk/src/c/io/WriteData.cpp

    r3335 r3775  
    99#endif
    1010
    11 #include "../include/macros.h"
     11#include "../include/include.h"
    1212#include "./shared/shared.h"
    1313#include "./io.h"

  • issm/trunk/src/c/io/WriteDataToDisk.cpp

    r3332 r3775  
    55#include "stdio.h"
    66#include "string.h"
    7 #include "../include/macros.h"
     7#include "../include/include.h"
    88#include "../shared/shared.h"
    99

  • issm/trunk/src/c/io/WriteParams.cpp

    r3685 r3775  
    1616#include "../objects/objects.h"
    1717#include "../shared/shared.h"
    18 #include "../include/macros.h"
     18#include "../include/include.h"
    1919
    2020void WriteParams(DataHandle* pdataref,Parameters* parameters){

  • issm/trunk/src/c/io/io.h

    r3713 r3775  
    88#include "../objects/objects.h"
    99#include "../DataSet/DataSet.h"
    10 #include "../include/types.h"
     10#include "../include/include.h"
    1111
    1212class DataSet;

  • issm/trunk/src/c/io/pfclose.cpp

    r3570 r3775  
    1111#include "stdio.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414
    1515void pfclose(FILE* fid,char* filename){

  • issm/trunk/src/c/io/pfopen.cpp

    r3570 r3775  
    1111#include "stdio.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414
    1515FILE* pfopen(char* filename,char* format){

  • issm/trunk/src/c/objects/Bamg/BamgOpts.cpp

    r3683 r3775  
    11#include "stdio.h"
    22#include "../../shared/shared.h"
    3 #include "../../include/macros.h"
     3#include "../../include/include.h"
    44#include "../objects.h"
    55

  • issm/trunk/src/c/objects/Constraints/Rgb.cpp

    r3683 r3775  
    1515#include "../../DataSet/DataSet.h"
    1616#include "../../shared/shared.h"
    17 #include "../../include/macros.h"
     17#include "../../include/include.h"
    1818#include "../objects.h"
    1919

  • issm/trunk/src/c/objects/Constraints/Spc.cpp

    r3683 r3775  
    1212#include "stdio.h"
    1313#include <string.h>
    14 #include "../../include/macros.h"
     14#include "../../include/include.h"
    1515#include "../../shared/shared.h"
    1616#include "../../EnumDefinitions/EnumDefinitions.h"

  • issm/trunk/src/c/objects/Contour.cpp

    r3681 r3775  
    1010
    1111#include "./objects.h"
    12 #include "../include/macros.h"
     12#include "../include/include.h"
    1313#include "../shared/Matlab/matlabshared.h"
    1414

  • issm/trunk/src/c/objects/DakotaPlugin.cpp

    r3673 r3775  
    2424/*Standard ISSM includes: */
    2525#include "../shared/shared.h"
    26 #include "../include/macros.h"
     26#include "../include/include.h"
    2727#include "../objects/objects.h"
    2828#include "../Qmux/Qmux.h"

  • issm/trunk/src/c/objects/DofIndexing.cpp

    r3681 r3775  
    1515#include "../shared/shared.h"
    1616#include "../DataSet/DataSet.h"
    17 #include "../include/typedefs.h"
    18 #include "../include/macros.h"
     17#include "../include/include.h"
     18#include "../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/DofVec.cpp

    r3681 r3775  
    1111#include "./objects.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515

  • issm/trunk/src/c/objects/Elements/Beam.cpp

    r3751 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Elements/Beam.h

    r3751 r3775  
    1616
    1717#include "../../shared/Exceptions/exceptions.h"
    18 #include "../../include/macros.h"
     18#include "../../include/include.h"
    1919/*}}}*/
    2020

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r3751 r3775  
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../shared/shared.h"
    16 #include "../../include/typedefs.h"
    17 #include "../../include/macros.h"
     16#include "../../include/include.h"
     17#include "../../include/include.h"
    1818#include "../../DataSet/DataSet.h"
    1919

  • issm/trunk/src/c/objects/Elements/Penta.h

    r3751 r3775  
    1818
    1919#include "../../shared/Exceptions/exceptions.h"
    20 #include "../../include/macros.h"
     20#include "../../include/include.h"
    2121
    2222/*}}}*/

  • issm/trunk/src/c/objects/Elements/Sing.cpp

    r3751 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Elements/Sing.h

    r3751 r3775  
    1414class IoModel;
    1515
    16 #include "../../include/macros.h"
     16#include "../../include/include.h"
    1717#include "../../shared/Exceptions/exceptions.h"
    1818

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r3751 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
    2121/*}}}*/
    2222

  • issm/trunk/src/c/objects/Elements/Tria.h

    r3751 r3775  
    1414class IoModel;
    1515
    16 #include "../../include/macros.h"
     16#include "../../include/include.h"
    1717#include "../../shared/Exceptions/exceptions.h"
    1818/*}}}*/

  • issm/trunk/src/c/objects/FemModel.cpp

    r3751 r3775  
    1111#include "stdio.h"
    1212#include "../shared/shared.h"
    13 #include "../include/macros.h"
     13#include "../include/include.h"
    1414#include "./objects.h"
    1515

  • issm/trunk/src/c/objects/Hook.cpp

    r3681 r3775  
    1616#include "../EnumDefinitions/EnumDefinitions.h"
    1717#include "../shared/shared.h"
    18 #include "../include/typedefs.h"
    19 #include "../include/macros.h"
     18#include "../include/include.h"
     19#include "../include/include.h"
    2020
    2121

  • issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/BoolInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/types.h"
    19 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
     19#include "../../include/include.h"
    2020
    2121/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/BoolInput.h

    r3751 r3775  
    1010/*{{{1*/
    1111#include "./Input.h"
    12 #include "../../include/types.h"
     12#include "../../include/include.h"
    1313/*}}}*/
    1414

  • issm/trunk/src/c/objects/Inputs/DoubleInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/types.h"
    19 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
     19#include "../../include/include.h"
    2020
    2121/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/DoubleInput.h

    r3751 r3775  
    1010/*{{{1*/
    1111#include "./Input.h"
    12 #include "../../include/types.h"
     12#include "../../include/include.h"
    1313/*}}}*/
    1414

  • issm/trunk/src/c/objects/Inputs/IntInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/types.h"
    19 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
     19#include "../../include/include.h"
    2020
    2121/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/IntInput.h

    r3751 r3775  
    1010/*{{{1*/
    1111#include "./Input.h"
    12 #include "../../include/types.h"
     12#include "../../include/include.h"
    1313/*}}}*/
    1414

  • issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp

    r3732 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919
    2020/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/IoModel.cpp

    r3703 r3775  
    1010#endif
    1111
    12 #include "../shared/shared.h"
    13 #include "../io/io.h"
    14 #include "../include/globals.h"
    15 #include "../include/macros.h"
    1612#include <string.h>
    1713#include "stdio.h"
    1814#include "./objects.h"
     15#include "../shared/shared.h"
     16#include "../io/io.h"
     17#include "../include/include.h"
    1918
    2019/*FUNCTION IoModel::IoModel(){{{1*/

  • issm/trunk/src/c/objects/IoModel.h

    r3703 r3775  
    88#define _IOMODEL_H
    99
    10 #include "../include/types.h"
     10#include "../include/include.h"
    1111
    1212class IoModel {

  • issm/trunk/src/c/objects/Loads/Friction.cpp

    r3683 r3775  
    55#include "../objects.h"
    66#include "../../shared/shared.h"
    7 #include "../../include/typedefs.h"
     7#include "../../include/include.h"
    88
    99/*--------------------------------------------------

  • issm/trunk/src/c/objects/Loads/Icefront.cpp

    r3683 r3775  
    1616#include "../../EnumDefinitions/EnumDefinitions.h"
    1717#include "../../shared/shared.h"
    18 #include "../../include/typedefs.h"
    19 #include "../../include/macros.h"
     18#include "../../include/include.h"
     19#include "../../include/include.h"
    2020/*}}}*/
    2121

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r3683 r3775  
    1313#include "../../EnumDefinitions/EnumDefinitions.h"
    1414#include "../../shared/shared.h"
    15 #include "../../include/typedefs.h"
    16 #include "../../include/macros.h"
     15#include "../../include/include.h"
     16#include "../../include/include.h"
    1717#include "../objects.h"
    1818

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r3683 r3775  
    1414#include "../objects.h"
    1515#include "../../EnumDefinitions/EnumDefinitions.h"
    16 #include "../../include/macros.h"
     16#include "../../include/include.h"
    1717#include "../../shared/shared.h"
    18 #include "../../include/typedefs.h"
    19 #include "../../include/macros.h"
     18#include "../../include/include.h"
     19#include "../../include/include.h"
    2020#include "../../DataSet/DataSet.h"
    2121       

  • issm/trunk/src/c/objects/Loads/Penpair.cpp

    r3683 r3775  
    1414#include "../objects.h"
    1515#include "../../EnumDefinitions/EnumDefinitions.h"
    16 #include "../../include/macros.h"
     16#include "../../include/include.h"
    1717#include "../../shared/shared.h"
    18 #include "../../include/typedefs.h"
     18#include "../../include/include.h"
    1919
    2020               

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r3683 r3775  
    1515#include "../../EnumDefinitions/EnumDefinitions.h"
    1616#include "../../shared/shared.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    1919#include "../../ModelProcessorx/ModelProcessorx.h"
    2020#include "../objects.h"

  • issm/trunk/src/c/objects/Materials/Matice.cpp

    r3683 r3775  
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../shared/shared.h"
    16 #include "../../include/macros.h"
    17 #include "../../include/typedefs.h"
     16#include "../../include/include.h"
     17#include "../../include/include.h"
    1818               
    1919/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Materials/Matpar.cpp

    r3683 r3775  
    1414#include "../objects.h"
    1515#include "../../shared/shared.h"
    16 #include "../../include/macros.h"
     16#include "../../include/include.h"
    1717#include "../../EnumDefinitions/EnumDefinitions.h"
    1818

  • issm/trunk/src/c/objects/Model.cpp

    r3751 r3775  
    1414#include "../ModelProcessorx/ModelProcessorx.h"
    1515#include "./objects.h"
    16 #include "../include/types.h"
     16#include "../include/include.h"
    1717#include "../EnumDefinitions/EnumDefinitions.h"
    1818#include "../modules.h"

  • issm/trunk/src/c/objects/Model.h

    r3751 r3775  
    88/*Headers:*/
    99/*{{{1*/
    10 #include "../include/types.h"
     10#include "../include/include.h"
    1111struct FemModel;
    1212class DataSet;

  • issm/trunk/src/c/objects/Node.cpp

    r3681 r3775  
    1616#include "../EnumDefinitions/EnumDefinitions.h"
    1717#include "../shared/shared.h"
    18 #include "../include/typedefs.h"
    19 #include "../include/macros.h"
     18#include "../include/include.h"
     19#include "../include/include.h"
    2020/*}}}*/
    2121

  • issm/trunk/src/c/objects/NodeSets.cpp

    r1 r3775  
    33 */
    44
    5 #include "../include/macros.h"
     5#include "../include/include.h"
    66#include "../shared/shared.h"
    77#include "./objects.h"

  • issm/trunk/src/c/objects/Params/BoolParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/BoolParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/DoubleMatParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/DoubleMatParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/DoubleParam.cpp

    r3761 r3775  
    1515#include "../../shared/shared.h"
    1616#include "../../DataSet/DataSet.h"
    17 #include "../../include/typedefs.h"
    18 #include "../../include/types.h"
    19 #include "../../include/macros.h"
     17#include "../../include/include.h"
     18#include "../../include/include.h"
    2019
    2120/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Params/DoubleParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/DoubleVecParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/DoubleVecParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/IntParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/IntParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/PetscMatParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/PetscMatParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/PetscVecParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/PetscVecParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/StringArrayParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/StringArrayParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Params/StringParam.cpp

    r3761 r3775  
    1717#include "../../shared/shared.h"
    1818#include "../../DataSet/DataSet.h"
    19 #include "../../include/typedefs.h"
    20 #include "../../include/types.h"
    21 #include "../../include/macros.h"
     19#include "../../include/include.h"
     20#include "../../include/include.h"
     21#include "../../include/include.h"
    2222/*}}}*/
    2323

  • issm/trunk/src/c/objects/Params/StringParam.h

    r3751 r3775  
    2222
    2323#include "./Param.h"
    24 #include "../../include/types.h"
     24#include "../../include/include.h"
    2525#include "../../shared/shared.h"
    26 #include "../../include/typedefs.h"
    27 #include "../../include/macros.h"
     26#include "../../include/include.h"
     27#include "../../include/include.h"
    2828/*}}}*/
    2929

  • issm/trunk/src/c/objects/Result.cpp

    r3681 r3775  
    1414#include "./objects.h"
    1515#include "../EnumDefinitions/EnumDefinitions.h"
    16 #include "../include/macros.h"
     16#include "../include/include.h"
    1717#include "../shared/shared.h"
    18 #include "../include/typedefs.h"
    19 #include "../include/macros.h"
     18#include "../include/include.h"
     19#include "../include/include.h"
    2020
    2121/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Vertex.cpp

    r3681 r3775  
    1313#include "./objects.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/macros.h"
     15#include "../include/include.h"
    1616#include "../shared/shared.h"
    17 #include "../include/typedefs.h"
    18 #include "../include/macros.h"
     17#include "../include/include.h"
     18#include "../include/include.h"
    1919/*}}}*/
    2020

  • issm/trunk/src/c/objects/Vertex.h

    r3751 r3775  
    1212class IoModel;
    1313#include "../shared/Exceptions/exceptions.h"
    14 #include "../include/macros.h"
     14#include "../include/include.h"
    1515
    1616/*}}}*/

  • issm/trunk/src/c/parallel/ControlInitialization.cpp

    r3751 r3775  
    104104
    105105        //Add to inputs:
    106         SplitSolutionVector(ug_horiz,numberofnodes,numberofdofspernode_dh,&vx,&vy);
     106        SplitSolutionVectorx(ug_horiz,numberofnodes,numberofdofspernode_dh,&vx,&vy);
    107107        model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    108108        model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
    … …  
    129129
    130130        //Add in inputs
    131         SplitSolutionVector(ug_stokes,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
     131        SplitSolutionVectorx(ug_stokes,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
    132132        model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    133133        model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
    … …  
    150150        //Add in inputs
    151151        xfree((void**)&vx); xfree((void**)&vy); xfree((void**)&vz); xfree((void**)&pressure);
    152         SplitSolutionVector(ug,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
     152        SplitSolutionVectorx(ug,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
    153153        model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    154154        model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);

  • issm/trunk/src/c/parallel/WriteLockFile.cpp

    r3570 r3775  
    44#include "stdio.h"
    55#include "../shared/shared.h"
    6 #include "../include/macros.h"
     6#include "../include/include.h"
    77
    88void WriteLockFile(char* filename){

  • issm/trunk/src/c/parallel/balancedthickness.cpp

    r3767 r3775  
    1212#include "../DataSet/DataSet.h"
    1313#include "../EnumDefinitions/EnumDefinitions.h"
    14 #include "../include/globals.h"
     14#include "../include/include.h"
    1515#include "./parallel.h"
    1616

  • issm/trunk/src/c/parallel/balancedthickness2.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/balancedthickness2_core.cpp

    r3751 r3775  
    66#include "../objects/objects.h"
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../EnumDefinitions/EnumDefinitions.h"
    1010#include "./parallel.h"

  • issm/trunk/src/c/parallel/balancedthickness_core.cpp

    r3751 r3775  
    66#include "../objects/objects.h"
    77#include "../shared/shared.h"
    8 #include "../include/macros.h"
     8#include "../include/include.h"
    99#include "../EnumDefinitions/EnumDefinitions.h"
    1010#include "./parallel.h"

  • issm/trunk/src/c/parallel/balancedvelocities.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/diagnostic.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/diagnostic_core.cpp

    r3771 r3775  
    99#include "./parallel.h"
    1010#include "../modules.h"
    11 #include "../include/macros.h"
     11#include "../include/include.h"
    1212
    1313void diagnostic_core(DataSet* results,Model* model){
    … …  
    143143                FieldExtrudex( ug,fem_dh->elements,fem_dh->nodes, fem_dh->vertices,fem_dh->loads,fem_dh->materials,fem_dh->parameters,"velocity",1);
    144144
    145                 SplitSolutionVector(ug,numberofnodes,numberofdofspernode_dh,&vx,&vy);
     145                SplitSolutionVectorx(ug,numberofnodes,numberofdofspernode_dh,&vx,&vy);
    146146                model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    147147                model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);

  • issm/trunk/src/c/parallel/gradjcompute_core.cpp

    r3751 r3775  
    8484
    8585        /*add to inputs: */
    86         SplitSolutionVector(lambda_g,numberofnodes,numberofdofspernode,&lambdax,&lambday);
     86        SplitSolutionVectorx(lambda_g,numberofnodes,numberofdofspernode,&lambdax,&lambday);
    8787        model->UpdateInputsFromVector(lambdax,AdjointxEnum,VertexEnum);
    8888        model->UpdateInputsFromVector(lambday,AdjointyEnum,VertexEnum);
    … …  
    106106                diagnostic_results->FindResult(&u_g,"u_g");
    107107               
    108                 SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
     108                SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
    109109                model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    110110                model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);

  • issm/trunk/src/c/parallel/objectivefunctionC.cpp

    r3751 r3775  
    104104                diagnostic_results->FindResult(&u_g,"u_g");
    105105               
    106                 SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
     106                SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
    107107                femmodel->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    108108                femmodel->UpdateInputsFromVector(vy,VxEnum,VertexEnum);

  • issm/trunk/src/c/parallel/prognostic.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/prognostic2.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/slopecompute.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/steadystate.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/thermal.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/transient.cpp

    r3767 r3775  
    1313#include "../DataSet/DataSet.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "../include/globals.h"
     15#include "../include/include.h"
    1616#include "./parallel.h"
    1717

  • issm/trunk/src/c/parallel/transient_core_2d.cpp

    r3751 r3775  
    9797                _printf_("%s\n","computing new thickness");
    9898               
    99                 SplitSolutionVector(u_g,numberofnodes,2,&vx,&vy);
     99                SplitSolutionVectorx(u_g,numberofnodes,2,&vx,&vy);
    100100                model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    101101                model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
    … …  
    130130                model->UpdateInputsFromVector(b_g,BedEnum,VertexEnum);
    131131       
    132                 SplitSolutionVector(u_g,numberofnodes,2,&vx,&vy);
     132                SplitSolutionVectorx(u_g,numberofnodes,2,&vx,&vy);
    133133                model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    134134                model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);

  • issm/trunk/src/c/parallel/transient_core_3d.cpp

    r3751 r3775  
    118118                if(verbose)_printf_("%s\n","computing new thickness");
    119119       
    120                 SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
     120                SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
    121121                model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    122122                model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
    … …  
    159159                model->UpdateInputsFromVector(b_g,BedEnum,VertexEnum);
    160160       
    161                 SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
     161                SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
    162162                model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
    163163                model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);

  • issm/trunk/src/c/shared/Alloc/alloc.cpp

    r3332 r3775  
    2727#include  "./alloc.h"
    2828#include "../Exceptions/exceptions.h"
    29 #include "../../include/macros.h"
     29#include "../../include/include.h"
    3030
    3131void* xmalloc(int size){

  • issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp

    r3588 r3775  
    33 */
    44
    5 #include "../../include/macros.h"
     5#include "../../include/include.h"
    66#include "../../EnumDefinitions/EnumDefinitions.h"
    77#include "../shared.h"

  • issm/trunk/src/c/shared/Dofs/dofsetgen.cpp

    r3332 r3775  
    1010
    1111#include "../Alloc/alloc.h"
    12 #include "../../include/macros.h"
     12#include "../../include/include.h"
    1313#include "stdio.h"
    1414

  • issm/trunk/src/c/shared/Elements/ResolvePointers.cpp

    r3673 r3775  
    1111#include "../../objects/objects.h"
    1212#include "../../DataSet/DataSet.h"
    13 #include "../../include/typedefs.h"
    14 #include "../../include/macros.h"
     13#include "../../include/include.h"
     14#include "../../include/include.h"
    1515#include "../Exceptions/exceptions.h"
    1616

  • issm/trunk/src/c/shared/Exceptions/Exceptions.cpp

    r3332 r3775  
    44
    55#include "../shared.h"
    6 #include "../../include/macros.h"
     6#include "../../include/include.h"
    77
    88ErrorException::ErrorException(const string &what_arg){

  • issm/trunk/src/c/shared/Exp/DomainOutlineRead.cpp

    r3595 r3775  
    88#include "stdio.h"
    99#include "../Alloc/alloc.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111#include "../Exceptions/exceptions.h"
    1212

  • issm/trunk/src/c/shared/Matlab/CheckNumMatlabArguments.cpp

    r3332 r3775  
    66
    77#include "../Exceptions/exceptions.h"
    8 #include "../../include/macros.h"
     8#include "../../include/include.h"
    99#include "mex.h"
    1010

  • issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp

    r3570 r3775  
    3737#include <math.h>
    3838#include <float.h>    /*  DBL_EPSILON  */
    39 #include "../../include/macros.h"
     39#include "../../include/include.h"
    4040
    4141int TripleMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int nrowc, int ncolc, int itrnc, double* d, int iaddd){

  • issm/trunk/src/c/shared/Numerics/BrentSearch.cpp

    r2267 r3775  
    1111#include "./numerics.h"
    1212#include "../../objects/objects.h"
    13 #include "../../include/macros.h"
     13#include "../../include/include.h"
    1414#include "../../shared/shared.h"
    1515#include <float.h>

  • issm/trunk/src/c/shared/Numerics/GaussPoints.cpp

    r3570 r3775  
    55#include "../Matlab/matlabshared.h"
    66#include "../Alloc/alloc.h"
    7 #include "../../include/macros.h"
    8 #include "../../include/typedefs.h"
     7#include "../../include/include.h"
     8#include "../../include/include.h"
    99#include "../Exceptions/exceptions.h"
    1010#include <math.h>

  • issm/trunk/src/c/shared/Numerics/OptFunc.cpp

    r3673 r3775  
    1111#include "../../objects/objects.h"
    1212#include "../../shared/shared.h"
    13 #include "../../include/macros.h"
     13#include "../../include/include.h"
    1414
    1515#ifdef _SERIAL_

  • issm/trunk/src/c/shared/Numerics/numerics.h

    r3773 r3775  
    88#include "./GaussPoints.h"
    99#include "./isnan.h"
    10 #include "./SplitSolutionVector.h"
    1110
    1211struct OptArgs;

  • issm/trunk/src/c/shared/Threads/LaunchThread.cpp

    r3332 r3775  
    2222#include "../Alloc/alloc.h"
    2323#include "../Exceptions/exceptions.h"
    24 #include "../../include/macros.h"
     24#include "../../include/include.h"
    2525
    2626void LaunchThread(void* function(void*), void* gate,int num_threads){

  • issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp

    r3595 r3775  
    88#include "../Exceptions/exceptions.h"
    99#include "../Alloc/alloc.h"
    10 #include "../../include/macros.h"
     10#include "../../include/include.h"
    1111
    1212int IsGridOnRift(int* riftsegments, int nriftsegs, int grid){

  • issm/trunk/src/c/toolkits/petsc/patches/MatInvert.cpp

    r3332 r3775  
    99
    1010#include "../../../shared/shared.h"
    11 #include "../../../include/macros.h"
     11#include "../../../include/include.h"
    1212
    1313void MatInvert(Mat* pinv, Mat matrix){

  • issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp

    r3570 r3775  
    1717
    1818#include "../../../shared/shared.h"
    19 #include "../../../include/macros.h"
     19#include "../../../include/include.h"
    2020
    2121Mat NewMat(int M,int N,double* psparsity,int* pconnectivity,int* pnumberofdofspernode){

  • issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp

    r3570 r3775  
    3737
    3838#include "../../../shared/shared.h"
    39 #include "../../../include/macros.h"
     39#include "../../../include/include.h"
    4040
    4141void PetscOptionsDetermineSolverType(int* psolver_type,char* options_string){

  • issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp

    r3570 r3775  
    1717
    1818#include "../../../shared/shared.h"
    19 #include "../../../include/macros.h"
     19#include "../../../include/include.h"
    2020
    2121void PetscOptionsInsertMultipleString(char* options_string){

  • issm/trunk/src/c/toolkits/petsc/patches/VecMerge.cpp

    r3595 r3775  
    1717
    1818#include "../../../shared/shared.h"
    19 #include "../../../include/macros.h"
     19#include "../../../include/include.h"
    2020
    2121void VecMerge(Vec A, Vec B, double* row_partition_vector,int row_partition_size){

  • issm/trunk/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp

    r3595 r3775  
    22 * \brief invert petsc matrix using Plapack
    33 */
    4 #include "../../../include/macros.h"
     4#include "../../../include/include.h"
    55
    66/* petsc: */

  • issm/trunk/src/c/toolkits/plapack/plapackincludes.h

    r831 r3775  
    77
    88#include "PLA.h"
    9 #include "PLA_prototypes.h"
     9#include "PLA_protoinclude.h"
    1010
    1111/* missing Plapack prototypes: */

  • issm/trunk/src/mex/SplitSolutionVector/SplitSolutionVector.cpp

    r3773 r3775  
    1212        /*input datasets: */
    1313        double* vector=NULL;
    14         int dummy=NULL;
     14        int dummy;
    1515        int numberofnodes;
    1616        int numberofdofspernode;
    … …  
    2727        for(i=0;i<numberofdofspernode;i++){
    2828                double*  component=(double*)xmalloc(numberofnodes*sizeof(double));
    29                 for (j=0;j<numberofnodes;j++) component[i]=vector[j*numberofdofs+i];
     29                for (j=0;j<numberofnodes;j++) component[i]=vector[j*numberofdofspernode+i];
    3030
    3131
Note: See TracChangeset for help on using the changeset viewer.