Changeset 6271

Timestamp:

10/12/10 16:11:10 (14 years ago)

Author:

seroussi

Message:

continued to add SUPG in thermal (transient)

File:

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

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

@@ -2917 +2917 @@
         double     gravity,rho_ice,rho_water;
         double     heatcapacity,thermalconductivity,dt;
-        double     scalar_artdiff;
         double     tau_parameter,diameter;
         double     xyz_list[NUMVERTICES][3];
@@ -3040 +3039 @@
 
                         tau_parameter=GetStabilizationParameter(u,v,w,diameter,rho_ice,heatcapacity,thermalconductivity);
-                        if(dt) scalar_artdiff=scalar_artdiff*dt;
-
-                        scalar_artdiff=tau_parameter*gauss->weight*Jdet;
+
                         for(i=0;i<numdof;i++){
                                 for(j=0;j<numdof;j++){
-                                        Ke_gaussian_artdiff[i][j]=scalar_artdiff*(u*dh1dh6[0][i]+v*dh1dh6[1][i]+w*dh1dh6[2][i])*(u*dh1dh6[0][j]+v*dh1dh6[1][j]+w*dh1dh6[2][j]);
+                                        Ke_gaussian_artdiff[i][j]=tau_parameter*D_scalar_advec*(u*dh1dh6[0][i]+v*dh1dh6[1][i]+w*dh1dh6[2][i])*(u*dh1dh6[0][j]+v*dh1dh6[1][j]+w*dh1dh6[2][j]);
+                                }
+                        }
+                        if(dt){
+                                for(i=0;i<numdof;i++){
+                                        for(j=0;j<numdof;j++){
+                                                Ke_gaussian_artdiff[i][j]+=tau_parameter*D_scalar_trans*L[j]*(u*dh1dh6[0][i]+v*dh1dh6[1][i]+w*dh1dh6[2][i]);
+                                        }
                                 }
                         }
@@ -3891 +3895 @@
 
                         for(i=0;i<NUMVERTICES;i++)  pe->values[i]+=tau_parameter*scalar_def*(u*dh1dh6[0][i]+v*dh1dh6[1][i]+w*dh1dh6[2][i]);
+                        if(dt){
+                                for(i=0;i<NUMVERTICES;i++)  pe->values[i]+=tau_parameter*scalar_transient*(u*dh1dh6[0][i]+v*dh1dh6[1][i]+w*dh1dh6[2][i]);
+                        }
                 }
         }