processforge 0.6.3__tar.gz → 0.6.4__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.3/src/processforge.egg-info → processforge-0.6.4}/PKG-INFO +1 -1
- {processforge-0.6.3 → processforge-0.6.4}/pyproject.toml +1 -1
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/__init__.py +1 -1
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/run.py +1 -6
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/runs.py +1 -1
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/result.py +0 -117
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/runner.py +1 -1
- processforge-0.6.4/src/processforge/utils/plotting.py +171 -0
- {processforge-0.6.3 → processforge-0.6.4/src/processforge.egg-info}/PKG-INFO +1 -1
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge.egg-info/SOURCES.txt +1 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_cli.py +2 -2
- {processforge-0.6.3 → processforge-0.6.4}/LICENSE +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/MANIFEST.in +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/README.md +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/closed-loop-chain.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/coupled/msre_coupled.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/custom/crimson/MUWS_HB.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/custom/crimson/simple_water_system.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/custom/simple_hyrdaulic_scheme.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/festim/hydrogen_transport_1d.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/festim/tds_tungsten.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/hydraulic-chain.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/flowsheets/openmc/msre_eigenvalue.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/setup.cfg +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/__main__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/_schema.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/analysis/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/analysis/dof.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/api/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/api/serve.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/apply.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/common.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/diagram.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/display.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/export_fmu.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/export_modelica.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/init.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/persist.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/plan.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/cli/validate.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/compose.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/coupling.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/backends/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/backends/base.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/backends/casadi_backend.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/backends/pyomo_backend.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/backends/scipy_backend.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/flowsheet.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/jacobian.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/mixin.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/solver.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/stream_var.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/flash_eo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/heater_eo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/pipes_eo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/pump_eo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/strainer_eo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/eo/units/valve_eo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/flowsheet.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/fmu/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/fmu/_fmi_vars.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/fmu/builder.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/fmu/interface.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/fmu/slave_template.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/lock.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/modelica/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/modelica/mo_writer.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/modelica/omc_runner.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/modelica/transpiler.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/modelica/unit_equations.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/output_collector.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/pathsim/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/pathsim/adapter.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/pcl/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/pcl/compiler.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/pcl/namespace.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/persistence/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/persistence/archive.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/persistence/artifact_store.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/provenance.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/_sim_strategy.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/base.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/base_jacobian_mixin.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/base_simulation_provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/cantera_jacobian.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/cantera_provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/container_client.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/coolprop_provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/errors.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/build_helpers.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/result_extraction.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/strategies.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/jacobian_contributor.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/manager.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/modelica_jacobian.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/modelica_provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/build_helpers.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/result_extraction.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/strategies.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/reference_state_registry.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/registry.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/quantity.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/result_schema.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/schemas/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/schemas/festim/festim_model.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/schemas/flowsheet_schema.json +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/schemas/openmc/openmc_model.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/simulate.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/solver.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/state.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/thermo.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/types.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/base.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/cstr.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/flash.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/heater.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/pfr.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/pipes.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/pump.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/registry.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/solver_unit.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/strainer.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/tank.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/units/valve.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/__init__.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/flowsheet_diagram.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/mermaid_diagram.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/s3_upload.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/topology.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/unit_consistency.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/validate_flowsheet.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge/utils/validation.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge.egg-info/dependency_links.txt +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge.egg-info/entry_points.txt +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge.egg-info/requires.txt +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/src/processforge.egg-info/top_level.txt +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_artifact_store.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_container_client.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_coupling.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_display.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_festim_provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_festim_schema.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_fmu_solverunit.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_init.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_openmc_provider.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_pathsim_adapter.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_persist.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_provider_errors.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_providers.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_result_zarr.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_runner.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_runs_command.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_s3_upload.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_state.py +0 -0
- {processforge-0.6.3 → processforge-0.6.4}/tests/test_types.py +0 -0
|
@@ -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.4"
|
|
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.4"
|
|
14
14
|
|
|
15
15
|
from .eo import EOFlowsheet, EOSolver
|
|
16
16
|
from .flowsheet import Flowsheet
|
|
@@ -9,15 +9,10 @@ from ..runner import ProcessforgeRunError, run_flowsheet
|
|
|
9
9
|
|
|
10
10
|
def run(
|
|
11
11
|
flowsheet: str = typer.Argument(help="Path to the flowsheet JSON file"),
|
|
12
|
-
no_plot: bool = typer.Option(
|
|
13
|
-
False,
|
|
14
|
-
"--no-plot",
|
|
15
|
-
help="Skip terminal plots for simulation outputs",
|
|
16
|
-
),
|
|
17
12
|
) -> None:
|
|
18
13
|
"""Run a process simulation from a flowsheet JSON file."""
|
|
19
14
|
try:
|
|
20
|
-
result = run_flowsheet(flowsheet, no_plot=
|
|
15
|
+
result = run_flowsheet(flowsheet, no_plot=True)
|
|
21
16
|
except ProcessforgeRunError as exc:
|
|
22
17
|
logger.error(str(exc))
|
|
23
18
|
raise SystemExit(1) from exc
|
|
@@ -15,9 +15,9 @@ from ..result import (
|
|
|
15
15
|
_fmt_scientific,
|
|
16
16
|
_one_line_summary,
|
|
17
17
|
_scalar_from_sequence,
|
|
18
|
-
plot_zarr_summary_terminal,
|
|
19
18
|
summarize_zarr_store,
|
|
20
19
|
)
|
|
20
|
+
from ..utils.plotting import plot_zarr_summary_terminal
|
|
21
21
|
|
|
22
22
|
# Fixed column widths for the compact single-run stream table.
|
|
23
23
|
STREAM_COL_WIDTH = 28
|
|
@@ -5,7 +5,6 @@ from datetime import datetime, timezone
|
|
|
5
5
|
|
|
6
6
|
import numpy as np
|
|
7
7
|
import pandas as pd
|
|
8
|
-
import plotext as plt
|
|
9
8
|
import zarr
|
|
10
9
|
from loguru import logger
|
|
11
10
|
|
|
@@ -355,122 +354,6 @@ def save_results_zarr_s3(results, s3_uri: str, run_info: RunInfo | dict | None =
|
|
|
355
354
|
logger.info(f"Saved Zarr results to {s3_uri}")
|
|
356
355
|
|
|
357
356
|
|
|
358
|
-
def _plotext_figure():
|
|
359
|
-
"""Return a fresh plotext figure with a sensible terminal size."""
|
|
360
|
-
fig = plt.figure
|
|
361
|
-
fig.clear()
|
|
362
|
-
fig.plot_size(80, 18)
|
|
363
|
-
return fig
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
def plot_results_terminal(results, title=""):
|
|
367
|
-
"""Render steady-state stream results as terminal bar charts."""
|
|
368
|
-
streams = [k for k, v in results.items() if isinstance(v, dict) and "T" in v]
|
|
369
|
-
if not streams:
|
|
370
|
-
return
|
|
371
|
-
|
|
372
|
-
temp_values = [_scalar_from_sequence(results[s].get("T")) or 0.0 for s in streams]
|
|
373
|
-
|
|
374
|
-
fig = _plotext_figure()
|
|
375
|
-
fig.draw(fig.bar(streams, temp_values, orientation="vertical"))
|
|
376
|
-
fig.title(title or "Stream Temperatures (Steady State)")
|
|
377
|
-
fig.show()
|
|
378
|
-
fig.clear()
|
|
379
|
-
|
|
380
|
-
comps = set()
|
|
381
|
-
for s in streams:
|
|
382
|
-
z = results[s].get("z")
|
|
383
|
-
if isinstance(z, dict):
|
|
384
|
-
comps.update(z.keys())
|
|
385
|
-
comps = sorted(comps)
|
|
386
|
-
if not comps:
|
|
387
|
-
return
|
|
388
|
-
|
|
389
|
-
values = []
|
|
390
|
-
for comp in comps:
|
|
391
|
-
values.append([
|
|
392
|
-
_scalar_from_sequence(results[s].get("z", {}).get(comp, 0.0)) or 0.0
|
|
393
|
-
for s in streams
|
|
394
|
-
])
|
|
395
|
-
|
|
396
|
-
fig = _plotext_figure()
|
|
397
|
-
fig.draw(fig.bar(streams, values, orientation="vertical", stacked=True))
|
|
398
|
-
fig.title(title or "Stream Compositions (Steady State)")
|
|
399
|
-
fig.show()
|
|
400
|
-
fig.clear()
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
def plot_timeseries_terminal(results, title=""):
|
|
404
|
-
"""Render dynamic stream results as terminal line plots."""
|
|
405
|
-
streams = sorted(k for k, v in results.items() if isinstance(v, dict))
|
|
406
|
-
if not streams:
|
|
407
|
-
return
|
|
408
|
-
|
|
409
|
-
times = results[streams[0]].get("time", [])
|
|
410
|
-
if not times:
|
|
411
|
-
return
|
|
412
|
-
|
|
413
|
-
fig = _plotext_figure()
|
|
414
|
-
for s_name in streams:
|
|
415
|
-
if "T" in results[s_name]:
|
|
416
|
-
fig.draw(fig.signal(times, results[s_name]["T"]).label(s_name))
|
|
417
|
-
fig.title(title or "Stream Temperatures vs Time")
|
|
418
|
-
fig.show()
|
|
419
|
-
fig.clear()
|
|
420
|
-
|
|
421
|
-
comps = set()
|
|
422
|
-
for s_data in results.values():
|
|
423
|
-
if "z" in s_data and isinstance(s_data["z"], dict):
|
|
424
|
-
comps.update(s_data["z"].keys())
|
|
425
|
-
comps = sorted(comps)
|
|
426
|
-
|
|
427
|
-
for s_name in streams:
|
|
428
|
-
if "z" not in results[s_name]:
|
|
429
|
-
continue
|
|
430
|
-
fig = _plotext_figure()
|
|
431
|
-
for comp in comps:
|
|
432
|
-
if comp in results[s_name]["z"]:
|
|
433
|
-
fig.draw(fig.signal(times, results[s_name]["z"][comp]).label(comp))
|
|
434
|
-
fig.title(f"Compositions vs Time ({s_name})")
|
|
435
|
-
fig.show()
|
|
436
|
-
fig.clear()
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
def plot_zarr_summary_terminal(summary: dict, title: str = "") -> None:
|
|
440
|
-
"""Render a terminal visualization from a Zarr summary dict."""
|
|
441
|
-
if not summary.get("present"):
|
|
442
|
-
return
|
|
443
|
-
|
|
444
|
-
mode = summary.get("mode", "steady")
|
|
445
|
-
streams = summary.get("streams", {})
|
|
446
|
-
|
|
447
|
-
if mode == "dynamic":
|
|
448
|
-
# Reconstruct a results-like dict from Zarr summary for plotting.
|
|
449
|
-
results: dict = {}
|
|
450
|
-
for s_name, sdata in streams.items():
|
|
451
|
-
fields = sdata.get("fields", {})
|
|
452
|
-
results[s_name] = {k: v.get("value") for k, v in fields.items()}
|
|
453
|
-
plot_timeseries_terminal(results, title=title)
|
|
454
|
-
else:
|
|
455
|
-
# Steady: show final timestep values.
|
|
456
|
-
results = {}
|
|
457
|
-
for s_name, sdata in streams.items():
|
|
458
|
-
fields = sdata.get("fields", {})
|
|
459
|
-
results[s_name] = {
|
|
460
|
-
k: _scalar_from_sequence(v.get("value"))
|
|
461
|
-
for k, v in fields.items()
|
|
462
|
-
}
|
|
463
|
-
plot_results_terminal(results, title=title)
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
def plot_results_to_terminal(results, title: str = "", mode: str = "steady") -> None:
|
|
467
|
-
"""Dispatch to the appropriate terminal plotter for run results."""
|
|
468
|
-
if mode == "dynamic":
|
|
469
|
-
plot_timeseries_terminal(results, title=title)
|
|
470
|
-
else:
|
|
471
|
-
plot_results_terminal(results, title=title)
|
|
472
|
-
|
|
473
|
-
|
|
474
357
|
def _convert_value(value):
|
|
475
358
|
if isinstance(value, np.ndarray):
|
|
476
359
|
if value.size == 0:
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
"""Terminal plotting helpers for processforge run results."""
|
|
2
|
+
|
|
3
|
+
from __future__ import annotations
|
|
4
|
+
|
|
5
|
+
import numpy as np
|
|
6
|
+
import plotext as plt
|
|
7
|
+
|
|
8
|
+
from ..result import _convert_value, _scalar_from_sequence
|
|
9
|
+
|
|
10
|
+
# Default terminal plot dimensions.
|
|
11
|
+
_DEFAULT_WIDTH = 80
|
|
12
|
+
_DEFAULT_HEIGHT = 18
|
|
13
|
+
_MAX_WIDTH = 120
|
|
14
|
+
_MAX_HEIGHT = 40
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
def _plotext_figure(width: int = _DEFAULT_WIDTH, height: int = _DEFAULT_HEIGHT):
|
|
18
|
+
"""Return a fresh plotext figure with a sensible terminal size."""
|
|
19
|
+
fig = plt.figure
|
|
20
|
+
fig.clear()
|
|
21
|
+
fig.plot_size(width, height)
|
|
22
|
+
fig.theme("dark")
|
|
23
|
+
return fig
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def _shorten_labels(labels, max_len: int = 14):
|
|
27
|
+
"""Shorten long labels while preserving readability."""
|
|
28
|
+
return [lab if len(lab) <= max_len else lab[: max_len - 1] + "…" for lab in labels]
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
def _bar_figure(n_categories: int, max_label_len: int):
|
|
32
|
+
"""Create a figure sized appropriately for a bar chart.
|
|
33
|
+
|
|
34
|
+
Uses horizontal bars when there are many categories or long labels,
|
|
35
|
+
vertical bars otherwise.
|
|
36
|
+
"""
|
|
37
|
+
use_horizontal = n_categories > 6 or max_label_len > 12
|
|
38
|
+
if use_horizontal:
|
|
39
|
+
height = min(_MAX_HEIGHT, max(_DEFAULT_HEIGHT, n_categories * 2 + 6))
|
|
40
|
+
return _plotext_figure(width=_DEFAULT_WIDTH, height=height), "horizontal"
|
|
41
|
+
width = min(_MAX_WIDTH, max(_DEFAULT_WIDTH, n_categories * 12))
|
|
42
|
+
return _plotext_figure(width=width, height=_DEFAULT_HEIGHT), "vertical"
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def plot_results_terminal(results, title=""):
|
|
46
|
+
"""Render steady-state stream results as terminal bar charts."""
|
|
47
|
+
streams = [k for k, v in results.items() if isinstance(v, dict) and "T" in v]
|
|
48
|
+
if not streams:
|
|
49
|
+
return
|
|
50
|
+
|
|
51
|
+
temp_values = [_scalar_from_sequence(results[s].get("T")) or 0.0 for s in streams]
|
|
52
|
+
labels = _shorten_labels(streams)
|
|
53
|
+
max_len = max((len(lab) for lab in labels), default=0)
|
|
54
|
+
|
|
55
|
+
fig, orientation = _bar_figure(len(streams), max_len)
|
|
56
|
+
fig.draw(fig.bar(labels, temp_values, orientation=orientation, width=0.5))
|
|
57
|
+
fig.title(title or "Stream Temperatures (Steady State)")
|
|
58
|
+
if orientation == "horizontal":
|
|
59
|
+
fig.label("Temperature (K)", axis="x")
|
|
60
|
+
fig.label("Stream", axis="y")
|
|
61
|
+
else:
|
|
62
|
+
fig.label("Stream", axis="x")
|
|
63
|
+
fig.label("Temperature (K)", axis="y")
|
|
64
|
+
fig.show()
|
|
65
|
+
fig.clear()
|
|
66
|
+
|
|
67
|
+
comps = set()
|
|
68
|
+
for s in streams:
|
|
69
|
+
z = results[s].get("z")
|
|
70
|
+
if isinstance(z, dict):
|
|
71
|
+
comps.update(z.keys())
|
|
72
|
+
comps = sorted(comps)
|
|
73
|
+
if not comps:
|
|
74
|
+
return
|
|
75
|
+
|
|
76
|
+
values = []
|
|
77
|
+
for comp in comps:
|
|
78
|
+
values.append([
|
|
79
|
+
_scalar_from_sequence(results[s].get("z", {}).get(comp, 0.0)) or 0.0
|
|
80
|
+
for s in streams
|
|
81
|
+
])
|
|
82
|
+
|
|
83
|
+
fig, orientation = _bar_figure(len(streams), max_len)
|
|
84
|
+
fig.draw(fig.bar(labels, values, orientation=orientation, stacked=True, width=0.5))
|
|
85
|
+
fig.title(title or "Stream Compositions (Steady State)")
|
|
86
|
+
if orientation == "horizontal":
|
|
87
|
+
fig.label("Mole fraction", axis="x")
|
|
88
|
+
fig.label("Stream", axis="y")
|
|
89
|
+
else:
|
|
90
|
+
fig.label("Stream", axis="x")
|
|
91
|
+
fig.label("Mole fraction", axis="y")
|
|
92
|
+
fig.show()
|
|
93
|
+
fig.clear()
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
def plot_timeseries_terminal(results, title=""):
|
|
97
|
+
"""Render dynamic stream results as terminal line plots."""
|
|
98
|
+
streams = sorted(k for k, v in results.items() if isinstance(v, dict))
|
|
99
|
+
if not streams:
|
|
100
|
+
return
|
|
101
|
+
|
|
102
|
+
times = results[streams[0]].get("time", [])
|
|
103
|
+
if not times:
|
|
104
|
+
return
|
|
105
|
+
|
|
106
|
+
n_points = len(times)
|
|
107
|
+
width = min(_MAX_WIDTH, max(_DEFAULT_WIDTH, n_points // 2))
|
|
108
|
+
|
|
109
|
+
fig = _plotext_figure(width=width, height=_DEFAULT_HEIGHT)
|
|
110
|
+
for s_name in streams:
|
|
111
|
+
if "T" in results[s_name]:
|
|
112
|
+
fig.draw(fig.signal(times, results[s_name]["T"]).label(s_name))
|
|
113
|
+
fig.title(title or "Stream Temperatures vs Time")
|
|
114
|
+
fig.label("Time (s)", axis="x")
|
|
115
|
+
fig.label("Temperature (K)", axis="y")
|
|
116
|
+
fig.show()
|
|
117
|
+
fig.clear()
|
|
118
|
+
|
|
119
|
+
comps = set()
|
|
120
|
+
for s_data in results.values():
|
|
121
|
+
if "z" in s_data and isinstance(s_data["z"], dict):
|
|
122
|
+
comps.update(s_data["z"].keys())
|
|
123
|
+
comps = sorted(comps)
|
|
124
|
+
|
|
125
|
+
for s_name in streams:
|
|
126
|
+
if "z" not in results[s_name]:
|
|
127
|
+
continue
|
|
128
|
+
fig = _plotext_figure(width=width, height=_DEFAULT_HEIGHT)
|
|
129
|
+
for comp in comps:
|
|
130
|
+
if comp in results[s_name]["z"]:
|
|
131
|
+
fig.draw(fig.signal(times, results[s_name]["z"][comp]).label(comp))
|
|
132
|
+
fig.title(f"Compositions vs Time ({s_name})")
|
|
133
|
+
fig.label("Time (s)", axis="x")
|
|
134
|
+
fig.label("Mole fraction", axis="y")
|
|
135
|
+
fig.show()
|
|
136
|
+
fig.clear()
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
def plot_zarr_summary_terminal(summary: dict, title: str = "") -> None:
|
|
140
|
+
"""Render a terminal visualization from a Zarr summary dict."""
|
|
141
|
+
if not summary.get("present"):
|
|
142
|
+
return
|
|
143
|
+
|
|
144
|
+
mode = summary.get("mode", "steady")
|
|
145
|
+
streams = summary.get("streams", {})
|
|
146
|
+
|
|
147
|
+
if mode == "dynamic":
|
|
148
|
+
# Reconstruct a results-like dict from Zarr summary for plotting.
|
|
149
|
+
results: dict = {}
|
|
150
|
+
for s_name, sdata in streams.items():
|
|
151
|
+
fields = sdata.get("fields", {})
|
|
152
|
+
results[s_name] = {k: v.get("value") for k, v in fields.items()}
|
|
153
|
+
plot_timeseries_terminal(results, title=title)
|
|
154
|
+
else:
|
|
155
|
+
# Steady: show final timestep values.
|
|
156
|
+
results = {}
|
|
157
|
+
for s_name, sdata in streams.items():
|
|
158
|
+
fields = sdata.get("fields", {})
|
|
159
|
+
results[s_name] = {
|
|
160
|
+
k: _scalar_from_sequence(v.get("value"))
|
|
161
|
+
for k, v in fields.items()
|
|
162
|
+
}
|
|
163
|
+
plot_results_terminal(results, title=title)
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
def plot_results_to_terminal(results, title: str = "", mode: str = "steady") -> None:
|
|
167
|
+
"""Dispatch to the appropriate terminal plotter for run results."""
|
|
168
|
+
if mode == "dynamic":
|
|
169
|
+
plot_timeseries_terminal(results, title=title)
|
|
170
|
+
else:
|
|
171
|
+
plot_results_terminal(results, title=title)
|
|
@@ -134,6 +134,7 @@ src/processforge/units/valve.py
|
|
|
134
134
|
src/processforge/utils/__init__.py
|
|
135
135
|
src/processforge/utils/flowsheet_diagram.py
|
|
136
136
|
src/processforge/utils/mermaid_diagram.py
|
|
137
|
+
src/processforge/utils/plotting.py
|
|
137
138
|
src/processforge/utils/s3_upload.py
|
|
138
139
|
src/processforge/utils/topology.py
|
|
139
140
|
src/processforge/utils/unit_consistency.py
|
|
@@ -374,7 +374,7 @@ class TestCmdRun:
|
|
|
374
374
|
with patch.object(
|
|
375
375
|
runner_mod, "run_flowsheet", side_effect=FlowsheetValidationError("not found")
|
|
376
376
|
), pytest.raises(SystemExit) as exc_info:
|
|
377
|
-
run(flowsheet=str(tmp_path / "nope.json")
|
|
377
|
+
run(flowsheet=str(tmp_path / "nope.json"))
|
|
378
378
|
assert exc_info.value.code == 1
|
|
379
379
|
|
|
380
380
|
def test_run_flowsheet_delegates_to_runner(self, tmp_path, log_output):
|
|
@@ -382,7 +382,7 @@ class TestCmdRun:
|
|
|
382
382
|
from processforge.cli.run import run
|
|
383
383
|
|
|
384
384
|
with patch.object(run_mod, "run_flowsheet", return_value=self._mock_result()):
|
|
385
|
-
run(flowsheet=str(tmp_path / "fs.json")
|
|
385
|
+
run(flowsheet=str(tmp_path / "fs.json"))
|
|
386
386
|
|
|
387
387
|
assert any("Run Summary" in m for m in log_output)
|
|
388
388
|
assert any("converged" in m for m in log_output)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/flowsheets/custom/crimson/simple_water_system.json
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/base_simulation_provider.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/build_helpers.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/festim/result_extraction.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/jacobian_contributor.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/build_helpers.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/openmc/result_extraction.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.6.3 → processforge-0.6.4}/src/processforge/providers/reference_state_registry.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|