Changeset 7356

Timestamp:

02/05/11 09:49:04 (14 years ago)

Author:

Eric.Larour

Message:

Added grounding line melting rate field

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (2 diffs)
• c/objects/IoModel.cpp (modified) (3 diffs)
• c/objects/IoModel.h (modified) (1 diff)
• m/classes/model.m (modified) (2 diffs)
• 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(PenaltyMeltingEnum,iomodel->penalty_melting));
         parameters->AddObject(new IntParam(MinThermalConstraintsEnum,iomodel->min_thermal_constraints));

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -4823 +4823 @@
         bool    elementonshelf = false;
 
-        double  shelf_melting=10;
+        /*melting rate at the grounding line: */
         double  yts;
         int     swap;
+        double  gl_melting_rate;
 
         /*recover parameters: */
         parameters->FindParam(&yts,YtsEnum);
+        parameters->FindParam(&gl_melting_rate,GroundingLineMeltingRateEnum);
 
         /*Recover info at the vertices: */
@@ -4874 +4876 @@
         if(swap){
                 Input* melting_rate_input     =inputs->GetInput(MeltingRateEnum);     _assert_(melting_rate_input);
-                melting_rate_input->GetValuesPtr(&values,NULL); for(i=0;i<3;i++)values[i]=shelf_melting/yts;
+                melting_rate_input->GetValuesPtr(&values,NULL); for(i=0;i<3;i++)values[i]=gl_melting_rate/yts;
         }
 

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

@@ -84 +84 @@
         xfree((void**)&this->melting_rate);
         xfree((void**)&this->melting_rate_correction);
+        xfree((void**)&this->grounding_line_melting_rate);
         xfree((void**)&this->accumulation_rate);
         xfree((void**)&this->dhdt);
@@ -207 +208 @@
         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");
         
         /*qmu: */
@@ -269 +271 @@
         this->pressure=NULL;
         this->temperature=NULL;
+        this->grounding_line_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*  melting_rate_correction;
                 int      melting_rate_correction_apply;

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

@@ -250 +250 @@
                  vel=NaN;
                  temperature=NaN; %temperature solution vector
+                 gl_melting_rate=NaN;
                  melting_rate=NaN;
                  melting_rate_correction=NaN;
@@ -483 +484 @@
 
                          %melting rate correction: 
+                         md.gl_melting_rate=0; 
                          md.melting_rate_correction_apply=0; %do not 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.melting_rate,'Mat','melting_rate');
 WriteData(fid,md.melting_rate_correction_apply,'Integer','melting_rate_correction_apply');