Changeset 120

Timestamp:

04/29/09 08:50:31 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved viscosity_overshoot in the element

Location:

issm/trunk/src/m/classes

Files:

• @matpar/display.m (modified) (1 diff)
• @matpar/matpar.m (modified) (1 diff)
• @pentaelem/CreateKMatrix.m (modified) (3 diffs)
• @pentaelem/display.m (modified) (1 diff)
• @pentaelem/pentaelem.m (modified) (1 diff)
• @triaelem/CreateKMatrix.m (modified) (4 diffs)
• @triaelem/display.m (modified) (1 diff)
• @triaelem/triaelem.m (modified) (1 diff)

issm/trunk/src/m/classes/@matpar/display.m

@@ -14 +14 @@
 disp(sprintf('   mixed_layer_capacity: %i',matpar.mixed_layer_capacity));
 disp(sprintf('   thermal_exchange_velocity: %i',matpar.thermal_exchange_velocity));
-disp(sprintf('   viscosity_overshoot: %i',matpar.viscosity_overshoot));
 disp(sprintf('   g: %g',matpar.g));

issm/trunk/src/m/classes/@matpar/matpar.m

@@ -18 +18 @@
         matpar.thermal_exchange_velocity=NaN;
         matpar.g=9.81;
-        matpar.viscosity_overshoot=0.3;
         matpar=class(matpar,'matpar');
                                 

issm/trunk/src/m/classes/@pentaelem/CreateKMatrix.m

@@ -142 +142 @@
 %recover material parameters
 gravity=matpar.g;
-viscosity_overshoot=matpar.viscosity_overshoot;
 rho_ice=matpar.rho_ice;
 rho_water=matpar.rho_water;
@@ -732 +731 @@
         %recover material parameters
         gravity=matpar.g;
-        viscosity_overshoot=matpar.viscosity_overshoot;
         rho_ice=matpar.rho_ice;
         rho_water=matpar.rho_water;
@@ -841 +839 @@
                 newviscosity=GetViscosity3d(matice,epsilon);
                 oldviscosity=GetViscosity3d(matice,oldepsilon);
-                viscosity=newviscosity+viscosity_overshoot*(newviscosity-oldviscosity);
+                viscosity=newviscosity+pentaelem.viscosity_overshoot*(newviscosity-oldviscosity);
                 %disp(sprintf('Element id %i Viscosity: %g \n',pentaelem.id,viscosity));
 

issm/trunk/src/m/classes/@pentaelem/display.m

@@ -13 +13 @@
 disp(sprintf('   bedrock: %g %g %g %g %g %g',pentaelem.b(1),pentaelem.b(2),pentaelem.b(3),pentaelem.b(4),pentaelem.b(5),pentaelem.b(6)));
 disp(sprintf('   friction type: %i',pentaelem.friction_type));
+disp(sprintf('   viscosity overshoot: %g',pentaelem.viscosity_overshoot));
 disp(sprintf('   p: %i',pentaelem.p));
 disp(sprintf('   q: %i',pentaelem.q));

issm/trunk/src/m/classes/@pentaelem/pentaelem.m

@@ -16 +16 @@
         pentaelem.b=zeros(6,1);
         pentaelem.friction_type=2;
+        pentaelem.viscosity_overshoot=0;
         pentaelem.k=zeros(6,1);
         pentaelem.p=1;

issm/trunk/src/m/classes/@triaelem/CreateKMatrix.m

@@ -218 +218 @@
 %recover material parameters
 gravity=matpar.g;
-viscosity_overshoot=matpar.viscosity_overshoot;
 rho_ice=matpar.rho_ice;
 rho_water=matpar.rho_water;
@@ -243 +242 @@
 temperature_average_list=zeros(numgrids,1);
 
-
 %Get all element grid data:
 xyz_list=getgriddata(triaelem,grids);
-
 
 %Build linear indices for elementary stiffness matrix.
@@ -298 +295 @@
         if(temperature_average_is_present)disp(sprintf('   temperature_average [%g %g %g]',temperature_average_list(1),temperature_average_list(2),temperature_average_list(3)));end;
 end
-
-
 
 alpha2_list=zeros(3,1);
@@ -402 +397 @@
         newviscosity=GetViscosity2d(matice,epsilon);
         oldviscosity=GetViscosity2d(matice,oldepsilon);
-        viscosity=newviscosity+viscosity_overshoot*(newviscosity-oldviscosity);
+        viscosity=newviscosity+triaelem.viscosity_overshoot*(newviscosity-oldviscosity);
 
         %Get Jacobian determinant:

issm/trunk/src/m/classes/@triaelem/display.m

@@ -13 +13 @@
 disp(sprintf('   grids bedrock: %g %g %g',triaelem.b(1),triaelem.b(2),triaelem.b(3)));
 disp(sprintf('   friction type: %i',triaelem.friction_type));
+disp(sprintf('   viscosity overshoot: %g',triaelem.viscosity_overshoot));
 disp(sprintf('   p: %i',triaelem.p));
 disp(sprintf('   q: %i',triaelem.q));

issm/trunk/src/m/classes/@triaelem/triaelem.m

@@ -16 +16 @@
         triaelem.b=zeros(3,1);
         triaelem.friction_type=2;
+        triaelem.viscosity_overshoot=0;
         triaelem.k=zeros(3,1);
         triaelem.p=1;