Changeset 12889


Ignore:
Timestamp:
08/03/12 11:19:25 (13 years ago)
Author:
jschierm
Message:

Python fixes.

Location:
issm/trunk-jpl
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/model/MatlabFuncs.py

    r12842 r12889  
     1def oshostname():
     2        import socket
     3
     4        return socket.gethostname().lower().split('.')[0]
     5
    16def strcmp(s1,s2):
    27
  • issm/trunk-jpl/src/m/model/ismodelselfconsistent.py

    r12827 r12889  
     1from AnalysisConfiguration import *
     2
    13def ismodelselfconsistent(md):
    24        """
     
    810
    911        #initialize consistency as true
    10         md.private.isconsistent=true
     12        md.private.isconsistent=True
    1113
    1214        #Get solution and associated analyses
     
    1517
    1618        #Go through a model fields, check that it is a class, and call checkconsistency
    17         fields=vars('model')
     19#       fields=vars('model')
     20        fields=dir(md)
    1821        for field in fields:
    1922
     
    2427                #Check that current field is an object
    2528                if not hasattr(getattr(md,field),'checkconsistency'):
    26                         md=checkmessage(md,"field '%s' is not an object." % field)
     29                        md.checkmessage("field '%s' is not an object." % field)
    2730
    2831                #Check consistency of the object
  • issm/trunk-jpl/src/m/model/marshall.py

    r12827 r12889  
    2121
    2222        #First, write MaximumNumberOfEnum to make sure that the Enums are synchronized
    23         WriteData(fid,'enum',MaximumNumberOfEnums(),'data',true,'format','Boolean')
     23        WriteData(fid,'enum',MaximumNumberOfEnums(),'data',True,'format','Boolean')
    2424
    2525        #Go through all model fields: check that it is a class and call checkconsistency
  • issm/trunk-jpl/src/m/model/process_solve_options.py

    r12827 r12889  
    11import os
     2from EnumDefinitions import *
    23
    34def process_solve_options(options):
     
    1516        #solution_type: check on this option, error out otherwise
    1617        solution_type=options.getfieldvalue('solution_type')
    17         if solution_type in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\
     18        if not solution_type in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\
    1819                        SteadystateSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,\
    1920                        BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum):
     
    4243        outoptions['keep']=options.getfieldvalue('keep','y')
    4344        outoptions['latsgn']=options.getfieldvalue('latsgn',0)
    44         outoptions['cmap']=options.getfieldvalue('cmap',None)
     45        outoptions['cmap']=options.getfieldvalue('cmap',[])
    4546
    4647        return outoptions
  • issm/trunk-jpl/src/m/model/solve.py

    r12845 r12889  
    22import os
    33import shutil
     4from pairoptions import *
     5from process_solve_options import *
     6from EnumDefinitions import *
     7from ismodelselfconsistent import *
    48
    59def solve(md,solutionenum,*args):
  • issm/trunk-jpl/test/NightlyRun/test101.py

    r12788 r12889  
    33from setmask import *
    44from parameterize import *
     5from setflowequation import *
     6from EnumDefinitions import *
     7from solve import *
     8from MatlabFuncs import *
    59
    610md=model()
     
    812md=setmask(md,'all','')
    913md=parameterize(md,'../Par/SquareShelfConstrained.py')
     14md=setflowequation(md,'macayeal','all')
     15md.cluster=generic('name',oshostname(),'np',3)
     16md.diagnostic.requested_outputs=StressTensorEnum
     17md=solve(md,DiagnosticSolutionEnum)
    1018
    1119#Fields and tolerances to track changes
Note: See TracChangeset for help on using the changeset viewer.