Changeset 10565 for issm/trunk/src/m/classes/materials.m

Timestamp:

11/10/11 08:27:02 (13 years ago)

Author:

Eric.Larour

Message:

Added mu_water field for hydrology solutoin.
Missing enums.

File:

• issm/trunk/src/m/classes/materials.m (modified) (4 diffs)

issm/trunk/src/m/classes/materials.m

@@ -8 +8 @@
                 rho_ice                    = modelfield('default',0,'marshall',true,'format','Double');
                 rho_water                  = modelfield('default',0,'marshall',true,'format','Double');
+                mu_water                   = modelfield('default',0,'marshall',true,'format','Double');
                 heatcapacity               = modelfield('default',0,'marshall',true,'format','Double');
                 latentheat                 = modelfield('default',0,'marshall',true,'format','Double');
@@ -50 +51 @@
                         obj.rho_water=1023;
 
+                        %water viscosity (N.s/m^2)
+                        obj.mu_water=0.001787;  
+
                         %ice heat capacity cp (J/kg/K)
                         obj.heatcapacity=2093;
@@ -78 +82 @@
                         checkfield(md,'materials.rho_ice','>',0);
                         checkfield(md,'materials.rho_water','>',0);
+                        checkfield(md,'materials.mu_water','>',0);
                         checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]);
                         checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
@@ -87 +92 @@
                         fielddisplay(obj,'rho_ice','ice density [kg/m^3]');
                         fielddisplay(obj,'rho_water','water density [kg/m^3]');
+                        fielddisplay(obj,'mu_water','water viscosity [N s/m^2]');
                         fielddisplay(obj,'heatcapacity','heat capacity [J/kg/K]');
                         fielddisplay(obj,'thermalconductivity','ice thermal conductivity [W/m/K]');