Changeset 19277

Timestamp:

04/09/15 11:04:24 (10 years ago)

Author:

schlegel

Message:

CHG: update pdd test to catch yts conversion

File:

• issm/trunk-jpl/test/NightlyRun/test237.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test237.py

@@ -20 +20 @@
 md.surfaceforcings.ismungsm=1
 
-
-# # Add temperature, precipitation and delta18o needed to measure the surface mass balance
-# # creating delta18o
-# delta18o=numpy.loadtxt('../Data/delta18o.data')
-# md.surfaceforcings.delta18o=delta18o
-# # creating delta18oSurface
-# md.surfaceforcings.delta18o_surface = numpy.zeros((2,numpy.size(delta18o,axis=1)))
-# md.surfaceforcings.delta18o_surface[1,:] = delta18o[1,:]
+# time steps and resolution
+md.timestepping.time_step=20.
+md.settings.output_frequency=1
+md.timestepping.final_time=60.
 
 # creating Present day and lgm temperatures
@@ -58 +54 @@
     md.surfaceforcings.precipitations_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.)
 
-# Interpolation factors
-md.surfaceforcings.Pfac=0.5*numpy.ones((2,md.timestepping.final_time))
-md.surfaceforcings.Tdiff=0.5*numpy.ones((2,md.timestepping.final_time))
-md.surfaceforcings.sealev=0.5*numpy.ones((2,md.timestepping.final_time))
-# Year of each data point
-md.surfaceforcings.Pfac[1,1:md.timestepping.final_time]=numpy.arange(1.,md.timestepping.final_time)
-md.surfaceforcings.Tdiff[1,1:md.timestepping.final_time]=numpy.arange(1.,md.timestepping.final_time)
-md.surfaceforcings.sealev[1,1:md.timestepping.final_time]=numpy.arange(1.,md.timestepping.final_time)
-
-# time steps and resolution
-md.timestepping.time_step=20.
-md.settings.output_frequency=1
-md.timestepping.final_time=60.
+for iint in xrange(0,(md.timestepping.final_time/md.timestepping.time_step)+2)
+    # Interpolation factors
+         md.surfaceforcings.Pfac[1,iint]=0.15*(iint+1);
+         md.surfaceforcings.Tdiff[1,iint]=0.15*(iint+1);
+         md.surfaceforcings.sealev[1,iint]=0.15*(iint+1);
+         # Year of each data point
+         md.surfaceforcings.Pfac[2,iint]=(iint)*20;
+         md.surfaceforcings.Tdiff[2,iint]=(iint)*20;
+         md.surfaceforcings.sealev[2,iint]=(iint)*20;
 
 #