Changeset 17497


Ignore:
Timestamp:
03/20/14 07:43:05 (11 years ago)
Author:
cborstad
Message:

CHG: cleaning up import * statements, caught a few missing modules

Location:
issm/trunk-jpl/src/m
Files:
50 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/classes/SMB.py

    r17079 r17497  
     1import numpy
    12from fielddisplay import fielddisplay
    23from EnumDefinitions import *
    3 from checkfield import *
    4 from project3d import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
     6from project3d import project3d
    67
    78class SMB(object):

  • issm/trunk-jpl/src/m/classes/SMBgradients.py

    r17079 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from project3d import *
    5 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
     5from project3d import project3d
    66
    77class SMBgradients(object):

  • issm/trunk-jpl/src/m/classes/SMBpdd.py

    r17079 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from project3d import *
    5 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
     5from project3d import project3d
    66
    77class SMBpdd(object):

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

    r16764 r17497  
    11import numpy
    2 from dependent import *
    3 from independent import *
     2from dependent import dependent
     3from independent import independent
    44from fielddisplay import fielddisplay
    55from EnumDefinitions import *
    6 from checkfield import *
    7 from WriteData import *
     6from checkfield import checkfield
     7from WriteData import WriteData
    88
    99class autodiff(object):

  • issm/trunk-jpl/src/m/classes/balancethickness.py

    r16764 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class balancethickness(object):

  • issm/trunk-jpl/src/m/classes/basalforcings.py

    r17071 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55import numpy
    66

  • issm/trunk-jpl/src/m/classes/constants.py

    r16764 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class constants(object):

  • issm/trunk-jpl/src/m/classes/flaim.py

    r16764 r17497  
    33from fielddisplay import fielddisplay
    44from EnumDefinitions import *
    5 from checkfield import *
    6 from WriteData import *
     5from checkfield import checkfield
     6from WriteData import WriteData
    77
    88class flaim(object):

  • issm/trunk-jpl/src/m/classes/friction.py

    r17051 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class friction(object):

  • issm/trunk-jpl/src/m/classes/geometry.py

    r16764 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class geometry(object):

  • issm/trunk-jpl/src/m/classes/gia.py

    r16764 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class gia(object):

  • issm/trunk-jpl/src/m/classes/hydrologydc.py

    r17365 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class hydrologydc(object):

  • issm/trunk-jpl/src/m/classes/hydrologyshreve.py

    r17366 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class hydrologyshreve(object):

  • issm/trunk-jpl/src/m/classes/inversion.py

    r16764 r17497  
    44from EnumDefinitions import *
    55from StringToEnum import StringToEnum
    6 from checkfield import *
    7 from WriteData import *
     6from checkfield import checkfield
     7from WriteData import WriteData
    88
    99class inversion(object):

  • issm/trunk-jpl/src/m/classes/mask.py

    r17283 r17497  
    22from fielddisplay import fielddisplay
    33from EnumDefinitions import *
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66
    77class mask(object):

  • issm/trunk-jpl/src/m/classes/massfluxatgate.py

    r16396 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
    5 from MeshProfileIntersection import *
     3from checkfield import checkfield
     4from WriteData import WriteData
     5from MeshProfileIntersection import MeshProfileIntersection
    66import os
    77

  • issm/trunk-jpl/src/m/classes/masstransport.py

    r17364 r17497  
    22from EnumDefinitions import *
    33from StringToEnum import StringToEnum
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66
    77class masstransport(object):

  • issm/trunk-jpl/src/m/classes/matice.py

    r17456 r17497  
    22from EnumDefinitions import *
    33from StringToEnum import StringToEnum
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66
    77class matice(object):

  • issm/trunk-jpl/src/m/classes/miscellaneous.py

    r16764 r17497  
    22from fielddisplay import fielddisplay
    33from EnumDefinitions import *
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66
    77class miscellaneous(object):

  • issm/trunk-jpl/src/m/classes/organizer.py

    r16109 r17497  
    11import os.path
    22from collections import OrderedDict
    3 from pairoptions import *
    4 from loadvars import *
    5 from loadmodel import *
    6 from savevars import *
     3import pairoptions
     4from loadvars import loadvars
     5from loadmodel import loadmodel
     6from savevars import savevars
    77from model import model
    88from whichdb import whichdb
    … …  
    3434
    3535                #process options
    36                 options=pairoptions(*args)
     36                options=pairoptions.pairoptions(*args)
    3737
    3838                #Get prefix

  • issm/trunk-jpl/src/m/classes/outputdefinition.py

    r16764 r17497  
    22from EnumDefinitions import *
    33from StringToEnum import StringToEnum
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66import numpy as npy
    77

  • issm/trunk-jpl/src/m/classes/private.py

    r14640 r17497  
    22from fielddisplay import fielddisplay
    33from EnumDefinitions import *
    4 from checkfield import *
     4from checkfield import checkfield
    55
    66class private(object):

  • issm/trunk-jpl/src/m/classes/rifts.py

    r16766 r17497  
    22from fielddisplay import fielddisplay
    33from EnumDefinitions import *
    4 from checkfield import *
    5 from WriteData import *
    6 from isnans import *
     4from checkfield import checkfield
     5from WriteData import WriteData
     6from isnans import isnans
    77
    88class rifts(object):

  • issm/trunk-jpl/src/m/classes/settings.py

    r17100 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class settings(object):

  • issm/trunk-jpl/src/m/classes/steadystate.py

    r16764 r17497  
    22from fielddisplay import fielddisplay
    33from EnumDefinitions import *
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66
    77class steadystate(object):

  • issm/trunk-jpl/src/m/classes/thermal.py

    r17471 r17497  
    22from fielddisplay import fielddisplay
    33from EnumDefinitions import *
    4 from checkfield import *
    5 from WriteData import *
     4from checkfield import checkfield
     5from WriteData import WriteData
    66
    77class thermal(object):

  • issm/trunk-jpl/src/m/classes/timestepping.py

    r16764 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class timestepping(object):

  • issm/trunk-jpl/src/m/classes/transient.py

    r17114 r17497  
    11from fielddisplay import fielddisplay
    22from EnumDefinitions import *
    3 from checkfield import *
    4 from WriteData import *
     3from checkfield import checkfield
     4from WriteData import WriteData
    55
    66class transient(object):

  • issm/trunk-jpl/src/m/io/loadmodel.py

    r15494 r17497  
    1 import os.path
    2 from loadvars import *
     1from loadvars import loadvars
    32from whichdb import whichdb
    43

  • issm/trunk-jpl/src/m/mesh/ElementsFromEdge.py

    r14211 r17497  
    11import numpy
    2 from PythonFuncs import *
     2import PythonFuncs as p
    33
    44def ElementsFromEdge(elements,A,B):
    … …  
    1313
    1414        edgeelements=numpy.nonzero(\
    15                 logical_or_n(numpy.logical_and(elements[:,0]==A,elements[:,1]==B), \
     15                p.logical_or_n(numpy.logical_and(elements[:,0]==A,elements[:,1]==B), \
    1616                                         numpy.logical_and(elements[:,0]==A,elements[:,2]==B), \
    1717                                         numpy.logical_and(elements[:,1]==A,elements[:,2]==B), \

  • issm/trunk-jpl/src/m/mesh/meshconvert.py

    r16284 r17497  
    11import numpy
    22from collections import OrderedDict
    3 from BamgConvertMesh import *
    4 from bamgmesh import *
    5 from bamggeom import *
     3from BamgConvertMesh import BamgConvertMesh
     4from bamgmesh import bamgmesh
     5from bamggeom import bamggeom
    66
    77def meshconvert(md,*args):

  • issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py

    r14098 r17497  
    11import numpy
    2 from TriMeshProcessRifts import *
    3 from ContourToMesh import *
    4 from meshprocessoutsiderifts import *
    5 from GetAreas import *
     2from TriMeshProcessRifts import TriMeshProcessRifts
     3from ContourToMesh import ContourToMesh
     4from meshprocessoutsiderifts import meshprocessoutsiderifts
     5from GetAreas import GetAreas
    66
    77def meshprocessrifts(md,domainoutline):

  • issm/trunk-jpl/src/m/mesh/roundmesh.py

    r13808 r17497  
    22import os
    33from collections import OrderedDict
    4 from expwrite import *
    5 from triangle import *
    6 #from bamg import *
     4from expwrite import expwrite
     5from triangle import triangle
    76
    87def roundmesh(md,radius,resolution):

  • issm/trunk-jpl/src/m/mesh/squaremesh.py

    r14095 r17497  
    11import numpy
    2 from NodeConnectivity import *
    3 from ElementConnectivity import *
     2from NodeConnectivity import NodeConnectivity
     3from ElementConnectivity import ElementConnectivity
    44
    55def squaremesh(md,Lx,Ly,nx,ny):

  • issm/trunk-jpl/src/m/parameterization/contourenvelope.py

    r17488 r17497  
    44from NodeConnectivity import NodeConnectivity
    55from ElementConnectivity import ElementConnectivity
    6 from mesh import *
     6from mesh import mesh
    77import MatlabFuncs as m
    88

  • issm/trunk-jpl/src/m/parameterization/setflowequation.py

    r17496 r17497  
    11import numpy
    2 from model import *
     2from model import model
    33from pairoptions import pairoptions
    44import MatlabFuncs as m

  • issm/trunk-jpl/src/m/parameterization/setmask.py

    r17488 r17497  
    11import numpy
    22import os
    3 from model import *
     3from model import model
    44from FlagElements import FlagElements
    55import pairoptions

  • issm/trunk-jpl/src/m/plot/plot_manager.py

    r14252 r17497  
    55        print "could not import pylab, matplotlib has not been installed, no plotting capabilities enabled"
    66
    7 from pairoptions import *
    87from checkplotoptions import checkplotoptions
    98from plot_mesh import plot_mesh

  • issm/trunk-jpl/src/m/plot/plotmodel.py

    r17402 r17497  
    66        print "could not import pylab, matplotlib has not been installed, no plotting capabilities enabled"
    77
    8 #from pairoptions import *
    98from plotoptions import plotoptions
    109from plot_manager import plot_manager

  • issm/trunk-jpl/src/m/solve/marshall.py

    r16514 r17497  
    1 from WriteData import *
     1from WriteData import WriteData
    22from EnumDefinitions import *
    33

  • issm/trunk-jpl/src/m/solvers/asmoptions.py

    r15907 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def asmoptions(*args):
    34        #ASMOPTIONS - return ASM petsc options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','lu'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-30]];

  • issm/trunk-jpl/src/m/solvers/iluasmoptions.py

    r14610 r17497  
    11from collections import OrderedDict
    2 from pairoptions import *
     2import pairoptions
    33
    44def iluasmoptions(*args):
    … …  
    1111                         
    1212        #retrieve options provided in varargin
    13         options=pairoptions(*args)
     13        options=pairoptions.pairoptions(*args)
    1414        iluasm=OrderedDict()
    1515

  • issm/trunk-jpl/src/m/solvers/issmgslsolver.py

    r16191 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def issmgslsolver(*args):
    34        #ISSMSOLVE - return issm solver options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','issm'],['mat_type','dense'],['vec_type','seq'],['solver_type','gsl']];

  • issm/trunk-jpl/src/m/solvers/issmmumpssolver.py

    r16191 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def issmmumpssolver(*args):
    34        #ISSMSOLVE - return issm solver options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']];

  • issm/trunk-jpl/src/m/solvers/jacobiasmoptions.py

    r15907 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def jacobiasmoptions(*args):
    34        #ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','gmres'],['pc_type','asm'],['sub_pc_type','jacobi'],['pc_asm_overlap',3],['ksp_max_it',100],['ksp_rtol',1e-15]];

  • issm/trunk-jpl/src/m/solvers/jacobicgoptions.py

    r15907 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def jacobicgoptions(*args):
    34        #ASMOPTIONS - return Additive Shwartz Method with Jacobi preconditioner petsc options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['ksp_max_it',100],['ksp_rtol',1e-15]];

  • issm/trunk-jpl/src/m/solvers/matlaboptions.py

    r15907 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def matlaboptions(*args):
    34        #MATLABOPTIONS - return Matlab petsc options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','petsc'],['ksp_type','matlab']];

  • issm/trunk-jpl/src/m/solvers/mumpsoptions.py

    r15907 r17497  
    11from collections import OrderedDict
    2 from pairoptions import *
    3 from IssmConfig  import *
     2import pairoptions
     3from IssmConfig import IssmConfig
    44
    55def mumpsoptions(*args):
    … …  
    1212
    1313        #retrieve options provided in varargin
    14         options=pairoptions(*args)
     14        options=pairoptions.pairoptions(*args)
    1515        mumps=OrderedDict()
    1616

  • issm/trunk-jpl/src/m/solvers/soroptions.py

    r15907 r17497  
    1 from pairoptions import *
     1import pairoptions
     2
    23def soroptions(*args):
    34        #SOROPTIONS - return Relaxation Solver petsc options
    … …  
    78       
    89        #retrieve options provided in varargin
    9         arguments=pairoptions(*args)
     10        arguments=pairoptions.pairoptions(*args)
    1011       
    1112        options=[['toolkit','petsc'],['mat_type','aij'],['ksp_type','cg'],['pc_type','sor'],['pc_sor_omega',1.1],['pc_sor_its',2]];

  • issm/trunk-jpl/src/m/solvers/stokesoptions.py

    r15907 r17497  
    1 from pairoptions import *
    2 from IssmConfig  import *
     1import pairoptions
     2from IssmConfig import IssmConfig
     3
    34def stokesoptions(*args):
    45        #STOKESOPTIONS - return STOKES multi-physics solver petsc options
    … …  
    89       
    910        #retrieve options provided in varargin
    10         arguments=pairoptions(*args)
     11        arguments=pairoptions.pairoptions(*args)
    1112
    1213
Note: See TracChangeset for help on using the changeset viewer.