Changeset 16986

Timestamp:

12/02/13 11:05:11 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: kappa is supposed to be calculated from EnthalpyPicardEnum

File:

• issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (modified) (2 diffs)

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

@@ -236 +236 @@
 
         /*Enthalpy diffusion parameter*/
-        IssmDouble kappa=this->EnthalpyDiffusionParameterVolume(element,EnthalpyEnum); _assert_(kappa>0.);
+        IssmDouble kappa=this->EnthalpyDiffusionParameterVolume(element,EnthalpyPicardEnum); _assert_(kappa>0.);
 
         /* Start  looping on the number of gaussian points: */
@@ -332 +332 @@
         if(!element->IsOnBed() || !element->IsFloating()) return NULL;
 
+        /*Intermediaries*/
         IssmDouble  dt,Jdet,D;
         IssmDouble *xyz_list_base = NULL;
-
-        /*Get basal element*/
-        if(!element->IsOnBed() || !element->IsFloating()) return NULL;
 
         /*Fetch number of nodes for this finite element*/