Changeset 14622

Timestamp:

04/17/13 10:51:03 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issue with name change from solver to toolkits

Location:

issm/trunk-jpl/src/m/solve

Files:

• loadresultsfromcluster.m (modified) (1 diff)
• loadresultsfromcluster.py (modified) (1 diff)
• marshall.m (modified) (1 diff)
• marshall.py (modified) (1 diff)
• solve.m (modified) (2 diffs)
• solve.py (modified) (2 diffs)

issm/trunk-jpl/src/m/solve/loadresultsfromcluster.m

@@ -51 +51 @@
         else
                 delete([md.miscellaneous.name '.bin']);
-                delete([md.miscellaneous.name '.petsc']);
+                delete([md.miscellaneous.name '.toolkits']);
                 if ~ispc(),
                         delete([md.miscellaneous.name '.queue']);

issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py

@@ -52 +52 @@
                 else:
                         os.remove(md.miscellaneous.name+'.bin')
-                        os.remove(md.miscellaneous.name+'.petsc')
+                        os.remove(md.miscellaneous.name+'.toolkits')
                         if not ispc():
                                 os.remove(md.miscellaneous.name+'.queue')

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

@@ -25 +25 @@
 
         %Some properties do not need to be marshalled
-        if ismember(field,{'results' 'radaroverlay' 'solver' 'cluster'  'flaim' 'private'}),
+        if ismember(field,{'results' 'radaroverlay' 'toolkits' 'cluster'  'flaim' 'private'}),
                 continue;
         end

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

@@ -31 +31 @@
 
                 #Some properties do not need to be marshalled
-                if field in ['results','radaroverlay','solver','cluster','flaim','private']:
+                if field in ['results','radaroverlay','toolkits','cluster','flaim','private']:
                         continue
 

issm/trunk-jpl/src/m/solve/solve.m

@@ -76 +76 @@
 %Write all input files
 marshall(md);                                          % bin file
-ToolkitsFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file
+ToolkitsFile(md.solver,[md.miscellaneous.name '.toolkits']); % toolkits file
 BuildQueueScript(cluster,md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof); % queue file
 
@@ -88 +88 @@
 %Launch job
 modelname = md.miscellaneous.name;
-filelist  = {[modelname '.bin '] [modelname '.petsc '] [modelname '.queue ']};
+filelist  = {[modelname '.bin '] [modelname '.toolkits '] [modelname '.queue ']};
 if md.qmu.isdakota,
         filelist{end+1} = [modelname '.qmu.in'];

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

@@ -80 +80 @@
         #Write all input files
         marshall(md)                                           # bin file
-        md.solver.ToolkitsFile(md.miscellaneous.name+'.petsc')    # petsc file
+        md.solver.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)    # queue file
 
@@ -96 +96 @@
         #Launch job
         modelname = md.miscellaneous.name
-        filelist  = [modelname+'.bin ',modelname+'.petsc ',modelname+'.queue ']
+        filelist  = [modelname+'.bin ',modelname+'.toolkits ',modelname+'.queue ']
         if md.qmu.isdakota:
                 filelist.append(modelname+'.qmu.in')