Changeset 24584

Timestamp:

02/25/20 16:35:52 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: now assume that we have monthly temps and precips

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• Makefile (modified) (1 diff)
• test236.m (modified) (2 diffs)
• test236.py (modified) (2 diffs)
• test237.m (modified) (2 diffs)
• test237.py (modified) (2 diffs)
• test238.m (modified) (2 diffs)
• test238.py (modified) (2 diffs)
• test239.m (modified) (2 diffs)
• test239.py (modified) (2 diffs)
• test240.m (modified) (2 diffs)
• test240.py (modified) (2 diffs)
• test247.m (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/Makefile

@@ -1 +1 @@
 clean: 
-        rm -rf *.tar.gz *.bin *.errlog *.outlog  *.outbin *.petsc *.queue *.toolkits *.run valgrind.log* *.bat *.lock qmu*
+        rm -rf *.tar.gz *.bin *.errlog *.outlog  *.outbin *.petsc *.queue *.toolkits *.run valgrind.log* *.bat *.lock qmu* dakota_tabular.dat

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

@@ -28 +28 @@
     md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
     md.smb.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.;
-    % Time for the last line:
-    md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
-    md.smb.temperatures_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 
@@ -47 +44 @@
     md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
     md.smb.precipitations_lgm(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
-    % Time for the last line:
-    md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
-    md.smb.precipitations_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 

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

@@ -35 +35 @@
     md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth]
     md.smb.temperatures_lgm[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - 20.
-# Time for the last line:
-    md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
-    md.smb.temperatures_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 # creating initialization and spc temperatures initialization and spc
@@ -53 +50 @@
 for imonth in range(0, 12):
     md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
     md.smb.precipitations_lgm[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 # Interpolation factors

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

@@ -22 +22 @@
     md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
     md.smb.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.;
-    % Time for the last line:
-    md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
-    md.smb.temperatures_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 
@@ -40 +37 @@
     md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
     md.smb.precipitations_lgm(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
-    % Time for the last line:
-    md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
-    md.smb.precipitations_lgm(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 

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

@@ -33 +33 @@
     md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth]
     md.smb.temperatures_lgm[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - 20.
-# Time for the last line:
-    md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
-    md.smb.temperatures_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 # creating initialization and spc temperatures initialization and spc
@@ -51 +48 @@
 for imonth in range(0, 12):
     md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
     md.smb.precipitations_lgm[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 fsize = int(md.timestepping.final_time / md.timestepping.time_step) + 2

issm/trunk-jpl/test/NightlyRun/test238.m

@@ -22 +22 @@
 for imonth=0:11
     md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
-    % Time for the last line:
-    md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 
@@ -34 +32 @@
 for imonth=0:11
     md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
-    % Time for the last line:
-    md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 md.smb = initialize(md.smb,md);

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

@@ -29 +29 @@
 for imonth in range(0, 12):
     md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth]
-# Time for the last line:
-    md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 # creating initialization and spc temperatures initialization and spc
@@ -42 +40 @@
 for imonth in range(0, 12):
     md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.)
 
 # time steps and resolution

issm/trunk-jpl/test/NightlyRun/test239.m

@@ -22 +22 @@
 for imonth=0:11
     md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
-    % Time for the last line:
-    md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 
@@ -35 +33 @@
 for imonth=0:11
     md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
-    % Time for the last line:
-    md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 md.smb = initialize(md.smb,md);

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

@@ -26 +26 @@
 # Same temperature over the all region:
 tmonth = np.ones(12) * (238.15 + 20.)
-md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12))
+md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices, 12))
 for imonth in range(0, 12):
     md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth]
-# Time for the last line:
-    md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.)
 
 # creating initialization and spc temperatures initialization and spc
@@ -39 +37 @@
 
 # creating precipitation
-md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12))
+md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices, 12))
 for imonth in range(0, 12):
     md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 # time steps and resolution

issm/trunk-jpl/test/NightlyRun/test240.m

@@ -22 +22 @@
 for imonth=0:11
     md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
-    % Time for the last line:
-    md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 md.smb = initialize(md.smb,md);
@@ -35 +33 @@
 for imonth=0:11
     md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
-    % Time for the last line:
-    md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 

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

@@ -26 +26 @@
 # Same temperature over the all region:
 tmonth = np.ones(12) * (238.15 + 20.)
-md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12))
+md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices, 12))
 for imonth in range(0, 12):
     md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth]
-# Time for the last line:
-    md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.)
 
 # creating initialization and spc temperatures initialization and spc
@@ -39 +37 @@
 
 # creating precipitation
-md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12))
+md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices, 12))
 for imonth in range(0, 12):
     md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5
-    md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.)
 
 # time steps and resolution

issm/trunk-jpl/test/NightlyRun/test247.m

@@ -20 +20 @@
 for imonth=0:11
         md.smb.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1);
-        % Time for the last line:
-        md.smb.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end
 md.smb = initialize(md.smb,md);
@@ -33 +31 @@
 for imonth=0:11
         md.smb.precipitations_presentday(1:md.mesh.numberofvertices,imonth+1)=-0.4*10^(-6)*md.mesh.y+0.5;
-        % Time for the last line:
-        md.smb.precipitations_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12);
 end