Changeset 23317 for issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

Timestamp:

09/19/18 11:50:04 (7 years ago)

Author:

rueckamp

Message:

NEW: SICOPOLIS PDD scheme

File:

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

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

@@ -43 +43 @@
                 int smb_model;
                 iomodel->FindConstant(&smb_model,"md.smb.model");
-                if(smb_model==SMBpddEnum)     isdynamic=true;
-                if(smb_model==SMBd18opddEnum) isdynamic=true;
+                if(smb_model==SMBpddEnum)                               isdynamic=true;
+                if(smb_model==SMBd18opddEnum)                   isdynamic=true;
+                if(smb_model==SMBpddSicopolisEnum)      isdynamic=true;
         }
 
@@ -1200 +1201 @@
                 _assert_((Hc+Ht)>0.);
                 lambda = Hc/(Hc+Ht);
+                _assert_(lambda>=0.);
+                _assert_(lambda<=1.);
                 kappa  = kappa_c*kappa_t/(lambda*kappa_t+(1.-lambda)*kappa_c); // ==(lambda/kappa_c + (1.-lambda)/kappa_t)^-1
         }