Changeset 3681


Ignore:
Timestamp:
05/10/10 14:30:44 (15 years ago)
Author:
Eric.Larour
Message:

reorganized into sub directories

Location:
issm/trunk/src/c/objects
Files:
39 deleted
17 edited

Legend:

Unmodified
Added
Removed

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

    r1 r3681  
    99#endif
    1010
    11 #include "./Contour.h"
     11#include "./objects.h"
    1212#include "../include/macros.h"
    1313#include "../shared/Matlab/matlabshared.h"

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

    r3567 r3681  
    1010
    1111#include "stdio.h"
    12 #include "./DofIndexing.h"
     12#include "./objects.h"
    1313#include <string.h>
    1414#include "../EnumDefinitions/EnumDefinitions.h"

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

    r3637 r3681  
    88
    99/*Headers:*/
    10 /*{{{1*/
    11 #include "./Object.h"
    1210#include "../toolkits/toolkits.h"
    13 /*}}}*/
    1411
    1512class DofObject{

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

    r3673 r3681  
    99#endif
    1010
    11 #include "./DofVec.h"
     11#include "./objects.h"
    1212#include "../shared/shared.h"
    1313#include "../include/macros.h"

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

    r3673 r3681  
    1212#include "../shared/shared.h"
    1313#include "../include/macros.h"
    14 #include "./FemModel.h"
     14#include "./objects.h"
    1515
    1616/*constructors/destructors*/

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

    r3673 r3681  
    88/*Headers:*/
    99/*{{{1*/
     10#include "./Object.h"
     11#include "../toolkits/toolkits.h"
    1012class DataSet;
     13class Parameters;
    1114class DofVec;
    12 #include "./Object.h"
    13 #include "../DataSet/DataSet.h"
    14 #include "../DataSet/Parameters.h"
    15 #include "./DofVec.h"
    16 #include "../toolkits/toolkits.h"
    17 #include "../parallel/parallel.h"
     15class NodeSets;
    1816/*}}}*/
    1917

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

    r3673 r3681  
    1212#include "stdio.h"
    1313#include <string.h>
    14 #include "./Object.h"
     14#include "./objects.h"
    1515#include "../DataSet/DataSet.h"
    16 #include "./Hook.h"
    1716#include "../EnumDefinitions/EnumDefinitions.h"
    1817#include "../shared/shared.h"

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

    r3673 r3681  
    1111/*Headers:*/
    1212/*{{{1*/
     13#include "./Object.h"
    1314class DataSet;
    14 class Object;
    15 #include "./Object.h"
    16 #include "../DataSet/DataSet.h"
    17 #include "../toolkits/toolkits.h"
    1815/*}}}*/
    1916

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

    r3673 r3681  
    33 */
    44
    5 #include "../issm.h"
    65
    76#ifdef HAVE_CONFIG_H
    … …  
    1110#endif
    1211
    13 #include "./Model.h"
     12#include "stdio.h"
     13#include "../DataSet/DataSet.h"
     14#include "../ModelProcessorx/ModelProcessorx.h"
     15#include "./objects.h"
     16#include "../include/types.h"
    1417#include "../EnumDefinitions/EnumDefinitions.h"
    15 #include "stdio.h"
     18#include "../modules.h"
     19
    1620
    1721/*Object constructors and destructor*/

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

    r3673 r3681  
    1111
    1212#include "stdio.h"
    13 #include "./Vertex.h"
    14 #include "./Node.h"
    15 #include "./Hook.h"
    16 #include "./DofIndexing.h"
    1713#include <string.h>
     14#include "./objects.h"
     15#include "../DataSet/DataSet.h"
    1816#include "../EnumDefinitions/EnumDefinitions.h"
    1917#include "../shared/shared.h"

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

    r3673 r3681  
    88/*Headers:*/
    99/*{{{1*/
    10 /*indefinitions: */
    1110#include "./Object.h"
    1211#include "./DofObject.h"
    13 #include "../DataSet/Inputs.h"
    14 #include "./Hook.h"
    15 #include "./DofIndexing.h"
    16 #include "../ModelProcessorx/IoModel.h"
     12class  Inputs;
     13class  Hook;
     14class  DofIndexing;
     15class IoModel;
     16class  DataSet;
    1717/*}}}*/
    1818

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

    r3637 r3681  
    88/*Headers:*/
    99/*{{{1*/
    10 #include "../toolkits/toolkits.h"
    1110/*}}}*/
    1211

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

    r3612 r3681  
    33 */
    44
    5 #ifndef OPTARGS_H_
    6 #define OPTARGS_H_
     5#ifndef _OPTARGS_H_
     6#define _OPTARGS_H_
    77
    88#ifdef _SERIAL_
    … …  
    2323};
    2424#else
    25 
     25class Model;
    2626struct OptArgs{
    2727        Model* model;

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

    r3673 r3681  
    1111
    1212#include "stdio.h"
    13 #include "./Result.h"
    1413#include <string.h>
     14#include "./objects.h"
    1515#include "../EnumDefinitions/EnumDefinitions.h"
    1616#include "../include/macros.h"

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

    r3673 r3681  
    1111
    1212#include <string.h>
    13 #include "./Vertex.h"
     13#include "./objects.h"
    1414#include "../EnumDefinitions/EnumDefinitions.h"
    1515#include "../include/macros.h"
    … …  
    1717#include "../include/typedefs.h"
    1818#include "../include/macros.h"
    19 #include "../ModelProcessorx/IoModel.h"
    2019/*}}}*/
    2120

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

    r3673 r3681  
    88/*Headers:*/
    99/*{{{1*/
    10 class Object;
    11 class DofObject;
    12 
    13 #include "../ModelProcessorx/IoModel.h"
    1410#include "./Object.h"
    1511#include "./DofObject.h"
     12class IoModel;
    1613/*}}}*/
    1714

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

    r3673 r3681  
    66#define ALL_OBJECTS_H_
    77
    8 /*Abstract class: */
     8/*Abstract classes: */
    99#include "./Object.h"
    1010
    11 /*C++ Objects: */
    12 #include "./Material.h"
    13 #include "./Matice.h"
    14 #include "./Matpar.h"
     11
     12/*Objects: */
     13#include "./Hook.h"
     14#include "./DofIndexing.h"
     15#include "./Vertex.h"
    1516#include "./Node.h"
    16 #include "./Penta.h"
    17 #include "./Tria.h"
    18 #include "./Sing.h"
    19 #include "./Beam.h"
    20 #include "./Spc.h"
    21 #include "./Result.h"
    22 #include "./Rgb.h"
    23 #include "./Icefront.h"
    24 #include "./Riftfront.h"
    25 #include "./Penpair.h"
    26 #include "./Pengrid.h"
    27 #include "./Numericalflux.h"
    28 #include "./Param.h"
    29 #include "./DoubleParam.h"
    30 #include "./Element.h"
    3117#include "./NodeSets.h"
    3218#include "./Model.h"
    33 #include "./Input.h"
    34 #include "./TriaVertexInput.h"
    35 #include "./Vertex.h"
    36 #include "./BoolInput.h"
    37 #include "./IntInput.h"
    38 #include "./DoubleInput.h"
     19#include "./Result.h"
     20#include "./IoModel.h"
     21
     22/*Constraints: */
     23#include "./Constraints/Spc.h"
     24#include "./Constraints/Rgb.h"
     25
     26/*Loads: */
     27#include "./Loads/Friction.h"
     28#include "./Loads/Icefront.h"
     29#include "./Loads/Numericalflux.h"
     30#include "./Loads/Riftfront.h"
     31#include "./Loads/Penpair.h"
     32#include "./Loads/Pengrid.h"
     33
     34/*Elements: */
     35#include "./Elements/Beam.h"
     36#include "./Elements/Element.h"
     37#include "./Elements/Penta.h"
     38#include "./Elements/Tria.h"
     39#include "./Elements/Sing.h"
     40
     41/*Inputs: */
     42#include "./Inputs/Input.h"
     43#include "./Inputs/BoolInput.h"
     44#include "./Inputs/DoubleInput.h"
     45#include "./Inputs/IntInput.h"
     46#include "./Inputs/BeamVertexInput.h"
     47#include "./Inputs/PentaVertexInput.h"
     48#include "./Inputs/SingVertexInput.h"
     49#include "./Inputs/TriaVertexInput.h"
     50
     51/*Materials: */
     52#include "./Materials/Material.h"
     53#include "./Materials/Matice.h"
     54#include "./Materials/Matpar.h"
     55
     56
     57/*Params: */
     58#include "./Params/BoolParam.h"
     59#include "./Params/DoubleMatParam.h"
     60#include "./Params/DoubleParam.h"
     61#include "./Params/DoubleVecParam.h"
     62#include "./Params/IntParam.h"
     63#include "./Params/Param.h"
     64#include "./Params/PetscMatParam.h"
     65#include "./Params/PetscVecParam.h"
     66#include "./Params/StringArrayParam.h"
     67#include "./Params/StringParam.h"
    3968
    4069/*C objects: */
    4170#include "./Contour.h"
    42 #include "./Friction.h"
    4371#include "./SolverEnum.h"
    4472#include "./FemModel.h"
    4573#include "./OptArgs.h"
    4674#include "./OptPars.h"
    47 #include "./BamgGeom.h"
    48 #include "./BamgMesh.h"
    49 #include "./BamgOpts.h"
     75#include "./DofVec.h"
     76
     77/*Bamg: */
     78#include "./Bamg/BamgGeom.h"
     79#include "./Bamg/BamgMesh.h"
     80#include "./Bamg/BamgOpts.h"
    5081
    5182#endif
Note: See TracChangeset for help on using the changeset viewer.