Merge pull request #44 from frkasper/2406

2406 cycle
frkasper · Jul 12, 2024 · 91799b1 · 91799b1
2 parents c993eda + 915b7b7
commit 91799b1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@ MacroUtils is a collection of high-level APIs in order to make your life easier
 
 ## Requires
 
-1. Simcenter STAR-CCM+ 2402 libraries;
+1. Simcenter STAR-CCM+ 2406 libraries;
 
-1. Integrated development environment (IDE) supporting JDK 17.0.8 and gradle
+1. Integrated development environment (IDE) supporting JDK 21.0.1 and gradle
 
 ## Recommended IDE
 
-NetBeans 18 or later.
+NetBeans 19 or later.
 
 ## Need an older version?
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/macroutils/src/macroutils/MacroUtils.java b/macroutils/src/macroutils/MacroUtils.java
@@ -28,7 +28,7 @@
  *
  * @since STAR-CCM+ v7.02, May of 2012
  * @author Fabio Kasper
- * @version 2402
+ * @version 2406
  */
 public final class MacroUtils {
 

diff --git a/macroutils/src/macroutils/creator/CreateScene.java b/macroutils/src/macroutils/creator/CreateScene.java
@@ -351,7 +351,6 @@ private Displayer _createDisplayer(Scene scn, StaticDeclarations.Displayer type,
     private PartDisplayer _createDisplayer_Part(Scene scn, ArrayList<NamedObject> ano, boolean vo) {
         PartDisplayer pd = _getDM(scn)
                 .createPartDisplayer(StaticDeclarations.Displayer.GEOMETRY.getType());
-        pd.initialize();
         pd.setColorMode(PartColorMode.DP);
         pd.setOutline(false);
         pd.setSurface(true);
@@ -364,7 +363,6 @@ private ScalarDisplayer _createDisplayer_Scalar(Scene scn, ArrayList<NamedObject
             FieldFunction ff, Units u, boolean vo) {
         ScalarDisplayer sd = _getDM(scn).createScalarDisplayer(
                 StaticDeclarations.Displayer.SCALAR.getType(), ClipMode.NONE);
-        sd.initialize();
         _setSDQ(sd.getScalarDisplayQuantity(), ff);
         if (u != null) {
             sd.getScalarDisplayQuantity().setUnits(u);
@@ -378,7 +376,6 @@ private StreamDisplayer _createDisplayer_Streamline(Scene scn, ArrayList<NamedOb
             FieldFunction ff, Units u, boolean vo) {
         StreamDisplayer sd = _getDM(scn).createStreamDisplayer(
                 StaticDeclarations.Displayer.STREAMLINE.getType(), ClipMode.NONE);
-        sd.initialize();
         _setSDQ(sd.getScalarDisplayQuantity(), ff);
         if (u != null) {
             sd.getScalarDisplayQuantity().setUnits(u);
@@ -392,7 +389,6 @@ private StreamDisplayer _createDisplayer_Streamline(Scene scn, ArrayList<NamedOb
     private VectorDisplayer _createDisplayer_Vector(Scene scn, ArrayList<NamedObject> ano,
             FieldFunction ff, Units u, boolean vo) {
         VectorDisplayer vd = _getDM(scn).createVectorDisplayer("Vector", ClipMode.NONE);
-        vd.initialize();
         if (!_chk.is.vector(ff)) {
             _io.say.value("Field Function is not a Vector. Type",
                     ff.getType().getSelected().name(), true, true);
@@ -509,8 +505,6 @@ private Scene _initScene(StaticDeclarations.Scene type, boolean vo) {
         _io.say.value("Type", type.getType(), true, vo);
         Scene scn = _sim.getSceneManager().createScene();
         scn.setPresentationName(type.getType());
-        ((PartDisplayer) scn.getCreatorDisplayer()).initialize();
-        scn.initializeAndWait();
         scn.resetCamera();
         _get.objects.hardcopyProperties(scn, false).setUseCurrentResolution(false);
         scn.setDepthPeel(false);

diff --git a/macroutils/src/macroutils/getter/GetPartSurfaces.java b/macroutils/src/macroutils/getter/GetPartSurfaces.java
@@ -277,7 +277,7 @@ public HashMap<PartSurface, NeoProperty> statistics(ArrayList<PartSurface> aps)
         _io.say.action("Querying Part Surfaces Statistics", true);
         //-- Init Widget
         Scene scn = _sim.getSceneManager().createScene("Repair Surface");
-        scn.initializeAndWait();
+        scn.initialize();
         PartSurfaceMeshWidget psmw = _get.geometries.representation().startSurfaceMeshWidget(scn);
         psmw.setActiveParts(agp, _get.geometries.rootDescriptionSource());
         psmw.startSurfaceRepairControllers();

diff --git a/tests/test/test_demo05.py b/tests/test/test_demo05.py
@@ -18,7 +18,7 @@ def test_kart_wrap_part_surfaces_count():
 
 
 def test_cell_count():
-    test_utils.assert_cell_count(DEMO_ID, 630000, tolerance=0.025)
+    test_utils.assert_cell_count(DEMO_ID, 640000, tolerance=0.05)
 
 
 def test_solution():
@@ -35,8 +35,8 @@ def test_cd_report():
 
 
 def test_cl_report():
-    test_utils.assert_report(DEMO_ID, 'C_l', 0.35,
-                             tolerance=0.01, relative=False)
+    test_utils.assert_report(DEMO_ID, 'C_l', 0.34,
+                             tolerance=0.02, relative=False)
 
 
 def test_scalar_pressure_kart_min():

diff --git a/tests/test/test_demo07.py b/tests/test/test_demo07.py
@@ -25,8 +25,8 @@ def test_solution():
 
 
 def test_cfl_avg_report():
-    test_utils.assert_report(DEMO_ID, 'CFL_avg', 0.011,
-                             tolerance=0.001, relative=False)
+    test_utils.assert_report(DEMO_ID, 'CFL_avg', 0.01,
+                             tolerance=0.005, relative=False)
 
 
 def test_cfl_max_report():