Changeset 16137 for issm/trunk/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ModelProcessorx (modified) (1 prop)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient (modified) (1 prop)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (modified) (1 diff)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

issm/trunk/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp

@@ -12 +12 @@
 
         /*Recover pointer: */
-        bool         isefficientlayer;
-        int          hydrology_model;
         Constraints* constraints=*pconstraints;
 
-        /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new Constraints();
-
         /*Do we really want DC?*/
+        int  hydrology_model;
         iomodel->Constant(&hydrology_model,HydrologyModelEnum);
-        if(hydrology_model!=HydrologydcEnum){
-                *pconstraints=constraints;
-                return;
-        }
+        if(hydrology_model!=HydrologydcEnum) return;
 
         /*Do we want an efficient layer*/
+        bool isefficientlayer;
         iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
-        if(!isefficientlayer){
-                *pconstraints=constraints;
-                return;
-        }
+        if(!isefficientlayer) return;
 
-        IoModelToConstraintsx(constraints,iomodel,HydrologydcSpceplHeadEnum,HydrologyDCEfficientAnalysisEnum);
+        IoModelToConstraintsx(constraints,iomodel,HydrologydcSpceplHeadEnum,HydrologyDCEfficientAnalysisEnum,P1Enum);
 
         /*Assign output pointer: */

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp