Changeset 9515

Timestamp:

08/31/11 11:07:57 (14 years ago)

Author:

Mathieu Morlighem

Message:

rheology_law now processed in marshall

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• m/classes/model.m (modified) (3 diffs)
• m/model/display/displaymaterials.m (modified) (1 diff)
• m/model/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -65 +65 @@
         parameters->AddObject(iomodel->CopyConstantObject(IsprognosticEnum));
         parameters->AddObject(iomodel->CopyConstantObject(IsthermalEnum));
-
-        /*Some parameters need to be processed from iomodel*/
-        char* rheology_law = NULL;
-        iomodel->Constant(&rheology_law,RheologyLawEnum);
-        if      (strcmp(rheology_law,"none")==0)      parameters->AddObject(new IntParam(RheologyLawEnum,NoneEnum));
-        else if (strcmp(rheology_law,"paterson")==0)  parameters->AddObject(new IntParam(RheologyLawEnum,PatersonEnum));
-        else if (strcmp(rheology_law,"arrhenius")==0) parameters->AddObject(new IntParam(RheologyLawEnum,ArrheniusEnum));
-        else _error_("Rheology law %s not supported",rheology_law);
-        xfree((void**)&rheology_law);
+        parameters->AddObject(iomodel->CopyConstantObject(RheologyLawEnum));
 
         /*some parameters that did not come with the iomodel: */

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

@@ -123 +123 @@
                  rheology_B       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  rheology_n       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2);
-                 rheology_law     = modelfield('default','','marshall',true,'format','String');
+                 rheology_law     = modelfield('default','','marshall',true,'preprocess','StringToEnum','format','Integer');
 
                  %Geometrical parameters
@@ -478 +478 @@
                          end
                          if isnumeric(structmd.rheology_law),
-                                 if (structmd.rheology_law==272), md.rheology_law='none';      end
-                                 if (structmd.rheology_law==368), md.rheology_law='paterson';  end
-                                 if (structmd.rheology_law==369), md.rheology_law='arrhenius'; end
+                                 if (structmd.rheology_law==272), md.rheology_law='None';      end
+                                 if (structmd.rheology_law==368), md.rheology_law='Paterson';  end
+                                 if (structmd.rheology_law==369), md.rheology_law='Arrhenius'; end
                          end
 
@@ -722 +722 @@
                          %Rheology law: what is the temperature dependence of B with T
                          %available: none, paterson and arrhenius
-                         md.rheology_law='paterson';
+                         md.rheology_law='Paterson';
 
                          %i/o:

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: ''none'', ''paterson'' or ''arrhenius''');
+fielddisplay(md,'rheology_law','law for the temperature dependance of the rheology: ''None'', ''Paterson'' 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 @@
         message(['model not consistent: model ' md.name ' hydrostatic_adjustment field should be AbsoluteEnum or IncrementalEnum']);
 end
-if ~ismember({md.rheology_law},{'none' 'paterson' 'arrhenius'}),
+if ~ismember({md.rheology_law},{'None' 'Paterson' 'Arrhenius'}),
         message(['model not consistent: model ' md.name ' rheology_law field should be ''none'' ''paterson'' or ''arrhenius''']);
 end