processforge 0.7.0__tar.gz → 0.7.1__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.7.0/src/processforge.egg-info → processforge-0.7.1}/PKG-INFO +1 -1
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/hydraulic-chain.json +1 -1
- {processforge-0.7.0 → processforge-0.7.1}/pyproject.toml +1 -1
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/__init__.py +1 -1
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/flowsheet.py +46 -15
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/tank.py +14 -5
- {processforge-0.7.0 → processforge-0.7.1/src/processforge.egg-info}/PKG-INFO +1 -1
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge.egg-info/SOURCES.txt +1 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_dynamic_engine_outputs.py +7 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_idaes_provider.py +11 -5
- processforge-0.7.1/tests/test_tank_energy.py +413 -0
- {processforge-0.7.0 → processforge-0.7.1}/LICENSE +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/MANIFEST.in +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/README.md +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/closed-loop-chain.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/coupled/msre_coupled.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/custom/crimson/MUWS_HB.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/custom/crimson/simple_water_system.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/custom/crimson/simple_water_system_modified.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/custom/crimson/simple_water_system_modified_b.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/custom/simple_hyrdaulic_scheme.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/festim/hydrogen_transport_1d.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/festim/tds_tungsten.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/idaes/closed-loop-chain-idaes.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/idaes/hydraulic-chain-idaes.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/idaes/hydraulic-chain-mixed.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/flowsheets/openmc/msre_eigenvalue.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/setup.cfg +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/__main__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/_schema.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/analysis/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/analysis/dof.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/api/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/api/serve.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/evidence.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/file_repository.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/loader.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/reporting/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/reporting/cae_renderer.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/repository.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/service.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cae/types.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/apply.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/common.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/diagram.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/display.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/export_fmu.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/export_modelica.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/init.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/persist.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/plan.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/run.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/runs.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/cli/validate.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/compose.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/coupling.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/backends/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/backends/base.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/backends/casadi_backend.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/backends/pyomo_backend.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/backends/scipy_backend.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/flowsheet.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/jacobian.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/mixin.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/solver.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/stream_var.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/flash_eo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/heater_eo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/pipes_eo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/pump_eo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/strainer_eo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/eo/units/valve_eo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/fmu/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/fmu/_fmi_vars.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/fmu/builder.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/fmu/interface.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/fmu/slave_template.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/lock.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/modelica/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/modelica/mo_writer.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/modelica/omc_runner.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/modelica/transpiler.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/modelica/unit_equations.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/output_collector.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/pathsim/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/pathsim/adapter.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/pcl/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/pcl/compiler.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/pcl/namespace.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/persistence/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/persistence/archive.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/persistence/artifact_store.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/provenance.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/_sim_strategy.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/base.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/base_jacobian_mixin.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/base_simulation_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/cantera_jacobian.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/cantera_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/container_client.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/coolprop_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/errors.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/festim/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/festim/build_helpers.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/festim/provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/festim/result_extraction.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/festim/strategies.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/idaes_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/jacobian_contributor.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/manager.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/modelica_jacobian.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/modelica_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/openmc/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/openmc/build_helpers.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/openmc/provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/openmc/result_extraction.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/openmc/strategies.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/reference_state_registry.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/providers/registry.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/quantity.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/result.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/result_schema.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/runner.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/schemas/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/schemas/festim/festim_model.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/schemas/flowsheet_schema.json +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/schemas/openmc/openmc_model.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/simulate.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/solver.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/state.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/thermo.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/types.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/base.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/cstr.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/flash.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/heater.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/pfr.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/pipes.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/pump.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/registry.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/solver_unit.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/strainer.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/units/valve.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/__init__.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/flowsheet_diagram.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/mermaid_diagram.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/plotting.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/s3_upload.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/topology.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/unit_consistency.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/validate_flowsheet.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge/utils/validation.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge.egg-info/dependency_links.txt +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge.egg-info/entry_points.txt +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge.egg-info/requires.txt +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/src/processforge.egg-info/top_level.txt +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_artifact_store.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_cae.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_cli.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_container_client.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_coupling.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_display.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_festim_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_festim_schema.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_fmu_solverunit.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_init.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_openmc_provider.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_pathsim_adapter.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_persist.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_provider_errors.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_providers.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_result_zarr.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_runner.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_runs_command.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_s3_upload.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_state.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_types.py +0 -0
- {processforge-0.7.0 → processforge-0.7.1}/tests/test_validate_flowsheet.py +0 -0
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "processforge"
|
|
7
|
-
version = "0.7.
|
|
7
|
+
version = "0.7.1"
|
|
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.7.
|
|
13
|
+
__version__ = "0.7.1"
|
|
14
14
|
|
|
15
15
|
from .eo import EOFlowsheet, EOSolver
|
|
16
16
|
from .flowsheet import Flowsheet
|
|
@@ -14,6 +14,7 @@ from .types import EngineOutput, FlowsheetConfig, MergedInletTimeseries, StreamT
|
|
|
14
14
|
from .solver import Solver
|
|
15
15
|
from .providers.manager import UnitProviderConfig
|
|
16
16
|
from .units.registry import get_unit_class
|
|
17
|
+
from .units.tank import TANK_CP_FALLBACK
|
|
17
18
|
|
|
18
19
|
_UNIT_META_KEYS = {"type", "in", "out", "material", "material_mix", "provider"}
|
|
19
20
|
_DEFAULT_T = 298.15
|
|
@@ -1134,17 +1135,35 @@ class Flowsheet:
|
|
|
1134
1135
|
snapshot[prop] = values
|
|
1135
1136
|
return snapshot
|
|
1136
1137
|
|
|
1138
|
+
def _tank_cp(self, unit, x: dict, T: float) -> float:
|
|
1139
|
+
"""Mixture molar heat capacity [J/mol/K] for a tank state.
|
|
1140
|
+
|
|
1141
|
+
Routes through the unit's attached thermo provider when available and
|
|
1142
|
+
falls back to ``TANK_CP_FALLBACK`` (75.3 J/mol/K, the same default as
|
|
1143
|
+
the Modelica writer) if the provider is unavailable, fails, or returns
|
|
1144
|
+
a non-positive / non-finite Cp (e.g. the IDAES provider returns 0.0
|
|
1145
|
+
when its property package cannot be loaded).
|
|
1146
|
+
"""
|
|
1147
|
+
try:
|
|
1148
|
+
props = unit._get_thermo_properties(x, T, unit.P)
|
|
1149
|
+
cp = props.get("Cp", 0.0)
|
|
1150
|
+
if cp > 0: # also False for NaN
|
|
1151
|
+
return float(cp)
|
|
1152
|
+
except Exception: # noqa: BLE001 — Cp is best-effort; never block integration
|
|
1153
|
+
pass
|
|
1154
|
+
return TANK_CP_FALLBACK
|
|
1155
|
+
|
|
1137
1156
|
def _integrate_tank_step(self, unit, inlet_snapshot, state, dt, components):
|
|
1138
1157
|
"""
|
|
1139
1158
|
Integrate Tank for one timestep using simple Euler method.
|
|
1140
|
-
|
|
1159
|
+
|
|
1141
1160
|
Args:
|
|
1142
1161
|
unit: Tank unit instance
|
|
1143
1162
|
inlet_snapshot: Dict with T, P, flowrate, z for inlet
|
|
1144
1163
|
state: Current Tank state {n: {comp: moles}, T: temperature}
|
|
1145
1164
|
dt: Timestep size
|
|
1146
1165
|
components: Set of component names
|
|
1147
|
-
|
|
1166
|
+
|
|
1148
1167
|
Returns:
|
|
1149
1168
|
tuple: (outlet_snapshot, new_state)
|
|
1150
1169
|
"""
|
|
@@ -1152,37 +1171,49 @@ class Flowsheet:
|
|
|
1152
1171
|
n = state["n"]
|
|
1153
1172
|
T = state["T"]
|
|
1154
1173
|
n_tot = max(1e-12, sum(n.values()))
|
|
1155
|
-
|
|
1174
|
+
|
|
1156
1175
|
# Inlet properties
|
|
1157
1176
|
F_in = inlet_snapshot.get("flowrate", 0.0)
|
|
1158
1177
|
z_in = inlet_snapshot.get("z", {})
|
|
1159
1178
|
T_in = inlet_snapshot.get("T", _DEFAULT_T)
|
|
1160
|
-
|
|
1179
|
+
|
|
1161
1180
|
# Outlet flow (constant from Tank params)
|
|
1162
1181
|
F_out = unit.outflow
|
|
1163
|
-
|
|
1182
|
+
|
|
1164
1183
|
# Current compositions
|
|
1165
1184
|
x = {c: n.get(c, 0.0) / n_tot for c in components}
|
|
1166
|
-
|
|
1185
|
+
|
|
1167
1186
|
# Molar balances: dn/dt = F_in * z_in - F_out * x
|
|
1168
1187
|
new_n = {}
|
|
1169
1188
|
for comp in components:
|
|
1170
1189
|
dn_dt = F_in * z_in.get(comp, 0.0) - F_out * x.get(comp, 0.0)
|
|
1171
1190
|
new_n[comp] = max(0.0, n.get(comp, 0.0) + dn_dt * dt)
|
|
1172
|
-
|
|
1173
|
-
#
|
|
1174
|
-
# dT/dt
|
|
1191
|
+
|
|
1192
|
+
# Well-mixed energy balance (constant Cp):
|
|
1193
|
+
# n_tot * Cp * dT/dt = F_in * Cp * (T_in - T) + Q
|
|
1194
|
+
# => dT/dt = (F_in * (T_in - T) + Q / Cp) / n_tot
|
|
1195
|
+
# Matches the Modelica writer (unit_equations.tank_eq). For duty = 0
|
|
1196
|
+
# the Cp cancels and T relaxes toward T_in with time constant
|
|
1197
|
+
# n_tot / F_in, independent of F_out.
|
|
1175
1198
|
if n_tot > 1e-10:
|
|
1176
|
-
|
|
1199
|
+
cp = self._tank_cp(unit, x, T) # J/mol/K
|
|
1200
|
+
dT_dt = (F_in * (T_in - T) + unit.duty / cp) / n_tot
|
|
1177
1201
|
new_T = T + dT_dt * dt
|
|
1178
1202
|
else:
|
|
1179
1203
|
new_T = T_in
|
|
1180
|
-
|
|
1181
|
-
|
|
1182
|
-
|
|
1204
|
+
|
|
1205
|
+
# Sanity bound — warn instead of silently clamping so runaway energy
|
|
1206
|
+
# balances are visible in the logs.
|
|
1207
|
+
if new_T < 200 or new_T > 500:
|
|
1208
|
+
logger.warning(
|
|
1209
|
+
f"Tank '{unit.name}' temperature {new_T:.1f} K outside "
|
|
1210
|
+
f"[200, 500] K — clamping. Check energy balance parameters."
|
|
1211
|
+
)
|
|
1212
|
+
new_T = max(200.0, min(500.0, new_T))
|
|
1213
|
+
|
|
1183
1214
|
# New state
|
|
1184
1215
|
new_state = {"n": new_n, "T": new_T}
|
|
1185
|
-
|
|
1216
|
+
|
|
1186
1217
|
# Outlet snapshot
|
|
1187
1218
|
new_n_tot = max(1e-12, sum(new_n.values()))
|
|
1188
1219
|
outlet_snapshot = {
|
|
@@ -1191,7 +1222,7 @@ class Flowsheet:
|
|
|
1191
1222
|
"flowrate": F_out,
|
|
1192
1223
|
"z": {c: new_n.get(c, 0.0) / new_n_tot for c in components}
|
|
1193
1224
|
}
|
|
1194
|
-
|
|
1225
|
+
|
|
1195
1226
|
return outlet_snapshot, new_state
|
|
1196
1227
|
|
|
1197
1228
|
def _store_snapshot_in_timeseries(self, results, stream_name, snapshot, step, components):
|
|
@@ -4,6 +4,11 @@ from dataclasses import dataclass
|
|
|
4
4
|
from .base import BaseUnitMixin
|
|
5
5
|
from .registry import register_unit
|
|
6
6
|
|
|
7
|
+
# Fallback molar heat capacity [J/mol/K] used when no thermo provider is
|
|
8
|
+
# available (or the provider returns a non-positive Cp). Matches the
|
|
9
|
+
# ``Cp_default`` used by the Modelica writer (unit_equations.tank_eq).
|
|
10
|
+
TANK_CP_FALLBACK = 75.3
|
|
11
|
+
|
|
7
12
|
|
|
8
13
|
@dataclass
|
|
9
14
|
class TankState:
|
|
@@ -140,14 +145,18 @@ class Tank(BaseUnitMixin):
|
|
|
140
145
|
H_out = props_out["H"] # J/mol
|
|
141
146
|
|
|
142
147
|
# Cp mix
|
|
143
|
-
Cp_mix = props_out.get("Cp",
|
|
144
|
-
if Cp_mix
|
|
145
|
-
Cp_mix =
|
|
148
|
+
Cp_mix = props_out.get("Cp", TANK_CP_FALLBACK) # J/mol/K (from provider)
|
|
149
|
+
if not (Cp_mix > 0): # also catches NaN from a failing provider
|
|
150
|
+
Cp_mix = TANK_CP_FALLBACK
|
|
146
151
|
|
|
147
152
|
# energy balance (molar basis)
|
|
148
|
-
#
|
|
153
|
+
# Well-mixed enthalpy balance:
|
|
154
|
+
# d(n*H)/dt = Fin*H_in - Fout*H + Q, dn/dt = Fin - Fout
|
|
155
|
+
# expands to n * dH/dt = Fin*(H_in - H) + Q, so with dH/dt = Cp*dT/dt:
|
|
156
|
+
# dT/dt = (Fin * (H_in - H_out) + Q) / (n_tot * Cp_mix)
|
|
157
|
+
# (H_out is the tank/outlet enthalpy at the current tank state.)
|
|
149
158
|
Q = self.duty
|
|
150
|
-
dT_dt = (Fin * H_in -
|
|
159
|
+
dT_dt = (Fin * (H_in - H_out) + Q) / (n_tot * Cp_mix)
|
|
151
160
|
|
|
152
161
|
return np.concatenate([dn_dt, [dT_dt]])
|
|
153
162
|
|
|
@@ -158,5 +158,12 @@ def test_dynamic_recycle_collects_engine_output(monkeypatch):
|
|
|
158
158
|
"20260101T000000Z_bbbbbb", "dynamic", "dyn-engine-recycle"
|
|
159
159
|
)
|
|
160
160
|
assert "engine" in manifest.units
|
|
161
|
+
|
|
162
|
+
# Tank energy balance: the no-duty tank must equilibrate to the feed
|
|
163
|
+
# temperature (300.0 K in this fixture) instead of drifting toward the
|
|
164
|
+
# 500 K clamp (F_in=2 vs F_out=1 previously caused runaway heating).
|
|
165
|
+
for t in results["tank_out"]["T"]:
|
|
166
|
+
assert t == pytest.approx(300.0, abs=0.5)
|
|
167
|
+
assert t < 400.0
|
|
161
168
|
# The engine output must not leak into the stream outputs.
|
|
162
169
|
assert "engine" not in manifest.streams
|
|
@@ -221,7 +221,7 @@ class TestBaseUnitMixinIdaesDelegation:
|
|
|
221
221
|
_install_fake_idaes(monkeypatch)
|
|
222
222
|
from processforge.flowsheet import Flowsheet
|
|
223
223
|
|
|
224
|
-
cfg = json.load(open("flowsheets/hydraulic-chain-idaes.json"))
|
|
224
|
+
cfg = json.load(open("flowsheets/idaes/hydraulic-chain-idaes.json"))
|
|
225
225
|
# Flowsheet does dict-based init; mock stays via sys.modules
|
|
226
226
|
fs = Flowsheet(cfg)
|
|
227
227
|
result = fs.run()
|
|
@@ -250,25 +250,31 @@ class TestFlowsheetIntegration:
|
|
|
250
250
|
def test_hydraulic_chain_idaes_validates(self):
|
|
251
251
|
from processforge.utils.validate_flowsheet import validate_flowsheet_dict
|
|
252
252
|
|
|
253
|
-
cfg = json.load(open("flowsheets/hydraulic-chain-idaes.json"))
|
|
253
|
+
cfg = json.load(open("flowsheets/idaes/hydraulic-chain-idaes.json"))
|
|
254
254
|
assert validate_flowsheet_dict(cfg, "hydraulic-chain-idaes") is not None
|
|
255
255
|
|
|
256
256
|
def test_closed_loop_idaes_validates(self):
|
|
257
257
|
from processforge.utils.validate_flowsheet import validate_flowsheet_dict
|
|
258
258
|
|
|
259
|
-
cfg = json.load(open("flowsheets/closed-loop-chain-idaes.json"))
|
|
259
|
+
cfg = json.load(open("flowsheets/idaes/closed-loop-chain-idaes.json"))
|
|
260
260
|
assert validate_flowsheet_dict(cfg, "closed-loop-chain-idaes") is not None
|
|
261
261
|
|
|
262
262
|
def test_closed_loop_dynamic_runs(self, monkeypatch):
|
|
263
263
|
_install_fake_idaes(monkeypatch)
|
|
264
264
|
from processforge.flowsheet import Flowsheet
|
|
265
265
|
|
|
266
|
-
cfg = json.load(open("flowsheets/closed-loop-chain-idaes.json"))
|
|
266
|
+
cfg = json.load(open("flowsheets/idaes/closed-loop-chain-idaes.json"))
|
|
267
267
|
result = Flowsheet(cfg).run()
|
|
268
268
|
assert "recycle_to_tank" in result
|
|
269
269
|
# dynamic result has list for P
|
|
270
270
|
assert isinstance(result["recycle_to_tank"]["P"], list)
|
|
271
271
|
assert len(result["recycle_to_tank"]["P"]) == 21
|
|
272
|
+
# Tank energy balance: no-duty tank must hold its initial temperature
|
|
273
|
+
# (298.15 K) instead of drifting toward the 500 K clamp. The pump
|
|
274
|
+
# contributes only ~0.02 K of legitimate heating per pass.
|
|
275
|
+
for stream_name in ("after_tank_1", "recycle_to_tank"):
|
|
276
|
+
for t in result[stream_name]["T"]:
|
|
277
|
+
assert t == pytest.approx(298.15, abs=0.5)
|
|
272
278
|
|
|
273
279
|
def test_idaes_flowsheet_fails_without_idaes(self, monkeypatch):
|
|
274
280
|
# remove fake if present
|
|
@@ -277,6 +283,6 @@ class TestFlowsheetIntegration:
|
|
|
277
283
|
monkeypatch.delitem(sys.modules, k, raising=False)
|
|
278
284
|
from processforge.flowsheet import Flowsheet
|
|
279
285
|
|
|
280
|
-
cfg = json.load(open("flowsheets/hydraulic-chain-idaes.json"))
|
|
286
|
+
cfg = json.load(open("flowsheets/idaes/hydraulic-chain-idaes.json"))
|
|
281
287
|
with pytest.raises(ProviderNotAvailableError):
|
|
282
288
|
Flowsheet(cfg).run()
|