Changeset 23785

Timestamp:

03/09/19 14:31:26 (6 years ago)

Author:

kruegern

Message:

BUG: fixed failing consistency checks

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test212.py (modified) (1 diff)
• test213.py (modified) (1 diff)
• test214.py (modified) (1 diff)
• test215.py (modified) (1 diff)
• test245.py (modified) (1 diff)
• test272.py (modified) (1 diff)
• test320.py (modified) (1 diff)
• test321.py (modified) (1 diff)
• test322.py (modified) (1 diff)
• test340.py (modified) (1 diff)
• test341.py (modified) (1 diff)
• test415.py (modified) (1 diff)
• test416.py (modified) (1 diff)
• test512.py (modified) (1 diff)
• test513.py (modified) (1 diff)

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=1.0e6*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=2.0e9*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.0e6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=2.0e9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[101]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
-md.inversion.gradient_scaling=1.0e7*np.ones((md.inversion.nsteps))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions)))
+md.inversion.gradient_scaling=1.0e7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))

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

@@ -22 +22 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=10**6*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=2.*10**9*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=10**6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=2.*10**9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[101]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
-md.inversion.gradient_scaling=10**7*np.ones((md.inversion.nsteps))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions)))
+md.inversion.gradient_scaling=10**7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))

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

@@ -22 +22 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=2.*1e9*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=2.*1e9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[101]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
-md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions)))
+md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))

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

@@ -20 +20 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=2e9*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=2e9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[101]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
-md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions)))
+md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))

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

@@ -19 +19 @@
 # initalize pdd fields
 md.smb.initialize(md)
-md.smb.s0p = md.geometry.surface
-md.smb.s0t = md.geometry.surface
+md.smb.s0p = md.geometry.surface.reshape(-1,1)
+md.smb.s0t = md.geometry.surface.reshape(-1,1)
 
 # 

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

@@ -24 +24 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['DamageDbar']
-md.inversion.min_parameters=10**-13*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=10**-13*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[101]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
-md.inversion.gradient_scaling=0.9*np.ones((md.inversion.nsteps))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions)))
+md.inversion.gradient_scaling=0.9*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps))

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[103,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps)
 md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps)

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[102,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps)
 md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps)

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[104,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps)
 md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps)

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

@@ -20 +20 @@
 md.inversion.iscontrol = 1
 md.inversion.control_parameters = ['FrictionCoefficient']
-md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices,))
-md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices,))
+md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.maxsteps = 2
 md.inversion.maxiter = 6

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

@@ -21 +21 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.maxsteps=2
 md.inversion.maxiter=6

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[103,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[102,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps))

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

@@ -19 +19 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[103,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=2.99*np.ones((md.inversion.nsteps))

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

@@ -18 +18 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['FrictionCoefficient']
-md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.nsteps=2
 md.inversion.cost_functions=[103,501]
 md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,2))
 md.inversion.cost_functions_coefficients[:,1]=2.*10**-7
-md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps))
+md.inversion.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps))