Changeset 11830

Timestamp:

03/30/12 16:26:33 (13 years ago)

Author:

Mathieu Morlighem

Message:

Getting rid of thermal_core_step and enthalpy_core_step: they are not needed anymore and made it difficult to coherently save results

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/solutions/enthalpy_core.cpp (modified) (1 diff)
• c/solutions/enthalpy_core_step.cpp (deleted)
• c/solutions/solutions.h (modified) (1 diff)
• c/solutions/thermal_core.cpp (modified) (2 diffs)
• c/solutions/thermal_core_step.cpp (deleted)
• c/solutions/transient_core.cpp (modified) (1 diff)
• m/model/plot/plot_section.m (modified) (1 diff)
• m/solutions/enthalpy_core.m (modified) (1 diff)
• m/solutions/enthalpy_core_step.m (deleted)
• m/solutions/thermal_core.m (modified) (1 diff)
• m/solutions/thermal_core_step.m (deleted)
• m/solutions/transient_core.m (modified) (1 diff)

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

@@ -394 +394 @@
 
 thermal_psources = ./solutions/thermal_core.cpp\
-                                            ./solutions/thermal_core_step.cpp\
                                             ./solutions/enthalpy_core.cpp\
-                                            ./solutions/enthalpy_core_step.cpp\
                                             ./solvers/solver_thermal_nonlinear.cpp
 #}}}

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

@@ -17 +17 @@
         /*intermediary*/
         bool   save_results;
-        int    solution_type;
 
         //first recover parameters common to all solutions
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
-        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
-        /*call enthalpy_core_step: */
-        enthalpy_core_step(femmodel);
+        _printf_(VerboseSolution(),"   computing enthalpy\n");
+        femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
+        solver_nonlinear(femmodel,true);
+
+        /*transfer enthalpy to enthalpy picard for the next step: */
+        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyPicardEnum);
 
         if(save_results){

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

@@ -20 +20 @@
 void hydrology_core_step(FemModel* femmodel,int step, double time);
 void thermal_core(FemModel* femmodel);
-void thermal_core_step(FemModel* femmodel,int step=0, double time=0);
 void enthalpy_core(FemModel* femmodel);
-void enthalpy_core_step(FemModel* femmodel,int step=0, double time=0);
 void surfaceslope_core(FemModel* femmodel);
 void bedslope_core(FemModel* femmodel);

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

@@ -18 +18 @@
         double melting_offset;
         bool   save_results;
-        int    solution_type;
         bool   dakota_analysis  = false;
 
@@ -30 +29 @@
         }
 
-        /*call thermal_core_step: */
-        thermal_core_step(femmodel);
+        _printf_(VerboseSolution(),"   computing temperatures\n");
+        femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
+        solver_thermal_nonlinear(femmodel);
+
+        _printf_(VerboseSolution(),"   computing melting\n");
+        femmodel->SetCurrentConfiguration(MeltingAnalysisEnum);
+        solver_linear(femmodel);
 
         if(save_results){

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

@@ -96 +96 @@
 
                 if(isthermal && dim==3){
-                        _printf_(VerboseSolution(),"   computing temperatures:\n");
+                        _printf_(VerboseSolution(),"   computing temperatures\n");
                         #ifdef _HAVE_THERMAL_
                         if(isenthalpy==0){
-                                thermal_core_step(femmodel,step,time);
+                                thermal_core(femmodel);
                         }
                         else{
-                                enthalpy_core_step(femmodel,step,time);
+                                enthalpy_core(femmodel);
                         }
                         #else

issm/trunk-jpl/src/m/model/plot/plot_section.m

@@ -111 +111 @@
 
                         %plot section value
-                        hold on;
-                        subplot(nlines,ncols,index1)
-                        %subplot(1,3,[2 3])
+                        if(i==1), subplot(nlines,ncols,index1); end
                         plot(s,data_s,'color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
+                        hold on
 
 

issm/trunk-jpl/src/m/solutions/enthalpy_core.m

@@ -10 +10 @@
 
         issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);
-        femmodel=enthalpy_core_step(femmodel); 
+        femmodel=SetCurrentConfiguration(femmodel,EnthalpyAnalysisEnum);
+        femmodel=solver_nonlinear(femmodel,true);
 
         if (save_results),

issm/trunk-jpl/src/m/solutions/thermal_core.m

@@ -11 +11 @@
 
         issmprintf(VerboseSolution,'\n%s',['   computing temperature']);
-        femmodel=thermal_core_step(femmodel); 
+        femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
+        femmodel=solver_thermal_nonlinear(femmodel);
+
+        issmprintf(VerboseSolution,'\n%s',['   computing melting']);
+        femmodel=SetCurrentConfiguration(femmodel,MeltingAnalysisEnum);
+        femmodel=solver_linear(femmodel);
 
         if (save_results),

issm/trunk-jpl/src/m/solutions/transient_core.m

@@ -66 +66 @@
                         issmprintf(VerboseSolution,'\n%s',['   computing temperature']);
                         if (isenthalpy==0),
-                                femmodel=thermal_core_step(femmodel); 
+                                femmodel=thermal_core(femmodel); 
                         else
-                                femmodel=enthalpy_core_step(femmodel); 
+                                femmodel=enthalpy_core(femmodel); 
                         end
                 end