Bump to 25.6.5 and also add default value application to planar tolerance (#1348)

Author: benflexcompute

flow360/component/simulation/framework/updater.py

@@ -286,7 +286,7 @@ def _to_25_6_2(params_as_dict):
     return params_as_dict
 
 
-def _to_25_6_4(params_as_dict):
+def _add_default_planar_face_tolerance(params_as_dict):
     if params_as_dict.get("meshing") is None:
         return params_as_dict
     if "defaults" not in params_as_dict["meshing"]:
@@ -297,6 +297,15 @@ def _to_25_6_4(params_as_dict):
     return params_as_dict
 
 
+def _to_25_6_4(params_as_dict):
+    return _add_default_planar_face_tolerance(params_as_dict)
+
+
+def _to_25_6_5(params_as_dict):
+    # Some 25.6.4 JSONs are also missing the planar_face_tolerance.
+    return _add_default_planar_face_tolerance(params_as_dict)
+
+
 VERSION_MILESTONES = [
     (Flow360Version("24.11.1"), _to_24_11_1),
     (Flow360Version("24.11.7"), _to_24_11_7),
@@ -307,6 +316,7 @@ def _to_25_6_4(params_as_dict):
     (Flow360Version("25.4.1"), _to_25_4_1),
     (Flow360Version("25.6.2"), _to_25_6_2),
     (Flow360Version("25.6.4"), _to_25_6_4),
+    (Flow360Version("25.6.5"), _to_25_6_5),
 ]  # A list of the Python API version tuple with there corresponding updaters.
 
 

flow360/version.py

@@ -2,5 +2,10 @@
 version
 """
 
+<<<<<<< HEAD
 __version__ = "25.7.1b1"
 __solver_version__ = "release-25.7"
+=======
+__version__ = "25.6.5"
+__solver_version__ = "release-25.6"
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))

pyproject.toml

@@ -1,6 +1,10 @@
 [tool.poetry]
 name = "flow360"
+<<<<<<< HEAD
 version = "v25.7.1b1"
+=======
+version = "v25.6.5"
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))
 description = ""
 authors = ["Flexcompute <support@flexcompute.com>"]
 

tests/ref/simulation/service_init_geometry.json

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
   "version": "25.7.1b1",
+=======
+  "version": "25.6.5",
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))
   "unit_system": {
     "name": "SI"
   },

tests/ref/simulation/service_init_surface_mesh.json

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.7.1b1",
+=======
+    "version": "25.6.5",
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))
     "unit_system": {
         "name": "SI"
     },

tests/ref/simulation/service_init_volume_mesh.json

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.7.1b1",
+=======
+    "version": "25.6.5",
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))
     "unit_system": {
         "name": "SI"
     },

tests/simulation/converter/ref/ref_monitor.json

@@ -1 +1,5 @@
+<<<<<<< HEAD
 {"version":"25.7.1b1","unit_system":{"name":"SI"},"meshing":null,"reference_geometry":null,"operating_condition":null,"models":[{"material":{"type":"air","name":"air","dynamic_viscosity":{"reference_viscosity":{"value":0.00001716,"units":"Pa*s"},"reference_temperature":{"value":273.15,"units":"K"},"effective_temperature":{"value":110.4,"units":"K"}}},"initial_condition":{"type_name":"NavierStokesInitialCondition","constants":null,"rho":"rho","u":"u","v":"v","w":"w","p":"p"},"type":"Fluid","navier_stokes_solver":{"absolute_tolerance":1e-10,"relative_tolerance":0.0,"order_of_accuracy":2,"equation_evaluation_frequency":1,"linear_solver":{"max_iterations":30,"absolute_tolerance":null,"relative_tolerance":null},"private_attribute_dict":null,"CFL_multiplier":1.0,"kappa_MUSCL":-1.0,"numerical_dissipation_factor":1.0,"limit_velocity":false,"limit_pressure_density":false,"type_name":"Compressible","low_mach_preconditioner":false,"low_mach_preconditioner_threshold":null,"update_jacobian_frequency":4,"max_force_jac_update_physical_steps":0},"turbulence_model_solver":{"absolute_tolerance":1e-8,"relative_tolerance":0.0,"order_of_accuracy":2,"equation_evaluation_frequency":4,"linear_solver":{"max_iterations":20,"absolute_tolerance":null,"relative_tolerance":null},"private_attribute_dict":null,"CFL_multiplier":2.0,"type_name":"SpalartAllmaras","reconstruction_gradient_limiter":0.5,"quadratic_constitutive_relation":false,"modeling_constants":{"type_name":"SpalartAllmarasConsts","C_DES":0.72,"C_d":8.0,"C_cb1":0.1355,"C_cb2":0.622,"C_sigma":0.6666666666666666,"C_v1":7.1,"C_vonKarman":0.41,"C_w2":0.3,"C_t3":1.2,"C_t4":0.5,"C_min_rd":10.0},"update_jacobian_frequency":4,"max_force_jac_update_physical_steps":0,"hybrid_model":null,"rotation_correction":false, "controls":null},"transition_model_solver":{"type_name":"None"}}],"time_stepping":{"type_name":"Steady","max_steps":2000,"CFL":{"type":"adaptive","min":0.1,"max":10000.0,"max_relative_change":1.0,"convergence_limiting_factor":0.25}},"user_defined_dynamics":null,"user_defined_fields":[],"outputs":[{"name":"R1","entities":{"stored_entities":[{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"b9de2bce-36c1-4bbf-af0a-2c6a2ab713a4","name":"Point-0","location":{"value":[2.694298,0.0,1.0195910000000001],"units":"m"}}]},"output_fields":{"items":["primitiveVars"]},"output_type":"ProbeOutput"},{"name":"V3","entities":{"stored_entities":[{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"a79cffc0-31d0-499d-906c-f271c2320166","name":"Point-1","location":{"value":[4.007,0.0,-0.31760000000000005],"units":"m"}},{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"8947eb10-fc59-4102-b9c7-168a91ca22b9","name":"Point-2","location":{"value":[4.007,0.0,-0.29760000000000003],"units":"m"}},{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"27ac4e03-592b-4dba-8fa1-8f6678087a96","name":"Point-3","location":{"value":[4.007,0.0,-0.2776],"units":"m"}}]},"output_fields":{"items":["mut"]},"output_type":"ProbeOutput"}],"private_attribute_asset_cache":{"project_length_unit":null,"project_entity_info":null, "use_inhouse_mesher": false, "variable_context":null, "use_geometry_AI": false}}
+=======
+{"version":"25.6.5","unit_system":{"name":"SI"},"meshing":null,"reference_geometry":null,"operating_condition":null,"models":[{"material":{"type":"air","name":"air","dynamic_viscosity":{"reference_viscosity":{"value":0.00001716,"units":"Pa*s"},"reference_temperature":{"value":273.15,"units":"K"},"effective_temperature":{"value":110.4,"units":"K"}}},"initial_condition":{"type_name":"NavierStokesInitialCondition","constants":null,"rho":"rho","u":"u","v":"v","w":"w","p":"p"},"type":"Fluid","navier_stokes_solver":{"absolute_tolerance":1e-10,"relative_tolerance":0.0,"order_of_accuracy":2,"equation_evaluation_frequency":1,"linear_solver":{"max_iterations":30,"absolute_tolerance":null,"relative_tolerance":null},"private_attribute_dict":null,"CFL_multiplier":1.0,"kappa_MUSCL":-1.0,"numerical_dissipation_factor":1.0,"limit_velocity":false,"limit_pressure_density":false,"type_name":"Compressible","low_mach_preconditioner":false,"low_mach_preconditioner_threshold":null,"update_jacobian_frequency":4,"max_force_jac_update_physical_steps":0},"turbulence_model_solver":{"absolute_tolerance":1e-8,"relative_tolerance":0.0,"order_of_accuracy":2,"equation_evaluation_frequency":4,"linear_solver":{"max_iterations":20,"absolute_tolerance":null,"relative_tolerance":null},"private_attribute_dict":null,"CFL_multiplier":2.0,"type_name":"SpalartAllmaras","reconstruction_gradient_limiter":0.5,"quadratic_constitutive_relation":false,"modeling_constants":{"type_name":"SpalartAllmarasConsts","C_DES":0.72,"C_d":8.0,"C_cb1":0.1355,"C_cb2":0.622,"C_sigma":0.6666666666666666,"C_v1":7.1,"C_vonKarman":0.41,"C_w2":0.3,"C_t3":1.2,"C_t4":0.5,"C_min_rd":10.0},"update_jacobian_frequency":4,"max_force_jac_update_physical_steps":0,"hybrid_model":null,"rotation_correction":false, "controls":null},"transition_model_solver":{"type_name":"None"}}],"time_stepping":{"type_name":"Steady","max_steps":2000,"CFL":{"type":"adaptive","min":0.1,"max":10000.0,"max_relative_change":1.0,"convergence_limiting_factor":0.25}},"user_defined_dynamics":null,"user_defined_fields":[],"outputs":[{"name":"R1","entities":{"stored_entities":[{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"b9de2bce-36c1-4bbf-af0a-2c6a2ab713a4","name":"Point-0","location":{"value":[2.694298,0.0,1.0195910000000001],"units":"m"}}]},"output_fields":{"items":["primitiveVars"]},"output_type":"ProbeOutput"},{"name":"V3","entities":{"stored_entities":[{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"a79cffc0-31d0-499d-906c-f271c2320166","name":"Point-1","location":{"value":[4.007,0.0,-0.31760000000000005],"units":"m"}},{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"8947eb10-fc59-4102-b9c7-168a91ca22b9","name":"Point-2","location":{"value":[4.007,0.0,-0.29760000000000003],"units":"m"}},{"private_attribute_registry_bucket_name":"PointEntityType","private_attribute_entity_type_name":"Point","private_attribute_id":"27ac4e03-592b-4dba-8fa1-8f6678087a96","name":"Point-3","location":{"value":[4.007,0.0,-0.2776],"units":"m"}}]},"output_fields":{"items":["mut"]},"output_type":"ProbeOutput"}],"private_attribute_asset_cache":{"project_length_unit":null,"project_entity_info":null, "use_inhouse_mesher": false, "variable_context":null, "use_geometry_AI": false}}
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))

tests/simulation/data/simulation_with_wrong_expr_syntax.json

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
 	"version": "25.6.2",
+=======
+	"version": "25.6.5",
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))
 	"unit_system": {
 		"name": "SI"
 	},

tests/simulation/ref/simulation_with_project_variables.json

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.7.1b1",
+=======
+    "version": "25.6.5",
+>>>>>>> 651ac16a (Bump to 25.6.5 and also add default value application to planar tolerance (#1348))
     "unit_system": {
         "name": "SI"
     },

tests/simulation/test_updater.py

@@ -729,3 +729,21 @@ def test_updater_to_25_6_4():
         root_item_type="Geometry",
     )
     assert params_new
+
+
+def test_updater_to_25_6_5():
+    with open("../data/simulation/simulation_pre_25_4_1.json", "r") as fp:
+        params_as_dict = json.load(fp)
+
+    params_new = updater(
+        version_from="25.4.0b1",
+        version_to=f"25.6.5",
+        params_as_dict=params_as_dict,
+    )
+    assert params_new["meshing"]["defaults"]["planar_face_tolerance"] == 1e-6
+    params_new, _, _ = validate_model(
+        params_as_dict=params_new,
+        validated_by=ValidationCalledBy.LOCAL,
+        root_item_type="Geometry",
+    )
+    assert params_new