Changeset 11000

Timestamp:

12/01/11 08:08:59 (13 years ago)

Author:

seroussi

Message:

fixed bathymetry problem for grounding line only in transient

Location:

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

Files:

• DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• ModelProcessorx.cpp (modified) (3 diffs)
• Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)

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

@@ -61 +61 @@
         iomodel->FetchDataToInput(elements,VxEnum);
         iomodel->FetchDataToInput(elements,VyEnum);
-        iomodel->FetchDataToInput(elements,BathymetryEnum);
 
         if (dim==3){

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

@@ -19 +19 @@
 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* IOMODEL,const int solution_type,const int nummodels,const int* analysis_type_list){
 
-        int i;
-        int analysis_type;
-        int dim;
-        int verbose;
-        bool isthermal;
-        bool isprognostic;
-        bool isdiagnostic;
+        int   i,analysis_type,dim,verbose;
+        bool  isthermal,isprognostic,isdiagnostic,isgroundingline;
         
         /*output: */
@@ -46 +41 @@
         iomodel->Constant(&isprognostic,TransientIsprognosticEnum);
         iomodel->Constant(&isdiagnostic,TransientIsdiagnosticEnum);
+        iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum);
         
         SetVerbosityLevel(verbose);
@@ -58 +54 @@
                 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==PrognosticAnalysisEnum && isprognostic==false && isgroundingline==false) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHorizAnalysisEnum && isdiagnostic==false) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticVertAnalysisEnum && isdiagnostic==false) continue;

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

@@ -41 +41 @@
         iomodel->FetchDataToInput(elements,SurfaceEnum);
         iomodel->FetchDataToInput(elements,BedEnum);
+        iomodel->FetchDataToInput(elements,BathymetryEnum);
         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
         iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);