Changeset 9468

Timestamp:

08/26/11 14:29:04 (14 years ago)

Author:

Mathieu Morlighem

Message:

Some bug fix

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/objects/IoModel.cpp (modified) (1 diff)
• c/objects/IoModel.h (modified) (1 diff)
• m/model/ismodelselfconsistent.m (modified) (1 diff)

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

@@ -26 +26 @@
 
         /*Convert some parameters to Enums*/
-        iomodel->FetchData(&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));
+        iomodel->Constant(&rheology_law,RheologyLawEnum);
+        if      (strcmp(rheology_law,"none")==0)      parameters->SetParam(RheologyLawEnum,NoneEnum);
+        else if (strcmp(rheology_law,"paterson")==0)  parameters->SetParam(RheologyLawEnum,PatersonEnum);
+        else if (strcmp(rheology_law,"arrhenius")==0) parameters->SetParam(RheologyLawEnum,ArrheniusEnum);
         else _error_("rheology law %s not supported",rheology_law);
 

issm/trunk/src/c/objects/IoModel.cpp

@@ -108 +108 @@
 /*FUNCTION IoModel::Constant(double* poutput,int constant_enum){{{1*/
 void IoModel::Constant(double* poutput,int constant_enum){
+
+        _assert_(constant_enum>=0);
+        _assert_(this->constants);
+
+        this->constants->FindParam(poutput,constant_enum);
+}
+/*}}}*/
+/*FUNCTION IoModel::Constant(char** poutput,int constant_enum){{{1*/
+void IoModel::Constant(char** poutput,int constant_enum){
 
         _assert_(constant_enum>=0);

issm/trunk/src/c/objects/IoModel.h

@@ -43 +43 @@
                 void        Constant(int    *poutput,int constant_enum);
                 void        Constant(double *poutput,int constant_enum);
+                void        Constant(char  **poutput,int constant_enum);
                 Parameters *CopyConstants(void);
                 double     *Data(int dataenum);

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