Changeset 7368

Timestamp:

02/07/11 10:01:08 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed serial

Location:

issm/trunk/src

Files:

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

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

@@ -66 +66 @@
         parameters->AddObject(new IntParam(ArtDiffEnum,iomodel->artdiff));
         parameters->AddObject(new IntParam(MeltingRateCorrectionApplyEnum,iomodel->melting_rate_correction_apply));
-        parameters->AddObject(new DoubleParam(GroundingLineMeltingRateEnum,iomodel->grounding_line_melting_rate));
+        parameters->AddObject(new DoubleParam(GroundingLineMeltingRateEnum,iomodel->gl_melting_rate));
         parameters->AddObject(new DoubleParam(PenaltyMeltingEnum,iomodel->penalty_melting));
         parameters->AddObject(new IntParam(MinThermalConstraintsEnum,iomodel->min_thermal_constraints));

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

@@ -207 +207 @@
         IoModelFetchData(&this->thermal_exchange_velocity,iomodel_handle,"thermal_exchange_velocity");
         IoModelFetchData(&this->melting_rate_correction_apply,iomodel_handle,"melting_rate_correction_apply");
-        IoModelFetchData(&this->grounding_line_melting_rate,iomodel_handle,"grounding_line_melting_rate");
+        IoModelFetchData(&this->gl_melting_rate,iomodel_handle,"gl_melting_rate");
         
         /*qmu: */
@@ -270 +270 @@
         this->pressure=NULL;
         this->temperature=NULL;
-        this->grounding_line_melting_rate=0;
+        this->gl_melting_rate=0;
         this->melting_rate=NULL;
         this->melting_rate_correction=NULL;

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

@@ -180 +180 @@
                 /*basal: */
                 double*  melting_rate;
-                double  grounding_line_melting_rate;
+                double   gl_melting_rate;
                 double*  melting_rate_correction;
                 int      melting_rate_correction_apply;

issm/trunk/src/m/model/marshall.m

@@ -89 +89 @@
 WriteData(fid,md.geothermalflux,'Mat','geothermalflux');
 WriteData(fid,md.accumulation_rate,'Mat','accumulation_rate');
-WriteData(fid,md.gl_melting_rate,'Mat','grounding_line_melting_rate');
+WriteData(fid,md.gl_melting_rate,'Scalar','gl_melting_rate');
 WriteData(fid,md.melting_rate,'Mat','melting_rate');
 WriteData(fid,md.melting_rate_correction_apply,'Integer','melting_rate_correction_apply');