Improvements to sweep launching template report generation (#934)

* added functionality to sweep template report and reverted the deletion of evtol eaxmple

* removed from_cloud project upload

* changed cfl plot to be a single one

* black

* removed forces/moments vs beta

* used semi-log scale for CFL chart

Author: wiktor-flex

examples/post_processing/report/sweep_launch_report.py

@@ -10,10 +10,12 @@
     FrontLeftTopCamera,
     Inputs,
     LeftCamera,
+    NonlinearResiduals,
     PatternCaption,
     RearCamera,
     RearRightBottomCamera,
     Settings,
+    SubsetLimit,
     Summary,
     Table,
     TopCamera,
@@ -31,6 +33,7 @@ def generate_report(
     include_cfl: bool = False,
     include_forces_moments_table: bool = False,
     include_forces_moments_charts: bool = False,
+    include_forces_moments_alpha_charts: bool = False,
     include_cf_vec: bool = False,
     include_cp: bool = False,
     include_yplus: bool = False,
@@ -42,8 +45,6 @@ def generate_report(
 
     exclude = freestream_surfaces
 
-    SOLVER_VERSION = __solver_version__
-
     top_camera = TopCamera(pan_target=(3.5, 0, -0.5), dimension=15, dimension_dir="height")
     bottom_camera = BottomCamera(pan_target=(3.5, 0, -0.5), dimension=15, dimension_dir="height")
     front_camera = FrontCamera(pan_target=(3.5, 0, -0.5), dimension=15, dimension_dir="width")
@@ -94,24 +95,20 @@ def generate_report(
     avg = Average(fraction=0.1)
 
     force_list = [
-        "totalCD",
-        "totalCL",
-        "totalCFx",
-        "totalCFy",
-        "totalCFz",
-        "totalCMx",
-        "totalCMy",
-        "totalCMz",
+        "CD",
+        "CL",
+        "CFx",
+        "CFy",
+        "CFz",
+        "CMx",
+        "CMy",
+        "CMz",
     ]
 
-    residuals_list = ["0_cont", "1_momx", "2_momy", "3_momz", "4_energ", "5_nuHat"]
-
     for model in params.models:
         if model.type == "Fluid":
             turbulence_solver = model.turbulence_model_solver.type_name
 
-    cfl_list = ["0_NavierStokes_cfl", f"1_{turbulence_solver}_cfl"]
-
     CD = DataItem(data="surface_forces/totalCD", exclude=exclude, title="CD", operations=avg)
     CL = DataItem(data="surface_forces/totalCL", exclude=exclude, title="CL", operations=avg)
     CFX = DataItem(data="surface_forces/totalCFx", exclude=exclude, title="CFx", operations=avg)
@@ -158,45 +155,50 @@ def generate_report(
         items.append(table)
 
     if include_residuals:
-        residual_charts = [
-            Chart2D(
-                x=f"nonlinear_residuals/{step_type}",
-                y=f"nonlinear_residuals/{residual}",
-                force_new_page=True,
-                section_title="Residuals",
-                fig_name=f"{residual}_fig",
-            )
-            for residual in residuals_list
-        ]
-        items.extend(residual_charts)
+        residual_chart = NonlinearResiduals(
+            force_new_page=True, section_title="Nonlinear residuals", fig_name=f"nonlin-res_fig"
+        )
+        items.append(residual_chart)
 
     if include_cfl and params.time_stepping.CFL.type == "adaptive":
-        cfl_charts = [
-            Chart2D(
-                x=f"cfl/{step_type}",
-                y=f"cfl/{cfl}",
-                force_new_page=True,
-                section_title="CFL",
-                fig_name=f"{cfl}_fig",
-            )
-            for cfl in cfl_list
-        ]
-        items.extend(cfl_charts)
+        cfl_chart = Chart2D(
+            x=f"cfl/{step_type}",
+            y=["cfl/0_NavierStokes_cfl", f"cfl/1_{turbulence_solver}_cfl"],
+            force_new_page=True,
+            section_title="CFL",
+            fig_name="cfl_fig",
+            y_log=True,
+        )
+        items.append(cfl_chart)
 
     if include_forces_moments_charts:
         force_charts = [
             Chart2D(
                 x=f"surface_forces/{step_type}",
-                y=f"surface_forces/{force}",
+                y=f"surface_forces/total{force}",
                 force_new_page=True,
                 section_title="Forces/Moments",
                 fig_name=f"{force}_fig",
                 exclude=exclude,
+                ylim=SubsetLimit(subset=(0.5, 1), offset=0.25),
             )
             for force in force_list
         ]
         items.extend(force_charts)
 
+    if include_forces_moments_alpha_charts:
+        force_alpha_charts = [
+            Chart2D(
+                x=f"params/operating_condition/alpha",
+                y=f"total_forces/averages/{force}",
+                force_new_page=True,
+                section_title="Averaged Forces/Moments against alpha",
+                fig_name=f"{force}_alpha_fig",
+            )
+            for force in force_list
+        ]
+        items.extend(force_alpha_charts)
+
     if include_yplus:
         y_plus_screenshots = [
             Chart3D(
@@ -271,7 +273,7 @@ def generate_report(
     report = report.create_in_cloud(
         "sweep-script-report",
         cases,
-        solver_version=SOLVER_VERSION,
+        solver_version=__solver_version__,
     )
 
     report.wait()

examples/post_processing/report/sweep_launch_template.py

@@ -272,6 +272,7 @@ def main():
         include_cfl=True,
         include_forces_moments_table=True,
         include_forces_moments_charts=True,
+        include_forces_moments_alpha_charts=True,
         include_cf_vec=True,
         include_cp=True,
         include_yplus=True,

flow360/examples/__init__.py

@@ -6,6 +6,7 @@
 from .cylinder2D import Cylinder2D
 from .cylinder3D import Cylinder3D
 from .drivaer import DrivAer
+from .evtol import EVTOL
 from .monitors import MonitorsAndSlices
 from .om6wing import OM6wing
 from .quadcopter import Quadcopter
@@ -30,6 +31,7 @@
     "Cylinder2D",
     "Cylinder3D",
     "DrivAer",
+    "EVTOL",
     "MonitorsAndSlices",
     "OM6wing",
     "RotatingSpheres",