Merge branch 'main' into release/0.8

# Conflicts: # pyaedt/__init__.py
ansys · Feb 27, 2024 · 509a879 · 509a879
2 parents 69e41d8 + 61f4d81
commit 509a879
Show file tree

Hide file tree

Showing 51 changed files with 1,473 additions and 1,010 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -19,18 +19,6 @@ testing:
     - "_unittest_ironpython/run_unittests.py"
     - "_unittest_ironpython/run_unittests_batchmode.cmd"
 
-# TODO : Remove once EDB is extracted from PyAEDT
-edb:
-- changed-files:
-  - any-glob-to-any-file:
-    - "examples/00-EDB/*"
-    - "examples/01-HFSS3DLayout/EDB_in_3DLayout.py"
-    - "examples/01-HFSS3DLayout/Dcir_in_3DLayout.py"
-    - "examples/05-Q3D/Q3D_from_EDB.py"
-    - "examples/05-Q3D/Q3D_DC_IR.py"
-    - "pyaedt/edb_core/**/*"
-    - "pyaedt/edb.py"
-
 examples:
 - changed-files:
   - any-glob-to-any-file:

diff --git a/.github/labels.yml b/.github/labels.yml
@@ -30,10 +30,6 @@
   description: Anything related to testing
   color: 5802B8
 
-- name: edb
-  description: Anything related to the EDB API
-  color: C4C25D
-
 - name: examples
   description: Anything related to the examples
   color: 3C2E5F
diff --git a/.github/workflows/full_documentation.yml b/.github/workflows/full_documentation.yml
@@ -33,7 +33,7 @@ jobs:
   full_documentation:
     # The type of runner that the job will run on
     name: full_documentation
-    runs-on: [windows-latest, pyaedt]
+    runs-on: [Windows, self-hosted, pyaedt]
     timeout-minutes: 720
     strategy:
       matrix:
@@ -85,13 +85,6 @@ jobs:
           path: doc/_build/html
           retention-days: 7
 
-      - name: Upload HTML documentation artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: documentation-html-edb
-          path: doc/_build/html/EDBAPI
-          retention-days: 7
-
 #      - name: Upload PDF documentation artifact
 #        uses: actions/upload-artifact@v4
 #        with:
@@ -159,14 +152,3 @@ jobs:
           index-name: pyaedt-v${{ env.VERSION_MEILI }}
           host-url: ${{ vars.MEILISEARCH_HOST_URL }}
           api-key: ${{ env.MEILISEARCH_API_KEY }}
-          pymeilisearchopts: --stop_urls \"EDBAPI\" # Add EDB API as another index.
-
-      - name: "Deploy the stable documentation index for EDB API"
-        uses: ansys/actions/doc-deploy-index@v4
-        with:
-          cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}/EDBAPI/
-          index-name: pyedb-v${{ env.VERSION_MEILI }}
-          host-url: ${{ vars.MEILISEARCH_HOST_URL }}
-          api-key: ${{ env.MEILISEARCH_API_KEY }}
-          doc-artifact-name: documentation-html-edb # Add only EDB API as page in this index.
-          pymeilisearchopts: --port 8001 #serve in another port
diff --git a/.github/workflows/ironpython.yml b/.github/workflows/ironpython.yml
@@ -18,7 +18,7 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: [windows-latest, pyaedt]
+    runs-on: [Windows, self-hosted, pyaedt]
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/nightly-docs.yml b/.github/workflows/nightly-docs.yml
@@ -45,12 +45,6 @@ jobs:
           path: doc/_build/html
           retention-days: 7
 
-      - name: Upload HTML documentation artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: documentation-html-edb
-          path: doc/_build/html/EDBAPI
-          retention-days: 7
 
   docs_upload:
     needs: docs_build
@@ -82,17 +76,6 @@ jobs:
           index-name: pyaedt-vdev
           host-url: ${{ vars.MEILISEARCH_HOST_URL }}
           api-key: ${{ env.MEILISEARCH_API_KEY }}
