Changeset 23189 for issm/trunk/src/m/classes/qmu.py

Timestamp:

08/28/18 09:45:51 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23187

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/qmu.py (modified) (5 diffs)

issm/trunk/src/m/classes/qmu.py

@@ -1 +1 @@
 import numpy as np
+from MatlabFuncs import *
+from IssmConfig import *
 from project3d import project3d
 from collections import OrderedDict
@@ -5 +7 @@
 from checkfield import checkfield
 from WriteData import WriteData
+from helpers import *
 
 class qmu(object):
@@ -16 +19 @@
         def __init__(self): # {{{
                 self.isdakota                    = 0
-                self.variables                   = OrderedDict()
-                self.responses                   = OrderedDict()
+                self.variables                   = OrderedStruct()
+                self.responses                   = OrderedStruct()
                 self.method                      = OrderedDict()
                 self.params                      = OrderedDict()
@@ -117 +120 @@
                         return
 
-                if not md.qmu.params.evaluation_concurrency==1:
-                        md.checkmessage("concurrency should be set to 1 when running dakota in library mode")
-                if md.qmu.partition:
-                        if not np.size(md.qmu.partition)==md.mesh.numberofvertices:
-                                md.checkmessage("user supplied partition for qmu analysis should have size md.mesh.numberofvertices x 1")
-                        if not min(md.qmu.partition)==0:
+                version=IssmConfig('_DAKOTA_VERSION_')
+                version=float(version[0])
+
+                if version < 6:
+                        if not md.qmu.params.evaluation_concurrency==1:
+                                md.checkmessage("concurrency should be set to 1 when running dakota in library mode")
+                else:
+                        if not strcmpi(self.params.evaluation_scheduling,'master'):
+                                md.checkmessage('evaluation_scheduling in qmu.params should be set to "master"')
+
+                        if md.cluster.np <= 1:
+                                md.checkmessage('in parallel library mode, Dakota needs to run on at least 2 cpus, 1 cpu for the master, 1 cpu for the slave. Modify md.cluser.np accordingly.')
+                                        
+                        if self.params.processors_per_evaluation < 1:
+                                md.checkmessage('in parallel library mode, Dakota needs to run at least one slave on one cpu (md.qmu.params.processors_per_evaluation >=1)!')
+                                
+                        if np.mod(md.cluster.np-1,self.params.processors_per_evaluation):
+                                md.checkmessage('in parallel library mode, the requirement is for md.cluster.np = md.qmu.params.processors_per_evaluation * number_of_slaves, where number_of_slaves will automatically be determined by Dakota. Modify md.cluster.np accordingly')
+                
+                if np.size(md.qmu.partition) > 0:
+                        if np.size(md.qmu.partition)!=md.mesh.numberofvertices and np.size(md.qmu.partition) != md.mesh.numberofelements:
+                                md.checkmessage("user supplied partition for qmu analysis should have size (md.mesh.numberofvertices x 1) or (md.mesh.numberofelements x 1)")
+                        if not min(md.qmu.partition.flatten())==0:
                                 md.checkmessage("partition vector not indexed from 0 on")
-                        if max(md.qmu.partition)>=md.qmu.numberofpartitions:
+                        if max(md.qmu.partition.flatten())>=md.qmu.numberofpartitions:
                                 md.checkmessage("for qmu analysis, partitioning vector cannot go over npart, number of partition areas")
-
-                if md.cluster.name!='none':
-                        if not md.settings.waitonlock:
-                                md.checkmessage("waitonlock should be activated when running qmu in parallel mode!")
 
                 return md
@@ -143 +159 @@
                 WriteData(fid,prefix,'object',self,'fieldname','variabledescriptors','format','StringArray')
                 WriteData(fid,prefix,'object',self,'fieldname','responsedescriptors','format','StringArray')
-                if not self.mass_flux_segments:
+                if not isempty(self.mass_flux_segments):
                         WriteData(fid,prefix,'data',self.mass_flux_segments,'name','md.qmu.mass_flux_segments','format','MatArray');
                         flag=True;