Changeset 1104 for issm/trunk/src/c/ModelProcessorx/SlopeCompute

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/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp (modified) (4 diffs)

issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp

@@ -67 +67 @@
         double tria_viscosity_overshoot; 
         int    tria_artdiff; 
+        bool   tria_onwater; 
 
         /*penta constructor input: */
@@ -201 +202 @@
                 ModelFetchData((void**)&model->elements,NULL,NULL,model_handle,"elements","Matrix","Mat");
                 ModelFetchData((void**)&model->surface,NULL,NULL,model_handle,"surface","Matrix","Mat");
+                ModelFetchData((void**)&model->elementonwater,NULL,NULL,model_handle,"elementonwater","Matrix","Mat");
                 ModelFetchData((void**)&model->bed,NULL,NULL,model_handle,"bed","Matrix","Mat");
                 
@@ -229 +231 @@
                         tria_b[1]=*(model->bed+        ((int)*(model->elements+elements_width*i+1)-1)); 
                         tria_b[2]=*(model->bed+        ((int)*(model->elements+elements_width*i+2)-1)); 
+                        
+                        /*element on water? : */
+                        tria_onwater=(bool)*(model->elementonwater+i);
 
                         /*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: */
@@ -294 +299 @@
                                         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: */