Changeset 18808

Timestamp:

11/19/14 08:08:59 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not load calving fields if iscalving=0

File:

• issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (modified) (1 diff)

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

@@ -39 +39 @@
 
         /*Get calving parameters*/
-        int calvinglaw;
-        iomodel->Constant(&calvinglaw,CalvingLawEnum);
-        switch(calvinglaw){
-                case DefaultCalvingEnum:
-                        iomodel->FetchDataToInput(elements,CalvingCalvingrateEnum);
-                        break;
-                case CalvingLevermannEnum:
-                        iomodel->FetchDataToInput(elements,CalvinglevermannCoeffEnum);
-                        break;
-                default:
-                        _error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
+        bool iscalving;
+        int  calvinglaw;
+        iomodel->Constant(&iscalving,TransientIscalvingEnum);
+        if(iscalving){
+                iomodel->Constant(&calvinglaw,CalvingLawEnum);
+                iomodel->Constant(&iscalving,TransientIscalvingEnum);
+                switch(calvinglaw){
+                        case DefaultCalvingEnum:
+                                iomodel->FetchDataToInput(elements,CalvingCalvingrateEnum);
+                                break;
+                        case CalvingLevermannEnum:
+                                iomodel->FetchDataToInput(elements,CalvinglevermannCoeffEnum);
+                                break;
+                        default:
+                                _error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
+                }
         }
 }