Changeset 9520

Timestamp:

08/31/11 11:30:01 (14 years ago)

Author:

Mathieu Morlighem

Message:

-md.hydrostatic_adjustment is now a string

Location:

issm/trunk/src/m

Files:

• classes/model.m (modified) (2 diffs)
• model/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/m/classes/model.m

@@ -177 +177 @@
                  artificial_diffusivity = modelfield('default',0,'marshall',true,'format','Integer');
                  prognostic_DG          = modelfield('default',0,'marshall',true,'format','Integer');
-                 hydrostatic_adjustment = modelfield('default',0,'marshall',true,'format','Integer');
+                 hydrostatic_adjustment = modelfield('default',0,'marshall',true,'preprocess','StringToEnum','format','Integer');
                  isprognostic = modelfield('default',0,'marshall',true,'format','Boolean');
                  isdiagnostic = modelfield('default',0,'marshall',true,'format','Boolean');
@@ -632 +632 @@
 
                          %Hydrostatic adjustment
-                         md.hydrostatic_adjustment=AbsoluteEnum;
+                         md.hydrostatic_adjustment='Absolute';
                          %the artificial diffusivity is used in prognostic to avoid
                          %numerical wiggles of the solution.

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

@@ -175 +175 @@
         message(['model not consistent: model ' md.name ' time_adapt field should be 0 or 1']);
 end
-if ~ismember(md.hydrostatic_adjustment,[AbsoluteEnum IncrementalEnum]),
+if ~ismember(md.hydrostatic_adjustment,{'Absolute' 'Incremental']),
         message(['model not consistent: model ' md.name ' hydrostatic_adjustment field should be AbsoluteEnum or IncrementalEnum']);
 end