[Hotfix Main]: Bump to 25.6.3 #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

github-actions wants to merge 1 commit into main from hotfix-main-pr1313

+37 −4

flow360/component/simulation/framework/updater.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -292,7 +292,7 @@ def _to_25_6_2(params_as_dict): @@
         (Flow360Version("25.2.1"), _to_25_2_1),
         (Flow360Version("25.2.3"), _to_25_2_3),
         (Flow360Version("25.4.1"), _to_25_4_1),
-        (Flow360Version("25.6.2"), _to_25_6_2),
+        (Flow360Version("25.6.3"), _to_25_6_2),
     ]  # A list of the Python API version tuple with there corresponding updaters.
@@ Expand Down @@

flow360/version.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,10 @@ @@
     version
     """
+    <<<<<<< HEAD
     __version__ = "25.7.1b1"
     __solver_version__ = "release-25.7"
+    =======
+    __version__ = "25.6.3"
+    __solver_version__ = "release-25.6"
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))

pyproject.toml

-Original file line number
+Diff line change
@@ -1,6 +1,10 @@
     [tool.poetry]
     name = "flow360"
+    <<<<<<< HEAD
     version = "v25.7.1b1"
+    =======
+    version = "v25.6.3"
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))
     description = ""
     authors = ["Flexcompute <support@flexcompute.com>"]
@@ Expand Down @@

tests/ref/simulation/service_init_geometry.json

-Original file line number
+Diff line change
@@ -1,5 +1,9 @@
     {
+    <<<<<<< HEAD
       "version": "25.7.1b1",
+    =======
+      "version": "25.6.3",
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))
       "unit_system": {
         "name": "SI"
       },
@@ Expand Down @@

tests/ref/simulation/service_init_surface_mesh.json

-Original file line number
+Diff line change
@@ -1,5 +1,9 @@
     {
+    <<<<<<< HEAD
         "version": "25.7.1b1",
+    =======
+        "version": "25.6.3",
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))
         "unit_system": {
             "name": "SI"
         },
@@ Expand Down @@

tests/ref/simulation/service_init_volume_mesh.json

-Original file line number
+Diff line change
@@ -1,5 +1,9 @@
     {
+    <<<<<<< HEAD
         "version": "25.7.1b1",
+    =======
+        "version": "25.6.3",
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))
         "unit_system": {
             "name": "SI"
         },
@@ Expand Down @@

tests/simulation/converter/ref/ref_monitor.json

-Original file line number
+Diff line change
@@ -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.3","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}}
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))

tests/simulation/data/simulation_with_wrong_expr_syntax.json

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     {
-    	"version": "25.6.2",
+    	"version": "25.6.3",
     	"unit_system": {
     		"name": "SI"
     	},
@@ Expand Down @@

tests/simulation/ref/simulation_with_project_variables.json

-Original file line number
+Diff line change
@@ -1,5 +1,9 @@
     {
+    <<<<<<< HEAD
         "version": "25.7.1b1",
+    =======
+        "version": "25.6.3",
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))
         "unit_system": {
             "name": "SI"
         },
@@ Expand Down @@

tests/simulation/test_updater.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -494,7 +494,7 @@ def test_updater_to_25_6_2(): @@
         def _update_to_25_6_2(pre_update_param_as_dict, version_from):
             params_new = updater(
                 version_from=version_from,
-                version_to=f"25.6.2",
+                version_to=f"25.6.3",
                 params_as_dict=pre_update_param_as_dict,
             )
             return params_new
@@ Expand Down @@

tests/simulation/translator/data/simulation_isosurface.json

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     {
-        "version": "25.6.2",
+        "version": "25.6.3",
         "unit_system": {
             "name": "Imperial"
         },
@@ Expand Down @@

tests/test_current_flow360_version.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,8 @@ @@
     def test_version():
+    <<<<<<< HEAD
         assert __version__ == "25.7.1b1"
+    =======
+        assert __version__ == "25.6.3"
+    >>>>>>> ce6cc13e (Bump to 25.6.3 (#1313))

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Hotfix Main]: Bump to 25.6.3 #1314

Diff view

Diff view

There are no files selected for viewing

[Hotfix Main]: Bump to 25.6.3 #1314

[Hotfix Main]: Bump to 25.6.3 #1314

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing