Changeset 16972

Timestamp:

11/29/13 10:08:46 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing hydro tests

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (5 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (2 diffs)

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

@@ -127 +127 @@
 
         /*Initialize Element vector*/
-        ElementMatrix* Ke     = element->NewElementMatrix();
+        ElementMatrix* Ke     = basalelement->NewElementMatrix();
         IssmDouble*    B      = xNew<IssmDouble>(2*numnodes);
         IssmDouble*    basis  = xNew<IssmDouble>(numnodes);
@@ -135 +135 @@
         basalelement->GetVerticesCoordinates(&xyz_list);
         basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
-        Input* thickness_input=element->GetInput(HydrologydcEplThicknessEnum); _assert_(thickness_input);
+        Input* thickness_input=basalelement->GetInput(HydrologydcEplThicknessEnum); _assert_(thickness_input);
         IssmDouble epl_specificstoring = EplSpecificStoring(basalelement);
-        IssmDouble epl_conductivity    = element->GetMaterialParameter(HydrologydcEplConductivityEnum);
+        IssmDouble epl_conductivity    = basalelement->GetMaterialParameter(HydrologydcEplConductivityEnum);
 
         /* Start  looping on the number of gaussian points: */
-        Gauss* gauss=element->NewGauss(2);
+        Gauss* gauss=basalelement->NewGauss(2);
         for(int ig=gauss->begin();ig<gauss->end();ig++){
                 gauss->GaussPoint(ig);
 
-                element->JacobianDeterminant(&Jdet,xyz_list,gauss);
+                basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss);
                 thickness_input->GetInputValue(&epl_thickness,gauss);
 
@@ -152 +152 @@
                 D[0][0]=D_scalar;
                 D[1][1]=D_scalar;
-                GetB(B,element,xyz_list,gauss); 
+                GetB(B,basalelement,xyz_list,gauss); 
                 TripleMultiply(B,2,numnodes,1,
                                         &D[0][0],2,2,0,
@@ -160 +160 @@
                 /*Transient*/
                 if(dt!=0.){
-                        element->NodalFunctions(basis,gauss);
+                        basalelement->NodalFunctions(basis,gauss);
                         D_scalar=epl_specificstoring*epl_thickness*gauss->weight*Jdet;
 
@@ -176 +176 @@
         delete gauss;
         return Ke;
-
 
 }/*}}}*/

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

@@ -187 +187 @@
                 D[0][0]=D_scalar;
                 D[1][1]=D_scalar;
-                GetB(B,element,xyz_list,gauss); 
+                GetB(B,basalelement,xyz_list,gauss); 
                 TripleMultiply(B,2,numnodes,1,
                                         &D[0][0],2,2,0,
@@ -249 +249 @@
         IssmDouble sediment_storing = SedimentStoring(basalelement);
         basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
-        Input* water_input       = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input);
-        Input* transfer_input    = element->GetInput(WaterTransferEnum);            _assert_(transfer_input);
-        if(dt!= 0.){old_wh_input = element->GetInput(SedimentHeadOldEnum);          _assert_(old_wh_input);}
+        Input* water_input       = basalelement->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input);
+        Input* transfer_input    = basalelement->GetInput(WaterTransferEnum);            _assert_(transfer_input);
+        if(dt!= 0.){old_wh_input = basalelement->GetInput(SedimentHeadOldEnum);          _assert_(old_wh_input);}
 
         /* Start  looping on the number of gaussian points: */