Changeset 1310 for issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp

Timestamp:

07/14/09 14:56:05 (16 years ago)

Author:

Eric.Larour

Message:

Updated model processors to take elementonwater into account

File:

• issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp (modified) (5 diffs)

issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp

@@ -81 +81 @@
         double penta_viscosity_overshoot;
         double penta_stokesreconditioning;
+        bool   penta_onwater;
 
         /*matpar constructor input: */
@@ -197 +198 @@
         ModelFetchData((void**)&model->accumulation,NULL,NULL,model_handle,"accumulation","Matrix","Mat");
         ModelFetchData((void**)&model->melting,NULL,NULL,model_handle,"melting","Matrix","Mat");
+        ModelFetchData((void**)&model->elementonwater,NULL,NULL,model_handle,"elementonwater","Matrix","Mat");
         
         for (i=0;i<model->numberofelements;i++){
@@ -233 +235 @@
                 penta_meanvel=model->meanvel;
                 penta_epsvel=model->epsvel;
-                
+                penta_onwater=(bool)*(model->elementonwater+i);
+        
                 /*viscosity_overshoot*/
                 penta_viscosity_overshoot=model->viscosity_overshoot;
@@ -242 +245 @@
                                 penta_p,penta_q,penta_shelf,penta_onbed,penta_onsurface,penta_meanvel,penta_epsvel,
                                 penta_collapse,penta_melting,penta_accumulation,penta_geothermalflux,penta_artdiff,
-                                penta_thermal_steadystate,penta_viscosity_overshoot,penta_stokesreconditioning,0); 
+                                penta_thermal_steadystate,penta_viscosity_overshoot,penta_stokesreconditioning,penta_onwater); 
 
                 /*Add penta element to elements dataset: */
@@ -298 +301 @@
         xfree((void**)&model->n);
         xfree((void**)&model->B);
+        xfree((void**)&model->elementonwater);