Ignore:
Timestamp:
07/23/13 14:30:29 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: MacAyeal -> SSA

File:
1 edited

Legend:

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

    r15564 r15567  
    9494                data[numpy.nonzero(data==0)]=NoneApproximationEnum()
    9595                data[numpy.nonzero(data==1)]=SIAApproximationEnum()
    96                 data[numpy.nonzero(data==2)]=MacAyealApproximationEnum()
     96                data[numpy.nonzero(data==2)]=SSAApproximationEnum()
    9797                data[numpy.nonzero(data==3)]=HOApproximationEnum()
    9898                data[numpy.nonzero(data==4)]=FSApproximationEnum()
    99                 data[numpy.nonzero(data==5)]=MacAyealHOApproximationEnum()
    100                 data[numpy.nonzero(data==6)]=MacAyealFSApproximationEnum()
     99                data[numpy.nonzero(data==5)]=SSAHOApproximationEnum()
     100                data[numpy.nonzero(data==6)]=SSAFSApproximationEnum()
    101101                data[numpy.nonzero(data==7)]=HOFSApproximationEnum()
    102102                data[numpy.nonzero(data==8)]=L1L2ApproximationEnum()
     
    105105                data[numpy.nonzero(data==0)]=NoneApproximationEnum()
    106106                data[numpy.nonzero(data==1)]=SIAApproximationEnum()
    107                 data[numpy.nonzero(data==2)]=MacAyealApproximationEnum()
     107                data[numpy.nonzero(data==2)]=SSAApproximationEnum()
    108108                data[numpy.nonzero(data==3)]=HOApproximationEnum()
    109109                data[numpy.nonzero(data==4)]=FSApproximationEnum()
    110                 data[numpy.nonzero(data==5)]=MacAyealHOApproximationEnum()
    111                 data[numpy.nonzero(data==6)]=MacAyealFSApproximationEnum()
     110                data[numpy.nonzero(data==5)]=SSAHOApproximationEnum()
     111                data[numpy.nonzero(data==6)]=SSAFSApproximationEnum()
    112112                data[numpy.nonzero(data==7)]=HOFSApproximationEnum()
    113113                data[numpy.nonzero(data==8)]=L1L2ApproximationEnum()
Note: See TracChangeset for help on using the changeset viewer.