processforge 0.6.7__tar.gz → 0.6.9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {processforge-0.6.7/src/processforge.egg-info → processforge-0.6.9}/PKG-INFO +1 -1
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/custom/crimson/simple_water_system_modified.json +3 -3
- processforge-0.6.7/flowsheets/custom/crimson/simple_water_system.json → processforge-0.6.9/flowsheets/custom/crimson/simple_water_system_modified_b.json +32 -75
- {processforge-0.6.7 → processforge-0.6.9}/pyproject.toml +1 -1
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/__init__.py +1 -1
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/simulate.py +22 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/validate_flowsheet.py +56 -15
- {processforge-0.6.7 → processforge-0.6.9/src/processforge.egg-info}/PKG-INFO +1 -1
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge.egg-info/SOURCES.txt +3 -4
- processforge-0.6.9/tests/test_validate_flowsheet.py +93 -0
- processforge-0.6.7/flowsheets/custom/crimson/MUWS_HB.json +0 -216
- processforge-0.6.7/flowsheets/custom/simple_hyrdaulic_scheme.json +0 -202
- {processforge-0.6.7 → processforge-0.6.9}/LICENSE +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/MANIFEST.in +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/README.md +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/closed-loop-chain.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/coupled/msre_coupled.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/festim/hydrogen_transport_1d.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/festim/tds_tungsten.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/hydraulic-chain.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/idaes/closed-loop-chain-idaes.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/idaes/hydraulic-chain-idaes.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/idaes/hydraulic-chain-mixed.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/flowsheets/openmc/msre_eigenvalue.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/setup.cfg +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/__main__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/_schema.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/analysis/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/analysis/dof.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/api/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/api/serve.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/apply.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/common.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/diagram.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/display.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/export_fmu.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/export_modelica.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/init.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/persist.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/plan.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/run.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/runs.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/cli/validate.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/compose.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/coupling.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/backends/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/backends/base.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/backends/casadi_backend.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/backends/pyomo_backend.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/backends/scipy_backend.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/flowsheet.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/jacobian.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/mixin.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/solver.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/stream_var.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/flash_eo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/heater_eo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/pipes_eo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/pump_eo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/strainer_eo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/eo/units/valve_eo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/flowsheet.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/fmu/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/fmu/_fmi_vars.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/fmu/builder.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/fmu/interface.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/fmu/slave_template.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/lock.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/modelica/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/modelica/mo_writer.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/modelica/omc_runner.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/modelica/transpiler.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/modelica/unit_equations.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/output_collector.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/pathsim/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/pathsim/adapter.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/pcl/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/pcl/compiler.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/pcl/namespace.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/persistence/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/persistence/archive.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/persistence/artifact_store.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/provenance.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/_sim_strategy.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/base.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/base_jacobian_mixin.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/base_simulation_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/cantera_jacobian.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/cantera_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/container_client.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/coolprop_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/errors.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/festim/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/festim/build_helpers.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/festim/provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/festim/result_extraction.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/festim/strategies.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/idaes_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/jacobian_contributor.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/manager.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/modelica_jacobian.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/modelica_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/openmc/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/openmc/build_helpers.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/openmc/provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/openmc/result_extraction.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/openmc/strategies.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/reference_state_registry.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/providers/registry.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/quantity.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/result.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/result_schema.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/runner.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/schemas/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/schemas/festim/festim_model.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/schemas/flowsheet_schema.json +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/schemas/openmc/openmc_model.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/solver.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/state.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/thermo.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/types.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/base.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/cstr.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/flash.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/heater.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/pfr.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/pipes.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/pump.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/registry.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/solver_unit.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/strainer.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/tank.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/units/valve.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/__init__.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/flowsheet_diagram.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/mermaid_diagram.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/plotting.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/s3_upload.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/topology.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/unit_consistency.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge/utils/validation.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge.egg-info/dependency_links.txt +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge.egg-info/entry_points.txt +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge.egg-info/requires.txt +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/src/processforge.egg-info/top_level.txt +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_artifact_store.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_cli.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_container_client.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_coupling.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_display.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_dynamic_engine_outputs.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_festim_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_festim_schema.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_fmu_solverunit.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_idaes_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_init.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_openmc_provider.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_pathsim_adapter.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_persist.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_provider_errors.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_providers.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_result_zarr.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_runner.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_runs_command.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_s3_upload.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_state.py +0 -0
- {processforge-0.6.7 → processforge-0.6.9}/tests/test_types.py +0 -0
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"feed": {
|
|
22
22
|
"T": 313.00,
|
|
23
23
|
"P": 101325,
|
|
24
|
-
"flowrate":
|
|
24
|
+
"flowrate": 0.00001111,
|
|
25
25
|
"z": {
|
|
26
26
|
"Water": 1.0
|
|
27
27
|
}
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"out": "after_low_pressure_pump",
|
|
60
60
|
|
|
61
61
|
"material": 2,
|
|
62
|
-
"delta_p":
|
|
62
|
+
"delta_p": 3000000.0
|
|
63
63
|
},
|
|
64
64
|
"pipe_2": {
|
|
65
65
|
"type": "Pipes",
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"after_pipe_3"
|
|
93
93
|
],
|
|
94
94
|
"out": "after_tank_2",
|
|
95
|
-
"outlet_flow":
|
|
95
|
+
"outlet_flow": 0.00001111,
|
|
96
96
|
"initial_n": {
|
|
97
97
|
"Water": 1.0
|
|
98
98
|
},
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"metadata": {
|
|
3
|
-
"name": "
|
|
4
|
-
"description": "
|
|
5
|
-
"version": "2.
|
|
3
|
+
"name": "Modified Water System A",
|
|
4
|
+
"description": "Closed-loop water system with gravity tank, pump, valves, and high-pressure tank.",
|
|
5
|
+
"version": "2.1"
|
|
6
6
|
},
|
|
7
7
|
"providers": {
|
|
8
8
|
"coolprop": {
|
|
@@ -17,29 +17,19 @@
|
|
|
17
17
|
"id": 2
|
|
18
18
|
}
|
|
19
19
|
},
|
|
20
|
-
"streams": {
|
|
21
|
-
"feed": {
|
|
22
|
-
"T": 313.00,
|
|
23
|
-
"P": 101325,
|
|
24
|
-
"flowrate": 1,
|
|
25
|
-
"z": {
|
|
26
|
-
"Water": 1.0
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
},
|
|
20
|
+
"streams": {},
|
|
30
21
|
"units": {
|
|
31
22
|
"tank_1": {
|
|
32
23
|
"type": "Tank",
|
|
33
24
|
"in": [
|
|
34
|
-
"
|
|
25
|
+
"after_pipe_5"
|
|
35
26
|
],
|
|
36
27
|
"out": [
|
|
37
|
-
"tank_1_to_pipe1"
|
|
38
|
-
"tank_1_to_pipe2"
|
|
28
|
+
"tank_1_to_pipe1"
|
|
39
29
|
],
|
|
40
|
-
"outlet_flow":
|
|
30
|
+
"outlet_flow": 0.0005556,
|
|
41
31
|
"initial_n": {
|
|
42
|
-
"Water":
|
|
32
|
+
"Water": 222000.0
|
|
43
33
|
},
|
|
44
34
|
"initial_T": 298.15,
|
|
45
35
|
"P": 101325,
|
|
@@ -57,67 +47,29 @@
|
|
|
57
47
|
"type": "Pump",
|
|
58
48
|
"in": "after_pipe_1",
|
|
59
49
|
"out": "after_low_pressure_pump",
|
|
60
|
-
"q_flowrate": 4,
|
|
61
|
-
"head": 57,
|
|
62
|
-
"efficiency": 36,
|
|
63
|
-
"power": 1.3,
|
|
64
|
-
"cap": 2.5,
|
|
65
|
-
"motor_rating": 370,
|
|
66
50
|
"material": 2,
|
|
67
|
-
"delta_p":
|
|
51
|
+
"delta_p": 3000000.0
|
|
68
52
|
},
|
|
69
53
|
"pipe_2": {
|
|
70
|
-
"type": "Pipes",
|
|
71
|
-
"in": "tank_1_to_pipe2",
|
|
72
|
-
"out": "after_pipe_2",
|
|
73
|
-
"delta_p": 1000.0,
|
|
74
|
-
"diameter": 0.05,
|
|
75
|
-
"material": 2
|
|
76
|
-
},
|
|
77
|
-
"pipe_3": {
|
|
78
54
|
"type": "Pipes",
|
|
79
55
|
"in": "after_low_pressure_pump",
|
|
80
|
-
"out": "
|
|
56
|
+
"out": "after_pipe_2",
|
|
81
57
|
"delta_p": 1000.0,
|
|
82
58
|
"diameter": 0.05,
|
|
83
59
|
"material": 2
|
|
84
60
|
},
|
|
85
|
-
"
|
|
61
|
+
"makeup_valve_1": {
|
|
86
62
|
"type": "Valve",
|
|
87
63
|
"in": "after_pipe_2",
|
|
88
|
-
"out": "
|
|
89
|
-
"material": 2,
|
|
90
|
-
"valve_type": "drain",
|
|
91
|
-
"p_start_open": 2059396.5,
|
|
92
|
-
"p_full_open": 2451662.5,
|
|
93
|
-
"flow_min": 2.7778e-05,
|
|
94
|
-
"flow_max": 0.0013889,
|
|
95
|
-
"pressure_ratio": 0.5
|
|
96
|
-
},
|
|
97
|
-
"make_up_valve_1": {
|
|
98
|
-
"type": "Valve",
|
|
99
|
-
"in": "after_pipe_3",
|
|
100
|
-
"out": "after_make_up_valve_1",
|
|
64
|
+
"out": "after_makeup_valve_1",
|
|
101
65
|
"material": 2,
|
|
102
66
|
"valve_type": "makeup",
|
|
103
|
-
"p_start_open": 1863273.5,
|
|
104
|
-
"p_full_open": 1470997.5,
|
|
105
|
-
"flow_min": 5.5556e-05,
|
|
106
|
-
"flow_max": 0.0016667,
|
|
107
67
|
"pressure_ratio": 0.5
|
|
108
68
|
},
|
|
109
|
-
"
|
|
110
|
-
"type": "Pipes",
|
|
111
|
-
"in": "after_make_up_valve_1",
|
|
112
|
-
"out": "after_pipe_4",
|
|
113
|
-
"delta_p": 1000.0,
|
|
114
|
-
"diameter": 0.05,
|
|
115
|
-
"material": 2
|
|
116
|
-
},
|
|
117
|
-
"pipe_5": {
|
|
69
|
+
"pipe_3": {
|
|
118
70
|
"type": "Pipes",
|
|
119
|
-
"in": "
|
|
120
|
-
"out": "
|
|
71
|
+
"in": "after_makeup_valve_1",
|
|
72
|
+
"out": "after_pipe_3",
|
|
121
73
|
"delta_p": 1000.0,
|
|
122
74
|
"diameter": 0.05,
|
|
123
75
|
"material": 2
|
|
@@ -125,34 +77,39 @@
|
|
|
125
77
|
"tank_2": {
|
|
126
78
|
"type": "Tank",
|
|
127
79
|
"in": [
|
|
128
|
-
"
|
|
129
|
-
"after_pipe_5"
|
|
80
|
+
"after_pipe_3"
|
|
130
81
|
],
|
|
131
82
|
"out": "after_tank_2",
|
|
132
|
-
"outlet_flow":
|
|
83
|
+
"outlet_flow": 0.00001111,
|
|
133
84
|
"initial_n": {
|
|
134
|
-
"Water":
|
|
85
|
+
"Water": 555000.0
|
|
135
86
|
},
|
|
136
87
|
"initial_T": 298.15,
|
|
137
88
|
"P": 1961330,
|
|
138
89
|
"material": 1
|
|
139
90
|
},
|
|
140
|
-
"
|
|
91
|
+
"pipe_4": {
|
|
141
92
|
"type": "Pipes",
|
|
142
93
|
"in": "after_tank_2",
|
|
143
|
-
"out": "
|
|
94
|
+
"out": "after_pipe_4",
|
|
144
95
|
"delta_p": 1000.0,
|
|
145
96
|
"diameter": 0.05,
|
|
146
97
|
"material": 2
|
|
147
98
|
},
|
|
148
|
-
"
|
|
99
|
+
"manual_bleed_valve": {
|
|
149
100
|
"type": "Valve",
|
|
150
|
-
"in": "
|
|
151
|
-
"out": "
|
|
152
|
-
"opening": 50,
|
|
153
|
-
"q_flowrate": 50,
|
|
101
|
+
"in": "after_pipe_4",
|
|
102
|
+
"out": "after_manual_bleed_valve",
|
|
154
103
|
"material": 2,
|
|
155
104
|
"pressure_ratio": 0.5
|
|
105
|
+
},
|
|
106
|
+
"pipe_5": {
|
|
107
|
+
"type": "Pipes",
|
|
108
|
+
"in": "after_manual_bleed_valve",
|
|
109
|
+
"out": "after_pipe_5",
|
|
110
|
+
"delta_p": 1000.0,
|
|
111
|
+
"diameter": 0.05,
|
|
112
|
+
"material": 2
|
|
156
113
|
}
|
|
157
114
|
},
|
|
158
115
|
"simulation": {
|
|
@@ -162,4 +119,4 @@
|
|
|
162
119
|
"dt": 1.0,
|
|
163
120
|
"backend": "scipy"
|
|
164
121
|
}
|
|
165
|
-
}
|
|
122
|
+
}
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "processforge"
|
|
7
|
-
version = "0.6.
|
|
7
|
+
version = "0.6.9"
|
|
8
8
|
description = "A Python-based process simulation framework for chemical engineering applications."
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
license = "BSD-3-Clause"
|
|
@@ -10,7 +10,7 @@ Provides steady-state and dynamic process simulation capabilities including:
|
|
|
10
10
|
- Equation-oriented (EO) steady-state solver via EOFlowsheet
|
|
11
11
|
"""
|
|
12
12
|
|
|
13
|
-
__version__ = "0.6.
|
|
13
|
+
__version__ = "0.6.9"
|
|
14
14
|
|
|
15
15
|
from .eo import EOFlowsheet, EOSolver
|
|
16
16
|
from .flowsheet import Flowsheet
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
+
import sys
|
|
6
|
+
|
|
5
7
|
import typer
|
|
6
8
|
from loguru import logger
|
|
7
9
|
|
|
@@ -9,6 +11,22 @@ from .cli import register_commands
|
|
|
9
11
|
|
|
10
12
|
__all__ = ["main"]
|
|
11
13
|
|
|
14
|
+
|
|
15
|
+
def configure_logging(level: str = "INFO") -> None:
|
|
16
|
+
"""Install a concise stderr sink (no timestamp, no module/line).
|
|
17
|
+
|
|
18
|
+
Replaces loguru's default handler — which prints
|
|
19
|
+
``2026-10-22 17:54:26.021 | ERROR | module:function:line - ...`` — with a
|
|
20
|
+
compact ``LEVEL | message`` line. Colours are emitted only when stderr is a
|
|
21
|
+
TTY, so redirected/CI output stays clean.
|
|
22
|
+
"""
|
|
23
|
+
logger.remove()
|
|
24
|
+
logger.add(
|
|
25
|
+
sys.stderr,
|
|
26
|
+
level=level,
|
|
27
|
+
format="<level>{level: <8}</level> | <level>{message}</level>",
|
|
28
|
+
)
|
|
29
|
+
|
|
12
30
|
app = typer.Typer(
|
|
13
31
|
help="Processforge - Chemical Process Simulation",
|
|
14
32
|
add_completion=False,
|
|
@@ -39,6 +57,10 @@ register_commands(app)
|
|
|
39
57
|
|
|
40
58
|
def main() -> None:
|
|
41
59
|
"""Parse arguments and dispatch to the appropriate subcommand."""
|
|
60
|
+
# ``--debug`` is parsed by typer inside the callback, which runs after this
|
|
61
|
+
# point — scan argv so debug logging is enabled for the whole invocation.
|
|
62
|
+
debug = "--debug" in sys.argv or "-d" in sys.argv
|
|
63
|
+
configure_logging("DEBUG" if debug else "INFO")
|
|
42
64
|
try:
|
|
43
65
|
app()
|
|
44
66
|
except SystemExit:
|
|
@@ -224,28 +224,69 @@ def _check_unused_outlets(config, consumed_streams, defined_streams):
|
|
|
224
224
|
|
|
225
225
|
def _check_unreachable_units(config, defined_streams):
|
|
226
226
|
"""
|
|
227
|
-
Detect
|
|
227
|
+
Detect units disconnected from any valid boundary.
|
|
228
228
|
|
|
229
|
-
|
|
230
|
-
|
|
229
|
+
Connectivity is checked on the undirected unit graph, so a feed-less
|
|
230
|
+
closed loop is not treated as orphaned merely because it has no entry
|
|
231
|
+
point. A connected group of units is valid when it contains at least one
|
|
232
|
+
boundary:
|
|
233
|
+
|
|
234
|
+
- a unit consuming a declared feed stream;
|
|
235
|
+
- a SolverUnit (no inlet stream dependency);
|
|
236
|
+
- in dynamic mode, a Tank carrying initial state.
|
|
237
|
+
|
|
238
|
+
SolverUnit types are excluded from the orphan check — they have no inlet
|
|
239
|
+
stream dependency.
|
|
231
240
|
"""
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
241
|
+
units = config["units"]
|
|
242
|
+
sim_mode = config.get("simulation", {}).get("mode", "steady")
|
|
243
|
+
|
|
244
|
+
# stream -> producing unit
|
|
245
|
+
producers = {}
|
|
246
|
+
for unit_name, ucfg in units.items():
|
|
247
|
+
for outlet in _get_unit_outlets(ucfg):
|
|
248
|
+
producers[outlet] = unit_name
|
|
249
|
+
|
|
250
|
+
# Undirected unit adjacency: producer <-> consumer.
|
|
251
|
+
adj = {name: set() for name in units}
|
|
252
|
+
for unit_name, ucfg in units.items():
|
|
253
|
+
for inlet in _get_unit_inlets(ucfg):
|
|
254
|
+
producer = producers.get(inlet)
|
|
255
|
+
if producer is not None and producer != unit_name:
|
|
256
|
+
adj[unit_name].add(producer)
|
|
257
|
+
adj[producer].add(unit_name)
|
|
258
|
+
|
|
259
|
+
# Valid boundaries seed the traversal.
|
|
260
|
+
reachable = {
|
|
261
|
+
name for name, ucfg in units.items()
|
|
262
|
+
if ucfg.get("type") in _SOLVER_UNIT_TYPES
|
|
263
|
+
}
|
|
264
|
+
for name, ucfg in units.items():
|
|
265
|
+
if any(i in defined_streams for i in _get_unit_inlets(ucfg)):
|
|
266
|
+
reachable.add(name)
|
|
267
|
+
if sim_mode == "dynamic":
|
|
268
|
+
for name, ucfg in units.items():
|
|
269
|
+
if ucfg.get("type") == "Tank" and ucfg.get("initial_n") is not None:
|
|
270
|
+
reachable.add(name)
|
|
271
|
+
|
|
272
|
+
stack = list(reachable)
|
|
273
|
+
while stack:
|
|
274
|
+
current = stack.pop()
|
|
275
|
+
for neighbour in adj[current]:
|
|
276
|
+
if neighbour not in reachable:
|
|
277
|
+
reachable.add(neighbour)
|
|
278
|
+
stack.append(neighbour)
|
|
240
279
|
|
|
241
280
|
unreachable = [
|
|
242
|
-
|
|
243
|
-
if
|
|
244
|
-
and not
|
|
281
|
+
name for name, ucfg in units.items()
|
|
282
|
+
if ucfg.get("type") not in _SOLVER_UNIT_TYPES
|
|
283
|
+
and name not in reachable
|
|
245
284
|
]
|
|
246
285
|
if unreachable:
|
|
247
286
|
raise ValueError(
|
|
248
|
-
f"❌ Unreachable units detected: {', '.join(unreachable)}"
|
|
287
|
+
f"❌ Unreachable units detected: {', '.join(unreachable)}. "
|
|
288
|
+
f"Each connected group of units needs a feed stream or, in dynamic "
|
|
289
|
+
f"mode, a Tank with initial conditions."
|
|
249
290
|
)
|
|
250
291
|
|
|
251
292
|
|
|
@@ -5,10 +5,8 @@ pyproject.toml
|
|
|
5
5
|
flowsheets/closed-loop-chain.json
|
|
6
6
|
flowsheets/hydraulic-chain.json
|
|
7
7
|
flowsheets/coupled/msre_coupled.json
|
|
8
|
-
flowsheets/custom/simple_hyrdaulic_scheme.json
|
|
9
|
-
flowsheets/custom/crimson/MUWS_HB.json
|
|
10
|
-
flowsheets/custom/crimson/simple_water_system.json
|
|
11
8
|
flowsheets/custom/crimson/simple_water_system_modified.json
|
|
9
|
+
flowsheets/custom/crimson/simple_water_system_modified_b.json
|
|
12
10
|
flowsheets/festim/hydrogen_transport_1d.json
|
|
13
11
|
flowsheets/festim/tds_tungsten.json
|
|
14
12
|
flowsheets/idaes/closed-loop-chain-idaes.json
|
|
@@ -166,4 +164,5 @@ tests/test_runner.py
|
|
|
166
164
|
tests/test_runs_command.py
|
|
167
165
|
tests/test_s3_upload.py
|
|
168
166
|
tests/test_state.py
|
|
169
|
-
tests/test_types.py
|
|
167
|
+
tests/test_types.py
|
|
168
|
+
tests/test_validate_flowsheet.py
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"""Tests for flowsheet stream-connectivity validation."""
|
|
2
|
+
import pytest
|
|
3
|
+
|
|
4
|
+
from processforge.utils.validate_flowsheet import check_stream_connectivity
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
def _closed_loop(initial_n=True):
|
|
8
|
+
"""A feed-less loop: tank -> pipe -> pump -> pipe -> tank."""
|
|
9
|
+
tank = {
|
|
10
|
+
"type": "Tank",
|
|
11
|
+
"in": "after_pipe_2",
|
|
12
|
+
"out": "tank_out",
|
|
13
|
+
}
|
|
14
|
+
if initial_n:
|
|
15
|
+
tank["initial_n"] = {"Water": 1.0}
|
|
16
|
+
return {
|
|
17
|
+
"streams": {},
|
|
18
|
+
"units": {
|
|
19
|
+
"tank_1": tank,
|
|
20
|
+
"pipe_1": {
|
|
21
|
+
"type": "Pipes",
|
|
22
|
+
"in": "tank_out",
|
|
23
|
+
"out": "after_pipe_1",
|
|
24
|
+
},
|
|
25
|
+
"pump_1": {
|
|
26
|
+
"type": "Pump",
|
|
27
|
+
"in": "after_pipe_1",
|
|
28
|
+
"out": "after_pump",
|
|
29
|
+
},
|
|
30
|
+
"pipe_2": {
|
|
31
|
+
"type": "Pipes",
|
|
32
|
+
"in": "after_pump",
|
|
33
|
+
"out": "after_pipe_2",
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
def test_feedless_dynamic_closed_loop_is_connected():
|
|
40
|
+
config = _closed_loop()
|
|
41
|
+
config["simulation"] = {"mode": "dynamic"}
|
|
42
|
+
|
|
43
|
+
assert check_stream_connectivity(config) is True
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
def test_feedless_dynamic_loop_without_initial_n_is_unreachable():
|
|
47
|
+
config = _closed_loop(initial_n=False)
|
|
48
|
+
config["simulation"] = {"mode": "dynamic"}
|
|
49
|
+
|
|
50
|
+
with pytest.raises(ValueError, match="Unreachable units detected"):
|
|
51
|
+
check_stream_connectivity(config)
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
def test_feedless_steady_loop_is_unreachable():
|
|
55
|
+
config = _closed_loop()
|
|
56
|
+
config["simulation"] = {"mode": "steady"}
|
|
57
|
+
|
|
58
|
+
with pytest.raises(ValueError, match="Unreachable units detected"):
|
|
59
|
+
check_stream_connectivity(config)
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
def test_disconnected_island_is_still_reported():
|
|
63
|
+
config = {
|
|
64
|
+
"streams": {"feed": {}},
|
|
65
|
+
"simulation": {"mode": "dynamic"},
|
|
66
|
+
"units": {
|
|
67
|
+
"pump_1": {"type": "Pump", "in": "feed", "out": "after_pump"},
|
|
68
|
+
"pipe_1": {"type": "Pipes", "in": "loop_a", "out": "loop_b"},
|
|
69
|
+
"pump_2": {"type": "Pump", "in": "loop_b", "out": "loop_a"},
|
|
70
|
+
},
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
with pytest.raises(ValueError, match="Unreachable units detected") as excinfo:
|
|
74
|
+
check_stream_connectivity(config)
|
|
75
|
+
|
|
76
|
+
message = str(excinfo.value)
|
|
77
|
+
assert "pipe_1" in message
|
|
78
|
+
assert "pump_2" in message
|
|
79
|
+
assert "pump_1" not in message
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
def test_feed_based_flowsheet_still_passes():
|
|
83
|
+
config = {
|
|
84
|
+
"streams": {"feed": {}},
|
|
85
|
+
"simulation": {"mode": "steady"},
|
|
86
|
+
"units": {
|
|
87
|
+
"pump_1": {"type": "Pump", "in": "feed", "out": "after_pump"},
|
|
88
|
+
"pipe_1": {"type": "Pipes", "in": "after_pump", "out": "after_pipe"},
|
|
89
|
+
"valve_1": {"type": "Valve", "in": "after_pipe", "out": "product"},
|
|
90
|
+
},
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
assert check_stream_connectivity(config) is True
|