Changeset 17737

Timestamp:

04/15/14 09:40:08 (11 years ago)

Author:

bdef

Message:

BUG : fixing model processor for hydromodels

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (3 diffs)

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

@@ -16 +16 @@
 
         int   i,analysis_enum,verbose;
-        bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy,islevelset,isdamage;
+        bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy,islevelset,isdamage,ishydrology;
 
         /*Initialize datasets*/
@@ -39 +39 @@
         iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum);
         iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum);
+        iomodel->Constant(&ishydrology,TransientIshydrologyEnum);
 
         SetVerbosityLevel(verbose);
@@ -78 +79 @@
                 if(solution_enum==TransientSolutionEnum && analysis_enum==ExtrapolationAnalysisEnum && islevelset==false) continue;
                 if(solution_enum==TransientSolutionEnum && analysis_enum==LsfReinitializationAnalysisEnum && islevelset==false) continue;
-
+                if(solution_enum==TransientSolutionEnum && analysis_enum==HydrologyShreveAnalysisEnum && ishydrology==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==HydrologyDCEfficientAnalysisEnum && ishydrology==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==HydrologyDCInefficientAnalysisEnum && ishydrology==false) continue;
 
                 if(VerboseMProcessor()) _printf0_("   creating datasets for analysis " << EnumToStringx(analysis_enum) << "\n");