Changeset 11192

Timestamp:

01/24/12 15:19:29 (13 years ago)

Author:

seroussi

Message:

added md.prognostic.min_thickness to have better control of minimum ice thickness

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/objects/Elements/Penta.cpp (modified) (2 diffs)
• c/objects/Elements/Tria.cpp (modified) (2 diffs)
• m/classes/prognostic.m (modified) (5 diffs)
• m/enum/PrognosticMinThicknessEnum.m (added)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -126 +126 @@
         MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script)
         PrognosticHydrostaticAdjustmentEnum,
+        PrognosticMinThicknessEnum,
         PrognosticPenaltyFactorEnum,
         PrognosticSpcthicknessEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -130 +130 @@
                 case MiscellaneousNameEnum : return "MiscellaneousName";
                 case PrognosticHydrostaticAdjustmentEnum : return "PrognosticHydrostaticAdjustment";
+                case PrognosticMinThicknessEnum : return "PrognosticMinThickness";
                 case PrognosticPenaltyFactorEnum : return "PrognosticPenaltyFactor";
                 case PrognosticSpcthicknessEnum : return "PrognosticSpcthickness";

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

@@ -51 +51 @@
         parameters->AddObject(iomodel->CopyConstantObject(PrognosticStabilizationEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DiagnosticPenaltyFactorEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(PrognosticMinThicknessEnum));
         parameters->AddObject(iomodel->CopyConstantObject(PrognosticPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -128 +128 @@
         else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
         else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
+        else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum;
         else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
         else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;

issm/trunk-jpl/src/c/objects/Elements/Penta.cpp

@@ -1785 +1785 @@
         int    i,hydroadjustment;
         int*   doflist = NULL;
-        double rho_ice,rho_water;
+        double rho_ice,rho_water,minthickness;
         double newthickness[numdof];
         double newbed[numdof];
@@ -1801 +1801 @@
 
         /*Use the dof list to index into the solution vector and extrude it */
+        this->parameters->FindParam(&minthickness,PrognosticMinThicknessEnum);
         for(i=0;i<numdof2d;i++){
                 newthickness[i]=solution[doflist[i]];
                 if(isnan(newthickness[i])) _error_("NaN found in solution vector");
                 /*Constrain thickness to be at least 1m*/
-                if(newthickness[i]<1) newthickness[i]=1;
+                if(newthickness[i]<minthickness) newthickness[i]=minthickness;
                 newthickness[i+numdof2d]=newthickness[i];
         }

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

@@ -1603 +1603 @@
         int       i,hydroadjustment;
         int*      doflist=NULL;
-        double    rho_ice,rho_water;
+        double    rho_ice,rho_water,minthickness;
         double    newthickness[numdof];
         double    newbed[numdof];
@@ -1615 +1615 @@
 
         /*Use the dof list to index into the solution vector: */
+        this->parameters->FindParam(&minthickness,PrognosticMinThicknessEnum);
         for(i=0;i<numdof;i++){
                 newthickness[i]=solution[doflist[i]];
                 if(isnan(newthickness[i])) _error_("NaN found in solution vector");
                 /*Constrain thickness to be at least 1m*/
-                if(newthickness[i]<1) newthickness[i]=1;
+                if(newthickness[i]<minthickness) newthickness[i]=minthickness;
         }
 

issm/trunk-jpl/src/m/classes/prognostic.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                  spcthickness           = NaN;
+                 min_thickness          = 0;
                  hydrostatic_adjustment = 0;
                  stabilization          = 0;
@@ -36 +37 @@
                         obj.penalty_factor=3;
 
+                        %Minimum ice thickness that can be used
+                        obj.min_thickness=1;
+
                         %Hydrostatic adjustment
                         obj.hydrostatic_adjustment='Absolute';
@@ -47 +51 @@
                         checkfield(md,'prognostic.hydrostatic_adjustment','values',{'Absolute' 'Incremental'});
                         checkfield(md,'prognostic.stabilization','values',[0 1 3]);
+                        checkfield(md,'prognostic.min_thickness','>',0);
 
                 end % }}}
@@ -52 +57 @@
                         disp(sprintf('   Prognostic solution parameters:'));
                         fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)');
+                        fielddisplay(obj,'min_thickness','minimum ice thickness allowed');
                         fielddisplay(obj,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ');
                         fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 3->discontinuous Galerkin');
@@ -62 +68 @@
                 function marshall(obj,fid) % {{{
                         WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');
                         WriteData(fid,'data',StringToEnum(obj.hydrostatic_adjustment),'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum);
                         WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');