-          pymeilisearchopts: --stop_urls \"EDBAPI\" # Add EDB API as another index to show it in dropdown button
-
-      - name: "Deploy the dev documentation index for EDB API"
-        uses: ansys/actions/doc-deploy-index@v4
-        with:
-          cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev/EDBAPI/
-          index-name: pyedb-vdev
-          host-url: ${{ vars.MEILISEARCH_HOST_URL }}
-          api-key: ${{ env.MEILISEARCH_API_KEY }}
-          doc-artifact-name: documentation-html-edb # Add only EDB API as page in this index.
-          pymeilisearchopts: --port 8001 # serve in another port as 8000 is deafult
 
   # docstring_testing:
   #   runs-on: Windows

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -30,7 +30,7 @@ jobs:
   # This workflow contains a single job called "build"
   build_solvers:
     # The type of runner that the job will run on
-    runs-on: [ windows-latest, pyaedt ]
+    runs-on: [Windows, self-hosted, pyaedt]
     strategy:
       matrix:
         python-version: [ '3.10' ]
@@ -93,7 +93,7 @@ jobs:
 
   build:
     # The type of runner that the job will run on
-    runs-on: [windows-latest, pyaedt]
+    runs-on: [Windows, self-hosted, pyaedt]
     strategy:
       matrix:
         python-version: ['3.10']

diff --git a/.github/workflows/unit_tests_solvers.bkp b/.github/workflows/unit_tests_solvers.bkp
@@ -30,7 +30,7 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: [windows-latest, pyaedt]
+    runs-on: [Windows, self-hosted, pyaedt]
     strategy:
       matrix:
         python-version: ['3.10']

