Changeset 10999

Timestamp:

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

Author:

seroussi

Message:

cleaned transient for cases where isthermal=0

Location:

issm/trunk-jpl/src

Files:

• c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (3 diffs)
• c/solutions/transient_core.cpp (modified) (1 diff)
• m/classes/basalforcings.m (modified) (2 diffs)
• m/classes/diagnostic.m (modified) (1 diff)
• m/classes/prognostic.m (modified) (1 diff)
• m/classes/thermal.m (modified) (1 diff)
• m/solutions/transient_core.m (modified) (1 diff)

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));

issm/trunk-jpl/src/c/solutions/transient_core.cpp ¶

@@ -133 +133 @@
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
-                        if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time);
+                        if(dim==3 && isthermal) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time);

issm/trunk-jpl/src/m/classes/basalforcings.m ¶

@@ -31 +31 @@
                 function checkconsistency(obj,md,solution,analyses) % {{{
 
-                        if ismember(PrognosticAnalysisEnum,analyses),
+                        if ismember(PrognosticAnalysisEnum,analyses) & ~(solution==TransientSolutionEnum & md.transient.isprognostic==0),
                                 checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1);
                         end
@@ -37 +37 @@
                                 checkfield(md,'basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
                         end
-                        if ismember(ThermalAnalysisEnum,analyses),
+                        if ismember(ThermalAnalysisEnum,analyses) & ~(solution==TransientSolutionEnum & md.transient.isthermal==0),
                                 checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1);
                                 checkfield(md,'basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0);

issm/trunk-jpl/src/m/classes/diagnostic.m ¶

@@ -74 +74 @@
                         %Early return
                         if ~ismember(DiagnosticHorizAnalysisEnum,analyses), return; end
+                        %if ~ismember(DiagnosticHorizAnalysisEnum,analyses) |  (solution==TransientSolutionEnum & md.transient.isdiagnostic==0), return; end
 
                         checkfield(md,'diagnostic.spcvx','forcing',1);

issm/trunk-jpl/src/m/classes/prognostic.m ¶

@@ -42 +42 @@
 
                         %Early return,
-                        if ~ismember(PrognosticAnalysisEnum,analyses), return; end
+                        if ~ismember(PrognosticAnalysisEnum,analyses) |  (solution==TransientSolutionEnum & md.transient.isprognostic==0), return; end
 
                         checkfield(md,'prognostic.spcthickness','forcing',1);

issm/trunk-jpl/src/m/classes/thermal.m ¶

@@ -46 +46 @@
 
                         %Early return
-                        if ~ismember(ThermalAnalysisEnum,analyses), return; end
+                        if ~ismember(ThermalAnalysisEnum,analyses) | (solution==TransientSolutionEnum & md.transient.isthermal==0), return; end
 
                         checkfield(md,'thermal.stabilization','numel',1,'values',[0 1 2]);

issm/trunk-jpl/src/m/solutions/transient_core.m ¶

@@ -89 +89 @@
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceEnum,step,time);
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedEnum,step,time);
-                        if (dim==3), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time);end
+                        if (dim==3 & isthermal), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time);end
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalforcingsMeltingRateEnum,step,time);
                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceforcingsMassBalanceEnum,step,time);