Merge branch 'main' into release/0.4

wenhuiuy · wenhuiuy · commit c972fd0b01aa · 2024-02-23T16:01:09.000+08:00
diff --git a/examples/Airbag/airbag_deploy.py b/examples/Airbag/airbag_deploy.py
@@ -46,10 +46,11 @@
 #
 from ansys.dyna.core.pre.dynamaterial import MatRigid, MatFabric
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/airbag/airbag.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 ###############################################################################
diff --git a/examples/EM/em_resistive_heating.py b/examples/EM/em_resistive_heating.py
@@ -25,10 +25,11 @@
 from ansys.dyna.core.pre.dynamaterial import MatElastic,MatThermalIsotropic,EMMATTYPE,EMEOSTabulated1
 from em_set_data import *
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/em/em_resistive_heating.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/EM/em_resistive_heating_2d.py b/examples/EM/em_resistive_heating_2d.py
@@ -26,10 +26,11 @@
 )
 from ansys.dyna.core.pre.dynamaterial import MatRigid,MatThermalIsotropic,EMMATTYPE,EMEOSTabulated1
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/em/resistive_heating_2d.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/EM/em_resistive_heating_2d_isopots.py b/examples/EM/em_resistive_heating_2d_isopots.py
@@ -32,10 +32,11 @@
 from ansys.dyna.core.pre.dynamaterial import MatRigid,MatThermalIsotropic,EMMATTYPE,EMEOSTabulated1
 from em_set_data import rogoseg
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/em/resistive_heating_2d_isopots.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/EM/em_resistive_heating_2d_multi_isopots.py b/examples/EM/em_resistive_heating_2d_multi_isopots.py
@@ -30,10 +30,11 @@
 from ansys.dyna.core.pre.dynamaterial import MatRigid,MatThermalIsotropic,EMMATTYPE
 from em_set_data import rogoseg
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/em/resistive_heating_2d_isopots.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/EM/em_rlc_define_func.py b/examples/EM/em_rlc_define_func.py
@@ -25,10 +25,11 @@
 )
 from ansys.dyna.core.pre.dynamaterial import MatRigid,EMMATTYPE
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/em/rlc_isopotential.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/EM/em_rlc_isopotential.py b/examples/EM/em_rlc_isopotential.py
@@ -26,10 +26,11 @@
 from ansys.dyna.core.pre.dynamaterial import MatRigid,EMMATTYPE
 from em_set_data import rlc_rogoseg
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/em/rlc_isopotential.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/Explicit/ball_plate.py b/examples/Explicit/ball_plate.py
@@ -34,6 +34,7 @@
     MatPiecewiseLinearPlasticity,
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/explicit/ball_plate.png'
 
 ###############################################################################
@@ -52,7 +53,7 @@
 # (``"localhost"`` and ``"50051"`` respectively).
 #
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 solution = launch_dynapre(ip = hostname)
 
diff --git a/examples/Explicit/belted_dummy.py b/examples/Explicit/belted_dummy.py
@@ -41,6 +41,7 @@
 )
 from belted_dummy_data import *
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/explicit/belted_dummy.png'
 
 ###############################################################################
@@ -59,7 +60,7 @@
 # (``"localhost"`` and ``"50051"`` respectively).
 #
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 dummy_solution = launch_dynapre(ip = hostname)
 
diff --git a/examples/Explicit/output/ball_plate.k b/examples/Explicit/output/ball_plate.k
diff --git a/examples/ICFD/icfd_cylinderflow.py b/examples/ICFD/icfd_cylinderflow.py
@@ -22,10 +22,11 @@
     MeshedVolume,
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/cylinderflow.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 icfd_solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_dam_break.py b/examples/ICFD/icfd_dam_break.py
@@ -25,10 +25,11 @@
     Compressible
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/dam_break.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_dem_coupling.py b/examples/ICFD/icfd_dem_coupling.py
@@ -30,11 +30,12 @@
 from ansys.dyna.core.pre.dynadem import DEMAnalysis
 from ansys.dyna.core.pre.dynamaterial import MatRigidDiscrete
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/dem_coupling.png'
 
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_driven_cavity.py b/examples/ICFD/icfd_driven_cavity.py
@@ -25,10 +25,11 @@
     ICFDDOF
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/driven_cavity.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_free_convection_flow.py b/examples/ICFD/icfd_free_convection_flow.py
@@ -24,10 +24,11 @@
 
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/free_convection_flow.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_imposed_move.py b/examples/ICFD/icfd_imposed_move.py
@@ -24,10 +24,11 @@
     Curve
     )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/imposed_move.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_internal_3d_flow.py b/examples/ICFD/icfd_internal_3d_flow.py
@@ -25,10 +25,11 @@
     ICFD_SurfRemeshMethod
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/internal_3d_flow.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_mesh_adaptivity.py b/examples/ICFD/icfd_mesh_adaptivity.py
@@ -22,10 +22,11 @@
     ICFDAnalysis
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/mesh_adaptivity.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_mesh_morphing.py b/examples/ICFD/icfd_mesh_morphing.py
@@ -22,10 +22,11 @@
     ICFDAnalysis
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/mesh_morphing.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_mesh_size.py b/examples/ICFD/icfd_mesh_size.py
@@ -22,10 +22,11 @@
     ICFDAnalysis
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/mesh_size.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_plate_flow.py b/examples/ICFD/icfd_plate_flow.py
@@ -22,10 +22,11 @@
     ICFDAnalysis
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/plate_flow.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_sloshing.py b/examples/ICFD/icfd_sloshing.py
@@ -27,10 +27,11 @@
     Compressible
     )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/sloshing.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_strong_fsi.py b/examples/ICFD/icfd_strong_fsi.py
