Changeset 25697

Timestamp:

10/20/20 11:43:06 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: making steadystate work

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyGlaDSAnalysis.cpp (modified) (1 diff)
• classes/Loads/Moulin.cpp (modified) (4 diffs)

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

@@ -129 +129 @@
         iomodel->FetchDataToInput(inputs,elements,"md.geometry.base",BaseEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.geometry.bed",BedEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.solidearth.sealevel",SealevelEnum,0); /*Needed for friction*/
         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.geothermalflux",BasalforcingsGeothermalfluxEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);

issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp

@@ -6 +6 @@
 /*{{{*/
 #ifdef HAVE_CONFIG_H
-        #include <config.h>
+#include <config.h>
 #else
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
@@ -367 +367 @@
 
         /*Load vector*/
-        Ke->values[0] = +Am/(rho_water*g)/dt;
+        if(dt>0){
+                Ke->values[0] = +Am/(rho_water*g)/dt;
+        }
 
         /*Clean up and return*/
@@ -393 +395 @@
         element->GetInputValue(&moulin_load,node,HydrologyMoulinInputEnum);
 
-        pe->values[0] = moulin_load +Am/(rho_water*g) * phi_old/dt;
+        pe->values[0] = moulin_load;
+        if(dt>0.){
+                pe->values[0] += Am/(rho_water*g) * phi_old/dt;
+        }
 
         /*Clean up and return*/
@@ -447 +452 @@
         /*Clean up and return*/
         return pe;
- }
+}
 /*}}}*/
 ElementVector* Moulin::CreatePVectorHydrologyDCEfficient(void){/*{{{*/