Changeset 16476

Timestamp:

10/21/13 09:48:52 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: for steadystate, we cannot call PostprocessingEnthalpyx...

Location:

issm/trunk-jpl/src/c

Files:

• analyses/steadystate_core.cpp (modified) (1 diff)
• analyses/thermal_core.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)

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

@@ -52 +52 @@
                 #ifdef _HAVE_THERMAL_
                 thermal_core(femmodel);
-                femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);/*Could be MeltingAnalysis...*/
+                if(!isenthalpy)femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);/*Could be MeltingAnalysis...*/
                 GetSolutionFromInputsx(&tg,femmodel);
                 #else

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

@@ -47 +47 @@
 
                 /*Post process*/
-                PostprocessingEnthalpyx(femmodel);
+                if(solution_type!=SteadystateSolutionEnum) PostprocessingEnthalpyx(femmodel);
         }
         else{
-                if(VerboseSolution()) _printf0_("   setting basal Dirichlet boundary conditions\n");
-                femmodel->UpdateBasalConstraintsEnthalpyx();
-
                 if(VerboseSolution()) _printf0_("   computing temperatures\n");
                 femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1402 +1402 @@
 /*}}}*/
 #endif
-#ifdef _HAVE_THERMAL_
-void FemModel::UpdateBasalConstraintsEnthalpyx(void){ /*{{{*/
-
-        for(int i=0;i<elements->Size();i++){
-                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                element->UpdateBasalConstraintsEnthalpy();
-        }
-
-}
-/*}}}*/
-#endif

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -103 +103 @@
                 void HydrologyEPLupdateDomainx(void);
                 #endif
-                #ifdef _HAVE_THERMAL_
-                void UpdateBasalConstraintsEnthalpyx(void);
-                #endif
 };