Changeset 13865


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/classes/autodiff.py

    r13863 r13865  
    11#module imports
     2import numpy
    23from dependent import *
    34from independent import *
     
    111112
    112113                        for indep in self.independents:
    113                                 if not isnan(indep.fos_forward_index):
     114                                if not numpy.isnan(indep.fos_forward_index):
    114115                                        index+=indep.fos_forward_index
    115116                                        break
     
    129130
    130131                        for dep in self.dependents:
    131                                 if not isnan(dep.fos_reverse_index):
     132                                if not numpy.isnan(dep.fos_reverse_index):
    132133                                        index+=dep.fos_reverse_index
    133134                                        break
  • issm/trunk-jpl/src/m/classes/dependent.py

    r13863 r13865  
    11import os.path
     2import numpy
    23from pairoptions import *
    34from fielddisplay import *
     
    56from EnumDefinitions import *
    67from WriteData import *
    7 #from MeshProfileIntersection import *
     8from MeshProfileIntersection import *
    89
    910class dependent(object):
     
    4445                        #process the file and retrieve segments
    4546                        mesh=options.getfieldvalue('mesh')
    46                         raise RuntimeError("MeshProfileIntersection is not complete.")
    4747                        self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp)
    4848        # }}}
     
    5454                s+="%s\n" % fielddisplay(self,'type',"type of variable ('vertex' or 'scalar')")
    5555
    56                 if not isnan(self.fos_reverse_index):
     56                if not numpy.isnan(self.fos_reverse_index):
    5757                        s+="%s\n" % fielddisplay(self,'fos_reverse_index',"index for fos_reverse driver of ADOLC")
    5858                if self.exp:
     
    7575                                raise RuntimeError("dependent checkconsistency error: index for segments should be >=0")
    7676
    77                 if not isnan(self.fos_reverse_index):
     77                if not numpy.isnan(self.fos_reverse_index):
    7878                        if not strcmpi(driver,'fos_reverse'):
    7979                                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  
     1import numpy
    12from pairoptions import *
    23from fielddisplay import *
     
    3536                s+="%s\n" % fielddisplay(self,'name',"variable name (must match corresponding Enum)")
    3637                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):
    3839                        s+="%s\n" % fielddisplay(self,'fos_forward_index',"index for fos_foward driver of ADOLC")
    3940                if numpy.any(numpy.logical_not(numpy.isnan(self.fov_forward_indices))):
     
    4950
    5051        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):
    5253                        if not strcmpi(driver,'fos_forward'):
    5354                                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.