Changeset 11509

Timestamp:

02/23/12 11:17:05 (13 years ago)

Author:

Mathieu Morlighem

Message:

moved AccumulationRate to Precepitation for PDD and removed ablation_rate never used

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToModelField.cpp (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• c/shared/Numerics/UnitConversion.cpp (modified) (1 diff)
• m/classes/model/model.m (modified) (1 diff)
• m/classes/surfaceforcings.m (modified) (2 diffs)
• m/enum/SurfaceforcingsAblationRateEnum.m (deleted)
• m/enum/SurfaceforcingsAccumulationRateEnum.m (deleted)
• m/enum/SurfaceforcingsPrecipitationEnum.m (added)
• m/model/extrude.m (modified) (1 diff)
• m/utils/BC/SetIceSheetBC.m (modified) (1 diff)
• m/utils/BC/SetIceShelfBC.m (modified) (1 diff)
• m/utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)

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

@@ -153 +153 @@
         SteadystateRequestedOutputsEnum,
         SurfaceEnum,
-        SurfaceforcingsAblationRateEnum,
-        SurfaceforcingsAccumulationRateEnum,
+        SurfaceforcingsPrecipitationEnum,
         SurfaceforcingsMassBalanceEnum,
         ThermalMaxiterEnum,

issm/trunk-jpl/src/c/EnumDefinitions/EnumToModelField.cpp

@@ -23 +23 @@
                 case InversionVyObsEnum : return "vy_obs";
                 case BasalforcingsMeltingRateEnum : return "basal_melting_rate";
-      case SurfaceforcingsAccumulationRateEnum : return "surface_accumulation_rate";
-                case SurfaceforcingsAblationRateEnum : return "surface_ablation_rate";
                 case SurfaceforcingsMassBalanceEnum : return "surface_mass_balance";
                 default : _error_("No model field is associated to enum %s",EnumToStringx(en));

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

@@ -157 +157 @@
                 case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs";
                 case SurfaceEnum : return "Surface";
-                case SurfaceforcingsAblationRateEnum : return "SurfaceforcingsAblationRate";
-                case SurfaceforcingsAccumulationRateEnum : return "SurfaceforcingsAccumulationRate";
+                case SurfaceforcingsPrecipitationEnum : return "SurfaceforcingsPrecipitation";
                 case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance";
                 case ThermalMaxiterEnum : return "ThermalMaxiter";

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

@@ -42 +42 @@
         iomodel->FetchDataToInput(elements,VyEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum);
         iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
         iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum);

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -66 +66 @@
                 iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
                 iomodel->FetchDataToInput(elements,VzEnum);
-                iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
-                iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum);
                 iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
                 iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp

@@ -48 +48 @@
         iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum);
         iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
         iomodel->FetchDataToInput(elements,VxEnum);

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp

@@ -53 +53 @@
         iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
         iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,PressureEnum);

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

@@ -44 +44 @@
         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
         iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum);
+        iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
         iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);

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

@@ -161 +161 @@
               else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
               else if (strcmp(name,"Surface")==0) return SurfaceEnum;
-              else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum;
-              else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum;
+              else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum;
               else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
               else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
@@ -260 +259 @@
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
+              else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
-              else if (strcmp(name,"Pengrid")==0) return PengridEnum;
+              if (strcmp(name,"Pengrid")==0) return PengridEnum;
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
               else if (strcmp(name,"Penta")==0) return PentaEnum;
@@ -383 +382 @@
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
-              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+              if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"Patch")==0) return PatchEnum;

issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

@@ -63 +63 @@
                 case BasalforcingsMeltingRateEnum:        scale=yts;break; //m/yr
                 case BasalforcingsMeltingRateCorrectionEnum: scale=yts;break; //m/yr
-                case SurfaceforcingsAccumulationRateEnum: scale=yts;break; //m/yr
-                case SurfaceforcingsAblationRateEnum:     scale=yts;break; //m/yr
+                case SurfaceforcingsPrecipitationEnum:     scale=yts;break; //m/yr
                 case SurfaceforcingsMassBalanceEnum:      scale=yts;break; //m/yr
                 case MisfitEnum:      scale=pow(yts,2);break; //(m/yr)^2

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

@@ -136 +136 @@
                          if isfield(structmd,'melting_rate'), md.basalforcings.melting_rate=structmd.melting_rate; end
                          if isfield(structmd,'accumulation'), md.surfaceforcings.mass_balance=structmd.accumulation; end
