Changeset 18000

Timestamp:

05/14/14 14:38:28 (11 years ago)

Author:

schlegel

Message:

NEW: add SMB components and interpolation option

Location:

issm/trunk-jpl/src/m

Files:

• classes/SMBcomponents.m (added)
• classes/SMBcomponents.py (added)
• classes/SMBmeltcomponents.m (added)
• classes/SMBmeltcomponents.py (added)
• classes/timestepping.m (modified) (5 diffs)
• classes/timestepping.py (modified) (5 diffs)
• enum/EnumDefinitions.py (modified) (1 diff)
• enum/SMBcomponentsEnum.m (added)
• enum/SMBmeltcomponentsEnum.m (added)
• enum/SurfaceforcingsAccumulationEnum.m (added)
• enum/SurfaceforcingsEvaporationEnum.m (added)
• enum/SurfaceforcingsMeltEnum.m (added)
• enum/SurfaceforcingsRefreezeEnum.m (added)
• enum/SurfaceforcingsRunoffEnum.m (added)

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

@@ -11 +11 @@
                 time_adapt      = 0;
                 cfl_coefficient = 0.;
+                interp_forcings = 1;
         end
         methods
@@ -46 +47 @@
                         obj.time_adapt=0;
                         obj.cfl_coefficient=0.5;
+
+                        %should we interpolate forcings between timesteps?
+                        obj.interp_forcings=1;
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
@@ -54 +58 @@
                         md = checkfield(md,'fieldname','timestepping.time_adapt','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1);
+                        md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0 1]);
                         if obj.final_time-obj.start_time<0,
                                 md = checkmessage(md,'timestepping.final_time should be larger than timestepping.start_time');
@@ -66 +71 @@
                         fielddisplay(obj,'time_adapt','use cfl condition to define time step ? (0 or 1) ');
                         fielddisplay(obj,'cfl_coefficient','coefficient applied to cfl condition');
+                        fielddisplay(obj,'interp_forcings','interpolate in time between requested forcing values ? (0 or 1)');
 
                 end % }}}
@@ -77 +83 @@
                         WriteData(fid,'object',obj,'fieldname','time_adapt','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','cfl_coefficient','format','Double');
+                        WriteData(fid,'object',obj,'fieldname','interp_forcings','format','Boolean');
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/timestepping.py

@@ -18 +18 @@
                 self.time_adapt      = 0
                 self.cfl_coefficient = 0.
+                self.interp_forcings = 1
                 
                 #set defaults
@@ -30 +31 @@
                 string="%s\n%s"%(string,fielddisplay(self,"time_adapt","use cfl condition to define time step ? (0 or 1) "))
                 string="%s\n%s"%(string,fielddisplay(self,"cfl_coefficient","coefficient applied to cfl condition"))
+                string="%s\n%s"%(string,fielddisplay(self,"interp_forcings","interpolate in time between requested forcing values ? (0 or 1)"))
                 return string
                 #}}}
@@ -43 +45 @@
                 self.time_adapt=0
                 self.cfl_coefficient=0.5
+                
+                #should we interpolate forcings between timesteps?
+                self.interp_forcings=1
 
                 return self
@@ -55 +60 @@
                 if self.final_time-self.start_time<0:
                         md.checkmessage("timestepping.final_time should be larger than timestepping.start_time")
+                md = checkfield(md,'fieldname','timestepping.interp_forcings','numel',[1],'values',[0,1])
 
                 return md
@@ -67 +73 @@
                 WriteData(fid,'object',self,'fieldname','time_adapt','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','cfl_coefficient','format','Double')
+                WriteData(fid,'object',self,'fieldname','interp_forcings','format','Boolean')
         # }}}

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -322 +322 @@
 def SurfaceforcingsBNegEnum(): return StringToEnum("SurfaceforcingsBNeg")[0]
 def SMBhenningEnum(): return StringToEnum("SMBhenning")[0]
+def SMBcomponentsEnum(): return StringToEnum("SMBcomponents")[0]
+def SurfaceforcingsAccumulationEnum(): return StringToEnum("SurfaceforcingsAccumulation")[0]
+def SurfaceforcingsEvaporationEnum(): return StringToEnum("SurfaceforcingsEvaporation")[0]
+def SurfaceforcingsRunoffEnum(): return StringToEnum("SurfaceforcingsRunoff")[0]
+def SMBmeltcomponentsEnum(): return StringToEnum("SMBmeltcomponents")[0]
+def SurfaceforcingsMeltEnum(): return StringToEnum("SurfaceforcingsMelt")[0]
+def SurfaceforcingsRefreezeEnum(): return StringToEnum("SurfaceforcingsRefreeze")[0]
 def SurfaceforcingsIspddEnum(): return StringToEnum("SurfaceforcingsIspdd")[0]
 def SurfaceforcingsIssmbgradientsEnum(): return StringToEnum("SurfaceforcingsIssmbgradients")[0]