Merge branch 'zzqbranch'

Author: wenhuiuy

doc/source/getting-started/SERVER_SOLVER_README.rst

@@ -34,7 +34,7 @@ Run an example on the client side
 
        hostname = "localhost"
        port = "5000"
-       dyna=solver.DynaSolver(hostname,port)     # connect to the server
+       dyna=launch_dyna(ip = hostname,port = port)     # connect to the server
        dyna.push("./output/ball_plate.k")        # push an input file
        dyna.start_locally(input = "ball_plate.k",nproc=1) 
 

doc/source/getting-started/example.rst

@@ -98,7 +98,7 @@ you can get the Python file from ``examples/solver/ball_plate_solver.py``.
 
     hostname = "localhost"
     port = "5000"
-    dyna=solver.DynaSolver(hostname,port)           # connect to the container
+    dyna=launch_dyna(ip = hostname,port = port)            # connect to the container
     dyna.push("./output/ball_plate.k")                            # push an input file
     dyna.start(4)                                   # start 4 ranks of mppdyna
     dyna.run("i=ball_plate.k memory=10m ncycle=20000")   # begin execution

docker/pre/README.rst

@@ -25,7 +25,7 @@ Prerequisites
   instructions from `this page <https://docs.docker.com/engine/install/>`_.
 
 * Download the latest Linux release artifacts for the ``pre`` Docker container:
-  `linux-binaries.zip <https://github.com/ansys/pydyna/releases/download/v0.4.3/linux-binaries.zip>`_.
+  `linux-binaries.zip <https://github.com/ansys/pydyna/releases/download/v0.4.6/linux-binaries.zip>`_.
 
 * Move this ZIP file to the ``docker/pre`` directory.
 

docker/solver/Dockerfile

@@ -13,11 +13,11 @@ LABEL "com.ansys.description"="Ansys MPPDYNA with gRPC server"
 
 # install some missing stuff we want/need
 
-RUN yum -y install openssh-clients openssh-server bind-utils sudo python3
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install grpcio
-RUN python3 -m pip install grpcio-tools
-RUN python3 -m pip install protobuf==4.21.0
+RUN yum -y install openssh-clients openssh-server bind-utils sudo python3 unzip &>/dev/null && yum clean all
+RUN python3 -m pip install --upgrade pip && \ 
+python3 -m pip install grpcio && \
+python3 -m pip install grpcio-tools && \ 
+python3 -m pip install protobuf==4.21.0
 #
 ENV USER mpirun
 ENV HOME /home/mpirun
@@ -27,16 +27,15 @@ ENV LSTC_LICENSE_SERVER license
 ENV SSHDIR ${HOME}/.ssh
 
 
-RUN groupadd ${USER}
-RUN useradd -g ${USER} -d ${HOME} ${USER} && \
+RUN groupadd ${USER} && useradd -g ${USER} -d ${HOME} ${USER} && \
     echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 #
-RUN mkdir -p /ansys_inc/lib
-RUN mkdir -p /rundir
-RUN mkdir /var/run/sshd
-RUN mkdir -p ${SSHDIR}
-RUN chown -R ${USER}:${USER} /rundir
-RUN chmod -R 755 /rundir
+RUN mkdir -p /ansys_inc/lib && \
+mkdir -p /rundir && \
+mkdir /var/run/sshd && \
+mkdir -p ${SSHDIR} && \
+chown -R ${USER}:${USER} /rundir && \
+chmod -R 755 /rundir
 WORKDIR /rundir
 
 # set up the runtime environment variables for
@@ -73,29 +72,28 @@ RUN echo "export PATH=/opt/openmpi/bin:\${PATH}" >> ${HOME}/.bashrc
 #RUN ssh-keygen -A
 
 
-RUN ssh-keygen -q -b 2048 -f ${SSHDIR}/id_rsa -N ""
-RUN chmod 700 ${SSHDIR} && chmod -R 600 ${SSHDIR}/id_rsa
-RUN echo "Host *" > ${SSHDIR}/config
-RUN echo "  StrictHostKeyChecking no" >> ${SSHDIR}/config
-RUN cp ${SSHDIR}/id_rsa.pub ${SSHDIR}/authorized_keys
-RUN ssh-keygen -A
+RUN ssh-keygen -q -b 2048 -f ${SSHDIR}/id_rsa -N "" && \
+chmod 700 ${SSHDIR} && chmod -R 600 ${SSHDIR}/id_rsa && \
+echo "Host *" > ${SSHDIR}/config && \
+echo "  StrictHostKeyChecking no" >> ${SSHDIR}/config && \
+cp ${SSHDIR}/id_rsa.pub ${SSHDIR}/authorized_keys && \
+ssh-keygen -A
 
 RUN chmod -R 600 ${SSHDIR}* && \
-    chown -R ${USER}:${USER} ${SSHDIR}
-
-RUN chown -R ${USER}:${USER} ${HOME}
+    chown -R ${USER}:${USER} ${SSHDIR} && \
+    chown -R ${USER}:${USER} ${HOME}
 
 # Copy the openmpi libraries
 
