Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/solve/solve.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/solve/solve.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/solve/solve.py

@@ -7 +7 @@
 from waitonlock import waitonlock
 from loadresultsfromcluster import loadresultsfromcluster
-import MatlabFuncs as m
 
 def solve(md,solutionstring,*args):
@@ -76 +75 @@
         md.private.solution=solutionstring
         cluster=md.cluster 
-        if m.strcmpi(options.getfieldvalue('batch','no'),'yes'):
+        if options.getfieldvalue('batch','no')=='yes':
                 batch=1
         else:
@@ -82 +81 @@
 
         #check model consistency
-        if m.strcmpi(options.getfieldvalue('checkconsistency','yes'),'yes'):
+        if options.getfieldvalue('checkconsistency','yes')=='yes':
                 print "checking model consistency"
                 ismodelselfconsistent(md)
@@ -114 +113 @@
         marshall(md)                                           # bin file
         md.toolkits.ToolkitsFile(md.miscellaneous.name+'.toolkits')    # toolkits file
-        cluster.BuildQueueScript(md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof,md.qmu.isdakota)    # queue file
+        cluster.BuildQueueScript(md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof,md.qmu.isdakota,md.transient.isoceancoupling)    # queue file
 
         #Stop here if batch mode
-        if m.strcmpi(options.getfieldvalue('batch','no'),'yes'):
+        if options.getfieldvalue('batch','no')=='yes':
                 print 'batch mode requested: not launching job interactively'
                 print 'launch solution sequence on remote cluster by hand'