Changeset 121

Timestamp:

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

Author:

Mathieu Morlighem

Message:

moved viscosity_overshoot in the element

Location:

issm/trunk/src/m/solutions/ice

Files:

• ModelProcessorDiagnosticBaseVert.m (modified) (1 diff)
• ModelProcessorDiagnosticHoriz.m (modified) (3 diffs)
• ModelProcessorDiagnosticStokes.m (modified) (2 diffs)
• ModelProcessorDiagnosticVert.m (modified) (2 diffs)
• SetupParams.m (modified) (1 diff)

issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticBaseVert.m

@@ -56 +56 @@
 [materials(end).constants]=deal(matpar);
 materials(end)=SetStructureField(materials(end),'constants','g',md.g);
-materials(end)=SetStructureField(materials(end),'constants','viscosity_overshoot',md.viscosity_overshoot);
 materials(end)=SetStructureField(materials(end),'constants','rho_ice',md.rho_ice);
 materials(end)=SetStructureField(materials(end),'constants','rho_water',md.rho_water);

issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticHoriz.m

@@ -46 +46 @@
                 elements(pos)=SetStructureField(elements(pos),'element','b',md.bed(md.elements(el3pos,1:3)));
                 elements(pos)=SetStructureField(elements(pos),'element','friction_type',md.drag_type);
+                elements(pos)=SetStructureField(elements(pos),'element','viscosity_overshoot',md.viscosity_overshoot);
                 elements(pos)=SetStructureField(elements(pos),'element','k',md.drag(md.elements(el3pos,1:3)));
                 elements(pos)=SetStructureField(elements(pos),'element','p',md.p(el3pos));
@@ -78 +79 @@
                 elements(pos)=SetStructureField(elements(pos),'element','b',md.bed(md.elements(el6pos,1:6)));
                 elements(pos)=SetStructureField(elements(pos),'element','friction_type',md.drag_type);
+                elements(pos)=SetStructureField(elements(pos),'element','viscosity_overshoot',md.viscosity_overshoot);
                 elements(pos)=SetStructureField(elements(pos),'element','k',md.drag(md.elements(el6pos,1:6)));
                 elements(pos)=SetStructureField(elements(pos),'element','p',md.p(el6pos));
@@ -108 +110 @@
 [materials(end).constants]=deal(matpar);
 materials(end)=SetStructureField(materials(end),'constants','g',md.g);
-materials(end)=SetStructureField(materials(end),'constants','viscosity_overshoot',md.viscosity_overshoot);
 materials(end)=SetStructureField(materials(end),'constants','rho_ice',md.rho_ice);
 materials(end)=SetStructureField(materials(end),'constants','rho_water',md.rho_water);

issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticStokes.m

@@ -41 +41 @@
 elements(stokesnewnumber)=SetStructureField(elements(stokesnewnumber),'element','b',md.bed(md.elements(pos,1:6)));
 elements(stokesnewnumber)=SetStructureField(elements(stokesnewnumber),'element','friction_type',md.drag_type);
+elements(stokesnewnumber)=SetStructureField(elements(stokesnewnumber),'element','viscosity_overshoot',md.viscosity_overshoot);
 elements(stokesnewnumber)=SetStructureField(elements(stokesnewnumber),'element','k',md.drag(md.elements(pos,1:6)));
 elements(stokesnewnumber)=SetStructureField(elements(stokesnewnumber),'element','p',md.p(pos));
@@ -63 +64 @@
 [materials(end).constants]=deal(matpar);
 materials(end)=SetStructureField(materials(end),'constants','g',md.g);
-materials(end)=SetStructureField(materials(end),'constants','viscosity_overshoot',md.viscosity_overshoot);
 materials(end)=SetStructureField(materials(end),'constants','rho_ice',md.rho_ice);
 materials(end)=SetStructureField(materials(end),'constants','rho_water',md.rho_water);

issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticVert.m

@@ -38 +38 @@
 elements(pos)=SetStructureField(elements(pos),'element','b',md.bed(md.elements(pos,1:6)));
 elements(pos)=SetStructureField(elements(pos),'element','friction_type',md.drag_type);
+elements(pos)=SetStructureField(elements(pos),'element','viscosity_overshoot',md.viscosity_overshoot);
 elements(pos)=SetStructureField(elements(pos),'element','k',md.drag(md.elements(pos,1:6)));
 elements(pos)=SetStructureField(elements(pos),'element','p',md.p(pos));
@@ -59 +60 @@
 [materials(end).constants]=deal(matpar);
 materials(end)=SetStructureField(materials(end),'constants','g',md.g);
-materials(end)=SetStructureField(materials(end),'constants','viscosity_overshoot',md.viscosity_overshoot);
 materials(end)=SetStructureField(materials(end),'constants','rho_ice',md.rho_ice);
 materials(end)=SetStructureField(materials(end),'constants','rho_water',md.rho_water);

issm/trunk/src/m/solutions/ice/SetupParams.m

@@ -12 +12 @@
 params.eps_rel=md.eps_rel;
 params.eps_abs=md.eps_abs;
-params.viscosity_overshoot=md.viscosity_overshoot;
 params.debug=md.debug;
 params.min_thermal_constraints=md.min_thermal_constraints;
 params.element_debug=md.element_debug;
 params.element_debugid=md.element_debugid;
-