-RUN yum install -y unzip
 COPY mppdyna_docker_centos7.zip .
-RUN unzip -qu mppdyna_docker_centos7.zip && rm mppdyna_docker_centos7.zip
-RUN mkdir -p /opt/openmpi
-RUN cp -r mpi/* /opt/openmpi
-RUN chmod -R 777 /opt/openmpi
+RUN unzip -qu mppdyna_docker_centos7.zip && \
+rm mppdyna_docker_centos7.zip && \
+mkdir -p /opt/openmpi && \
+cp -r mpi/* /opt/openmpi && \
+chmod -R 777 /opt/openmpi && \
 
 # The executable will go in /ansys_inc, and the
 # ifort runtime libraries in /ansys_inc/lib
 
-RUN cp -rpu docker_dir/* /ansys_inc/
-RUN chmod -R 777 /ansys_inc/
+cp -rpu docker_dir/* /ansys_inc/ && \
+chmod -R 777 /ansys_inc/

docker/solver/README.rst

@@ -25,7 +25,7 @@ Prerequisites
   instructions from `this page <https://docs.docker.com/engine/install/>`_.
 
 * Download the latest Linux release artifacts for the ``solver`` Docker container:
-  `mppdyna_docker_centos7.zip <https://github.com/ansys/pydyna/releases/download/v0.4.3/mppdyna_docker_centos7.zip>`_.
+  `mppdyna_docker_centos7.zip <https://github.com/ansys/pydyna/releases/download/v0.4.6/mppdyna_docker_centos7.zip>`_.
 
 * Move this ZIP file to the ``docker/solver`` directory.
 

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 
-dependencies = ["ansys-dpf-core>=0.7.2", "ansys-api-dyna==0.3.5"]
+dependencies = ["ansys-dpf-core>=0.7.2", "ansys-api-dyna==0.3.6"]
 
 [project.optional-dependencies]
 tests = [

src/ansys/dyna/core/pre/__init__.py

@@ -3,6 +3,7 @@
 import os
 
 from ansys.dyna.core.pre.dynalogging import Logger
+from ansys.dyna.core.pre.model import Model
 
 LOG = Logger(level=logging.ERROR, to_file=False, to_stdout=True)
 LOG.debug("Loaded logging module as LOG")

src/ansys/dyna/core/pre/dynabase.py

@@ -5,11 +5,12 @@
 Module for creating a DYNA input deck.
 """
 
-# from subprocess import DETACHED_PROCESS
-
 from enum import Enum
 import logging
 
+# from subprocess import DETACHED_PROCESS
+from typing import List
+
 from ansys.api.dyna.v0.kwprocess_pb2 import *  # noqa : F403
 from ansys.api.dyna.v0.kwprocess_pb2_grpc import *  # noqa : F403
 
@@ -277,11 +278,21 @@ def __init__(self):
         self.have_hourglass = False
         self.have_bulk_viscosity = False
         self.have_control_shell = False
+        # add for drawing entity
+        self._parent: DynaSolution = None
+        self.init_velocity: List = None
+        self.bdy_spc: List = None
 
     def get_stub():
         """Get the stub of the ``DynaBase`` object."""
         return DynaBase.stub
 
+    def set_parent(self, parent=None):
+        self._parent = parent
+        model = self._parent.model
+        self.boundaryconditions.assign_model(model)
+        self.initialconditions.assign_model(model)
+
     def set_timestep(self, tssfac=0.9, isdo=0, timestep_size_for_mass_scaled=0.0, max_timestep=None):
         """Set the structural time step size control using different options.
 
@@ -2245,6 +2256,10 @@ def __init__(self):
         self.imposedmotionlist = []
         self.templist = []
         self.convectionlist = []
+        self._model = None
+
+    def assign_model(self, model):
+        self._model = model
 
     def create_spc(
         self,
@@ -2273,6 +2288,8 @@ def create_spc(
         """
         param = [nodeset, tx, ty, tz, rx, ry, rz, cid, birth, death]
         self.spclist.append(param)
+        # self.bdy_spc = nodeset.nodes
+        self._model.add_bdy_spc(nodeset.nodes)
 
     def create_imposed_motion(
         self,
@@ -2488,6 +2505,10 @@ def __init__(self):
         self.velocitylist = []
         self.velocitynodelist = []
         self.temperaturelist = []
+        self._model = None
+
+    def assign_model(self, model):
+        self._model = model
 
     def create_velocity(
         self,
@@ -2503,6 +2524,8 @@ def create_velocity(
     def create_velocity_node(self, nodeid, trans=Velocity(0, 0, 0), rot=RotVelocity(0, 0, 0)):
         """Define initial nodal point velocities for a node."""
         self.velocitynodelist.append([nodeid, trans, rot])
+        # self.init_velocity.append([nodeid,trans.x,trans.y,trans.z])
+        self._model.add_init_velocity([nodeid, trans.x, trans.y, trans.z])
 
     def create_temperature(self, nodeset=None, temperature=0):
         """Create an initial nodal point temperature."""