Changeset 8032 for issm/trunk

Timestamp:

04/22/11 16:14:31 (14 years ago)

Author:

seroussi

Message:

added type of rheology_law in display and ismodelselfconsistent

Location:

issm/trunk/src/m/model

Files:

• display/displaymaterials.m (modified) (1 diff)
• ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/m/model/display/displaymaterials.m

@@ -15 +15 @@
 fielddisplay(md,'rheology_B','flow law parameter [Pa/s^(1/n)]');
 fielddisplay(md,'rheology_n','Glen''s flow law exponent');
+fielddisplay(md,'rheology_law','law for the temperature dependance of the rheology: NoneEnum, PatersonEnum or Arrhenius');
 fielddisplay(md,'heatcapacity','heat capacity [J/kg/K]');
 fielddisplay(md,'thermalconductivity','ice thermal conductivity [W/m/K]');

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -176 +176 @@
         error(['model not consistent: model ' md.name ' hydrostatic_adjustment field should be AbsoluteEnum or IncrementalEnum']);
 end
+if ~ismember(md.rheology_law,[NoneEnum PatersonEnum ArrheniusEnum]),
+        error(['model not consistent: model ' md.name ' hydrostatic_adjustment field should be AbsoluteEnum or IncrementalEnum']);
+end
 %}}}
 %PARAMETEROUTPUT {{{1