@@ -30,10 +30,11 @@
 )
 from ansys.dyna.core.pre.dynamaterial import MatRigid
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/strong_fsi.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_thermal_flow.py b/examples/ICFD/icfd_thermal_flow.py
@@ -23,10 +23,11 @@
     ICFDAnalysis
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/thermal_flow.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ICFD/icfd_weak_fsi.py b/examples/ICFD/icfd_weak_fsi.py
@@ -30,10 +30,11 @@
 )
 from ansys.dyna.core.pre.dynamaterial import MatRigid
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/icfd/weak_fsi.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 solution = launch_dynapre(ip = hostname)
diff --git a/examples/ISPH/rigidtest.py b/examples/ISPH/rigidtest.py
@@ -33,10 +33,11 @@
     GravityOption,
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/isph/rigidtest.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 isphsolution = launch_dynapre(ip = hostname)
 fns = []
diff --git a/examples/Implicit/camry_rc.py b/examples/Implicit/camry_rc.py
@@ -39,6 +39,7 @@
 )
 from camry_rc_data import *
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 
 ###############################################################################
 # Start the ``pre`` service
@@ -56,7 +57,7 @@
 # (``"localhost"`` and ``"50051"`` respectively).
 #
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 camry_solution = launch_dynapre(ip = hostname)
 
diff --git a/examples/NVH/frf_plate_damping.py b/examples/NVH/frf_plate_damping.py
@@ -29,6 +29,7 @@
     ResponseType,
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/nvh/frf_plate_damping.png'
 ###############################################################################
 # Start the ``pre`` service
@@ -46,7 +47,7 @@
 # (``"localhost"`` and ``"50051"`` respectively).
 #
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 solution = launch_dynapre(ip = hostname)
 ###############################################################################
diff --git a/examples/NVH/nvh_frf_solid.py b/examples/NVH/nvh_frf_solid.py
@@ -26,10 +26,11 @@
     ExcitationType
 )
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/nvh/frf_column_hole.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 solution = launch_dynapre(ip = hostname)
 fns = []
diff --git a/examples/SALE/sale_efp.py b/examples/SALE/sale_efp.py
@@ -20,10 +20,11 @@
 )
 from ansys.dyna.core.pre import dynamaterial as matDB
 from ansys.dyna.core.pre import examples
+from ansys.dyna.core.pre.misc import check_valid_ip
 # sphinx_gallery_thumbnail_path = '_static/pre/sale/efpcase.png'
 
 hostname = "localhost"
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):
     hostname = sys.argv[1]
 
 efp_solution = launch_dynapre(ip = hostname)
diff --git a/examples/Thermal/thermal_stress.py b/examples/Thermal/thermal_stress.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/src/ansys/dyna/core/pre/dynasolution.py b/src/ansys/dyna/core/pre/dynasolution.py
diff --git a/src/ansys/dyna/core/pre/launcher.py b/src/ansys/dyna/core/pre/launcher.py
diff --git a/src/ansys/dyna/core/pre/misc.py b/src/ansys/dyna/core/pre/misc.py
diff --git a/src/ansys/dyna/core/solver/dynasolver.py b/src/ansys/dyna/core/solver/dynasolver.py
diff --git a/src/ansys/dyna/core/solver/launcher.py b/src/ansys/dyna/core/solver/launcher.py

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`MatPiecewiseLinearPlasticity,`
`35`	`35`	`)`
`36`	`36`	`from ansys.dyna.core.pre import examples`
	`37`	`+from ansys.dyna.core.pre.misc import check_valid_ip`
`37`	`38`	`# sphinx_gallery_thumbnail_path = '_static/pre/explicit/ball_plate.png'`
`38`	`39`
`39`	`40`	`###############################################################################`
`@@ -52,7 +53,7 @@`
`52`	`53`	# (``"localhost"`` and ``"50051"`` respectively).
`53`	`54`	`#`
`54`	`55`	`hostname = "localhost"`
`55`		`-if len(sys.argv) > 1:`
	`56`	`+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):`
`56`	`57`	`hostname = sys.argv[1]`
`57`	`58`	`solution = launch_dynapre(ip = hostname)`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`)`
`42`	`42`	`from belted_dummy_data import *`
`43`	`43`	`from ansys.dyna.core.pre import examples`
	`44`	`+from ansys.dyna.core.pre.misc import check_valid_ip`
`44`	`45`	`# sphinx_gallery_thumbnail_path = '_static/pre/explicit/belted_dummy.png'`
`45`	`46`
`46`	`47`	`###############################################################################`
`@@ -59,7 +60,7 @@`
`59`	`60`	# (``"localhost"`` and ``"50051"`` respectively).
`60`	`61`	`#`
`61`	`62`	`hostname = "localhost"`
`62`		`-if len(sys.argv) > 1:`
	`63`	`+if len(sys.argv) > 1 and check_valid_ip(sys.argv[1]):`
`63`	`64`	`hostname = sys.argv[1]`
`64`	`65`	`dummy_solution = launch_dynapre(ip = hostname)`
`65`	`66`