Changeset 26911

Timestamp:

03/01/22 13:08:53 (3 years ago)

Author:

vverjans

Message:

CHG: remove contributions of grounded points in calculation of melting flux output

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (2 diffs)

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

@@ -5500 +5500 @@
         /*Get inputs*/
         IssmDouble flux = 0.;
-        IssmDouble calvingratex,calvingratey,vx,vy,vel,meltingrate,meltingratex,meltingratey,thickness,Jdet;
+        IssmDouble calvingratex,calvingratey,vx,vy,vel,meltingrate,meltingratex,meltingratey,thickness,Jdet,groundedice;
         IssmDouble rho_ice=FindParam(MaterialsRhoIceEnum);
-        Input* thickness_input=this->GetInput(ThicknessEnum); _assert_(thickness_input);
+        Input* thickness_input = this->GetInput(ThicknessEnum); _assert_(thickness_input);
+        Input *gr_input        = this->GetInput(MaskOceanLevelsetEnum); _assert_(gr_input);
         Input* calvingratex_input=NULL;
         Input* calvingratey_input=NULL;
@@ -5526 +5527 @@
                 calvingratex_input->GetInputValue(&calvingratex,gauss);
                 calvingratey_input->GetInputValue(&calvingratey,gauss);
+                gr_input->GetInputValue(&groundedice,gauss);
                 vx_input->GetInputValue(&vx,gauss);
                 vy_input->GetInputValue(&vy,gauss);
                 vel=vx*vx+vy*vy;
                 meltingrate_input->GetInputValue(&meltingrate,gauss);
+                if(groundedice<0) meltingrate = 0.;
                 meltingratex=meltingrate*vx/(sqrt(vel)+1.e-14);
                 meltingratey=meltingrate*vy/(sqrt(vel)+1.e-14);