Changeset 18724

Timestamp:

10/31/14 14:39:50 (10 years ago)

Author:

seroussi

Message:

CHG: added values and additional test consistency for PDD scheme new variables

Location:

issm/trunk-jpl

Files:

• src/m/classes/SMBpdd.m (modified) (2 diffs)
• test/NightlyRun/test236.m (modified) (1 diff)
• test/NightlyRun/test237.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/SMBpdd.m ¶

@@ -8 +8 @@
                 precipitation             = NaN;
                 monthlytemperatures       = NaN;
-                desfac                    = 0.5;
+                desfac                    = 0;
                 s0p                       = 0;
                 s0t                       = 0;
-                rlaps                     = 6.5;
-                rlapslgm                  = 6.5;                
-                Pfac                      = NaN;
-                Tdiff                     = NaN;
-                sealev                    = NaN;
+      rlaps                     = 0;
+      rlapslgm                  = 0;                
+      Pfac                      = NaN;
+      Tdiff                     = NaN;
+      sealev                    = NaN;
                 isdelta18o                = 0;
                 delta18o                  = NaN;
@@ -68 +68 @@
                                 md = checkfield(md,'fieldname','surfaceforcings.rlaps','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',1);
-                                md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1);
-                                md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1);
-                                md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1);
+            md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1,'size',[2,NaN]);
+            md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,NaN]);
+            md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,NaN]);
                                 if(obj.isdelta18o==0)
                                         md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','forcing',1,'NaN',1);

issm/trunk-jpl/test/NightlyRun/test236.m ¶

@@ -44 +44 @@
 md.timestepping.final_time=60;
 
+md.surfaceforcings.Pfac=[1;1];
+md.surfaceforcings.Tdiff=[1;1];
+md.surfaceforcings.sealev=[1;1];
+
 % 
 md.transient.requested_outputs={'default','SurfaceforcingsMonthlytemperatures'};

issm/trunk-jpl/test/NightlyRun/test237.m ¶

@@ -40 +40 @@
     md.surfaceforcings.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
+
+md.surfaceforcings.Pfac=[1;1];
+md.surfaceforcings.Tdiff=[1;1];
+md.surfaceforcings.sealev=[1;1];
 
 % time steps and resolution