Changeset 12297

Timestamp:

05/29/12 10:12:16 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added surfaceforcings.monthlytemperatures field for PDD module

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (4 diffs)
• m/classes/surfaceforcings.m (modified) (5 diffs)
• m/enum/EnumToModelField.m (deleted)

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

@@ -159 +159 @@
         SurfaceforcingsPrecipitationEnum,
         SurfaceforcingsMassBalanceEnum,
+        SurfaceforcingsIspddEnum,
+        SurfaceforcingsMonthlytemperatures,
         ThermalMaxiterEnum,
         ThermalPenaltyFactorEnum,
@@ -484 +486 @@
         PatersonEnum,
         ArrheniusEnum,
-        SurfaceforcingsIspddEnum,
         /*}}}*/
         MaximumNumberOfEnums

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

@@ -163 +163 @@
                 case SurfaceforcingsPrecipitationEnum : return "SurfaceforcingsPrecipitation";
                 case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance";
+                case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd";
                 case ThermalMaxiterEnum : return "ThermalMaxiter";
                 case ThermalPenaltyFactorEnum : return "ThermalPenaltyFactor";
@@ -452 +453 @@
                 case PatersonEnum : return "Paterson";
                 case ArrheniusEnum : return "Arrhenius";
-                case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd";
                 default : return "unknown";
 

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

@@ -71 +71 @@
           iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum);
           iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
+          iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperatures);
         }
         else{

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

@@ -167 +167 @@
               else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum;
               else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
+              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
               else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
               else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
@@ -259 +260 @@
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
               else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
-              else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Matice")==0) return MaticeEnum;
+              if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
+              else if (strcmp(name,"Matice")==0) return MaticeEnum;
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"Node")==0) return NodeEnum;
@@ -382 +383 @@
               else if (strcmp(name,"P0")==0) return P0Enum;
               else if (strcmp(name,"P1")==0) return P1Enum;
-              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
+              if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
@@ -462 +463 @@
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
-              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
          else stage=5;
    }

issm/trunk/src/m/classes/surfaceforcings.m

@@ -8 +8 @@
                 precipitation = NaN;
                 mass_balance  = NaN;
-                ispdd = false;
+                ispdd = 0;
+                monthlytemperatures = NaN;
         end
         methods
@@ -22 +23 @@
                   
                   %pdd method not used in default mode
-                  obj.ispdd=false;
+                  obj.ispdd=0;
 
                 end % }}}
@@ -28 +29 @@
 
                         if ismember(PrognosticAnalysisEnum,analyses),
-                                checkfield(md,'surfaceforcings.mass_balance','forcing',1,'NaN',1);
+                                checkfield(md,'surfaceforcings.ispdd','numel',1,'values',[0 1]);
+                                if(obj.ispdd)
+                                        checkfield(md,'surfaceforcings.monthlytemperatures','forcing',1,'NaN',1);
+                                else
+                                        checkfield(md,'surfaceforcings.mass_balance','forcing',1,'NaN',1);
+                                end
                         end
                         if ismember(BalancethicknessAnalysisEnum,analyses),
                                 checkfield(md,'surfaceforcings.mass_balance','size',[md.mesh.numberofvertices 1],'NaN',1);
-                        end
-                        if (ismember(PrognosticAnalysisEnum,analyses) & md.surfaceforcings.ispdd),
-                          checkfield(md,'surfaceforcings.ispdd','numel',1,'values',[0 1]);
                         end
                 end % }}}
@@ -43 +46 @@
                         fielddisplay(obj,'mass_balance','surface mass balance [m/yr ice eq]');
                         fielddisplay(obj,'ispdd','is pdd activated (0 or 1, default is 0)');
+                        fielddisplay(obj,'monthlytemperatures','monthly surface temperatures required if pdd is activated');
 
                 end % }}}
@@ -49 +53 @@
                         WriteData(fid,'object',obj,'fieldname','mass_balance','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','ispdd','format','Boolean');
+                        if obj.ispdd,
+                                WriteData(fid,'object',obj,'fieldname','monthlytemperatures','format','DoubleMat','mattype',1);
+                        end
 
                 end % }}}