Changeset 15465


Ignore:
Timestamp:
07/08/13 16:27:26 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: no need to create loads or constraints if pointer is NULL, this is done by CreateDatasets

Location:
issm/trunk-jpl/src/c/modules/ModelProcessorx
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp

    r14999 r15465  
    1414        Constraints* constraints=*pconstraints;
    1515
    16         /*Create constraints if they do not exist yet*/
    17         if(!constraints) constraints = new Constraints();
    18 
    1916        /*Do not add constraints in DG*/
    2017        if(stabilization!=3){

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp

    r15435 r15465  
    1818        /*Recover pointer: */
    1919        Loads* loads=*ploads;
    20 
    21         /*Create loads if they do not exist yet*/
    22         if(!loads) loads = new Loads();
    2320
    2421        /*Loads only in DG*/

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp

    r15000 r15465  
    1010void    CreateConstraintsBedSlope(Constraints** pconstraints, IoModel* iomodel){
    1111
    12         /*Recover pointer: */
    13         Constraints* constraints=*pconstraints;
     12        /*No constraints*/
    1413
    15         /*Create constraints if they do not exist yet*/
    16         if(!constraints) constraints = new Constraints();
    17 
    18         /*Assign output pointer: */
    19         *pconstraints=constraints;
    2014}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp

    r15000 r15465  
    99void    CreateLoadsBedSlope(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Recover pointer: */
    12         Loads* loads=*ploads;
     11        /*No loads*/
    1312
    14         /*Create loads if they do not exist yet*/
    15         if(!loads) loads = new Loads();
    16 
    17         /*Assign output pointer: */
    18         *ploads=loads;
    1913}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp

    r15464 r15465  
    3232        materials = *pmaterials;
    3333
    34         /*Creates Nodes dataset if empty*/
    35         if(!*pnodes) *pnodes = new Nodes();
     34        /*Creates Nodes and constraints datasets if empty*/
     35        if(!*pnodes)       *pnodes       = new Nodes();
     36        if(!*pconstraints) *pconstraints = new Constraints();
     37        if(!*ploads)       *ploads       = new Loads();
    3638
    3739        /*Now, branch onto analysis dependent model generation: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

    r15461 r15465  
    5656        constraints=*pconstraints;
    5757
    58         /*Create constraints if they do not exist yet*/
    59         if(!constraints) constraints = new Constraints();
    60 
    6158        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
    6259        if(!ismacayealpattyn & !isstokes & !isl1l2){

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r15428 r15465  
    4040        Loads* loads=*ploads;
    4141
    42         /*Create loads if they do not exist yet*/
    43         if(!loads) loads = new Loads();
    44 
    4542        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
    46         if(!ismacayealpattyn & !isstokes & !isl1l2){
    47                 *ploads=loads;
    48                 return;
    49         }
     43        if(!ismacayealpattyn & !isstokes & !isl1l2) return;
    5044
    5145        /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the nodes

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp

    r15428 r15465  
    2626        iomodel->Constant(&ishutter,FlowequationIshutterEnum);
    2727
    28         /*Create constraints if they do not exist yet*/
    29         if(!constraints) constraints = new Constraints();
    30 
    3128        /*Now, is the flag ishutter on? otherwise, do nothing: */
    32         if (!ishutter){
    33                 *pconstraints=constraints;
    34                 return;
    35         }
     29        if (!ishutter) return;
    3630
    3731        /*Fetch data: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp

    r15000 r15465  
    99void    CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Recover pointer: */
    12         Loads* loads=*ploads;
    13 
    14         /*Create loads if they do not exist yet*/
    15         if(!loads) loads = new Loads();
    16 
    17         /*Assign output pointer: */
    18         *ploads=loads;
     11        /*No loads*/
    1912}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

    r15428 r15465  
    2020        Constraints* constraints=*pconstraints;
    2121
    22         /*Create constraints if they do not exist yet*/
    23         if(!constraints) constraints = new Constraints();
    24 
    2522        /*return if 2d mesh*/
    26         if(iomodel->dim==2){
    27                 *pconstraints=constraints;
    28                 return;
    29         }
     23        if(iomodel->dim==2) *pconstraints=constraints;
    3024
    3125        /*Fetch data: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp

    r15000 r15465  
    99void    CreateLoadsDiagnosticVert(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Recover pointer: */
    12         Loads* loads=*ploads;
     11        /*No loads*/
    1312
    14         /*Create loads if they do not exist yet*/
    15         if(!loads) loads = new Loads();
    16 
    17         /*Assign output pointer: */
    18         *ploads=loads;
    1913}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp

    r15428 r15465  
    3030        Constraints* constraints=*pconstraints;
    3131
    32         /*Create constraints if they do not exist yet*/
    33         if(!constraints) constraints = new Constraints();
    34 
    3532        /*return if 2d mesh*/
    36         if(iomodel->dim==2){
    37                 *pconstraints=constraints;
    38                 return;
    39         }
     33        if(iomodel->dim==2) return;
    4034
    4135        /*Fetch data: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp

    r15000 r15465  
    99void    CreateLoadsEnthalpy(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Recover pointer: */
    12         Loads* loads=*ploads;
    13 
    14         /*Create loads if they do not exist yet*/
    15         if(!loads) loads = new Loads();
    16 
    17         /*Assign output pointer: */
    18         *ploads=loads;
     11        /*No loads */
    1912}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp

    r15000 r15465  
    1010void    CreateConstraintsGia(Constraints** pconstraints, IoModel* iomodel){
    1111
    12         /*Recover pointer: */
    13         Constraints* constraints=*pconstraints;
     12        /*No constraints*/
    1413
    15         /*Create constraints if they do not exist yet*/
    16         if(!constraints) constraints = new Constraints();
    17 
    18         /*Assign output pointer: */
    19         *pconstraints=constraints;
    2014}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp

    r15000 r15465  
    99void    CreateLoadsGia(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Recover pointer: */
    12         Loads* loads=*ploads;
     11        /*No loads*/
    1312
    14         /*Create loads if they do not exist yet*/
    15         if(!loads) loads = new Loads();
    16 
    17         /*Assign output pointer: */
    18         *ploads=loads;
    1913}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp

    r15000 r15465  
    1212
    1313        /*Recover pointer: */
    14         bool         isefficientlayer;
    15         int          hydrology_model;
    1614        Constraints* constraints=*pconstraints;
    1715
    18         /*Create constraints if they do not exist yet*/
    19         if(!constraints) constraints = new Constraints();
    20 
    2116        /*Do we really want DC?*/
     17        int  hydrology_model;
    2218        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
    23         if(hydrology_model!=HydrologydcEnum){
    24                 *pconstraints=constraints;
    25                 return;
    26         }
     19        if(hydrology_model!=HydrologydcEnum) return;
    2720
    2821        /*Do we want an efficient layer*/
     22        bool isefficientlayer;
    2923        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    30         if(!isefficientlayer){
    31                 *pconstraints=constraints;
    32                 return;
    33         }
     24        if(!isefficientlayer) return;
    3425
    3526        IoModelToConstraintsx(constraints,iomodel,HydrologydcSpceplHeadEnum,HydrologyDCEfficientAnalysisEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp

    r15428 r15465  
    99void    CreateLoadsHydrologyDCEfficient(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Intermediary*/
    12         bool isefficientlayer;
    13         int  hydrology_model;
    14 
    1511        /*Recover pointer: */
    1612        Loads* loads=*ploads;
    1713
    18         /*Create loads if they do not exist yet*/
    19         if(!loads) loads = new Loads();
    20 
    2114        /*Do we really want DC?*/
     15        int  hydrology_model;
    2216        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
    23         if(hydrology_model!=HydrologydcEnum){
    24                 *ploads=loads;
    25                 return;
    26         }
     17        if(hydrology_model!=HydrologydcEnum) return;
    2718
    2819        /*Do we want an efficient layer*/
     20        bool isefficientlayer;
    2921        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    30         if(!isefficientlayer){
    31                 *ploads=loads;
    32                 return;
    33         }
     22        if(!isefficientlayer) return;
    3423
    3524        /*Nothing for now*/

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp

    r15000 r15465  
    1212
    1313        /*Recover pointer: */
    14         int          hydrology_model;
    1514        Constraints* constraints=*pconstraints;
    1615
    1716        /*retrieve some parameters: */
     17        int hydrology_model;
    1818        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
    19 
    20         /*Create constraints if they do not exist yet*/
    21         if(!constraints) constraints = new Constraints();
    22 
    23         if(hydrology_model!=HydrologydcEnum){
    24                 *pconstraints=constraints;
    25                 return;
    26         }
     19        if(hydrology_model!=HydrologydcEnum) return;
    2720
    2821        IoModelToConstraintsx(constraints,iomodel,HydrologydcSpcsedimentHeadEnum,HydrologyDCInefficientAnalysisEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp

    r15456 r15465  
    99void    CreateLoadsHydrologyDCInefficient(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Intermediary*/
    12         int hydrology_model;
    13 
    1411        /*Recover pointer: */
    1512        Loads* loads=*ploads;
    1613
    1714        /*Fetch parameters: */
     15        int hydrology_model;
    1816        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
    19 
    20         /*Create loads if they do not exist yet*/
    21         if(!loads) loads = new Loads();
    22 
    23         if(hydrology_model!=HydrologydcEnum){
    24                 *ploads=loads;
    25                 return;
    26         }
     17        if(hydrology_model!=HydrologydcEnum) return;
    2718       
    2819        iomodel->FetchData(1,MeshVertexonbedEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp

    r15000 r15465  
    1212
    1313        /*Recover pointer: */
    14         int          hydrology_model;
    15         bool         isefficientlayer;
    1614        Constraints* constraints=*pconstraints;
    1715
    1816        /*retrieve some parameters: */
     17        int          hydrology_model;
    1918        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
    2019
    21         /*Create constraints if they do not exist yet*/
    22         if(!constraints) constraints = new Constraints();
    23 
    24         if(hydrology_model!=HydrologyshreveEnum){
    25                 *pconstraints=constraints;
    26                 return;
    27         }
     20        if(hydrology_model!=HydrologyshreveEnum) return;
    2821
    2922        IoModelToConstraintsx(constraints,iomodel,HydrologyshreveSpcwatercolumnEnum,HydrologyShreveAnalysisEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp

    r15000 r15465  
    99void    CreateLoadsHydrologyShreve(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Intermediary*/
    12         int      numberofvertices;
    13         Pengrid *pengrid = NULL;
     11        /*No loads*/
    1412
    15         /*Recover pointer: */
    16         Loads* loads=*ploads;
    17 
    18         /*Create loads if they do not exist yet*/
    19         if(!loads) loads = new Loads();
    20 
    21         /*Assign output pointer: */
    22         *ploads=loads;
    2313}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp

    r15000 r15465  
    1010void    CreateConstraintsMelting(Constraints** pconstraints, IoModel* iomodel){
    1111
    12         /*Recover pointer: */
    13         Constraints* constraints=*pconstraints;
     12        /*No constraints*/
    1413
    15         /*Create constraints if they do not exist yet*/
    16         if(!constraints) constraints = new Constraints();
    17 
    18         /*Assign output pointer: */
    19         *pconstraints=constraints;
    2014}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

    r15428 r15465  
    1414        /*Recover pointer: */
    1515        Loads* loads=*ploads;
    16 
    17         /*Create loads if they do not exist yet*/
    18         if(!loads) loads = new Loads();
    1916
    2017        //create penalties for nodes: no node can have a temperature over the melting point

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

    r15000 r15465  
    1414        Constraints* constraints=*pconstraints;
    1515
    16         /*Create constraints if they do not exist yet*/
    17         if(!constraints) constraints = new Constraints();
    18 
    1916        /*Do not add constraints in DG, they are weakly imposed*/
    2017        if(stabilization!=3){

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

    r15435 r15465  
    2121        /*Recover pointer: */
    2222        Loads* loads=*ploads;
    23 
    24         /*Create loads if they do not exist yet*/
    25         if(!loads) loads = new Loads();
    2623
    2724        /*Loads only in DG*/

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp

    r15000 r15465  
    1010void    CreateConstraintsSurfaceSlope(Constraints** pconstraints, IoModel* iomodel){
    1111
    12         /*Recover pointer: */
    13         Constraints* constraints=*pconstraints;
    14 
    15         /*Create constraints if they do not exist yet*/
    16         if(!constraints) constraints = new Constraints();
    17 
    18         /*Assign output pointer: */
    19         *pconstraints=constraints;
     12        /*No constraints*/
    2013}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp

    r15000 r15465  
    99void    CreateLoadsSurfaceSlope(Loads** ploads, IoModel* iomodel){
    1010
    11         /*Recover pointer: */
    12         Loads* loads=*ploads;
     11        /*No loads*/
    1312
    14         /*Create loads if they do not exist yet*/
    15         if(!loads) loads = new Loads();
    16 
    17         /*Assign output pointer: */
    18         *ploads=loads;
    1913}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

    r15423 r15465  
    1414        Constraints* constraints=*pconstraints;
    1515
    16         /*Create constraints if they do not exist yet*/
    17         if(!constraints) constraints = new Constraints();
    18 
    1916        /*Only 3d mesh supported*/
    2017        if(iomodel->dim==3){

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

    r15428 r15465  
    1414        if(iomodel->dim==2) _error_("2d meshes not supported yet");
    1515
    16         /*Create loads if they do not exist yet*/
    17         if(!loads) loads = new Loads();
    18 
    19         //create penalties for nodes: no node can have a temperature over the melting point
     16        /*create penalties for nodes: no node can have a temperature over the melting point*/
    2017        iomodel->FetchData(1,ThermalSpctemperatureEnum);
    2118        CreateSingleNodeToElementConnectivity(iomodel);
Note: See TracChangeset for help on using the changeset viewer.