Changeset 14621

Timestamp:

04/17/13 10:37:49 (12 years ago)

Author:

Eric.Larour

Message:

CHG: renamed solver to toolkits

Location:

issm/trunk-jpl/src/m

Files:

• classes/model/model.m (modified) (4 diffs)
• classes/model/model.py (modified) (4 diffs)
• classes/solver.m (deleted)
• classes/solver.py (deleted)
• classes/toolkits.m (added)
• classes/toolkits.py (added)
• solve/solve.m (modified) (1 diff)
• solve/solve.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/model/model.m

@@ -25 +25 @@
                 verbose          = 0;
                 settings         = 0;
-                solver           = 0;
+                toolkits         = 0;
                 cluster          = 0;
 
@@ -817 +817 @@
                         if isfield(structmd,'gridonwater'), md.mask.vertexonwater=structmd.gridonwater; end
                         if isfield(structmd,'gridonboundary'), md.mesh.vertexonboundary=structmd.gridonboundary; end
-                        if isfield(structmd,'petscoptions') & ~isempty(structmd.petscoptions), md.solver=structmd.petscoptions; end
+                        if isfield(structmd,'petscoptions') & ~isempty(structmd.petscoptions), md.toolkits=structmd.petscoptions; end
                         if isfield(structmd,'g'), md.constants.g=structmd.g; end
                         if isfield(structmd,'yts'), md.constants.yts=structmd.yts; end
@@ -1087 +1087 @@
                         md.verbose          = verbose();
                         md.settings         = settings();
-                        md.solver           = solver();
+                        md.toolkits         = toolkits();
                         md.cluster          = generic();
                         md.balancethickness = balancethickness();
@@ -1122 +1122 @@
                         disp(sprintf('%19s: %-22s -- %s','verbose'         ,['[1x1 ' class(obj.verbose) ']'],'verbosity level in solve'));
                         disp(sprintf('%19s: %-22s -- %s','settings'        ,['[1x1 ' class(obj.settings) ']'],'settings properties'));
-                        disp(sprintf('%19s: %-22s -- %s','solver'          ,['[1x1 ' class(obj.solver) ']'],'PETSc options for each solution'));
+                        disp(sprintf('%19s: %-22s -- %s','toolkits'          ,['[1x1 ' class(obj.toolkits) ']'],'PETSc options for each solution'));
                         disp(sprintf('%19s: %-22s -- %s','cluster'         ,['[1x1 ' class(obj.cluster) ']'],'cluster parameters (number of cpus...)'));
                         disp(sprintf('%19s: %-22s -- %s','balancethickness',['[1x1 ' class(obj.balancethickness) ']'],'parameters for balancethickness solution'));

issm/trunk-jpl/src/m/classes/model/model.py

@@ -18 +18 @@
 from verbose import verbose
 from settings import settings
-from solver import solver
+from toolkits import toolkits
 from generic import generic
 from balancethickness import balancethickness
@@ -68 +68 @@
                 self.verbose          = verbose()
                 self.settings         = settings()
-                self.solver           = solver()
+                self.toolkits         = toolkits()
                 self.cluster          = generic()
 
@@ -108 +108 @@
                         'verbose',\
                         'settings',\
-                        'solver',\
+                        'toolkits',\
                         'cluster',\
                         'balancethickness',\
@@ -147 +147 @@
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("verbose","[%s,%s]" % ("1x1",obj.verbose.__class__.__name__),"verbosity level in solve"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("settings","[%s,%s]" % ("1x1",obj.settings.__class__.__name__),"settings properties"))
-                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("solver","[%s,%s]" % ("1x1",obj.solver.__class__.__name__),"PETSc options for each solution"))
+                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("toolkits","[%s,%s]" % ("1x1",obj.toolkits.__class__.__name__),"PETSc options for each solution"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("cluster","[%s,%s]" % ("1x1",obj.cluster.__class__.__name__),"cluster parameters (number of cpus...)"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("balancethickness","[%s,%s]" % ("1x1",obj.balancethickness.__class__.__name__),"parameters for balancethickness solution"))

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

@@ -76 +76 @@
 %Write all input files
 marshall(md);                                          % bin file
-PetscFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file
+ToolkitsFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file
 BuildQueueScript(cluster,md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof); % queue file
 

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

@@ -80 +80 @@
         #Write all input files
         marshall(md)                                           # bin file
-        md.solver.PetscFile(md.miscellaneous.name+'.petsc')    # petsc file
+        md.solver.ToolkitsFile(md.miscellaneous.name+'.petsc')    # petsc file
         cluster.BuildQueueScript(md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof)    # queue file