diff --git a/process/core/io/data_structure_dicts.py b/process/core/data_structure/data_structure_dicts.py similarity index 100% rename from process/core/io/data_structure_dicts.py rename to process/core/data_structure/data_structure_dicts.py diff --git a/process/core/io/obsolete_vars.py b/process/core/data_structure/obsolete_vars.py similarity index 100% rename from process/core/io/obsolete_vars.py rename to process/core/data_structure/obsolete_vars.py diff --git a/process/core/io/variable_metadata.py b/process/core/data_structure/variable_metadata.py similarity index 100% rename from process/core/io/variable_metadata.py rename to process/core/data_structure/variable_metadata.py diff --git a/process/core/io/in_dat/base.py b/process/core/io/in_dat/base.py index 21be3d153c..71bdd1b98a 100644 --- a/process/core/io/in_dat/base.py +++ b/process/core/io/in_dat/base.py @@ -13,8 +13,8 @@ import sys from re import sub +from process.core.data_structure.data_structure_dicts import get_dicts from process.core.exceptions import ProcessValidationError -from process.core.io.data_structure_dicts import get_dicts from process.core.solver.constraints import ConstraintManager from process.core.solver.iteration_variables import ITERATION_VARIABLES from process.data_structure.numerics import PROCESSRunMode diff --git a/process/core/io/mfile/comparison.py b/process/core/io/mfile/comparison.py index eeb88efc2b..0125f3e738 100644 --- a/process/core/io/mfile/comparison.py +++ b/process/core/io/mfile/comparison.py @@ -12,7 +12,7 @@ import numpy as np from numpy import isfinite -from process.core.io.data_structure_dicts import get_dicts +from process.core.data_structure.data_structure_dicts import get_dicts from process.core.io.mfile.base import MFile if TYPE_CHECKING: diff --git a/process/core/io/plot/scans.py b/process/core/io/plot/scans.py index d1325f59f4..c88a2c904e 100644 --- a/process/core/io/plot/scans.py +++ b/process/core/io/plot/scans.py @@ -35,8 +35,8 @@ import numpy as np from matplotlib.ticker import MultipleLocator, PercentFormatter +from process.core.data_structure.variable_metadata import var_dicts as meta from process.core.io.mfile import MFile -from process.core.io.variable_metadata import var_dicts as meta from process.core.scan import ScanVariables from process.data_structure.numerics import SolverOutputCondition diff --git a/process/core/io/vary_run/tools.py b/process/core/io/vary_run/tools.py index 396b617c17..dc5f6d1e50 100644 --- a/process/core/io/vary_run/tools.py +++ b/process/core/io/vary_run/tools.py @@ -10,8 +10,8 @@ from pathlib import Path from typing import TYPE_CHECKING +from process.core.data_structure.data_structure_dicts import get_dicts from process.core.input import INPUT_VARIABLES -from process.core.io.data_structure_dicts import get_dicts from process.core.io.in_dat import InDat from process.core.io.mfile import MFile from process.core.solver.iteration_variables import ITERATION_VARIABLES diff --git a/process/core/scan.py b/process/core/scan.py index 6c974a1a12..7109b1c932 100644 --- a/process/core/scan.py +++ b/process/core/scan.py @@ -13,8 +13,8 @@ from process.core import constants, process_output from process.core.caller import write_output_files +from process.core.data_structure.data_structure_dicts import get_dicts from process.core.exceptions import ProcessValueError -from process.core.io.data_structure_dicts import get_dicts from process.core.log import logging_model_handler, show_errors from process.core.solver import constraints from process.core.solver.solver_handler import SolverHandler diff --git a/process/main.py b/process/main.py index ac155c4d68..6d07e2ef3c 100644 --- a/process/main.py +++ b/process/main.py @@ -39,8 +39,8 @@ import process # noqa: F401 from process.core import constants, init +from process.core.data_structure import obsolete_vars as ov from process.core.data_structure.base import DataStructure -from process.core.io import obsolete_vars as ov from process.core.io.cli_tools import LazyGroup, help_opt, indat_opt from process.core.io.mfile import MFile from process.core.io.plot import plot_sankey_plotly, plot_summary