Changeset 20452 for issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

Timestamp:

04/07/16 11:42:19 (9 years ago)

Author:

seroussi

Message:

CHG: moved md.transient.iscalving into md.transient.ismovingfront

File:

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

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

@@ -48 +48 @@
         iomodel->FetchDataToInput(elements,VyEnum);
 
-        /*Get calving parameters*/
-        bool iscalving;
+        /*Get moving front parameters*/
+        bool ismovingfront;
         int  calvinglaw;
-        iomodel->Constant(&iscalving,TransientIscalvingEnum);
-        if(iscalving){
+        iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum);
+        if(ismovingfront){
                 iomodel->Constant(&calvinglaw,CalvingLawEnum);
-                iomodel->Constant(&iscalving,TransientIscalvingEnum);
+                iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum);
                 switch(calvinglaw){
                         case DefaultCalvingEnum:
@@ -129 +129 @@
         /*Intermediaries */
         int  stabilization,dim, domaintype, calvinglaw;
-        bool iscalving;
+        bool ismovingfront;
         int i, row, col;
         IssmDouble kappa;
@@ -138 +138 @@
         IssmDouble* xyz_list = NULL;
 
-        /*Get problem dimension and whether there is calving or not*/
-        basalelement->FindParam(&iscalving,TransientIscalvingEnum);
+        /*Get problem dimension and whether there is moving front or not*/
+        basalelement->FindParam(&ismovingfront,TransientIsmovingfrontEnum);
         basalelement->FindParam(&domaintype,DomainTypeEnum);
         basalelement->FindParam(&calvinglaw,CalvingLawEnum);
@@ -194 +194 @@
 
         /*Load calving inputs*/
-        if(iscalving){
+        if(ismovingfront){
                 switch(calvinglaw){
                         case DefaultCalvingEnum:
@@ -267 +267 @@
 
                 /*Get calving speed*/
-                if(iscalving){
+                if(ismovingfront){
                         switch(calvinglaw){
                                 case DefaultCalvingEnum: