Changeset 1916

Timestamp:

08/26/09 09:37:00 (16 years ago)

Author:

Mathieu Morlighem

Message:

removed steadystate field from model

Location:

issm/trunk/src

Files:

• c/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/ModelProcessorx/IoModel.cpp (modified) (2 diffs)
• c/ModelProcessorx/IoModel.h (modified) (1 diff)
• m/classes/@model/model.m (modified) (1 diff)
• m/classes/@model/setdefaultparameters.m (modified) (1 diff)
• m/classes/public/marshall.m (modified) (1 diff)

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

@@ -65 +65 @@
         parameters->AddObject(param);
 
-        //control: thermal static
-        count++;
-        param= new Param(count,"steadystate",INTEGER);
-        param->SetInteger(iomodel->steadystate);
-        parameters->AddObject(param);
-
         /*debug: */
         param= new Param(count,"debug",INTEGER);

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

@@ -105 +105 @@
         /*!control methods: */
         iomodel->control_type=NULL;
-        iomodel->steadystate=0;
 
         /*!solution parameters: */
@@ -317 +316 @@
         /*Get control parameters: */
         IoModelFetchData((void**)&iomodel->control_type,NULL,NULL,iomodel_handle,"control_type","String",NULL); 
-        IoModelFetchData((void**)&iomodel->steadystate,NULL,NULL,iomodel_handle,"steadystate","Integer",NULL); 
 
         /*!Get solution parameters: */

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

@@ -104 +104 @@
         /*control methods: */
         char*   control_type;
-        int     steadystate;
 
         /*solution parameters: */

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

@@ -185 +185 @@
         md.epsvel=0;
         md.meanvel=0;
-        md.steadystate=0;
 
         %Output parameters

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

@@ -189 +189 @@
 md.fit=0*ones(md.nsteps,1);
 
-%steadystate solution in control methods? 
-md.steadystate=0;
-
 %minimum velocity to avoid the misfit to be singular
 md.epsvel=eps;

issm/trunk/src/m/classes/public/marshall.m

@@ -101 +101 @@
 %Write solution parameters
 WriteData(fid,md.fit,'Mat','fit');
-WriteData(fid,md.steadystate,'Integer','steadystate');
 WriteData(fid,md.yts,'Scalar','yts');
 WriteData(fid,md.meanvel,'Scalar','meanvel');