Changeset 26109

Timestamp:

03/16/21 13:53:06 (4 years ago)

Author:

Eric.Larour

Message:

CHG: ommit full extent of modules not needed by Ivins model GIA
computations.

File:

• issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp

@@ -220 +220 @@
 
         /*Verbose: */
-        if(VerboseSolution()) _printf0_("         computing GRD sea level patterns\n");
+        if(VerboseSolution()) _printf0_("         computing GRD patterns\n");
         
         /*retrieve parameters:*/
@@ -387 +387 @@
 SealevelMasks* sealevel_masks(FemModel* femmodel) {  /*{{{*/
 
+        int grdmodel=0; 
+
+        /*early return?:*/
+        femmodel->parameters->FindParam(&grdmodel,GrdModelEnum);
+        if(grdmodel==IvinsEnum) return NULL;
+
         if(VerboseSolution()) _printf0_("         computing sea level masks\n");
         
@@ -419 +425 @@
         bool geometrydone = false;
         bool optim=false;
+        int  grdmodel=0;
 
                 
@@ -424 +431 @@
         femmodel->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
         femmodel->parameters->FindParam(&geometrydone,SealevelchangeGeometryDoneEnum);
+        femmodel->parameters->FindParam(&grdmodel,GrdModelEnum);
+        
+        /*early return?:*/
+        if(grdmodel==IvinsEnum) return;
 
         if(geometrydone){