Merge remote-tracking branch 'origin/updatedocker'

Author: wenhuiuy

README.rst

@@ -111,8 +111,8 @@ Start by cloning the repository
 .. code::
 
    git clone https://github.com/pyansys/pyDyna
-
-and copy the required files.
+   cd pyDyna
+   pip install -e .
 
 Install in offline mode
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -123,17 +123,17 @@ archive from the `Releases Page <https://github.com/pyansys/pydyna/releases>`_ f
 corresponding machine architecture.
 
 Each wheelhouse archive contains all the Python wheels necessary to install PyDyna from scratch on Windows
-and Linux, from Python 3.6,3.8 and 3.9. You can install this on an isolated system with a fresh Python
+and Linux, from Python 3.7 to 3.10. You can install this on an isolated system with a fresh Python
 installation or on a virtual environment.
 
 For example, on Linux with Python 3.8, unzip the wheelhouse archive and install it with:
 
 .. code:: bash
 
-    unzip ansys-dyna-core-v0.3.dev0-wheelhouse-Linux-3.8.zip wheelhouse
+    unzip ansys-dyna-core-v0.3.dev0-wheelhouse-Linux-3.8.zip -d wheelhouse
     pip install ansys-dyna-core -f wheelhouse --no-index --upgrade --ignore-installed
 
-If you are on Windows with Python 3.9, unzip the corresponding wheelhouse to a wheelhouse directory
+If you are on Windows with Python 3.8, unzip the corresponding wheelhouse to a wheelhouse directory
 and install using the preceding command.
 
 Consider installing using a `virtual environment <https://docs.python.org/3/library/venv.html>`_.
@@ -176,8 +176,8 @@ Here is a basic pre-processing example:
 	icfd_solution = DynaSolution(hostname)
 	# Import the initial mesh data(nodes and elements)
 	fns = []
-	path = examples.cylinder_flow + os.sep
-	fns.append(path + "cylinder_flow.k")
+	path = os.getcwd()+os.sep
+	fns.append(path+"cylinder_flow.k")
 	icfd_solution.open_files(fns)
 	# Set total time of simulation
 	icfd_solution.set_termination(termination_time=100)
@@ -224,7 +224,13 @@ Here is a basic pre-processing example:
 	icfd.add(meshvol)
 
 	icfd_solution.create_database_binary(dt=1)
-	icfd_solution.save_file()
+	serverpath = icfd_solution.save_file()
+	serveroutfile = '/'.join((serverpath,"cylinder_flow.k"))
+	downloadpath = os.path.join(os.getcwd(), "output")
+	if not os.path.exists(downloadpath):
+		os.makedirs(downloadpath)
+	downloadfile = os.path.join(downloadpath,"cylinder_flow.k")
+	icfd_solution.download(serveroutfile,downloadfile)
 	
 For more examples, visit https://dyna.docs.pyansys.com/version/stable/examples/index.html
 

docker/Dockerfile renamed to docker/pre/Dockerfile

@@ -4,7 +4,7 @@ Create your own pydyna-pre service docker container
 The pydyna-pre service Docker containers can be easily built by following
 these steps.
 
-Inside this folder, the instructions (i.e. ``Dockerfile.*`` files) for
+Inside this folder, the instructions (i.e. ``Dockerfile`` files) for
 building the pydyna-pre service Docker containers are made available. 
 
 * ``Dockerfile``: this file builds the Linux-based Docker image.
@@ -15,20 +15,29 @@ Prerequisites
 * Ensure that ``docker`` is installed in your machine.
   If you do not have ``docker`` available, please refer to the
   `official Docker site <https://www.docker.com>`_.
+  Note that the container can also be started on Windows if the Docker Desktop has been installed.
+  How to install the Docker Desktop: https://docs.docker.com/desktop/install/windows-install/
 
-* Download the latest release artifacts for the Linux
-  Docker container. You can do this as follows:
+* Download the latest release artifacts. You can do this as follows:
 
   * Latest Linux artifacts: `linux-binaries.zip <https://github.com/ansys/pydyna/releases/download/v0.2.1/linux-binaries.zip>`_
 
-* Move these ``.zip`` files to the current location (i.e. ``<repository-root-folder>/docker``).
+* Move these ``.zip`` files to the current location (i.e. ``<repository-root-folder>/docker/pre``).
+
+Starting the docker container
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There are two ways to start docker container.
+
+1.bulid image and run container
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 Building the Docker images
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+::::::::::::::::::::::::::
 
 In order to build your images, follow the next instructions:
 
