Changeset 13865
- Timestamp:
- 11/01/12 11:08:31 (12 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/autodiff.py
r13863 r13865 1 1 #module imports 2 import numpy 2 3 from dependent import * 3 4 from independent import * … … 111 112 112 113 for indep in self.independents: 113 if not isnan(indep.fos_forward_index):114 if not numpy.isnan(indep.fos_forward_index): 114 115 index+=indep.fos_forward_index 115 116 break … … 129 130 130 131 for dep in self.dependents: 131 if not isnan(dep.fos_reverse_index):132 if not numpy.isnan(dep.fos_reverse_index): 132 133 index+=dep.fos_reverse_index 133 134 break -
issm/trunk-jpl/src/m/classes/dependent.py
r13863 r13865 1 1 import os.path 2 import numpy 2 3 from pairoptions import * 3 4 from fielddisplay import * … … 5 6 from EnumDefinitions import * 6 7 from WriteData import * 7 #from MeshProfileIntersection import *8 from MeshProfileIntersection import * 8 9 9 10 class dependent(object): … … 44 45 #process the file and retrieve segments 45 46 mesh=options.getfieldvalue('mesh') 46 raise RuntimeError("MeshProfileIntersection is not complete.")47 47 self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp) 48 48 # }}} … … 54 54 s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')") 55 55 56 if not isnan(self.fos_reverse_index):56 if not numpy.isnan(self.fos_reverse_index): 57 57 s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC") 58 58 if self.exp: … … 75 75 raise RuntimeError("dependent checkconsistency error: index for segments should be >=0") 76 76 77 if not isnan(self.fos_reverse_index):77 if not numpy.isnan(self.fos_reverse_index): 78 78 if not strcmpi(driver,'fos_reverse'): 79 79 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
r13863 r13865 1 import numpy 1 2 from pairoptions import * 2 3 from fielddisplay import * … … 35 36 s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)") 36 37 s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')") 37 if not isnan(self.fos_forward_index):38 if not numpy.isnan(self.fos_forward_index): 38 39 s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC") 39 40 if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))): … … 49 50 50 51 def checkconsistency(self,md,i,solution,analyses,driver): # {{{ 51 if not isnan(self.fos_forward_index):52 if not numpy.isnan(self.fos_forward_index): 52 53 if not strcmpi(driver,'fos_forward'): 53 54 raise TypeError("cannot declare an independent with a fos_forward_index when the driver is not fos_forward!")
Note:
See TracChangeset
for help on using the changeset viewer.