Performing parallezation

run.py

@@ -1,13 +1,36 @@
 import os, sys
 from collections import namedtuple
+import time
+import logging
+from datetime import timedelta
+import multiprocessing
 
 ROOT = os.getcwd()
 sys.path.append(ROOT)
 
-import src.utils
-import src.salome_utils
+LOG = os.path.join(ROOT, "logs")
+BUILD = os.path.join(ROOT, "build")
+
+from src import utils
+from src import salome_utils
 
 if __name__ == "__main__":
+    start_time = time.monotonic()
+    logging.info("Started at {}".format(timedelta(seconds=start_time)))
+
+    if not os.path.exists(LOG):
+        os.makedirs(LOG)
+
+    if not os.path.exists(BUILD):
+        os.makedirs(BUILD)
+
+    logging.basicConfig(
+        level=logging.INFO, 
+        format="%(levelname)s: %(message)s",
+        handlers = [
+            logging.StreamHandler(),
+            logging.FileHandler("{}/cubic.log".format(LOG))
+        ])
      
     nprocs = os.cpu_count()
     port = 2810
@@ -17,12 +40,15 @@ if __name__ == "__main__":
     for n in range(nprocs):
         while not utils.portIsFree:
             port += 1
+        
+        p = multiprocessing.Process(target = salome_utils.startServer, args = (port,))
+        #s = salomeServer(salome_utils.startServer(port), port)
+        s = salomeServer(p, port)
 
-        s = salomeServer(salome_utils.startServer(port), port)
         salomeServers.append(s)
+        port += 1
 
     var = []
-    cmd = "python "
     
     # TODO: pass it to samples in namedtuples
     # get sample.directions and etc ..
@@ -34,15 +60,50 @@ if __name__ == "__main__":
     directions = [
         [1, 0, 0],
         [0, 0, 1],
-        [1, 1, 1]
+        #[1, 1, 1]
     ]
 
-    cmd += "-m "
-    var.append((salomeServer[n].port, cmd))
-
-    utils.parallel(nprocs, var, salome_utils.execute)
-
+    cmd = """python -c
+    \"import sys;
+    sys.append('{}');
+    import samples;
+    samples.genMesh('{}', {}, {}, '{}');
+    \"
+    """.replace("\n", "")
+    tasks = []
 
+    for structure in structures:
+        if structure == "simpleCubic":
+            theta = [c * 0.01 for c in range(1, 14)]
+
+        elif structure == "faceCenteredCubic":
+            theta = []
+
+        elif structure == "bodyCenteredCubic":
+            theta = []
+
+        for coeff in theta:
+            for direction in directions:
+                tasks.append(cmd.format(ROOT, structure, coeff, direction, BUILD))
+
+    logging.info("tasks: {}".format(tasks))
+    n = 0
+    for cmd in tasks:
+        var.append((salomeServer[n].port, cmd))
+        n = n + 1 if n < 3 else 0
+
+    for s in salomeServers:
+        s.process.start()
+    
+    #res = utils.parallel(nprocs, var, salome_utils.remote)
+    #print(res)
+    
+    #for s in salomeServers:
+    #    s.process.join()
+
+
+    end_time = time.monotonic()
+    logging.info("Elapsed time: {}".format(timedelta(seconds=end_time - start_time)))
 
 
 
@@ -60,6 +121,7 @@ if __name__ == "__main__":
 
 
 
+"""
 if __name__ == "__main__":
     ###
     #   SALOME
@@ -199,4 +261,4 @@ if __name__ == "__main__":
 
     end_time = time.monotonic()
     logging.info("Elapsed time: {}".format(timedelta(seconds=end_time - start_time)))
-
+"""

samples/__init__.py

@@ -1,3 +1,57 @@
 from .simpleCubic import simpleCubic
 from .faceCenteredCubic import faceCenteredCubic
 from .bodyCenteredCubic import bodyCenteredCubic
+
+from src import geometry_utils
+from src import mesh_utils
+
+import salome
+from collections import namedtuple
+import os
+
+def genMesh(stype, theta, flowdirection, saveto):
+    _G = globals()
+
+    structure = _G.get(stype)
+
+    if structure:
+        salome.salome_init()
+
+        grains, cubic, rhombohedron = structure(theta)
+        fd = namedtuple("fd", ["x", "y", "z"])
+        geometry = cubic
+        
+        if flowdirection == [1, 1, 1]:
+            geometry = rhombohedron
+            direction = fd([1, 1, 1], [1, -1, 1], [1, -1, -1])
+        
+        else:
+            geometry = cubic
+
+        if flowdirection == [1, 0, 0]:
+            direction = fd([1, 1, 0], [1, -1, 0], [0, 0, 1])
+
+        if flowdirection == [0, 0, 1]:
+            direction = fd([0, 0, 1], [1, -1, 0], [1, 1, 0])
+        
+        boundary = geometry_utils.boundaryCreate(geometry, direction, grains)
+
+        fineness = 3
+        mesh = mesh_utils.meshCreate(geometry, boundary, fineness)
+        mesh_utils.meshCompute(mesh)
+
+        path = os.path.join(saveto, 
+                         stype, 
+                         "theta-%s" % theta, 
+                         "direction-{}{}{}".format(flowdirection[0], flowdirection[1], flowdirection[2]))
+
+        if not os.path.exists(path):
+            logging.info("Creating directory: {}".format(path))
+            os.makedirs(path)
+
+        mesh_utils.meshExport(mesh, os.path.join(path, "mesh.unv"))
+
+        salome.salome_close()
+
+    else:
+        raise Exception("Unknown sample function")

samples/bodyCenteredCubic.py

@@ -118,6 +118,7 @@ def bodyCenteredCubic(alpha):
     if salome.sg.hasDesktop():
         salome.sg.updateObjBrowser()
 
+    # Preparation
     grains = geompy.ExtractShapes(Up_Down, geompy.ShapeType["SOLID"], True)
     grains += geompy.ExtractShapes(Middle, geompy.ShapeType["SOLID"], True)
 

samples/faceCenteredCubic.py

@@ -125,7 +125,8 @@ def faceCenteredCubic(alpha):
 
     if salome.sg.hasDesktop():
         salome.sg.updateObjBrowser()
-   
+    
+    # Preparation
     grains = geompy.ExtractShapes(Up_Down, geompy.ShapeType["SOLID"], True)
     grains += geompy.ExtractShapes(Middle, geompy.ShapeType["SOLID"], True)
 

samples/simpleCubic.py

@@ -99,5 +99,12 @@ def simpleCubic(alpha):
 
     if salome.sg.hasDesktop():
         salome.sg.updateObjBrowser()
+    
+    # Preparation
+    #Cut_1 = geompy.MakeRotation(Cut_1, OZ, -pi_4)
+
+    grains = geompy.ExtractShapes(Multi_Translation_3, geompy.ShapeType["SOLID"], True)
+
+    grains = geompy.MakeFuseList(grains, False, False)
 
     return Multi_Translation_3, Cut_1, Cut_2

src/geometry_utils.py

@@ -12,13 +12,12 @@ def getGeom():
     return geompy
 
 def rotate(gobj, ang):
-    x = geompy.MakeVectorDXDYDZ(1, 0, 0),
-    y = geompy.MakeVectorDXDYDZ(0, 1, 0),
+    x = geompy.MakeVectorDXDYDZ(1, 0, 0)
+    y = geompy.MakeVectorDXDYDZ(0, 1, 0)
     z = geompy.MakeVectorDXDYDZ(0, 0, 1)
 
     # yaw
     rotated = geompy.MakeRotation(gobj, z, ang[2])
-    print(rotated)
     # pitch
     rotated = geompy.MakeRotation(rotated, y, ang[1])
     # roll
@@ -30,9 +29,9 @@ def createGroup(gobj, planelist, grains, name):
     gr = geompy.CreateGroup(gobj, geompy.ShapeType["FACE"], name)
 
     grcomp = geompy.MakeCompound(planelist)
-    grcut = geompy.MakeCutList(grcomp, [grains], True)
+    #grcut = geompy.MakeCutList(grcomp, [grains], False)
 
-    gip = geompy.GetInPlace(gobj, grcut, True)
+    gip = geompy.GetInPlace(gobj, grcomp, True)
     faces = geompy.SubShapeAll(gip, geompy.ShapeType["FACE"])
     geompy.UnionList(gr, faces)
 
@@ -42,18 +41,33 @@ def boundaryCreate(gobj, dvec, grains):
 
     xvec = geompy.MakeVector(
         geompy.MakeVertex(0, 0, 0),
-        geompy.MakeVertex(dvec[0], dvec[1], dvec[2]))
-    #xvec = rotate(dvec, self.angle)
+        geompy.MakeVertex(dvec.x[0], dvec.x[1], dvec.x[2]))
+    #xvec = rotate(xvec, [0, 0, 0.25 * math.pi])
 
-    yvec = rotate(xvec, [0.5 * math.pi, 0, 0])
-    zvec = rotate(xvec, [0, 0.5 * math.pi, 0])
+    #yvec = rotate(xvec, [0.5 * math.pi, 0, 0])
+    #zvec = rotate(xvec, [0, 0.5 * math.pi, 0])
+    
+    yvec = geompy.MakeVector(
+        geompy.MakeVertex(0, 0, 0),
+        geompy.MakeVertex(dvec.y[0], dvec.y[1], dvec.y[2]))
+    zvec = geompy.MakeVector(
+        geompy.MakeVertex(0, 0, 0),
+        geompy.MakeVertex(dvec.z[0], dvec.z[1], dvec.z[2]))
+
+    geompy.addToStudy(xvec, "xvec")
+    geompy.addToStudy(yvec, "yvec")
+    geompy.addToStudy(zvec, "zvec")
 
     logging.info("boundaryCreate: dvec = {}".format(dvec))
 
-    planes = geompy.ExtractShapes(gobj, geompy.ShapeType["FACE"], True)
+    planes = geompy.ExtractShapes(gobj, geompy.ShapeType["FACE"], False)
+    planes = geompy.MakeCompound(planes)
+    planes = geompy.MakeCutList(planes, [grains], False)
+    planes = geompy.ExtractShapes(planes, geompy.ShapeType["FACE"], False)
+
     inletplanes = []
     outletplanes = []
-    uplanes = []
+    #uplanes = []
 
     fwplanes = []
     bwplanes = []
@@ -62,9 +76,10 @@ def boundaryCreate(gobj, dvec, grains):
 
     for plane in planes:
         nvec = geompy.GetNormal(plane)
-        xang = geompy.GetAngle(nvec, xvec)
-        yang = geompy.GetAngle(nvec, yvec)
-        zang = geompy.GetAngle(nvec, zvec)
+        xang = round(geompy.GetAngle(nvec, xvec), 0)
+        yang = round(geompy.GetAngle(nvec, yvec), 0)
+        zang = round(geompy.GetAngle(nvec, zvec), 0)
+        print(xang, yang, zang, sep="\t")
 
         if xang == 0:
             inletplanes.append(plane)
@@ -85,16 +100,16 @@ def boundaryCreate(gobj, dvec, grains):
             rplanes.append(plane)
 
     logging.info(
-        "boundaryCreate: inletplanes = {}, outletplanes = {}, hplanes = {}".format(
-            len(inletplane), len(outletplane), len(hplanes)))
+        "boundaryCreate: planes = {}, inletplanes = {}, outletplanes = {}".format(
+            len(planes), len(inletplanes), len(outletplanes)))
 
     logging.info(
         "boundaryCreate: fwplanes = {}, bwplanes = {}, lplanes = {}, rplanes = {}".format(
             len(fwplanes), len(bwplanes), len(lplanes), len(rplanes)))
 
     # Main groups
-    inlet = createGroup(gobj, inletplane, grains, "inlet")
-    outlet = createGroup(gobj, grains, outletplane, "outlet")
+    inlet = createGroup(gobj, inletplanes, grains, "inlet")
+    outlet = createGroup(gobj, outletplanes, grains, "outlet")
 
     symetryPlaneFW = createGroup(gobj, fwplanes, grains, "symetryPlaneFW")
     symetryPlaneBW = createGroup(gobj, bwplanes, grains, "symetryPlaneBW")

src/salome_utils.py

@@ -1,4 +1,4 @@
-import salome
+#import salome
 import subprocess
 import logging
 
@@ -9,31 +9,32 @@ def startServer(port):
 
     logging.info("Starting SALOME on port {} ...".format(port))
 
-    p = subprocess.Popen(["salome", "start", "--port", str(port), "-t"],
-        shell = False,
+    p = subprocess.run(["salome", "start", "--port", str(port), "-t"],
+        #shell = False,
         stdout = subprocess.PIPE,
         stderr = subprocess.PIPE)
 
     return p
 
+
 def killServer(port):
 
     logging.info("Terminating SALOME on port {} ...".format(port))
 
-    p = subprocess.Popen(["salome", "kill", str(port)],
-        shell = True,
+    p = subprocess.run(["salome", "kill", str(port)],
+        #shell = True,
         stdout = subprocess.PIPE,
         stderr = subprocess.PIPE)
 
     return p
 
-def execute(port, cmd):
+def remote(port, cmd):
 
     logging.info("Executing command in the SALOME on port {} ...".format(port))
     
     # cmd = "python -m"; = "python -c"
-    p = subprocess.Popen(["salome", "remote", "-p", str(port), "--", str(cmd)],
-        shell = True,
+    p = subprocess.run(["salome", "remote", "-p", str(port), "--", str(cmd)],
+        #shell = True,
         stdout = subprocess.PIPE,
         stderr = subprocess.PIPE)
 

src/utils.py

@@ -1,5 +1,6 @@
 from multiprocessing import Queue, Process, cpu_count
 import socket
+import logging
 
 def queue(cmd, qin, qout, *args):
     
@@ -12,7 +13,7 @@ def queue(cmd, qin, qout, *args):
             break
 
         # Execute command
-        res = cmd(var, *args)
+        res = cmd(*var, *args)
 
         # Put results to the queue
         qout.put((pos, res))
@@ -30,6 +31,10 @@ def parallel(np, var, cmd):
     qin = Queue(1)
     qout = Queue()
     
+    logging.info("cpu count: {}".format(np))
+    logging.info("var: {}".format(var))
+    logging.info("cmd: {}".format(cmd))
+
     # Create processes
     for n in range(nprocs):
         pargs = [cmd, qin, qout]