Changeset 20002

Timestamp:

01/27/16 11:36:27 (9 years ago)

Author:

glperez

Message:

CHG: changes to Python AD code to fix remaining failures.

Location:

issm/trunk-jpl

Files:

• src/m/classes/autodiff.py (modified) (1 diff)
• src/m/classes/dependent.py (modified) (1 diff)
• src/m/classes/independent.py (modified) (1 diff)
• test/NightlyRun/test3015.py (modified) (1 diff)

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

@@ -109 +109 @@
 
                         for i,dep in enumerate(self.dependents):
-                                names[i]=dep.name
+                                names.append(dep.name)
                                 types[i]=dep.typetoscalar()
                                 indices[i]=dep.index

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

@@ -3 +3 @@
 from pairoptions import pairoptions
 from fielddisplay import fielddisplay
-import MatlabFuncs as m
+from MatlabFuncs import *
 from EnumDefinitions import *
 from MeshProfileIntersection import MeshProfileIntersection

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

@@ -2 +2 @@
 from pairoptions import pairoptions
 from fielddisplay import fielddisplay
-import MatlabFuncs as m
+from MatlabFuncs import *
 from EnumDefinitions import *
 

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

@@ -85 +85 @@
 dVdh_ad=md.results.MasstransportSolution.AutodiffJacobian
 
-print "dV/dh: analytical:  #16.16g\n       using adolc:  #16.16g\n" % (dVdh_an,dVdh_ad)
+print "dV/dh: analytical:  {0}\n       using adolc:  {1}\n".format(dVdh_an,dVdh_ad)
 
 #Fields and tolerances to track changes