Changeset 595

Timestamp:

05/26/09 12:17:44 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing

Location:

issm/trunk/src/c/objects

Files:

• Penta.cpp (modified) (8 diffs)
• Tria.cpp (modified) (1 diff)

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

@@ -3403 +3403 @@
 
         /*Material properties: */
-        double         gravity,rho_ice,rho_water;
-        double         heatcapacity,thermalconductivity;
-        double         mixed_layer_capacity,thermal_exchange_velocity;
+        double     gravity,rho_ice,rho_water;
+        double     heatcapacity,thermalconductivity;
+        double     mixed_layer_capacity,thermal_exchange_velocity;
 
         /*Collapsed formulation: */
@@ -3424 +3424 @@
         heatcapacity=matpar->GetHeatCapacity();
         thermalconductivity=matpar->GetThermalConductivity();
-
                 
         /*recover extra inputs from users, dt and velocity: */
@@ -3481 +3480 @@
                         D[2][0]=0; D[2][1]=0; D[2][2]=D_scalar;
 
-
                         /*  Do the triple product B'*D*B: */
                         MatrixMultiply(&B_conduct[0][0],3,numdof,1,&D[0][0],3,3,0,&tBD_conduct[0][0],0);
@@ -3491 +3489 @@
                         GetB_advec(&B_advec[0][0],&xyz_list[0][0],gauss_coord); 
                         GetBprime_advec(&Bprime_advec[0][0],&xyz_list[0][0],gauss_coord); 
-
 
                         //Build the D matrix
@@ -3511 +3508 @@
                         MatrixMultiply(&B_advec[0][0],3,numdof,1,&D[0][0],3,3,0,&tBD_advec[0][0],0);
                         MatrixMultiply(&tBD_advec[0][0],numdof,3,0,&Bprime_advec[0][0],3,numdof,0,&Ke_gaussian_advec[0][0],0);
-
 
                         /*Transient: */
@@ -3709 +3705 @@
         double  gauss_weight,area_gauss_weight,vert_gauss_weight;
         double  gauss_coord[4];
-        int area_order=2;
-        int     num_vert_gauss=3;
-        
-        double         dt;
-        double         vx_list[numgrids];
-        double         vy_list[numgrids];
-        double         vz_list[numgrids];
-        double         vxvyvz_list[numgrids][3];
-        double         temperature_list[numgrids];
-        double         temperature;
+        int     area_order=2;
+        int       num_vert_gauss=3;
+        
+        double dt;
+        double vx_list[numgrids];
+        double vy_list[numgrids];
+        double vz_list[numgrids];
+        double vxvyvz_list[numgrids][3];
+        double temperature_list[numgrids];
+        double temperature;
 
         /*Material properties: */
-        double         gravity,rho_ice,rho_water;
-        double         mixed_layer_capacity,heatcapacity;
-        double         beta,meltingpoint,thermal_exchange_velocity;
+        double gravity,rho_ice,rho_water;
+        double mixed_layer_capacity,heatcapacity;
+        double beta,meltingpoint,thermal_exchange_velocity;
 
         /* element parameters: */
-        int     friction_type;
-        
-        int            dofs[3]={0,1,2};
-        int            dofs1[1]={0};
+        int    friction_type;
+        
+        int    dofs[3]={0,1,2};
+        int    dofs1[1]={0};
 
         /*matrices: */
-        double     P_terms[numdof]={0.0};
-        double     L[numdof];
-        double     l1l2l3[3];
-        double     alpha2_list[3];
-        double     basalfriction_list[3]={0.0};
-        double     basalfriction;
-        double     epsilon[6];
-        double     epsilon_sqr[3][3];
-        double     epsilon_matrix[3][3];
-
-        double     Jdet;
-        double     viscosity;
-        double     epsilon_eff;
-        double     phi;
-        double     t_pmp;
-        double     scalar;
-        double     scalar_def;
-        double     scalar_ocean;
-        double     scalar_transient;
+        double P_terms[numdof]={0.0};
+        double L[numdof];
+        double l1l2l3[3];
+        double alpha2_list[3];
+        double basalfriction_list[3]={0.0};
+        double basalfriction;
+        double epsilon[6];
+        double epsilon_sqr[3][3];
+        double epsilon_matrix[3][3];
+
+        double Jdet;
+        double viscosity;
+        double epsilon_eff;
+        double phi;
+        double t_pmp;
+        double scalar;
+        double scalar_def;
+        double scalar_ocean;
+        double scalar_transient;
 
         /*Collapsed formulation: */
@@ -3763 +3759 @@
         GetDofList(&doflist[0],&numberofdofspernode);
         
-        // /*recovre material parameters: */
+        /*recovre material parameters: */
         rho_water=matpar->GetRhoWater();
         rho_ice=matpar->GetRhoIce();
@@ -3812 +3808 @@
                         /*Compute strain rate and viscosity: */
                         GetStrainRateStokes(&epsilon[0],&vxvyvz_list[0][0],&xyz_list[0][0],gauss_coord);
-                        matice->GetViscosity3d(&viscosity,&epsilon[0]);
+                        matice->GetViscosity3dStokes(&viscosity,&epsilon[0]);
 
                         /* Get Jacobian determinant: */

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

@@ -51 +51 @@
                 melting[i]=tria_melting[i];
                 accumulation[i]=tria_accumulation[i];
-                geothermalflux[i]=tria_geothermalflux[i]; }
+                geothermalflux[i]=tria_geothermalflux[i]; 
+        }
         matice=NULL;
         matice_offset=UNDEF;