Changeset 14540

Timestamp:

04/11/13 14:41:33 (12 years ago)

Author:

seroussi

Message:

CHG: removed hydrology_core_step

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• solutions/hydrology_core.cpp (modified) (3 diffs)
• solutions/hydrology_core_step.cpp (deleted)
• solutions/solutions.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -446 +446 @@
                                               ./modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp\
                                               ./modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp \
-                                                  ./solutions/hydrology_core.cpp\
-                                                  ./solutions/hydrology_core_step.cpp 
+                                                  ./solutions/hydrology_core.cpp
 #}}}
 #Diagnostic sources  {{{

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

@@ -10 +10 @@
 #include "./solutions.h"
 #include "../modules/modules.h"
+#include "../include/include.h"
 #include "../solvers/solvers.h"
 
@@ -17 +18 @@
 
         /*intermediary*/
-        IssmDouble time;
-        int    nsteps;
+        int        nsteps;
+        int        output_frequency;
+        bool       save_results;
+        bool       modify_loads=true;
         IssmDouble starttime,final_time;
-        IssmDouble dt;
-        bool   save_results;
-        int    output_frequency;
+        IssmDouble time,dt;
 
         //first recover parameters common to all solutions
@@ -49 +50 @@
                 femmodel->parameters->SetParam(time,TimeEnum);
 
-                /*call hydrology_core step: */
-                hydrology_core_step(femmodel,i,time);
+                /*Compute hydrology solution: */
+                if(VerboseSolution()) _pprintLine_("   computing water column");
+                femmodel->SetCurrentConfiguration(HydrologyAnalysisEnum);
+                solver_nonlinear(femmodel,modify_loads);
+
+                /*transfer water column thickness to old water column thickness: */
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,WaterColumnOldEnum);
 
                 if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
                         if(VerboseSolution()) _pprintLine_("   saving results ");
-                        //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,i+1,time);
-                        //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum,i+1,time);
-                        //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVyEnum,i+1,time);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVyEnum);
 
                         /*unload results*/

issm/trunk-jpl/src/c/solutions/solutions.h

@@ -19 +19 @@
 void diagnostic_core(FemModel* femmodel);
 void hydrology_core(FemModel* femmodel);
-void hydrology_core_step(FemModel* femmodel,int step, IssmDouble time);
 void thermal_core(FemModel* femmodel);
 void enthalpy_core(FemModel* femmodel);