Changeset 23784

Timestamp:

03/09/19 11:24:09 (6 years ago)

Author:

kruegern

Message:

BUG: fixed consistency check failures in several tests and changed consistencycheck.py to report size check failures correctly

Location:

issm/trunk-jpl

Files:

• src/m/classes/frictionwaterlayer.py (modified) (1 diff)
• src/m/consistency/checkfield.py (modified) (1 diff)
• test/NightlyRun/test319.py (modified) (1 diff)
• test/NightlyRun/test511.py (modified) (1 diff)
• test/NightlyRun/test611.py (modified) (1 diff)
• test/NightlyRun/test613.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/frictionwaterlayer.py

@@ -27 +27 @@
 
                 md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1)
-                md = checkfield(md,'fieldname','friction.f','size',[1,1],'NaN',1,'Inf',1)
+                md = checkfield(md,'fieldname','friction.f','size',[1],'NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])
                 md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements])

issm/trunk-jpl/src/m/consistency/checkfield.py

@@ -113 +113 @@
 
         else:
-            for i in range(np.size(fieldsize)):
-                if (not np.isnan(fieldsize[i])) and (np.shape(field)[i] != fieldsize[i]):
-                    md = md.checkmessage(options.getfieldvalue('message',"field {} dimension # {} should be of size {}".format(fieldname,i,fieldsize[i])))
+            if len(np.shape(field)) < len(fieldsize):
+                    md = md.checkmessage(options.getfieldvalue('message',"field {} has size {} but should be size {}".format(fieldname,np.shape(field),fieldsize)))
+            else:
+                for i in range(np.size(fieldsize)):
+                    if (not np.isnan(fieldsize[i])) and (np.shape(field)[i] != fieldsize[i]):
+                        md = md.checkmessage(options.getfieldvalue('message',"field {} dimension # {} should be of size {}".format(fieldname,i,fieldsize[i])))
 
     #Check numel

issm/trunk-jpl/test/NightlyRun/test319.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.3*np.ones(md.inversion.nsteps)

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

@@ -23 +23 @@
 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.**8*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.**8*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/test611.py

@@ -21 +21 @@
 md.inversion.control_parameters=['BalancethicknessThickeningRate']
 md.inversion.thickness_obs=md.geometry.thickness
-md.inversion.min_parameters=-50.*np.ones((md.mesh.numberofvertices))
-md.inversion.max_parameters=50.*np.ones((md.mesh.numberofvertices))
+md.inversion.min_parameters=-50.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
+md.inversion.max_parameters=50.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters)))
 md.inversion.cost_functions=[201]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
-md.inversion.gradient_scaling=10./md.constants.yts*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./md.constants.yts*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters)))
 md.inversion.maxiter_per_step=4*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps))

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

@@ -33 +33 @@
 md.inversion.max_parameters=np.vstack((+2000.*np.ones((md.mesh.numberofvertices)),+2000.*np.ones((md.mesh.numberofvertices)))).T
 md.inversion.cost_functions=[201]
-md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices))
+md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions)))
 md.inversion.maxiter_per_step=4*np.ones((md.inversion.nsteps))
 md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps))