Changeset 12889
- Timestamp:
- 08/03/12 11:19:25 (13 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/model/MatlabFuncs.py
r12842 r12889 1 def oshostname(): 2 import socket 3 4 return socket.gethostname().lower().split('.')[0] 5 1 6 def strcmp(s1,s2): 2 7 -
issm/trunk-jpl/src/m/model/ismodelselfconsistent.py
r12827 r12889 1 from AnalysisConfiguration import * 2 1 3 def ismodelselfconsistent(md): 2 4 """ … … 8 10 9 11 #initialize consistency as true 10 md.private.isconsistent= true12 md.private.isconsistent=True 11 13 12 14 #Get solution and associated analyses … … 15 17 16 18 #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) 18 21 for field in fields: 19 22 … … 24 27 #Check that current field is an object 25 28 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) 27 30 28 31 #Check consistency of the object -
issm/trunk-jpl/src/m/model/marshall.py
r12827 r12889 21 21 22 22 #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') 24 24 25 25 #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 1 1 import os 2 from EnumDefinitions import * 2 3 3 4 def process_solve_options(options): … … 15 16 #solution_type: check on this option, error out otherwise 16 17 solution_type=options.getfieldvalue('solution_type') 17 if solution_type in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\18 if not solution_type in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\ 18 19 SteadystateSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,\ 19 20 BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum): … … 42 43 outoptions['keep']=options.getfieldvalue('keep','y') 43 44 outoptions['latsgn']=options.getfieldvalue('latsgn',0) 44 outoptions['cmap']=options.getfieldvalue('cmap', None)45 outoptions['cmap']=options.getfieldvalue('cmap',[]) 45 46 46 47 return outoptions -
issm/trunk-jpl/src/m/model/solve.py
r12845 r12889 2 2 import os 3 3 import shutil 4 from pairoptions import * 5 from process_solve_options import * 6 from EnumDefinitions import * 7 from ismodelselfconsistent import * 4 8 5 9 def solve(md,solutionenum,*args): -
issm/trunk-jpl/test/NightlyRun/test101.py
r12788 r12889 3 3 from setmask import * 4 4 from parameterize import * 5 from setflowequation import * 6 from EnumDefinitions import * 7 from solve import * 8 from MatlabFuncs import * 5 9 6 10 md=model() … … 8 12 md=setmask(md,'all','') 9 13 md=parameterize(md,'../Par/SquareShelfConstrained.py') 14 md=setflowequation(md,'macayeal','all') 15 md.cluster=generic('name',oshostname(),'np',3) 16 md.diagnostic.requested_outputs=StressTensorEnum 17 md=solve(md,DiagnosticSolutionEnum) 10 18 11 19 #Fields and tolerances to track changes
Note:
See TracChangeset
for help on using the changeset viewer.