Changeset 28013 for issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

Timestamp:

11/15/23 12:14:04 (16 months ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 28011

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (3 diffs)

issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -65 +65 @@
         GetBasalSolutionFromInputsx(&ug_sed,femmodel);
         /*Initialize the IDS element mask to exclude frozen nodes*/
+        inefanalysis = new HydrologyDCInefficientAnalysis();
         inefanalysis->ElementizeIdsMask(femmodel);
 
@@ -72 +73 @@
 
         if(isefficientlayer) {
-                inefanalysis = new HydrologyDCInefficientAnalysis();
                 effanalysis = new HydrologyDCEfficientAnalysis();
                 femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
@@ -303 +303 @@
                                 _error_("   maximum number for hydrological global iterations (" << hydro_maxiter << ") exceeded");
                                 delete ug_sed;delete uf_sed;delete effanalysis;
-                                delete ug_epl;  delete uf_epl;  delete inefanalysis;
+                                delete ug_epl;  delete uf_epl;
                         }
                 }