Changeset 23377

Timestamp:

10/02/18 16:18:43 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing NR

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (2 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)

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

@@ -349 +349 @@
         }
         if(smb_model==SMBgradientscomponentsEnum){
-                surface_runoff_input = basalelement->GetInput(SmbRunoffEnum);
+                surface_runoff_input = basalelement->GetInput(SmbRunoffEnum); _assert_(surface_runoff_input);
         }
 
@@ -363 +363 @@
                 /*Loading term*/
                 basal_melt_input->GetInputValue(&water_load,gauss);
-                surface_runoff_input->GetInputValue(&runoff_value,gauss);
+                if(surface_runoff_input) surface_runoff_input->GetInputValue(&runoff_value,gauss);
+                else                     runoff_value = 0.;
                 scalar = Jdet*gauss->weight*(water_load+runoff_value);
                 //scalar = Jdet*gauss->weight*(water_load)/epl_transmitivity;

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

@@ -407 +407 @@
                         if(!active_element){
                                 basal_melt_input->GetInputValue(&water_load,gauss);
-                                surface_runoff_input->GetInputValue(&runoff_value,gauss);
+                                if(surface_runoff_input) surface_runoff_input->GetInputValue(&runoff_value,gauss);
+                                else                     runoff_value = 0.;
                                 scalar = Jdet*gauss->weight*(water_load+runoff_value);
                                 //scalar = Jdet*gauss->weight*(water_load)/sediment_transmitivity;