-                         if isfield(structmd,'accumulation_rate'), md.surfaceforcings.mass_balance=structmd.accumulation_rate; end
                          if isfield(structmd,'numberofgrids'), md.mesh.numberofvertices=structmd.numberofgrids; end
                          if isfield(structmd,'numberofgrids2d'), md.mesh.numberofvertices2d=structmd.numberofgrids2d; end

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

@@ -6 +6 @@
 classdef surfaceforcings
         properties (SetAccess=public) 
-                accumulation_rate = NaN;
-                ablation_rate     = NaN;
-                mass_balance      = NaN;
+                precipitation = NaN;
+                mass_balance  = NaN;
         end
         methods
@@ -41 +40 @@
                         disp(sprintf('   surface forcings parameters:'));
 
-                        fielddisplay(obj,'accumulation_rate','surface accumulation rate [m]');
-                        fielddisplay(obj,'ablation_rate','surface ablation rate [m]');
-                        fielddisplay(obj,'mass_balance','surface mass balance [m]');
+                        fielddisplay(obj,'precipitation','surface precipitation [m/yr ice eq]');
+                        fielddisplay(obj,'mass_balance','surface mass balance [m/yr ice eq]');
 
                 end % }}}
                 function marshall(obj,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','accumulation_rate','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','ablation_rate','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','mass_balance','format','DoubleMat','mattype',1);
                 end % }}}

issm/trunk-jpl/src/m/model/extrude.m

@@ -137 +137 @@
 md.inversion.vel_obs=project3d(md,'vector',md.inversion.vel_obs,'type','node');
 md.surfaceforcings.mass_balance=project3d(md,'vector',md.surfaceforcings.mass_balance,'type','node');
-md.surfaceforcings.accumulation_rate=project3d(md,'vector',md.surfaceforcings.accumulation_rate,'type','node');
-md.surfaceforcings.ablation_rate=project3d(md,'vector',md.surfaceforcings.ablation_rate,'type','node');
+md.surfaceforcings.precipitation=project3d(md,'vector',md.surfaceforcings.precipitation,'type','node');
 md.balancethickness.thickening_rate=project3d(md,'vector',md.balancethickness.thickening_rate,'type','node');
 

issm/trunk-jpl/src/m/utils/BC/SetIceSheetBC.m

@@ -34 +34 @@
 
 %Create zeros basal melting rate and surface mass balance if not specified
-if isnan(md.surfaceforcings.accumulation_rate),
-        md.surfaceforcings.accumulation_rate=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.accumulation_rate specified: values set as zero');
-end
-if isnan(md.surfaceforcings.ablation_rate),
-        md.surfaceforcings.ablation_rate=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.ablation_rate specified: values set as zero');
+if isnan(md.surfaceforcings.precipitation),
+        md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
+        disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
 if isnan(md.surfaceforcings.mass_balance),

issm/trunk-jpl/src/m/utils/BC/SetIceShelfBC.m

@@ -64 +64 @@
 md.diagnostic.icefront=pressureload;
 
-%Create zeros basalforcings.melting_rate, surfaceforcings.ablation_rate, surfaceforcings.accumulation_rate
-% and surfaceforcings.mass_balance if not specified
-if isnan(md.surfaceforcings.accumulation_rate),
-        md.surfaceforcings.accumulation_rate=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.accumulation_rate specified: values set as zero');
-end
-if isnan(md.surfaceforcings.ablation_rate),
-        md.surfaceforcings.ablation_rate=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.ablation_rate specified: values set as zero');
+%Create zeros basalforcings and surfaceforcings
+if isnan(md.surfaceforcings.precipitation),
+        md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
+        disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
 if isnan(md.surfaceforcings.mass_balance),

issm/trunk-jpl/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -75 +75 @@
 
 
-%Create zeros basalforcings.melting_rate, surfaceforcings.ablation_rate, surfaceforcings.accumulation_rate
-% and surfaceforcings.mass_balance if not specified
-if isnan(md.surfaceforcings.accumulation_rate),
-        md.surfaceforcings.accumulation_rate=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.accumulation_rate specified: values set as zero');
-end
-if isnan(md.surfaceforcings.ablation_rate),
-        md.surfaceforcings.ablation_rate=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.ablation_rate specified: values set as zero');
+%Create zeros basalforcings and surfaceforcings
+if isnan(md.surfaceforcings.precipitation),
+        md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
+        disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
 if isnan(md.surfaceforcings.mass_balance),