Changeset 23825

Timestamp:

04/06/19 21:27:00 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added min thickness criterion to VM as well

File:

• issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (modified) (3 diffs)

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

@@ -109 +109 @@
                 case DefaultCalvingEnum:
                 case CalvingLevermannEnum:
+                        break;
                 case CalvingVonmisesEnum:
+                        parameters->AddObject(iomodel->CopyConstantObject("md.calving.min_thickness",CalvingMinthicknessEnum));
                         break;
                 case CalvingMinthicknessEnum:
@@ -701 +703 @@
         femmodel->parameters->FindParam(&calvinglaw,CalvingLawEnum);
 
-        if(calvinglaw==CalvingMinthicknessEnum){
+        if(calvinglaw==CalvingMinthicknessEnum || calvinglaw==CalvingVonmisesEnum){
 
                 /*Get minimum thickness threshold*/
@@ -819 +821 @@
                         delete gauss;
                 }
+
                 /*Assemble vector and serialize: */
                 vec_constraint_nodes->Assemble();