Changeset 9517

Timestamp:

08/31/11 11:11:51 (14 years ago)

Author:

Mathieu Morlighem

Message:

converted md.groundingline_migration to string

Location:

issm/trunk/src/m

Files:

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

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

@@ -283 +283 @@
 
                  %grounding line migration: 
-                 groundingline_migration = modelfield('default',0,'marshall',true,'format','Integer');
+                 groundingline_migration = modelfield('default','','marshall',true,'preprocess','StringToEnum','format','Integer');
 
                  %partitioner:
@@ -693 +693 @@
 
                          %grounding line migration: 
-                         md.groundingline_migration=NoneEnum;
+                         md.groundingline_migration='None';
 
                          %How often to save results, default is 1 so save every step

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

@@ -120 +120 @@
 end
 %GROUNDING LINE MIGRATION {{{1
-checkvalues(md,{'groundingline_migration'},[NoneEnum() AgressiveMigrationEnum() SoftMigrationEnum()]);
-if (md.groundingline_migration~=NoneEnum),
+checkvalues(md,{'groundingline_migration'},{'None' 'AgressiveMigration' 'SoftMigration']);
+if ~strcmp(md.groundingline_migration,'None'),
         if (md.dim==3 | strcmpi(md.cluster.name,'none')),
                 message(['model ' md.name ' requesting grounding line migration, but grounding line module only implemented for 2d models and parallel runs!']);

issm/trunk/src/m/model/tres.m

@@ -66 +66 @@
                         results2(count).time=md.results.TransientSolution(i).time;
                         results2(count).step=md.results.TransientSolution(i).step;
-                        if md.groundingline_migration~=NoneEnum,
+                        if ~strcmpi(md.groundingline_migration,'None'),
                                 results2(count).ElementOnIceShelf=md.results.TransientSolution(i).ElementOnIceShelf;
                         end