Changeset 7352

Timestamp:

02/04/11 21:21:00 (14 years ago)

Author:

Eric.Larour

Message:

Added melting_rate_corecction, deactivated by default. Only activatable in prognostic

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (2 diffs)
• c/objects/Elements/Tria.cpp (modified) (4 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

@@ -65 +65 @@
         parameters->AddObject(new DoubleParam(HeatCapacityEnum,iomodel->heatcapacity));
         parameters->AddObject(new IntParam(ArtDiffEnum,iomodel->artdiff));
+        parameters->AddObject(new IntParam(MeltingRateCorrectionApplyEnum,iomodel->melting_rate_correction_apply));
         parameters->AddObject(new DoubleParam(PenaltyMeltingEnum,iomodel->penalty_melting));
         parameters->AddObject(new IntParam(MinThermalConstraintsEnum,iomodel->min_thermal_constraints));

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -29 +29 @@
         IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
+        if(iomodel->melting_rate_correction_apply)IoModelFetchData(&iomodel->melting_rate_correction,NULL,NULL,iomodel_handle,"melting_rate_correction");
         IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
         IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
@@ -60 +61 @@
         xfree((void**)&iomodel->accumulation_rate);
         xfree((void**)&iomodel->melting_rate);
+        xfree((void**)&iomodel->melting_rate_correction);
         xfree((void**)&iomodel->vx);
         xfree((void**)&iomodel->vy);

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

@@ -2321 +2321 @@
         int        i,j,ig;
         double     Jdettria,dt;
-        double     accumulation_g,melting_g,thickness_g;
+        double     accumulation_g,melting_g,melting_correction_g,thickness_g;
         double     xyz_list[NUMVERTICES][3];
         double     L[NUMVERTICES];
@@ -2335 +2335 @@
         Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input);
         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
+        Input* melting_correction_input=inputs->GetInput(MeltingRateCorrectionEnum);           
         Input* thickness_input=inputs->GetInput(ThicknessEnum);           _assert_(thickness_input);
 
+        /*Initialize melting_correction_g to 0, do not forget!:*/
         /* Start  looping on the number of gaussian points: */
         gauss=new GaussTria(2);
@@ -2349 +2351 @@
                 melting_input->GetParameterValue(&melting_g,gauss);
                 thickness_input->GetParameterValue(&thickness_g,gauss);
-
-                for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(thickness_g+dt*(accumulation_g-melting_g))*L[i];
+                if(melting_correction_input) melting_correction_input->GetParameterValue(&melting_correction_g,gauss);
+
+                for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(thickness_g+dt*(accumulation_g-melting_g-melting_correction_g))*L[i];
         }
 
@@ -3678 +3681 @@
                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->melting_rate[tria_vertex_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(MeltingRateEnum,nodeinputs));
+        }
+        if (iomodel->melting_rate_correction) {
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->melting_rate_correction[tria_vertex_ids[i]-1]/iomodel->yts;
+                this->inputs->AddInput(new TriaVertexInput(MeltingRateCorrectionEnum,nodeinputs));
         }
         if (iomodel->accumulation_rate) {

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

@@ -83 +83 @@
         xfree((void**)&this->geothermalflux);
         xfree((void**)&this->melting_rate);
+        xfree((void**)&this->melting_rate_correction);
         xfree((void**)&this->accumulation_rate);
         xfree((void**)&this->dhdt);
@@ -205 +206 @@
         IoModelFetchData(&this->mixed_layer_capacity,iomodel_handle,"mixed_layer_capacity");
         IoModelFetchData(&this->thermal_exchange_velocity,iomodel_handle,"thermal_exchange_velocity");
+        IoModelFetchData(&this->melting_rate_correction_apply,iomodel_handle,"melting_rate_correction_apply");
         
         /*qmu: */
@@ -268 +270 @@
         this->temperature=NULL;
         this->melting_rate=NULL;
+        this->melting_rate_correction=NULL;
+        this->melting_rate_correction_apply=0;
         this->geothermalflux=NULL;
         this->elementonbed=NULL;

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

@@ -180 +180 @@
                 /*basal: */
                 double*  melting_rate;
+                double*  melting_rate_correction;
+                int      melting_rate_correction_apply;
                 double*  accumulation_rate;
                 double*  dhdt;

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

@@ -251 +251 @@
                  temperature=NaN; %temperature solution vector
                  melting_rate=NaN;
+                 melting_rate_correction=NaN;
+                 melting_rate_correction_apply=NaN;
                  pressure=NaN;
 
@@ -480 +482 @@
                          md.latentheat=3.34*10^5;
 
+                         %melting rate correction: 
+                         md.melting_rate_correction_apply=0; %do not apply
+
                          %ice thermal conductivity lamda (W/m/K)
                          md.thermalconductivity=2.4;

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

@@ -90 +90 @@
 WriteData(fid,md.accumulation_rate,'Mat','accumulation_rate');
 WriteData(fid,md.melting_rate,'Mat','melting_rate');
+WriteData(fid,md.melting_rate_correction_apply,'Integer','melting_rate_correction_apply');
+if md.melting_rate_correction_apply,
+        WriteData(fid,md.melting_rate_correction,'Mat','melting_rate_correction');
+end
 WriteData(fid,md.dhdt,'Mat','dhdt');