-* Locate yourself at ``<repository-root-folder>/docker`` in your terminal.
+* Locate yourself at ``<repository-root-folder>/docker/pre`` in your terminal.
 * Run the following Docker command:
 
   .. code:: bash
@@ -52,13 +61,13 @@ In order to build your images, follow the next instructions:
      >>> ......                                                   ......                             ............   ..............   ......
 
 Run the image as a container
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+::::::::::::::::::::::::::::
 
 * Run the following Docker command:
 
   .. code:: bash
 
-     docker run -d -p 50051:50051 ghcr.io/ansys/ls-pre .
+     docker run -d -p 50051:50051 ghcr.io/ansys/ls-pre
 
 * Check that the image has been created successfully.   
 
@@ -67,4 +76,19 @@ Run the image as a container
 
 
      >>> CONTAINER ID   IMAGE                  COMMAND                  CREATED         STATUS         PORTS                                           NAMES
-     >>> c77ffd67f9fa   ghcr.io/ansys/ls-pre   "python3 ./linux-bin…"   7 seconds ago   Up 7 seconds   0.0.0.0:50051->50051/tcp, :::50051->50051/tcp   hardcore_margulis
+     >>> c77ffd67f9fa   ghcr.io/ansys/ls-pre   "python3 ./linux-bin…"   7 seconds ago   Up 7 seconds   0.0.0.0:50051->50051/tcp, :::50051->50051/tcp   hardcore_margulis
+	 
+	 
+2.Start the container from docker-compose.yml file
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	 
+Make sure the docker compose have been installed on your computer.
+For more information: https://docs.docker.com/compose/install/
+
+* Locate yourself at ``<repository-root-folder>/docker/pre`` in your terminal.
+* Run the following Docker command:
+
+  .. code:: bash
+
+     docker compose up -d
+     

docker/README.rst renamed to docker/pre/README.rst

@@ -0,0 +1,6 @@
+version: "3.8"
+services:
+  dyna-pre:
+    build: ./
+    ports:
+      - 50051:50051

docker/pre/docker-compose.yml

@@ -25,7 +25,7 @@
     ContactSurface,
     DOF,
     OffsetType,
-    ImplicitAnalysis,
+    AnalysisType
 )
 from ansys.dyna.core.pre.dynamaterial import (
     MatNull,
@@ -80,7 +80,7 @@
 ###############################################################################
 # We can then use the implicit analysis methods in DynaMech class to define
 # the IMILICIT control cards.
-camry = DynaMech()
+camry = DynaMech(analysis=AnalysisType.EXPLICIT)
 camry_solution.add(camry)
 
 ###############################################################################

docker/docker-compose.yml renamed to docker/solver/docker-compose.yml

@@ -18,7 +18,8 @@
     ThermalAnalysisType,
     SolidPart,
     SolidFormulation,
-    NodeSet
+    NodeSet,
+    AnalysisType
 )
 from ansys.dyna.core.pre.dynamaterial import MatElasticPlasticThermal
 from ansys.dyna.core.pre import examples
@@ -53,7 +54,7 @@
 ###############################################################################
 # To invoke the transient thermal solver, the thermal analysis type in CONTROL_SOLUTION is
 # being set to 2 by ThermalAnalysisType.TRANSIENT.
-ts = DynaMech()
+ts = DynaMech(analysis=AnalysisType.EXPLICIT)
 solution.add(ts)
 
 tanalysis = ThermalAnalysis()

examples/Implicit/camry_rc.py

@@ -218,6 +218,11 @@ def __init__(self):
         self.constraints = Constraint()
         self.contacts = ContactGroup()
         self.entities = []
+        self.have_accuracy = False
+        self.have_energy = False
+        self.have_hourglass = False
+        self.have_bulk_viscosity = False
+        self.have_control_shell = False
 
     def get_stub():
         """Get the stub of this DynaBase object."""
