Changeset 1104 for issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

Timestamp:

06/25/09 17:42:16 (16 years ago)

Author:

Eric.Larour

Message:

Transformed some Tria and Penta fields in booleans

File:

• issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (6 diffs)

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

@@ -71 +71 @@
         double tria_viscosity_overshoot;
         int    tria_artdiff; 
+        bool   tria_onwater; 
         
         /*matice constructor input: */
@@ -231 +232 @@
                 ModelFetchData((void**)&model->q,NULL,NULL,model_handle,"q","Matrix","Mat");
                 ModelFetchData((void**)&model->elementoniceshelf,NULL,NULL,model_handle,"elementoniceshelf","Matrix","Mat");
+                ModelFetchData((void**)&model->elementonwater,NULL,NULL,model_handle,"elementonwater","Matrix","Mat");
                 ModelFetchData((void**)&model->elements_type,NULL,NULL,model_handle,"elements_type","Matrix","Mat");
                 ModelFetchData((void**)&model->B,NULL,NULL,model_handle,"B","Matrix","Mat");
@@ -288 +290 @@
                                 tria_accumulation[2]=*(model->accumulation+        ((int)*(model->elements+elements_width*i+2)-1));
 
-                                /*element on iceshelf?:*/
+                                /*element on iceshelf, water?:*/
                                 tria_shelf=(int)*(model->elementoniceshelf+i);
+                                tria_onwater=(bool)*(model->elementonwater+i);
 
                                 tria_meanvel=model->meanvel;
@@ -298 +301 @@
 
                                 /*Create tria element using its constructor:*/
-                                tria=new Tria(tria_id, tria_mid, tria_mparid, tria_g, tria_h, tria_s, tria_b, tria_k, tria_melting,tria_accumulation,tria_geothermalflux,tria_friction_type, tria_p, tria_q, tria_shelf, tria_meanvel, tria_epsvel, tria_viscosity_overshoot,tria_artdiff);
+                                tria=new Tria(tria_id, tria_mid, tria_mparid, tria_g, tria_h, tria_s, tria_b, tria_k, tria_melting,tria_accumulation,tria_geothermalflux,tria_friction_type, tria_p, tria_q, tria_shelf, tria_meanvel, tria_epsvel, tria_viscosity_overshoot,tria_artdiff,tria_onwater);
 
                                 /*Add tria element to elements dataset: */
@@ -349 +352 @@
                 xfree((void**)&model->q);
                 xfree((void**)&model->elementoniceshelf);
+                xfree((void**)&model->elementonwater);
                 xfree((void**)&model->B);
                 xfree((void**)&model->n);
@@ -425 +429 @@
                                                 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); 
+                                                penta_thermal_steadystate,penta_viscosity_overshoot,penta_stokesreconditioning,0); 
 
                                 /*Add penta element to elements dataset: */