Changeset 28119

Timestamp:

02/29/24 16:32:59 (13 months ago)

Author:

Mathieu Morlighem

Message:

CHG: mostly cosmetics

Location:

issm/trunk-jpl/src/c

Files:

• analyses/FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (2 diffs)
• modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

@@ -467 +467 @@
                 }
                 else if(melt_style==IntrusionMeltEnum){
-                        Input* gldistance_input = basalelement->GetInput(DistanceToGroundinglineEnum);              _assert_(gldistance_input); 
-                gldistance_input->GetInputValue(&gldistance,gauss);
-                        if (intrusiondist==0)
+                        Input* gldistance_input = basalelement->GetInput(DistanceToGroundinglineEnum); _assert_(gldistance_input); 
+                        gldistance_input->GetInputValue(&gldistance,gauss);
+                        if(intrusiondist==0){
                                 if(gllevelset>0.) mb=gmb;
                                 else mb=fmb;
-                else if(gldistance>intrusiondist) 
+                        }
+                        else if(gldistance>intrusiondist) {
                                 mb=gmb;
-                        else if(gldistance<=intrusiondist && gldistance>0) 
+                        }
+                        else if(gldistance<=intrusiondist && gldistance>0) {
                                 mb=fmb*(1-gldistance/intrusiondist); 
-                        else
+                        }
+                        else{
                                 mb=fmb;
-        }
-                else  _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
+                        }
+                }
+                else{
+                        _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
+                }
 
                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(bed+dt*(mb) + dt*vz)*basis[i];

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -712 +712 @@
                         else mb=gmb;
                 }
-        else if(melt_style==IntrusionMeltEnum){
-                        Input* gldistance_input = element->GetInput(DistanceToGroundinglineEnum);              _assert_(gldistance_input); 
-                gldistance_input->GetInputValue(&gldistance,gauss);
-                        if (intrusiondist==0)
+                else if(melt_style==IntrusionMeltEnum){
+                        Input* gldistance_input = element->GetInput(DistanceToGroundinglineEnum); _assert_(gldistance_input); 
+                        gldistance_input->GetInputValue(&gldistance,gauss);
+                        if(intrusiondist==0){
                                 if(gllevelset>0.) mb=gmb;
                                 else mb=fmb;
-                else if(gldistance>intrusiondist) 
+                        }
+                        else if(gldistance>intrusiondist) {
                                 mb=gmb;
-                        else if(gldistance<=intrusiondist && gldistance>0) 
+                        }
+                        else if(gldistance<=intrusiondist && gldistance>0) {
                                 mb=fmb*(1-gldistance/intrusiondist); 
-                        else
+                        }
+                        else{
                                 mb=fmb;
-        }
-                else  _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
+                        }
+                }
+                else{
+                        _error_("melt interpolation "<<EnumToStringx(melt_style)<<" not implemented yet");
+                }
 
                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb))*basis[i];

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

@@ -17 +17 @@
 
         /*First, get melt_interpolation model from parameters*/
-    femmodel->parameters->FindParam(&melt_style,GroundinglineMeltInterpolationEnum);
-
-        switch(melt_style){
-        case IntrusionMeltEnum:
-                        if(VerboseSolution())_printf0_("          call Intrusion melting module\n");
-            DistanceToGroundingline(femmodel);
-            break;
-                default:
-            /*Nothing to be done*/
-            break;
+        femmodel->parameters->FindParam(&melt_style,GroundinglineMeltInterpolationEnum);
+        if(melt_style==IntrusionMeltEnum){
+                InputDuplicatex(femmodel,MaskOceanLevelsetEnum,DistanceToGroundinglineEnum);//FIXME Duplicate first so that it can preserve the sign
+                femmodel->DistanceToFieldValue(MaskOceanLevelsetEnum,0.,DistanceToGroundinglineEnum);
         }
 
@@ -304 +298 @@
         xDelete<IssmDouble>(perturbation);
 }/*}}}*/
-
-void DistanceToGroundingline(FemModel* femmodel){/*{{{*/
-
-        int         numvertices;
-        IssmDouble* distances=NULL;
-
-        InputDuplicatex(femmodel,MaskOceanLevelsetEnum,DistanceToGroundinglineEnum);
-                femmodel->DistanceToFieldValue(MaskOceanLevelsetEnum,0.,DistanceToGroundinglineEnum);
-}
-/*}}}*/

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h

@@ -18 +18 @@
 void BeckmannGoosseFloatingiceMeltingRatex(FemModel* femmodel);
 void LinearFloatingiceMeltingRatearmax(FemModel* femmodel);
-void DistanceToGroundingline(FemModel* femmodel);
 
 #endif  /* _FloatingiceMeltingRatex_H*/