Changeset 16272

Timestamp:

09/30/13 09:25:47 (11 years ago)

Author:

jbondzio

Message:

CHG: changed Penta::UpdateThermalBasalConstraints to Penta::UpdateBasalConstraintsEnthalpy and added ThermalIsdynamicbasalspcEnum

Location:

issm/trunk-jpl/src/c

Files:

• analyses/thermal_core.cpp (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (5 diffs)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.cpp (modified) (2 diffs)

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

@@ -34 +34 @@
 
         if(VerboseSolution()) _printf0_("   setting basal Dirichlet boundary conditions\n");
-        femmodel->UpdateThermalBasalConstraintsx();
+        femmodel->UpdateBasalConstraintsEnthalpyx();
 
         if(VerboseSolution()) _printf0_("   computing temperatures\n");

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -126 +126 @@
 
                 #ifdef _HAVE_THERMAL_
-                virtual void UpdateThermalBasalConstraints(void)=0;
+                virtual void UpdateBasalConstraintsEnthalpy(void)=0;
                 virtual void ComputeBasalMeltingrate(void)=0;
         virtual void DrainWaterfraction(void)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -4577 +4577 @@
                         }
                         else{
-                                // only base temperate, set Dirichlet BCs in Penta::UpdateThermalBasalConstraints()
+                                // only base temperate, set Dirichlet BCs in Penta::UpdateBasalConstraintsEnthalpy()
                         }
                 }
@@ -4992 +4992 @@
 }
 /*}}}*/
-/*FUNCTION Penta::UpdateThermalBasalConstraints{{{*/
-void  Penta::UpdateThermalBasalConstraints(void){
+/*FUNCTION Penta::UpdateBasalConstraintsEnthalpy{{{*/
+void  Penta::UpdateBasalConstraintsEnthalpy(void){
 
         /*Intermediary*/
@@ -5008 +5008 @@
         parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
         if(!isenthalpy) return;
-        //parameters->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum);
-        isdynamicbasalspc = true;
+        parameters->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum);
+        isdynamicbasalspc = true; // TODO: remove before release
         if(!isdynamicbasalspc) return;
 
@@ -5026 +5026 @@
         for(int i=0;i<numindices;i++){
                 gauss->GaussNode(this->element_type,indices[i]);
-        gaussup->GaussNode(this->element_type,indicesup[i]); // TODO: check: are the nodes corresponding?
-
-                /*Check wether there is a temperate layer at the base or not -> TODO: Johannes:) */
-        /*check if node is temperate, if not, return*/
+        gaussup->GaussNode(this->element_type,indicesup[i]); 
+
+                /*Check wether there is a temperate layer at the base or not */
+        /*check if node is temperate, if not, continue*/
         enthalpy_input->GetInputValue(&enthalpy, gauss);
                 pressure_input->GetInputValue(&pressure, gauss);
         if (enthalpy<matpar->PureIceEnthalpy(pressure)){
-          // TODO: reset, if necessary, all spcs to non-valid 
           continue;
         }
-        /*check if upper node is temperate. if yes, then we have a temperate layer of positive thickness. if not, continue.*/
+        /*check if upper node is temperate. 
+          if yes, then we have a temperate layer of positive thickness and 
+          reset the spc. 
+          if not, apply dirichlet BC.*/
         enthalpy_input->GetInputValue(&enthalpyup, gaussup);
                 pressure_input->GetInputValue(&pressureup, gaussup);    
@@ -5047 +5049 @@
                         /*Calculate enthalpy at pressure melting point */
                         h_pmp=matpar->PureIceEnthalpy(pressure);
-
                         /*Apply Dirichlet condition (dof = 0 here, since there is only one degree of freedom per node)*/
                         nodes[indices[i]]->ApplyConstraint(1,h_pmp);

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -347 +347 @@
                 void           InputUpdateFromSolutionThermal(IssmDouble* solutiong);
                 void           InputUpdateFromSolutionEnthalpy(IssmDouble* solutiong);
-                void           UpdateThermalBasalConstraints(void);
+                void           UpdateBasalConstraintsEnthalpy(void);
                 void           ComputeBasalMeltingrate(void);
                 void           DrainWaterfraction(void);

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -250 +250 @@
 
                 #ifdef _HAVE_THERMAL_
-                void UpdateThermalBasalConstraints(void){_error_("not implemented yet");};
+                void UpdateBasalConstraintsEnthalpy(void){_error_("not implemented yet");};
                 void ComputeBasalMeltingrate(void){_error_("not implemented yet");};
                 void DrainWaterfraction(void){_error_("not implemented yet");};

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

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

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

@@ -100 +100 @@
                 #endif
                 #ifdef _HAVE_THERMAL_
-                void UpdateThermalBasalConstraintsx(void);
+                void UpdateBasalConstraintsEnthalpyx(void);
                 #endif
 };

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -84 +84 @@
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgiaEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));

issm/trunk-jpl/src/c/modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.cpp

@@ -12 +12 @@
         Element* element=NULL;
 
-        /*drain excess water fraction: */
-        for (i=0;i<femmodel->elements->Size();i++){
-                element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                element->DrainWaterfraction();
-        }
-
+        
         /*Compute basal melting rates: */
         for (i=0;i<femmodel->elements->Size();i++){
@@ -24 +19 @@
         }
 
+    /*drain excess water fraction: */
+    /*  for (i=0;i<femmodel->elements->Size();i++){
+                element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
+                element->DrainWaterfraction();
+        }
+*/
+
         /*Update basal dirichlet BCs for enthalpy: */
         for (i=0;i<femmodel->elements->Size();i++){
                 element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                element->UpdateThermalBasalConstraints();
+                element->UpdateBasalConstraintsEnthalpy();
         }
 }