@@ -280,16 +285,19 @@ def set_accuracy(
         bool
             "True" when successful, "False" when failed
         """
-        ret = self.stub.CreateControlAccuracy(
-            ControlAccuracyRequest(
-                osu=objective_stress_updates.value,
-                inn=invariant_node_number.value,
-                pidosu=partsetid_for_objective_stress_updates,
-                iacc=implicit_accuracy_flag.value,
-                exacc=explicit_accuracy_flag.value,
+        ret = True
+        if not self.have_accuracy:
+            ret = self.stub.CreateControlAccuracy(
+                ControlAccuracyRequest(
+                    osu=objective_stress_updates.value,
+                    inn=invariant_node_number.value,
+                    pidosu=partsetid_for_objective_stress_updates,
+                    iacc=implicit_accuracy_flag.value,
+                    exacc=explicit_accuracy_flag.value,
+                )
             )
-        )
-        logging.info("Control Accuracy Created...")
+            self.have_accuracy = True
+            logging.info("Control Accuracy Created...")
         return ret
 
     def set_energy(
@@ -324,16 +332,19 @@ def set_energy(
         bool
             "True" when successful, "False" when failed
         """
-        ret = self.stub.CreateControlEnergy(
-            ControlEnergyRequest(
-                hgen=hourglass_energy.value,
-                rwen=rigidwall_energy.value,
-                slnten=sliding_interface_energy.value,
-                rylen=rayleigh_energy.value,
-                irgen=initial_reference_geometry_energy.value,
+        ret = True
+        if not self.have_energy:
+            ret = self.stub.CreateControlEnergy(
+                ControlEnergyRequest(
+                    hgen=hourglass_energy.value,
+                    rwen=rigidwall_energy.value,
+                    slnten=sliding_interface_energy.value,
+                    rylen=rayleigh_energy.value,
+                    irgen=initial_reference_geometry_energy.value,
+                )
             )
-        )
-        logging.info("Control Energy Created...")
+            self.have_energy = True
+            logging.info("Control Energy Created...")
         return ret
 
     def set_output(
@@ -385,8 +396,11 @@ def set_hourglass(self, controltype=HourglassControl.STANDARD_VISCOSITY_FORM, co
         bool
             "True" when successful, "False" when failed
         """
-        ret = self.stub.CreateControlHourgalss(ControlHourglassRequest(ihq=controltype.value, qh=coefficient))
-        logging.info("Control Hourglass Created...")
+        ret = True
+        if not self.have_hourglass:
+            ret = self.stub.CreateControlHourgalss(ControlHourglassRequest(ihq=controltype.value, qh=coefficient))
+            self.have_hourglass = True
+            logging.info("Control Hourglass Created...")
         return ret
 
     def set_bulk_viscosity(
@@ -411,14 +425,17 @@ def set_bulk_viscosity(
         bool
             "True" when successful, "False" when failed
         """
-        ret = self.stub.CreateControlBulkViscosity(
-            ControlBulkViscosityRequest(
-                q1=quadratic_viscosity_coeff,
-                q2=linear_viscosity_coeff,
-                type=bulk_viscosity_type.value,
+        ret = True
+        if not self.have_bulk_viscosity:
+            ret = self.stub.CreateControlBulkViscosity(
+                ControlBulkViscosityRequest(
+                    q1=quadratic_viscosity_coeff,
+                    q2=linear_viscosity_coeff,
+                    type=bulk_viscosity_type.value,
+                )
             )
-        )
-        logging.info("Control Bulk Viscosity Created...")
+            self.have_bulk_viscosity = True
+            logging.info("Control Bulk Viscosity Created...")
         return ret
 
     def set_init_temperature(self, temp=0):
@@ -482,20 +499,23 @@ def create_control_shell(
         bool
             "True" when successful, "False" when failed
         """
-        ret = self.stub.CreateControlShell(
-            ControlShellRequest(
-                wrpang=wrpang,
-                esort=esort,
-                irnxx=irnxx,
-                istupd=istupd,
-                theory=theory,
-                bwc=bwc,
-                miter=miter,
-                proj=proj,
-                irquad=irquad,
+        ret = True
+        if not self.have_control_shell:
+            ret = self.stub.CreateControlShell(
+                ControlShellRequest(
+                    wrpang=wrpang,
+                    esort=esort,
+                    irnxx=irnxx,
+                    istupd=istupd,
+                    theory=theory,
+                    bwc=bwc,
+                    miter=miter,
+                    proj=proj,
+                    irquad=irquad,
+                )
             )
-        )
-        logging.info("Control Shell Created...")
+            self.have_control_shell = True
+            logging.info("Control Shell Created...")
         return ret
 
     def create_control_solid(