Changeset 23751

Timestamp:

02/21/19 11:22:48 (6 years ago)

Author:

jdquinn

Message:

CHG: Temporary fix for ADOL-C ampioff (Nathan will refactor tomorrow)

Location:

issm/trunk-jpl

Files:

• src/m/consistency/checkfield.py (modified) (1 diff)
• src/py3/consistency/checkfield.py (modified) (1 diff)
• test/NightlyRun/test3019.py (modified) (1 diff)

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

@@ -201 +201 @@
                                 else:
                                         maxval=np.nanmax(field[0])
+                        elif hasattr(field, 'fov_forward_indices'):
+                                maxval=field.fov_forward_indices[0]
                         if maxval>upperbound:
                                 md = md.checkmessage(options.getfieldvalue('message',"field '%s' should have values below %d" % (fieldname,upperbound)))

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

@@ -201 +201 @@
                                 else:
                                         maxval=np.nanmax(field[0])
+                        elif hasattr(field, 'fov_forward_indices'):
+                                maxval=field.fov_forward_indices[0]
                         if maxval>upperbound:
                                 md = md.checkmessage(options.getfieldvalue('message',"field '%s' should have values below %d" % (fieldname,upperbound)))

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

@@ -34 +34 @@
 
 #now run vectorial forward mode
-md.autodiff.independents=[independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices,'fov_forward_indices',np.arange(1,md.mesh.numberofvertices))]
+md.autodiff.independents=[independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices,'fov_forward_indices',np.arange(1,md.mesh.numberofvertices+1))]
 md.autodiff.dependents=[dependent('name','MaxVel','type','scalar')]
 md.autodiff.driver='fov_forward'