Skip to content

Commit

Permalink
Merge branch 'develop' into add_optional_dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@tjwsch
tjwsch authored Jul 11, 2024
2 parents ce4a1ed + 29f93aa commit abe0221
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions examples/micro-manager-cpp-adaptivity-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config-adaptivity.xml",
"macro_mesh_name": "macro-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0.0, 25.0, 0.0, 25.0, 0.0, 25.0],
"adaptivity": "True",
"adaptivity_settings": {
Expand Down
4 changes: 2 additions & 2 deletions examples/micro-manager-cpp-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0.0, 25.0, 0.0, 25.0, 0.0, 25.0]
},
"diagnostics": {
Expand Down
4 changes: 2 additions & 2 deletions examples/micro-manager-python-adaptivity-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config-adaptivity.xml",
"macro_mesh_name": "macro-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0.0, 25.0, 0.0, 25.0, 0.0, 25.0],
"adaptivity": "True",
"adaptivity_settings": {
Expand Down
4 changes: 2 additions & 2 deletions examples/micro-manager-python-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0.0, 25.0, 0.0, 25.0, 0.0, 25.0]
},
"diagnostics": {
Expand Down
2 changes: 1 addition & 1 deletion micro_manager/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def read_json(self, config_filename):
"No read data names provided. Micro manager will only write data to preCICE."
)

self._micro_dt = data["coupling_params"]["micro_dt"]
self._micro_dt = data["simulation_params"]["micro_dt"]

self._macro_domain_bounds = data["simulation_params"]["macro_domain_bounds"]

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_unit_cube/micro-manager-config-global-adaptivity-parallel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-cube-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0, 1, 0, 1, 0, 1],
"decomposition": [2, 1, 1],
"adaptivity": "True",
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_unit_cube/micro-manager-config-global-adaptivity.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-cube-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0, 1, 0, 1, 0, 1],
"adaptivity": "True",
"adaptivity_settings": {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_unit_cube/micro-manager-config-local-adaptivity.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-cube-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0, 1, 0, 1, 0, 1],
"adaptivity": "True",
"adaptivity_settings": {
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_unit_cube/micro-manager-config-parallel-1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-cube-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0, 1, 0, 1, 0, 1],
"decomposition": [1, 1, 2]
},
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_unit_cube/micro-manager-config-parallel-2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "precice-config.xml",
"macro_mesh_name": "macro-cube-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0, 1, 0, 1, 0, 1],
"decomposition": [1, 2, 3]
},
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/micro-manager-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "dummy-config.xml",
"macro_mesh_name": "dummy-macro-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 0.1
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 0.1,
"macro_domain_bounds": [0.0, 25.0, 0.0, 25.0, 0.0, 25.0],
"adaptivity": "True",
"adaptivity_settings": {
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/micro-manager-config_crash.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"config_file_name": "dummy-config.xml",
"macro_mesh_name": "dummy-macro-mesh",
"read_data_names": {"macro-scalar-data": "scalar", "macro-vector-data": "vector"},
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"},
"micro_dt": 1.0
"write_data_names": {"micro-scalar-data": "scalar", "micro-vector-data": "vector"}
},
"simulation_params": {
"micro_dt": 1.0,
"macro_domain_bounds": [0.0, 25.0, 0.0, 25.0, 0.0, 25.0],
"interpolate_crash": "True",
"adaptivity": "True",
Expand Down

0 comments on commit abe0221

Please sign in to comment.