Changeset 21403

Timestamp:

11/18/16 13:58:48 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed levermann 3d and cleaned up FS shelf dampening

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• classes/Elements/Penta.cpp (modified) (1 diff)

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

@@ -3898 +3898 @@
 
         int         i,dim;
-        IssmDouble  Jdet,water_pressure,bed;
-        IssmDouble      normal[3];
+        IssmDouble  Jdet,water_pressure,base;
         IssmDouble *xyz_list_base = NULL;
 
@@ -3936 +3935 @@
                 element->NodalFunctionsVelocity(vbasis,gauss);
 
-                element->NormalBase(&normal[0],xyz_list_base);
-                _assert_(normal[dim-1]<0.);
-                base_input->GetInputValue(&bed, gauss);
-                water_pressure=gravity*rho_water*bed;
+                base_input->GetInputValue(&base, gauss);
+                water_pressure=gravity*rho_water*base;
 
                 for(i=0;i<vnumnodes;i++){
@@ -3951 +3948 @@
         if(shelf_dampening) {
                 Input*      mb_input=element->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(mb_input);
-                IssmDouble dt,mb,normal_b;
+                IssmDouble  dt,mb;
                 element->FindParam(&dt,TimesteppingTimeStepEnum);
                 for(int ig=gauss->begin();ig<gauss->end();ig++){

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

@@ -717 +717 @@
 
                 /*Create gauss point in the middle of the basal edge*/
-                Gauss* gauss=NewGauss();
+                Gauss* gauss=NewGaussBase(1);
                 gauss->GaussPoint(0);