Improve method get_solution_data to avoid intrinsics as arguments and… (

#3898) * Improve method get_solution_data to avoid intrinsics as arguments and to add the method to the setups objects * fix import_nastran * Minor improvements * Minor improvements --------- Co-authored-by: maxcapodi78 <Shark78> Co-authored-by: Samuel Lopez <[email protected]>
ansys · Nov 23, 2023 · 69cbff1 · 69cbff1
1 parent 3de28eb
commit 69cbff1
Show file tree

Hide file tree

Showing 9 changed files with 606 additions and 155 deletions.
diff --git a/_unittest/example_models/T20/test_cad.nas b/_unittest/example_models/T20/test_cad.nas
@@ -23,7 +23,7 @@ GRID          17        -142.085-81.8469969.8416
 GRID          18        338.1222.4335859436.2341
 GRID          19        328.0788-91.8056 418.809
 GRID          20        260.6554-89.1117 459.994
-GRID          21        1574.546 -4.1-111484.805
+GRID          21        1574.546 -34.1-11484.805
 GRID          22        4411.665-98.6627 505.296
 GRID          23        4410.392-95.7236504.7545
 GRID          24        4412.102-93.0528505.4793
@@ -38,18 +38,18 @@ GRID          32        4410.434-95.7239504.6637
 GRID          33        4414.683-98.9433506.4686
 GRID          34        4416.393-96.2763507.1935
 GRID          35        4413.413-96.0004505.9284
-GRID          40        0.0     0.0          0.0
-GRID          41        1.0     0.0          0.0
-GRID          42        1.0     1.0          0.0
-GRID          43        0.0     1.0          0.0
-GRID          44        0.0     0.0          1.0
-GRID          45        1.0     0.0          1.0
-GRID          46        1.0     1.0          1.0
-GRID          47        0.0     1.0          1.0
-GRID          50        0.0     0.0          0.0
-GRID          51        2.0     0.0          0.0
-GRID          52        0.0     2.0          0.0
-GRID          53        0.0     0.0          2.0
+GRID          40             0.0     0.0     0.0
+GRID          41             1.0     0.0     0.0
+GRID          42             1.0     1.0     0.0
+GRID          43             0.0     1.0     0.0
+GRID          44             0.0     0.0     1.0
+GRID          45             1.0     0.0     1.0
+GRID          46             1.0     1.0     1.0
+GRID          47             0.0     1.0     1.0
+GRID          50             0.0     0.0     0.0
+GRID          51             2.0     0.0     0.0
+GRID          52             0.0     2.0     0.0
+GRID          53             0.0     0.0     2.0
 CTRIA3     92455      31       4       5       6
 CTRIA3     92456      31       5      10      11
 CTRIA3     92457      31      21      20      16
@@ -64,7 +64,8 @@ CPENTA     25229       9      27      22      28      33      29      35
 CPENTA     25279       9      25      28      24      30      35      31
 CPENTA     25284       9      26      27      28      34      33      35
 CPENTA     25328       9      26      28      25      34      35      30
-CHEXA          1     105      40      41      42      43      44      45      46      47
+CHEXA          1     105      40      41      42      43      44      45
+*             46      47
 CTETRA         1     115      50      51      52      53
 
 ENDDATA

diff --git a/_unittest/example_models/T20/test_cad_2.nas b/_unittest/example_models/T20/test_cad_2.nas
@@ -0,0 +1,24 @@
+$
+$ Settings :
+$
+$ Output format : MSC Nastran
+$
+$ Output : Visible
+$
+$
+$
+$
+BEGIN BULK                                                                      
+GRID*                  4                       627.87512       568.96751*
+*              1942.1985
+GRID*                  5                       812.95973       486.74968*
+*              1495.9564
+GRID*                  6                       812.99916       484.24676*
+*              1470.1764
+CTRIA3*            75986              19               4               5
+*                      6
+
+
+ENDDATA
+$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
diff --git a/_unittest/test_12_PostProcessing.py b/_unittest/test_12_PostProcessing.py
@@ -209,14 +209,9 @@ def test_09_manipulate_report_D(self, field_test):
     def test_09_manipulate_report_E(self, field_test):
         field_test.modeler.create_polyline([[0, 0, 0], [0, 5, 30]], name="Poly1", non_model=True)
         variations2 = field_test.available_variations.nominal_w_values_dict
-        variations2["Theta"] = ["All"]
-        variations2["Phi"] = ["All"]
-        variations2["Freq"] = ["30GHz"]
-        variations2["Distance"] = ["All"]
-        assert field_test.post.create_report(
+
+        assert field_test.setups[0].create_report(
             "Mag_E",
-            field_test.nominal_adaptive,
-            variations=variations2,
             primary_sweep_variable="Distance",
             context="Poly1",
             report_category="Fields",
@@ -226,11 +221,10 @@ def test_09_manipulate_report_E(self, field_test):
         new_report.polyline = "Poly1"
         assert new_report.create()
         new_report = field_test.post.reports_by_category.modal_solution("S(1,1)")
-        new_report.plot_type = "Smith Chart"
+        new_report.report_type = "Smith Chart"
         assert new_report.create()
-        data = field_test.post.get_solution_data(
+        data = field_test.setups[0].get_solution_data(
             "Mag_E",
-            field_test.nominal_adaptive,
             variations=variations2,
             primary_sweep_variable="Theta",
             context="Poly1",
@@ -269,7 +263,7 @@ def test_17_circuit(self, circuit_test):
         circuit_test.analyze_setup("LNA")
         circuit_test.analyze_setup("Transient")
         assert circuit_test.setups[0].is_solved
-        assert circuit_test.post.create_report(["dB(S(Port1, Port1))", "dB(S(Port1, Port2))"], "LNA")
+        assert circuit_test.setups[0].create_report(["dB(S(Port1, Port1))", "dB(S(Port1, Port2))"])
         new_report = circuit_test.post.reports_by_category.standard(
             ["dB(S(Port1, Port1))", "dB(S(Port1, Port2))"], "LNA"
         )
@@ -382,7 +376,7 @@ def test_55_time_plot(self, sbr_test):
         assert sbr_test.setups[0].is_solved
         solution_data = sbr_test.post.get_solution_data(
             expressions=["NearEX", "NearEY", "NearEZ"],
-            variations={"_u": ["All"], "_v": ["All"], "Freq": ["All"]},
+            # variations={"_u": ["All"], "_v": ["All"], "Freq": ["All"]},
             context="Near_Field",
             report_category="Near Fields",
         )

diff --git a/_unittest/test_20_HFSS.py b/_unittest/test_20_HFSS.py
@@ -1421,9 +1421,11 @@ def test_58_create_near_field_line(self):
     def test_59_test_nastran(self):
         self.aedtapp.insert_design("Nas_teest")
         example_project = os.path.join(local_path, "../_unittest/example_models", test_subfolder, "test_cad.nas")
+        example_project2 = os.path.join(local_path, "../_unittest/example_models", test_subfolder, "test_cad_2.nas")
 
         cads = self.aedtapp.modeler.import_nastran(example_project)
         assert len(cads) > 0
+        assert self.aedtapp.modeler.import_nastran(example_project2)
 
     def test_60_set_variable(self):
         self.aedtapp.variable_manager.set_variable("var_test", expression="123")

diff --git a/pyaedt/application/Analysis.py b/pyaedt/application/Analysis.py
@@ -1195,7 +1195,7 @@ def _create_setup(self, setupname="MySetupAuto", setuptype=None, props=None):
             setup = SetupHFSSAuto(self, setuptype, name)
         elif setuptype == 4:
             setup = SetupSBR(self, setuptype, name)
-        elif setuptype in [5, 6, 7, 8, 9, 10]:
+        elif setuptype in [5, 6, 7, 8, 9, 10, 56]:
             setup = SetupMaxwell(self, setuptype, name)
         elif setuptype in [14]:
             setup = SetupQ3D(self, setuptype, name)

diff --git a/pyaedt/application/design_solutions.py b/pyaedt/application/design_solutions.py
@@ -110,15 +110,15 @@
             "name": None,
             "options": None,
             "report_type": None,
-            "default_setup": None,
+            "default_setup": 8,
             "default_adaptive": "LastAdaptive",
             "intrinsics": ["Freq", "Phase"],
         },
         "DCConduction": {
             "name": None,
             "options": None,
             "report_type": None,
-            "default_setup": None,
+            "default_setup": 8,
             "default_adaptive": "LastAdaptive",
         },
         "ElectroDCConduction": {
@@ -138,13 +138,21 @@
         },
     },
     "Twin Builder": {
-        "TR": {"name": None, "options": None, "report_type": "Standard", "default_setup": 35, "default_adaptive": None},
+        "TR": {
+            "name": None,
+            "options": None,
+            "report_type": "Standard",
+            "default_setup": 35,
+            "default_adaptive": None,
+            "intrinsics": ["Time"],
+        },
         "AC": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": None,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "DC": {
             "name": None,
@@ -161,6 +169,7 @@
             "report_type": "Standard",
             "default_setup": 15,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "NexximDC": {
             "name": None,
@@ -175,85 +184,104 @@
             "report_type": "Standard",
             "default_setup": 17,
             "default_adaptive": None,
+            "intrinsics": ["Time"],
         },
         "NexximVerifEye": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 19,
             "default_adaptive": None,
+            "intrinsics": ["Time"],
         },
         "NexximQuickEye": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 18,
             "default_adaptive": None,
+            "intrinsics": ["Time"],
         },
         "NexximAMI": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 20,
             "default_adaptive": None,
+            "intrinsics": ["Time"],
         },
         "NexximOscillatorRSF": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 21,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "NexximOscillator1T": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 22,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "NexximOscillatorNT": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 23,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "NexximHarmonicBalance1T": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 24,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "NexximHarmonicBalanceNT": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 25,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "NexximSystem": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 26,
             "default_adaptive": None,
+            "intrinsics": ["Time"],
         },
         "NexximTVNoise": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 27,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "HSPICE": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 28,
             "default_adaptive": None,
+            "intrinsics": ["Time"],
+        },
+        "TR": {
+            "name": None,
+            "options": None,
+            "report_type": "Standard",
+            "default_setup": 17,
+            "default_adaptive": None,
+            "intrinsics": ["Time"],
         },
-        "TR": {"name": None, "options": None, "report_type": "Standard", "default_setup": 17, "default_adaptive": None},
     },
     "2D Extractor": {
         "Open": {
@@ -353,6 +381,7 @@
             "report_type": "Modal Solution Data",
             "default_setup": 4,
             "default_adaptive": "Sweep",
+            "intrinsics": ["Freq", "Phase"],
         },
     },
     "Icepak": {
@@ -439,13 +468,15 @@
             "report_type": "Standard",
             "default_setup": 41,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
         "LNA3DLayout": {
             "name": None,
             "options": None,
             "report_type": "Standard",
             "default_setup": 42,
             "default_adaptive": None,
+            "intrinsics": ["Freq"],
         },
     },
     "Mechanical": {