Changeset 111 for issm/trunk/src/c/objects/Penta.cpp

Timestamp:

04/28/09 15:48:05 (16 years ago)

Author:

Eric.Larour

Message:

Took out viscosity overshoot from Matpar. Reactivated viscosity overshoot in tria, which had been wiped off

File:

• issm/trunk/src/c/objects/Penta.cpp (modified) (7 diffs)

issm/trunk/src/c/objects/Penta.cpp

@@ -22 +22 @@
                                 double penta_p, double penta_q, int penta_shelf, int penta_onbed, int penta_onsurface, double penta_meanvel,double penta_epsvel, 
                                 int penta_collapse, double penta_melting[6], double penta_accumulation[6], double penta_geothermalflux[6], 
-                                int penta_artdiff, int penta_thermal_steadystate){
+                                int penta_artdiff, int penta_thermal_steadystate,double penta_viscosity_overshoot){
         
         int i;
@@ -58 +58 @@
         artdiff = penta_artdiff; 
         thermal_steadystate = penta_thermal_steadystate;
+        viscosity_overshoot = penta_viscosity_overshoot;
 
         return;
@@ -97 +98 @@
         printf("   artdiff: %i\n",artdiff);
         printf("   thermal_steadystate: %i\n",thermal_steadystate);
+        printf("   viscosity_overshoot: %i\n",viscosity_overshoot);
         return;
 }
@@ -143 +145 @@
         memcpy(marshalled_dataset,&artdiff,sizeof(artdiff));marshalled_dataset+=sizeof(artdiff);
         memcpy(marshalled_dataset,&thermal_steadystate,sizeof(thermal_steadystate));marshalled_dataset+=sizeof(thermal_steadystate);
+        memcpy(marshalled_dataset,&viscosity_overshoot,sizeof(viscosity_overshoot));marshalled_dataset+=sizeof(viscosity_overshoot);
         
         *pmarshalled_dataset=marshalled_dataset;
@@ -178 +181 @@
                 sizeof(artdiff)+
                 sizeof(thermal_steadystate) +
+                sizeof(viscosity_overshoot) +
                 sizeof(int); //sizeof(int) for enum type
 }
@@ -224 +228 @@
         memcpy(&artdiff,marshalled_dataset,sizeof(artdiff));marshalled_dataset+=sizeof(artdiff);
         memcpy(&thermal_steadystate,marshalled_dataset,sizeof(thermal_steadystate));marshalled_dataset+=sizeof(thermal_steadystate);
+        memcpy(&viscosity_overshoot,marshalled_dataset,sizeof(viscosity_overshoot));marshalled_dataset+=sizeof(viscosity_overshoot);
 
         /*nodes and materials are not pointing to correct objects anymore:*/
@@ -770 +775 @@
         tria_node_offsets[2]=node_offsets[g2];
 
-        tria= new Tria(id,mid,mparid,tria_node_ids,tria_h,tria_s,tria_b,tria_k, friction_type,p,q,shelf,meanvel,epsvel);
+        tria= new Tria(id,mid,mparid,tria_node_ids,tria_h,tria_s,tria_b,tria_k, friction_type,p,q,shelf,meanvel,epsvel,viscosity_overshoot);
 
         tria->NodeConfiguration(tria_node_ids,tria_nodes,tria_node_offsets);