Changeset 26104

Timestamp:

03/16/21 09:33:17 (4 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing AD with Sealevel change

Location:

issm/trunk-jpl/src/c/cores

Files:

• cores.h (modified) (2 diffs)
• transient_core.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/cores/cores.h

@@ -58 +58 @@
 
 /*sealevel change cores:*/
+#ifdef _HAVE_SEALEVELCHANGE_
 void sealevelchange_core(FemModel* femmodel);
+void sealevelchange_geometry(FemModel* femmodel);
+#endif
 void grd_core(FemModel* femmodel);
 void solidearthexternal_core(FemModel* femmodel);
 void dynstr_core(FemModel* femmodel);
-void sealevelchange_geometry(FemModel* femmodel);
 SealevelMasks* sealevel_masks(FemModel* femmodel);
 Vector<IssmDouble>* sealevelchange_core_barystatic(FemModel* femmodel,SealevelMasks* mask, IssmDouble* poceanarea);
@@ -69 +71 @@
 void couplerinput_core(FemModel* femmodel);
 void coupleroutput_core(FemModel* femmodel);
-
 
 //optimization

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

@@ -24 +24 @@
         /*parameters: */
         IssmDouble finaltime,dt,yts;
-        bool       isoceancoupling,iscontrol,isautodiff,isslc;
+        bool       isoceancoupling,iscontrol,isautodiff;
         int        timestepping;
         int        output_frequency,checkpoint_frequency;
@@ -45 +45 @@
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
         femmodel->parameters->FindParam(&timestepping,TimesteppingTypeEnum);
-        femmodel->parameters->FindParam(&isslc,TransientIsslcEnum);
         femmodel->parameters->FindParam(&isoceancoupling,TransientIsoceancouplingEnum);
         femmodel->parameters->FindParam(&amr_frequency,TransientAmrFrequencyEnum);
@@ -231 +230 @@
 
         /*Sea level change: */
-        if(isslc) sealevelchange_core(femmodel);
+        if(isslc){
+                #ifdef _HAVE_SEALEVELCHANGE_
+                sealevelchange_core(femmodel);
+                #else
+                _error_("Compiled with SeaLevelChange capability");
+                #endif
+        }
 
         /*Sampling: */
@@ -258 +263 @@
         IssmDouble output_value;
         IssmDouble finaltime,dt,yts,time;
-        bool       isoceancoupling,isslc;
+        bool       isoceancoupling;
         int        step,timestepping;
         int        checkpoint_frequency;
@@ -271 +276 @@
         femmodel->parameters->FindParam(&yts,ConstantsYtsEnum);
         femmodel->parameters->FindParam(&timestepping,TimesteppingTypeEnum);
-        femmodel->parameters->FindParam(&isslc,TransientIsslcEnum);
         femmodel->parameters->FindParam(&checkpoint_frequency,SettingsCheckpointFrequencyEnum); _assert_(checkpoint_frequency>0);
-        if(isslc) sealevelchange_geometry(femmodel);
 
         std::vector<IssmDouble> time_all;