Changeset 16697

Timestamp:

11/09/13 20:46:41 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not get Matpar pointer, use GetMaterialParameter instead

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.cpp (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Elements/Tria.h (modified) (1 diff)
• classes/Materials/Matpar.cpp (modified) (1 diff)
• classes/Materials/Matpar.h (modified) (2 diffs)

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

@@ -978 +978 @@
         /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
         for(i=0;i<numnodes;i++){
-                vx[i]=values[i*NDOF2+0];
-                vy[i]=values[i*NDOF2+1];
+                vx[i]=values[i*2+0];
+                vy[i]=values[i*2+1];
 
                 /*Check solution*/
@@ -992 +992 @@
         /*For pressure: we have not computed pressure in this analysis, for this element. We are in 2D, 
          *so the pressure is just the pressure at the bedrock: */
-        Matpar* matpar=element->GetMatparPointer();
-        rho_ice=matpar->GetRhoIce();
-        g=matpar->GetG();
+        rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum);
+        g       = element->GetMaterialParameter(ConstantsGEnum);
         element->GetInputListOnNodes(&thickness[0],ThicknessEnum);
         for(i=0;i<numnodes;i++) pressure[i]=rho_ice*g*thickness[i];

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

@@ -47 +47 @@
                 virtual void   FindParam(IssmDouble* pvalue,int paramenum)=0;
                 virtual int    FiniteElement(void)=0;
-                virtual Matpar* GetMatparPointer(void)=0;
+                virtual IssmDouble GetMaterialParameter(int enum_in)=0;
                 virtual void   TransformSolutionCoord(IssmDouble* values,int transformenum)=0;
                 virtual void    GetDofList(int** pdoflist,int approximation_enum,int setenum)=0;

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

@@ -1074 +1074 @@
         /*Assign output pointers:*/
         *pdoflist=doflist;
+}
+/*}}}*/
+/*FUNCTION Penta::GetMaterialParameter{{{*/
+IssmDouble Penta::GetMaterialParameter(int enum_in){
+
+        _assert_(this->matpar);
+        return this->matpar->GetMaterialParameter(enum_in);
 }
 /*}}}*/

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

@@ -91 +91 @@
                 void   GetNodesLidList(int* lidlist);
                 int    GetNumberOfNodes(void);
-                Matpar* GetMatparPointer(void){_error_("not implemented yet");};
+                IssmDouble GetMaterialParameter(int enum_in);
                 void   GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution,int enum_type);
                 IssmDouble GetZcoord(GaussPenta* gauss);

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

@@ -146 +146 @@
 /*}}}*/
 
+/*FUNCTION Seg::GetMaterialParameter{{{*/
+IssmDouble Seg::GetMaterialParameter(int enum_in){
+
+        _assert_(this->matpar);
+        return this->matpar->GetMaterialParameter(enum_in);
+}
+/*}}}*/
 /*FUNCTION Seg::GetSize{{{*/
 IssmDouble Seg::GetSize(void){

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

@@ -87 +87 @@
                 void        GetInputListOnNodes(IssmDouble* pvalue,int enumtype){_error_("not implemented yet");};
                 void        GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){_error_("not implemented yet");};
-                Matpar*     GetMatparPointer(void){_error_("not implemented yet");};
+                IssmDouble  GetMaterialParameter(int enum_in);
                 int         GetNodeIndex(Node* node){_error_("not implemented yet");};
                 void        GetNodesSidList(int* sidlist){_error_("not implemented yet");};

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

@@ -1189 +1189 @@
 }
 /*}}}*/
+/*FUNCTION Tria::GetMaterialParameter{{{*/
+IssmDouble Tria::GetMaterialParameter(int enum_in){
+
+        _assert_(this->matpar);
+        return this->matpar->GetMaterialParameter(enum_in);
+}
+/*}}}*/
 /*FUNCTION Tria::GetSegmentNormal {{{*/
 void Tria:: GetSegmentNormal(IssmDouble* normal,IssmDouble xyz_list[2][3]){
@@ -1495 +1502 @@
         input->GetInputValue(pvalue,gauss);
         delete gauss;
-}
-/*}}}*/
-/*FUNCTION Tria::GetMatparPointer(void) {{{*/
-Matpar* Tria::GetMatparPointer(void){
-        return this->matpar;
 }
 /*}}}*/

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

@@ -238 +238 @@
                 IssmDouble     GetGroundedPortion(IssmDouble* xyz_list);
                 void           GetSegmentNormal(IssmDouble* normal,IssmDouble xyz_list[2][3]);
-      Matpar*        GetMatparPointer(void);
+                IssmDouble     GetMaterialParameter(int enum_in);
                 void           GetZeroLevelsetCoordinates(IssmDouble* xyz_zero,IssmDouble xyz_list[3][3],int levelsetenum);
                 Input*         GetInput(int inputenum);

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -241 +241 @@
 }
 /*}}}*/
+/*FUNCTION Matpar::Configure {{{*/
+IssmDouble Matpar::GetMaterialParameter(int enum_in){
+
+        switch(enum_in){
+                case MaterialsRhoIceEnum:                   return this->rho_ice;
+                case MaterialsRhoWaterEnum:                 return this->rho_water;
+                case MaterialsRhoFreshwaterEnum:            return this->rho_freshwater;
+                case MaterialsMuWaterEnum:                  return this->mu_water;
+                case MaterialsHeatcapacityEnum:             return this->heatcapacity;
+                case MaterialsThermalconductivityEnum:      return this->thermalconductivity;
+                case MaterialsTemperateiceconductivityEnum: return this->temperateiceconductivity;
+                case MaterialsLatentheatEnum:               return this->latentheat;
+                case MaterialsBetaEnum:                     return this->beta;
+                case MaterialsMeltingpointEnum:             return this->meltingpoint;
+                case ConstantsReferencetemperatureEnum:     return this->referencetemperature;
+                case MaterialsMixedLayerCapacityEnum:       return this->mixed_layer_capacity;
+                case MaterialsThermalExchangeVelocityEnum:  return this->thermal_exchange_velocity;
+                case ConstantsGEnum:                        return this->g;
+                default: _error_("Enum "<<EnumToStringx(enum_in)<<" not supported yet");
+        }
+
+}
+/*}}}*/
 /*FUNCTION Matpar::GetBeta {{{*/
 IssmDouble Matpar::GetBeta(){

issm/trunk-jpl/src/c/classes/Materials/Matpar.h

@@ -15 +15 @@
 
         private: 
-                int       mid;
+                int           mid;
                 IssmDouble  rho_ice; 
                 IssmDouble  rho_water;
@@ -133 +133 @@
                 IssmDouble GetMantleShearModulus();
                 IssmDouble GetMantleDensity();
-                void   EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure);
-                void   ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure);
+                void       EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure);
+                void       ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure);
                 IssmDouble GetDesFac();
                 IssmDouble GetS0p(); 
+                IssmDouble GetMaterialParameter(int in_enum); 
                 bool       IsInput(int name);
                 /*}}}*/