Merge branch 'master' into master

precice · Jan 24, 2025 · 537d60f · 537d60f
2 parents 3355bc7 + 4eca45c
commit 537d60f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/imported/aste b/imported/aste
diff --git a/imported/micro-manager b/imported/micro-manager
diff --git a/imported/preeco-orga b/imported/preeco-orga
+1 −0		CHANGELOG.md
+4 −4		docs/configuration.md
+2 −2		examples/micro-manager-cpp-adaptivity-config.json
+2 −2		examples/micro-manager-cpp-config.json
+2 −2		examples/micro-manager-python-adaptivity-config.json
+2 −2		examples/micro-manager-python-config.json
+20 −56		micro_manager/config.py
+12 −23		micro_manager/micro_manager.py
+7 −7		micro_manager/snapshot/dataset.py
+2 −2		tests/integration/test_unit_cube/micro-manager-config-global-adaptivity-parallel.json
+2 −2		tests/integration/test_unit_cube/micro-manager-config-global-adaptivity.json
+2 −2		tests/integration/test_unit_cube/micro-manager-config-local-adaptivity.json
+2 −2		tests/integration/test_unit_cube/micro-manager-config-parallel-1.json
+2 −2		tests/integration/test_unit_cube/micro-manager-config-parallel-2.json
+2 −2		tests/unit/micro-manager-config.json
+2 −2		tests/unit/micro-manager-config_crash.json
+2 −2		tests/unit/snapshot-config.json
+15 −18		tests/unit/test_micro_manager.py
+8 −14		tests/unit/test_snapshot_computation.py
+6 −5		adapter-config-schema/README.md
+31 −10		adapter-config-schema/preatcs.json
+2 −2		guidelines/guidelines-adapters.md
+4 −2		guidelines/guidelines-application-cases.md