Changeset 22953

Timestamp:

07/16/18 15:37:34 (7 years ago)

Author:

Eric.Larour

Message:

CHG: allow spatial linear melt rates.

Location:

issm/trunk-jpl/src/c

Files:

• modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (2 diffs)
• modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h (modified) (1 diff)
• shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)

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

@@ -29 +29 @@
                         MismipFloatingiceMeltingRatex(femmodel);
                         break;
+                case SpatialLinearFloatingMeltRateEnum:
+                        if(VerboseSolution())_printf0_("        call Spatial Linear Floating melting rate module\n");
+                        SpatialLinearFloatingiceMeltingRatex(femmodel);
+                        break;
                 case BasalforcingsPicoEnum:
                         if(VerboseSolution())_printf0_(" call Pico Floating melting rate module\n");
@@ -47 +51 @@
 
 }/*}}}*/
+void SpatialLinearFloatingiceMeltingRatex(FemModel* femmodel){/*{{{*/
+
+        for(int i=0;i<femmodel->elements->Size();i++){
+                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
+                element->SpatialLinearFloatingiceMeltingRate();
+        }
+
+}/*}}}*/
 void MismipFloatingiceMeltingRatex(FemModel* femmodel){/*{{{*/
 

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

@@ -12 +12 @@
 void FloatingiceMeltingRatex(FemModel* femmodel);
 void LinearFloatingiceMeltingRatex(FemModel* femmodel);
+void SpatialLinearFloatingiceMeltingRatex(FemModel* femmodel);
 void MismipFloatingiceMeltingRatex(FemModel* femmodel);
 

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

@@ -183 +183 @@
                 case 4: return MantlePlumeGeothermalFluxEnum;
                 case 5: return BasalforcingsPicoEnum;
+                case 6: return SpatialLinearFloatingMeltRateEnum;
                 default: _error_("Marshalled Basal Forcings code \""<<enum_in<<"\" not supported yet");
         }