Changeset 13865

Timestamp:

11/01/12 11:08:31 (12 years ago)

Author:

jschierm

Message:

CHG: Enabling MeshProfileIntersection and more small changes.

Location:

issm/trunk-jpl/src/m/classes

Files:

• autodiff.py (modified) (3 diffs)
• dependent.py (modified) (5 diffs)
• independent.py (modified) (3 diffs)

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

@@ -1 +1 @@
 #module imports
+import numpy
 from dependent import *
 from independent import *
@@ -111 +112 @@
 
                         for indep in self.independents:
-                                if not isnan(indep.fos_forward_index):
+                                if not numpy.isnan(indep.fos_forward_index):
                                         index+=indep.fos_forward_index
                                         break
@@ -129 +130 @@
 
                         for dep in self.dependents:
-                                if not isnan(dep.fos_reverse_index):
+                                if not numpy.isnan(dep.fos_reverse_index):
                                         index+=dep.fos_reverse_index
                                         break

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

@@ -1 +1 @@
 import os.path
+import numpy
 from pairoptions import *
 from fielddisplay import *
@@ -5 +6 @@
 from EnumDefinitions import *
 from WriteData import *
-#from MeshProfileIntersection import *
+from MeshProfileIntersection import *
 
 class dependent(object):
@@ -44 +45 @@
                         #process the file and retrieve segments
                         mesh=options.getfieldvalue('mesh')
-                        raise RuntimeError("MeshProfileIntersection is not complete.")
                         self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp)
         # }}}
@@ -54 +54 @@
                 s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
 
-                if not isnan(self.fos_reverse_index):
+                if not numpy.isnan(self.fos_reverse_index):
                         s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC")
                 if self.exp:
@@ -75 +75 @@
                                 raise RuntimeError("dependent checkconsistency error: index for segments should be >=0")
 
-                if not isnan(self.fos_reverse_index):
+                if not numpy.isnan(self.fos_reverse_index):
                         if not strcmpi(driver,'fos_reverse'):
                                 raise TypeError("cannot declare a dependent with a fos_reverse_index when the driver is not fos_reverse!")

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

@@ +1 @@
+import numpy
 from pairoptions import *
 from fielddisplay import *
@@ -35 +36 @@
                 s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
                 s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
-                if not isnan(self.fos_forward_index):
+                if not numpy.isnan(self.fos_forward_index):
                         s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC")
                 if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))):
@@ -49 +50 @@
 
         def checkconsistency(self,md,i,solution,analyses,driver):    # {{{
-                if not isnan(self.fos_forward_index):
+                if not numpy.isnan(self.fos_forward_index):
                         if not strcmpi(driver,'fos_forward'):
                                 raise TypeError("cannot declare an independent with a fos_forward_index when the driver is not fos_forward!")