diff --git a/_unittest/example_models/T08/cylinder_geometry_creation.csv b/_unittest/example_models/T08/cylinder_geometry_creation.csv
@@ -0,0 +1,5 @@
+# Blocks Cylinder,,,,,,,,,,,,,,,,,,,
+#,,,,,,,,,,,,,,,,,,,
+name,xc,yc,zc,plane,radius,iradius,height
+Cylinder,0,0,0,2,40,0,70
+Cylinder_with_hole,10,10,0,2,40,20,70
diff --git a/_unittest/example_models/T08/cylinder_geometry_creation_missing_values.csv b/_unittest/example_models/T08/cylinder_geometry_creation_missing_values.csv
@@ -0,0 +1,5 @@
+# Blocks Cylinder,,,,,,,,,,,,,,,,,,,
+#,,,,,,,,,,,,,,,,,,,
+name,xc,yc,zc,plane,radius,iradius,height
+Cylinder,0,0,0,2,40,0,70
+Cylinder_with_hole,10,10,0,2,40
diff --git a/_unittest/example_models/T08/cylinder_geometry_creation_wrong_keys.csv b/_unittest/example_models/T08/cylinder_geometry_creation_wrong_keys.csv
@@ -0,0 +1,5 @@
+# Blocks Cylinder,,,,,,,,,,,,,,,,,,,
+#,,,,,,,,,,,,,,,,,,,
+name,xc,yc,zc,plane,outerradius,innerradius,height
+Cylinder,0,0,0,2,40,0,70
+Cylinder_with_hole,10,10,0,2,40,20,70
diff --git a/_unittest/example_models/T08/primitives_file.json b/_unittest/example_models/T08/primitives_file.json
@@ -0,0 +1,113 @@
+{
+	"Primitives":
+	[
+		{
+			"Primitive Type": "Cylinder",
+			"Name": "Small",
+			"Plane": 1,
+			"Height": 10.0,
+			"Radius": "3.0mm",
+			"Internal Radius": 1.0,
+			"Number of Segments": 0
+		},
+		{
+			"Primitive Type": "Cylinder",
+			"Name": "Big",
+			"Plane": 0,
+			"Height": 50.0,
+			"Radius": 10.0,
+			"Internal Radius": 0
+		},
+		{
+			"Primitive Type": "Cylinder",
+			"Name": "Big_hole",
+			"Plane": 0,
+			"Height": 50.0,
+			"Radius": 10.0,
+			"Internal Radius": 5
+		},
+		{
+			"Primitive Type": "Box",
+			"Name": "SmallBox",
+			"X Length": 10.0,
+			"Y Length": 10.0,
+			"Z Length": 10.0
+		},
+		{
+			"Primitive Type": "Box",
+			"Name": "BigBox",
+			"X Length": 100.0,
+			"Y Length": 100.0,
+			"Z Length": 100.0
+		}
+
+	],
+	"Instances":
+	[
+		{
+			"Name":"Small",
+			"Coordinate System": "CS1",
+			"Origin": ["0mm","1.052dm","2"]
+		},
+		{
+			"Name":"Small",
+			"Coordinate System": "Global",
+			"Origin": ["20um",10,"2.2"]
+		},
+		{
+			"Name":"Big",
+			"Coordinate System": "CS2",
+			"Origin": ["2.0mm",0,50.5]
+		},
+		{
+			"Name":"Big",
+			"Coordinate System": "Global",
+			"Origin": [10,10,10]
+		},
+		{
+			"Name":"Big_hole",
+			"CS": "CS1",
+			"Origin": [0,0,50]
+		},
+		{
+			"Name":"SmallBox",
+			"Coordinate System": "CS1",
+			"Origin": ["0mm","1.052dm","2"]
+		},
+		{
+			"Name":"SmallBox",
+			"Coordinate System": "Global",
+			"Origin": ["20um",10,"2.2"]
+		},
+		{
+			"Name":"BigBox",
+			"Coordinate System": "CS2",
+			"Origin": ["2.0mm",0,50.5]
+		},
+		{
+			"Name":"BigBox",
+			"Coordinate System": "Global",
+			"Origin": [10,10,10]
+		}
+	],
+	"Coordinate Systems":
+	[
+		{
+			"Name":"CS1",
+			"Reference CS": "Global",
+			"Mode": "Axis/Position",
+			"Origin": ["20um",10,"2.2"],
+			"X Axis": [1,0,0],
+			"Y Point": [0,1,0]
+		},
+		{
+			"Name": "CS2",
+			"Mode": "Euler Angle ZYZ",
+			"Origin": ["1.5",0,"0"],
+			"Phi": "0deg",
+			"Theta": 2,
+			"Psi": 0.5
+		}
+	],
+	"Units": "mm"
+}
diff --git a/_unittest/example_models/T08/prism_geometry_creation.csv b/_unittest/example_models/T08/prism_geometry_creation.csv
@@ -0,0 +1,5 @@
+# Blocks Prism,,,,,,,,,,,,,,,,,,,
+#,,,,,,,,,,,,,,,,,,,
+name,xs,ys,zs,xd,yd,zd
+block_1,0.65,0.4,0.4,0.2,0.2,0.2
+block_2,0.90,0.4,0.4,0.2,0.2,0.2
diff --git a/_unittest/example_models/T08/prism_geometry_creation_missing_values.csv b/_unittest/example_models/T08/prism_geometry_creation_missing_values.csv
@@ -0,0 +1,5 @@
+# Blocks Prism
+#
+name,xs,ys,zs,xe,ye,ze,xd,yd,zd
+block_1,0.65,0.4,0.4,0.85,0.6,0.6,0.2,0.2
+block_2,0.9,0.4,0.4,1.1,0.6,0.6,0.2,0.2,0.2
diff --git a/_unittest/example_models/T08/prism_geometry_creation_wrong_keys.csv b/_unittest/example_models/T08/prism_geometry_creation_wrong_keys.csv
@@ -0,0 +1,5 @@
+# Blocks Prism
+#
+name,xs,ys,zs,xe,ye,ze,xl,yl,zl
+block_1,0.65,0.4,0.4,0.85,0.6,0.6,0.2,0.2,0.2
+block_2,0.9,0.4,0.4,1.1,0.6,0.6,0.2,0.2,0.2