Merge remote-tracking branch 'origin/fix-marc-ddm' into development

Author: MarDiehl

PRIVATE

@@ -56,6 +56,7 @@ def tools_path(self):
     def submit_job(self, model: str, job: str,
                    compile: bool = False,
                    optimization: Literal['', 'l', 'h'] = '',
+                   domains: int = 1,
                    env = None):
         """
         Assemble command line arguments and call Marc executable.
@@ -72,6 +73,9 @@ def submit_job(self, model: str, job: str,
         optimization : {'', 'l', 'h'}, optional
             Optimization level '': -O0, 'l': -O1, or 'h': -O3.
             Defaults to ''.
+        domains: int, optional
+            Number of domains.
+            Defaults to 1.
         env : dict, optional
             Environment for execution.
 
@@ -83,7 +87,10 @@ def submit_job(self, model: str, job: str,
         # Define options [see Marc Installation and Operation Guide, pp 23]
         script = f'run_damask_{optimization}mp'
 
-        cmd = f'{self.tools_path/script} -jid {model}_{job} -nprocd 1 -autorst 0 -ci n -cr n -dcoup 0 -b no -v no ' \
+        cmd = f'{self.tools_path/script} -jid {model}_{job} '\
+            + ('-nprocd 1 ' if (domains == 1) else\
+               f'-nprocd {domains} -nsolver {domains} -nthread_elem {domains} -nthread_solver {domains} ')\
+            + '-autorst 0 -ci n -cr n -dcoup 0 -b no -v no '\
             + (f'-u {usersub} -save y' if compile else f'-prog {usersub.with_suffix("")}')
         print(cmd)
 

python/damask/solver/_marc.py

@@ -438,9 +438,10 @@ subroutine inputRead_NelemSets(nElemSets,maxNelemInSet,&
     if (chunkPos(1) < 2) cycle
     if (IO_lc(strValue(fileContent(l),chunkPos,1)) == 'define' .and. &
        IO_lc(strValue(fileContent(l),chunkPos,2)) == 'element') then
+      chunkPos = strPos(fileContent(l+1))
+      if (chunkPos(1) == 0) cycle
       nElemSets = nElemSets + 1
 
-      chunkPos = strPos(fileContent(l+1))
       if (containsRange(fileContent(l+1),chunkPos)) then
         elemInCurrentSet = 1 + abs( intValue(fileContent(l+1),chunkPos,3) &
                                    -intValue(fileContent(l+1),chunkPos,1))
@@ -488,9 +489,12 @@ subroutine inputRead_mapElemSets(nameElemSet,mapElemSet,&
     if (chunkPos(1) < 2) cycle
     if (IO_lc(strValue(fileContent(l),chunkPos,1)) == 'define' .and. &
        IO_lc(strValue(fileContent(l),chunkPos,2)) == 'element') then
-       elemSet = elemSet+1
-       nameElemSet(elemSet)  = trim(strValue(fileContent(l),chunkPos,4))
-       mapElemSet(:,elemSet) = continuousIntValues(fileContent(l+1:),size(mapElemSet,1)-1,nameElemSet,mapElemSet,size(nameElemSet))
+      chunkPos = strPos(fileContent(l+1))
+      if (chunkPos(1) == 0) cycle
+      chunkPos = strPos(fileContent(l))
+      elemSet = elemSet+1
+      nameElemSet(elemSet)  = trim(strValue(fileContent(l),chunkPos,4))
+      mapElemSet(:,elemSet) = continuousIntValues(fileContent(l+1:),size(mapElemSet,1)-1,nameElemSet,mapElemSet,size(nameElemSet))
     end if
   end do