Changeset 10999 for issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

Timestamp:

11/30/11 17:05:14 (13 years ago)

Author:

seroussi

Message:

cleaned transient for cases where isthermal=0

File:

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

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

@@ -23 +23 @@
         int dim;
         int verbose;
+        bool isthermal;
+        bool isprognostic;
+        bool isdiagnostic;
         
         /*output: */
@@ -40 +43 @@
         iomodel->Constant(&dim,MeshDimensionEnum);
         iomodel->Constant(&verbose,VerboseEnum);
+        iomodel->Constant(&isthermal,TransientIsthermalEnum);
+        iomodel->Constant(&isprognostic,TransientIsprognosticEnum);
+        iomodel->Constant(&isdiagnostic,TransientIsdiagnosticEnum);
         
         SetVerbosityLevel(verbose);
@@ -50 +56 @@
                 if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && dim==2) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && dim==2) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isthermal==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isthermal==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==PrognosticAnalysisEnum && isprognostic==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHorizAnalysisEnum && isdiagnostic==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticVertAnalysisEnum && isdiagnostic==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHutterAnalysisEnum && isdiagnostic==false) continue;
         
                 _printf_(VerboseMProcessor(),"   create datasets for analysis %s\n",EnumToStringx(analysis_type));