Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions flow360/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@
version
"""

<<<<<<< HEAD
__version__ = "25.9.8"
__solver_version__ = "release-25.9"
=======
__version__ = "25.8.9"
__solver_version__ = "release-25.8"
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[tool.poetry]
name = "flow360"
<<<<<<< HEAD
version = "v25.9.8"
=======
version = "v25.8.9"
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
description = "Flow360 Python Client"
authors = ["Flexcompute <support@flexcompute.com>"]

Expand Down
7 changes: 7 additions & 0 deletions tests/ref/simulation/service_init_geometry.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
<<<<<<< HEAD
=======
"version": "25.8.9",
"unit_system": {
"name": "SI"
},
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
"meshing": {
"defaults": {
"boundary_layer_growth_rate": 1.2,
Expand Down
7 changes: 7 additions & 0 deletions tests/ref/simulation/service_init_surface_mesh.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
<<<<<<< HEAD
=======
"version": "25.8.9",
"unit_system": {
"name": "SI"
},
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
"meshing": {
"defaults": {
"boundary_layer_growth_rate": 1.2,
Expand Down
114 changes: 114 additions & 0 deletions tests/ref/simulation/service_init_volume_mesh.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,118 @@
{
<<<<<<< HEAD
=======
"version": "25.8.9",
"unit_system": {
"name": "SI"
},
"reference_geometry": {
"moment_center": {
"value": [
0.0,
0.0,
0.0
],
"units": "m"
},
"moment_length": {
"value": [
1.0,
1.0,
1.0
],
"units": "m"
},
"area": {
"type_name": "number",
"value": 1.0,
"units": "m**2"
}
},
"operating_condition": {
"type_name": "AerospaceCondition",
"private_attribute_constructor": "default",
"private_attribute_input_cache": {
"alpha": {
"value": 0.0,
"units": "degree"
},
"beta": {
"value": 0.0,
"units": "degree"
},
"thermal_state": {
"type_name": "ThermalState",
"private_attribute_constructor": "default",
"private_attribute_input_cache": {},
"temperature": {
"value": 288.15,
"units": "K"
},
"density": {
"value": 1.225,
"units": "kg/m**3"
},
"material": {
"type": "air",
"name": "air",
"dynamic_viscosity": {
"reference_viscosity": {
"value": 1.716e-05,
"units": "Pa*s"
},
"reference_temperature": {
"value": 273.15,
"units": "K"
},
"effective_temperature": {
"value": 110.4,
"units": "K"
}
}
}
}
},
"alpha": {
"value": 0.0,
"units": "degree"
},
"beta": {
"value": 0.0,
"units": "degree"
},
"thermal_state": {
"type_name": "ThermalState",
"private_attribute_constructor": "default",
"private_attribute_input_cache": {},
"temperature": {
"value": 288.15,
"units": "K"
},
"density": {
"value": 1.225,
"units": "kg/m**3"
},
"material": {
"type": "air",
"name": "air",
"dynamic_viscosity": {
"reference_viscosity": {
"value": 1.716e-05,
"units": "Pa*s"
},
"reference_temperature": {
"value": 273.15,
"units": "K"
},
"effective_temperature": {
"value": 110.4,
"units": "K"
}
}
}
}
},
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
"models": [
{
"entities": {
Expand Down
7 changes: 7 additions & 0 deletions tests/simulation/converter/ref/ref_monitor.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
<<<<<<< HEAD
=======
"version": "25.8.9",
"unit_system": {
"name": "SI"
},
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
"models": [
{
"initial_condition": {
Expand Down
4 changes: 4 additions & 0 deletions tests/test_current_flow360_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@


def test_version():
<<<<<<< HEAD
assert __version__ == "25.9.8"
=======
assert __version__ == "25.8.9"
>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))