Changeset 17957

Timestamp:

05/07/14 08:30:26 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed FS flowand when meltrate = NaN

Location:

issm/trunk-jpl

Files:

• src/c/analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• test/Archives/Archive703.nc (modified) ( previous)

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

@@ -211 +211 @@
         iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
         iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
-        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,VxEnum,0.);
         if(dakota_analysis)elements->InputDuplicate(VxEnum,QmuVxEnum);
@@ -225 +224 @@
         }
         if(iomodel->domaintype==Domain3DEnum){
-                iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
                 iomodel->FetchDataToInput(elements,FlowequationBorderFSEnum);
                 iomodel->FetchDataToInput(elements,LoadingforceZEnum);
@@ -233 +231 @@
         if(isFS){
                 iomodel->FetchDataToInput(elements,PressureEnum,0.);
+                iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum,0.);
                 if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum);
         }