Changeset 26744 for issm/trunk/test/NightlyRun/test243.m

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test243.m (modified) (4 diffs)

issm/trunk/test/NightlyRun/test243.m

@@ -30 +30 @@
 md.smb.requested_outputs={'SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC',...
         'SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF',...
-        'SmbMeanULW','SmbNetLW','SmbNetSW','SmbAccumulatedMassBalance','SmbAccumulatedRunoff',...
-        'SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation'};
+        'SmbMeanULW','SmbNetLW','SmbNetSW','SmbWAdd','SmbRunoff','SmbRefreeze','SmbMelt',...
+        'SmbEC','SmbPrecipitation','SmbRain','SmbAccumulatedMassBalance','SmbAccumulatedRunoff',...
+        'SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain',...
+        'SmbAccumulatedPrecipitation','SmbAccumulatedRefreeze'};
 
 %only run smb core: 
@@ -42 +44 @@
 md.timestepping.final_time=1966;
 md.timestepping.time_step=1/365.0;
-md.timestepping.interp_forcings=0;
+md.timestepping.interp_forcing=0;
 
 %Run transient
@@ -53 +55 @@
 
 %Fields and tolerances to track changes
-field_names      ={'Layers','SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF','SmbMeanULW','SmbNetLW','SmbNetSW','SmbAccumulatedMassBalance','SmbAccumulatedRunoff','SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation'};
-field_tolerances ={1e-12,2e-12,1e-12,1e-11,1e-11,2e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,2e-11,2e-11,1e-11,9e-10,2e-11,1e-11,9e-10,2e-11,1e-11,1e-11,1e-11,1e-11,1e-11,};
+field_names      ={'Layers','SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF','SmbMeanULW','SmbNetLW','SmbNetSW','SmbAccumulatedMassBalance','SmbAccumulatedRunoff','SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain','SmbAccumulatedRefreeze','SmbRunoff','SmbMelt','SmbEC','SmbPrecipitation','SmbRain','SmbRefreeze','SmbWAdd'};
+field_tolerances ={1e-12,2e-12,1e-12,2e-11,1e-11,2e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,2e-11,2e-11,1e-11,9e-10,2e-11,1e-11,9e-10,2e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11};
 
 field_values={...
@@ -79 +81 @@
         (md.results.TransientSolution(end).SmbAccumulatedMelt(1)),...
         (md.results.TransientSolution(end).SmbAccumulatedEC(1)),...
-        (md.results.TransientSolution(end).SmbAccumulatedPrecipitation(1))
+        (md.results.TransientSolution(end).SmbAccumulatedPrecipitation(1)),...
+        (md.results.TransientSolution(end).SmbAccumulatedRain(1)),...
+        (md.results.TransientSolution(end).SmbAccumulatedRefreeze(1)),...
+        (md.results.TransientSolution(200).SmbRunoff(1)),...
+        (md.results.TransientSolution(200).SmbMelt(1)),...
+        (md.results.TransientSolution(200).SmbEC(1)),...
+        (md.results.TransientSolution(200).SmbPrecipitation(1)),...
+        (md.results.TransientSolution(200).SmbRain(1)),...
+        (md.results.TransientSolution(200).SmbRefreeze(1)),...
+        (md.results.TransientSolution(200).SmbWAdd(1))...
 };