Changeset 26442

Timestamp:

09/20/21 02:49:21 (3 years ago)

Author:

Cheng Gong

Message:

BUG: fixed error in MLHO tests and the forcing term of the calving front when bed is above sea level

Location:

issm/trunk-jpl

Files:

• src/c/analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• test/Archives/Archive447.arch (modified) ( previous)
• test/Archives/Archive518.arch (modified) ( previous)
• test/Archives/Archive519.arch (modified) ( previous)

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

@@ -2915 +2915 @@
         Input* thickness_input= element->GetInput(ThicknessEnum); _assert_(thickness_input);
         Input* surface_input  = element->GetInput(SurfaceEnum);   _assert_(surface_input);
-        Input* vx_input       = element->GetInput(VxEnum);        _assert_(vx_input); //vertically integrated vx
-        Input* vy_input       = element->GetInput(VyEnum);        _assert_(vy_input); //vertically integrated vy
+        //Input* vx_input       = element->GetInput(VxEnum);        _assert_(vx_input); //vertically integrated vx
+        //Input* vy_input       = element->GetInput(VyEnum);        _assert_(vy_input); //vertically integrated vy
         Input* vxbase_input   = element->GetInput(VxBaseEnum);    _assert_(vxbase_input); 
         Input* vybase_input   = element->GetInput(VyBaseEnum);    _assert_(vybase_input);
@@ -3144 +3144 @@
                 ice_pressure_sh   = gravity*rho_ice*thickness*thickness*(n+1)/(2*(n+3));
                 pressure_sh = ice_pressure_sh + water_pressure_sh;
+                if (b>0) {
+                        pressure = ice_pressure;
+                        pressure_sh = ice_pressure_sh;
+                }
 
                 for (int i=0;i<numnodes;i++){
@@ -3276 +3280 @@
                 vx[i]=vbx[i]+vshx[i]*(n[i]+1)/(n[i]+2);
                 vy[i]=vby[i]+vshy[i]*(n[i]+1)/(n[i]+2);
+                // HOTFIX: set surface velocity to VxEnum and VyEnum
+        //      vx[i]=vbx[i]+vshx[i];
+        //      vy[i]=vby[i]+vshy[i];
         }