Changeset 25727

Timestamp:

10/30/20 21:08:02 (4 years ago)

Author:

jdquinn

Message:

BUG: Have to be more careful with rigid and elastic flags

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (12 diffs)
• FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -5446 +5446 @@
 
         /*Computational flags:*/
-        bool computerigid = true;
-        bool computeelastic = true;
+        bool computerigid = false;
+        bool computeelastic = false;
         int  horiz;
 
@@ -5463 +5463 @@
         this->inputs->SetDoubleInput(AreaEnum,this->lid,area);
         this->AddInput(SealevelAreaEnum,&area,P0Enum);
-        if(!computerigid & !computeelastic)return;
 
         /*recover precomputed green function kernels:*/
@@ -5519 +5518 @@
 
                                 /*Rigid earth gravitational perturbation: */
-                                if(computerigid){
-                                        G[i]+=G_rigid_precomputed[index];
-                                }
-                                if(computeelastic){
-                                        G[i]+=G_elastic_precomputed[index];
-                                }
+                                G[i]+=G_rigid_precomputed[index];
+                                G[i]+=G_elastic_precomputed[index];
                                 G[i]=G[i]*constant;
 
@@ -5609 +5604 @@
                         this->inputs->SetDoubleInput(AreaEnum,this->lid,area);
                         this->AddInput(SealevelAreaEnum,&area,P0Enum);
-
-                        /*Free allocations:*/
-                        #ifdef _HAVE_RESTRICT_
-                        delete indices;
-                        delete G;
-                        #else
-                        xDelete(indices);
-                        xDelete(G);
-                        #endif
-                }
+                }
+
+                /*Free allocations:*/
+                #ifdef _HAVE_RESTRICT_
+                delete indices;
+                delete G;
+                #else
+                xDelete(indices);
+                xDelete(G);
+                #endif
         } else { /*computerigid==false*/
                 // do nothing
@@ -5635 +5630 @@
         bool notfullygrounded=false;
         bool scaleoceanarea= false;
-        bool computeelastic= true;
+        bool computerigid= false;
 
         /*output: */
@@ -5680 +5675 @@
         rho_ice=FindParam(MaterialsRhoIceEnum);
         rho_water=FindParam(MaterialsRhoSeawaterEnum);
-        this->parameters->FindParam(&computeelastic,SolidearthSettingsElasticEnum);
+        this->parameters->FindParam(&computerigid,SolidearthSettingsRigidEnum);
         this->parameters->FindParam(&scaleoceanarea,SolidearthSettingsOceanAreaScalingEnum);
 
         /*retrieve precomputed G:*/
-        if(computeelastic)this->inputs->GetArrayPtr(SealevelriseGEnum,this->lid,&G,&gsize);
+        if(computerigid)this->inputs->GetArrayPtr(SealevelriseGEnum,this->lid,&G,&gsize);
 
         /*Get area of element: precomputed in the sealevelrise_core_geometry:*/
@@ -5734 +5729 @@
         _assert_(!xIsNan<IssmDouble>(bslrice));
 
-        if(computeelastic){
+        if(computerigid){
                 /*convert from m to kg/m^2:*/
                 I=I*rho_ice*phi;
@@ -5755 +5750 @@
         bool notfullygrounded=false;
         bool scaleoceanarea= false;
-        bool computeelastic= true;
+        bool computerigid= false;
 
         /*elastic green function:*/
@@ -5784 +5779 @@
         rho_water=FindParam(MaterialsRhoSeawaterEnum);
         rho_freshwater=FindParam(MaterialsRhoFreshwaterEnum);
-        this->parameters->FindParam(&computeelastic,SolidearthSettingsElasticEnum);
+        this->parameters->FindParam(&computerigid,SolidearthSettingsRigidEnum);
         this->parameters->FindParam(&scaleoceanarea,SolidearthSettingsOceanAreaScalingEnum);
 
         /*retrieve precomputed G:*/
-        if(computeelastic)this->inputs->GetArrayPtr(SealevelriseGEnum,this->lid,&G,&gsize);
+        if(computerigid)this->inputs->GetArrayPtr(SealevelriseGEnum,this->lid,&G,&gsize);
 
         /*Get area of element: precomputed in the sealevelrise_core_geometry:*/
@@ -5804 +5799 @@
         _assert_(!xIsNan<IssmDouble>(bslrhydro));
 
-        if(computeelastic){
+        if(computerigid){
                 /*convert from m to kg/m^2:*/
                 W=W*rho_freshwater*phi;
@@ -5823 +5818 @@
         IssmDouble BP;  //change in bottom pressure (Farrel and Clarke, Equ. 4)
         IssmDouble constant;
-        bool computeelastic= true;
+        bool computeelastic= false;
 
         /*elastic green function:*/
@@ -5925 +5920 @@
 
         /*computational flags:*/
-        bool computeelastic= true;
+        bool computeelastic= false;
 
         /*early return if we are not on the ocean or on an ice cap:*/

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -4837 +4837 @@
 
         bool computerigid = true;
-        bool computeelastic= true;
 
         /*recover computational flags: */
         this->parameters->FindParam(&computerigid,SolidearthSettingsRigidEnum);
-        this->parameters->FindParam(&computeelastic,SolidearthSettingsElasticEnum);
 
         /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior
@@ -4853 +4851 @@
 
         /*Call the sea level rise non-eustatic core only if required: */
-        if(computerigid | computeelastic){
+        if(computerigid){
                 for(Object* & object : this->elements->objects){
                         Element* element = xDynamicCast<Element*>(object);