Changeset 14769 for issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

Timestamp:

04/26/13 15:33:39 (12 years ago)

Author:

bdef

Message:

NEW: split HydrologyDC in 2 sub analyses, and added penalties for the sediment layer

File:

• issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

@@ -61 +61 @@
                 if (hydrology_model==HydrologyshreveEnum){
                         if(VerboseSolution()) _pprintLine_("   computing water column");
-                        femmodel->SetCurrentConfiguration(HydrologyAnalysisEnum);
+                        femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum);
                         solver_nonlinear(femmodel,modify_loads);
 
@@ -81 +81 @@
                 else if (hydrology_model==HydrologydcEnum){
                         if(VerboseSolution()) _pprintLine_("   computing water head");
-                        femmodel->SetCurrentConfiguration(HydrologyAnalysisEnum);
-                        solver_linear(femmodel);
+                        solver_hydro_nonlinear(femmodel);
                         if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
                                 if(VerboseSolution()) _pprintLine_("   saving results ");