Move models under process/models

documentation/scripts/plotting_scripts/2nd_gen_rebco_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 temp_c0max = 90.0  # Critical temperature (K) at zero field and strain
 b_c20max = (

documentation/scripts/plotting_scripts/bi_2212_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(1, 11.0, 50)  # Temperature range (K)

documentation/scripts/plotting_scripts/durham_nbti_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(1, 8.0, 50)  # Temperature range (K)

documentation/scripts/plotting_scripts/durham_rebco_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(4.2, 30.0, 50)  # Temperature range (K)

documentation/scripts/plotting_scripts/eutf4_nb3sn_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 temp_c0max = 16.06  # Critical temperature (K) at zero field and strain
 b_c20max = (

documentation/scripts/plotting_scripts/hazelton_zhai_rebco_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(4.2, 40.0, 50)  # Temperature range (K)

documentation/scripts/plotting_scripts/old_empirical_nbti_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(1, 10.0, 50)  # Temperature range (K)

documentation/scripts/plotting_scripts/western_nb3sn_critical_surface.py

@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 temp_c0max = 16.34  # Critical temperature (K) at zero field and strain
 b_c20max = (

process/init.py

@@ -59,7 +59,7 @@
 from process.exceptions import ProcessValidationError
 from process.input import parse_input_file
 from process.log import logging_model_handler
-from process.stellarator.initialization import st_init
+from process.models.stellarator.initialization import st_init
 
 
 def init_process():

process/io/plot_proc.py

@@ -28,41 +28,41 @@
 from matplotlib.path import Path
 from scipy.interpolate import interp1d
 
-import process.confinement_time as confine
 import process.constants as constants
 import process.data_structure.pfcoil_variables as pfcoil_variables
 import process.io.mfile as mf
-import process.superconducting_tf_coil as sctf
-from process.build import Build
-from process.current_drive import ElectronBernstein, ElectronCyclotron
+import process.models.physics.confinement_time as confine
+import process.models.tfcoil.superconducting as sctf
 from process.data_structure import impurity_radiation_module, physics_variables
-from process.geometry.blanket_geometry import (
+from process.io.mfile import MFileErrorClass
+from process.models.build import Build
+from process.models.geometry.blanket import (
     blanket_geometry_double_null,
     blanket_geometry_single_null,
 )
-from process.geometry.cryostat_geometry import cryostat_geometry
-from process.geometry.firstwall_geometry import (
+from process.models.geometry.cryostat import cryostat_geometry
+from process.models.geometry.firstwall import (
     first_wall_geometry_double_null,
     first_wall_geometry_single_null,
 )
-from process.geometry.pfcoil_geometry import pfcoil_geometry
-from process.geometry.plasma_geometry import plasma_geometry
-from process.geometry.shield_geometry import (
+from process.models.geometry.pfcoil import pfcoil_geometry
+from process.models.geometry.plasma import plasma_geometry
+from process.models.geometry.shield import (
     shield_geometry_double_null,
     shield_geometry_single_null,
 )
-from process.geometry.tfcoil_geometry import (
+from process.models.geometry.tfcoil import (
     tfcoil_geometry_d_shape,
     tfcoil_geometry_rectangular_shape,
 )
-from process.geometry.vacuum_vessel_geometry import (
+from process.models.geometry.vacuum_vessel import (
     vacuum_vessel_geometry_double_null,
     vacuum_vessel_geometry_single_null,
 )
-from process.impurity_radiation import read_impurity_file
-from process.io.mfile import MFileErrorClass
+from process.models.physics.current_drive import ElectronBernstein, ElectronCyclotron
+from process.models.physics.impurity_radiation import read_impurity_file
+from process.models.tfcoil.superconducting import SUPERCONDUCTING_TF_TYPES
 from process.objectives import OBJECTIVE_NAMES
-from process.superconducting_tf_coil import SUPERCONDUCTING_TF_TYPES
 
 mpl.rcParams["figure.max_open_warning"] = 40
 

process/main.py

@@ -49,28 +49,6 @@
 import process.data_structure as data_structure
 import process.init as init
 from process import constants
-from process.availability import Availability
-from process.blanket_library import BlanketLibrary
-from process.build import Build
-from process.buildings import Buildings
-from process.costs import Costs
-from process.costs_2015 import Costs2015
-from process.cryostat import Cryostat
-from process.cs_fatigue import CsFatigue
-from process.current_drive import (
-    CurrentDrive,
-    ElectronBernstein,
-    ElectronCyclotron,
-    IonCyclotron,
-    LowerHybrid,
-    NeutralBeam,
-)
-from process.dcll import DCLL
-from process.divertor import Divertor
-from process.fw import FirstWall
-from process.hcpb import CCFE_HCPB
-from process.ife import IFE
-from process.impurity_radiation import initialise_imprad
 from process.io import (
     mfile,
     plot_plotly_sankey,
@@ -90,23 +68,54 @@
     vary_iteration_variables,
 )
 from process.log import logging_model_handler, show_errors
-from process.pfcoil import PFCoil
-from process.physics import DetailedPhysics, Physics, PlasmaBeta, PlasmaInductance
-from process.plasma_geometry import PlasmaGeom
-from process.plasma_profiles import PlasmaProfile
-from process.power import Power
+from process.models.availability import Availability
+from process.models.blankets.blanket_library import BlanketLibrary
+from process.models.blankets.dcll import DCLL
+from process.models.blankets.hcpb import CCFE_HCPB
+from process.models.build import Build
+from process.models.buildings import Buildings
+from process.models.costs.costs import Costs
+from process.models.costs.costs_2015 import Costs2015
+from process.models.cryostat import Cryostat
+from process.models.cs_fatigue import CsFatigue
+from process.models.divertor import Divertor
+from process.models.fw import FirstWall
+from process.models.ife import IFE
+from process.models.pfcoil import PFCoil
+from process.models.physics.current_drive import (
+    CurrentDrive,
+    ElectronBernstein,
+    ElectronCyclotron,
+    IonCyclotron,
+    LowerHybrid,
+    NeutralBeam,
+)
+from process.models.physics.impurity_radiation import initialise_imprad
+from process.models.physics.physics import (
+    DetailedPhysics,
+    Physics,
+    PlasmaBeta,
+    PlasmaInductance,
+)
+from process.models.physics.plasma_geometry import PlasmaGeom
+from process.models.physics.plasma_profiles import PlasmaProfile
+from process.models.power import Power
+from process.models.pulse import Pulse
+from process.models.shield import Shield
+from process.models.stellarator.neoclassics import Neoclassics
+from process.models.stellarator.stellarator import Stellarator
+from process.models.structure import Structure
+from process.models.tfcoil.base import TFCoil
+from process.models.tfcoil.resistive import (
+    AluminiumTFCoil,
+    CopperTFCoil,
+    ResistiveTFCoil,
+)
+from process.models.tfcoil.superconducting import SuperconductingTFCoil
+from process.models.vacuum import Vacuum, VacuumVessel
+from process.models.water_use import WaterUse
 from process.process_output import OutputFileManager, oheadr
-from process.pulse import Pulse
-from process.resistive_tf_coil import AluminiumTFCoil, CopperTFCoil, ResistiveTFCoil
 from process.scan import Scan
-from process.shield import Shield
-from process.stellarator.neoclassics import Neoclassics
-from process.stellarator.stellarator import Stellarator
-from process.structure import Structure
-from process.superconducting_tf_coil import SuperconductingTFCoil
-from process.tf_coil import TFCoil
-from process.vacuum import Vacuum, VacuumVessel
-from process.water_use import WaterUse
 
 os.environ["PYTHON_PROCESS_ROOT"] = os.path.join(os.path.dirname(__file__))
 

process/dcll.py → process/models/blankets/dcll.py

@@ -1,9 +1,8 @@
-import process.blanket_library as blanket_library
+import process.models.blankets.blanket_library as blanket_library
 from process import constants
 from process import (
     process_output as po,
 )
-from process.blanket_library import InboardBlanket, OutboardBlanket
 from process.data_structure import (
     build_variables,
     current_drive_variables,
@@ -15,6 +14,7 @@
     physics_variables,
     primary_pumping_variables,
 )
+from process.models.blankets.blanket_library import InboardBlanket, OutboardBlanket
 
 
 class DCLL(InboardBlanket, OutboardBlanket):

process/hcpb.py → process/models/blankets/hcpb.py

@@ -2,13 +2,12 @@
 
 import numpy as np
 
-import process.blanket_library as blanket_library
 import process.data_structure.blanket_library as blanket_vars
+import process.models.blankets.blanket_library as blanket_library
 from process import constants
 from process import (
     process_output as po,
 )
-from process.blanket_library import InboardBlanket, OutboardBlanket
 from process.coolprop_interface import FluidProperties
 from process.data_structure import (
     build_variables,
@@ -24,6 +23,7 @@
     tfcoil_variables,
 )
 from process.exceptions import ProcessValueError
+from process.models.blankets.blanket_library import InboardBlanket, OutboardBlanket
 
 logger = logging.getLogger(__name__)
 

process/fw.py → process/models/fw.py

@@ -4,7 +4,6 @@
 
 from process import constants
 from process import process_output as po
-from process.blanket_library import BlanketLibrary, dshellarea, eshellarea
 from process.coolprop_interface import FluidProperties
 from process.data_structure import (
     blanket_library,
@@ -15,6 +14,11 @@
     physics_variables,
 )
 from process.exceptions import ProcessValueError
+from process.models.blankets.blanket_library import (
+    BlanketLibrary,
+    dshellarea,
+    eshellarea,
+)
 
 logger = logging.getLogger(__name__)
 

process/geometry/blanket_geometry.py → process/models/geometry/blanket.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices, dhgap_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices, dhgap_vertices
 
 
 def blanket_geometry_single_null(

process/geometry/cryostat_geometry.py → process/models/geometry/cryostat.py

@@ -2,7 +2,7 @@
 Calculate cryostat geometries
 """
 
-from process.geometry.geometry_parameterisations import RectangleGeometry
+from process.models.geometry.parameterisations import RectangleGeometry
 
 
 def cryostat_geometry(

process/geometry/firstwall_geometry.py → process/models/geometry/firstwall.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices, dhgap_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices, dhgap_vertices
 
 
 def first_wall_geometry_single_null(

process/geometry/pfcoil_geometry.py → process/models/geometry/pfcoil.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import RectangleGeometry
+from process.models.geometry.parameterisations import RectangleGeometry
 
 
 def pfcoil_geometry(

process/geometry/shield_geometry.py → process/models/geometry/shield.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices
 
 
 def shield_geometry_single_null(

process/geometry/tfcoil_geometry.py → process/models/geometry/tfcoil.py

@@ -2,8 +2,8 @@
 Calculate radial and vertical coordinates for the geometry of the tf coils
 """
 
-from process.geometry.geometry_parameterisations import RectangleGeometry
-from process.geometry.utils import ellips_fill_vertices
+from process.models.geometry.parameterisations import RectangleGeometry
+from process.models.geometry.utils import ellips_fill_vertices
 
 
 def tfcoil_geometry_rectangular_shape(

process/geometry/vacuum_vessel_geometry.py → process/models/geometry/vacuum_vessel.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices
 
 
 def vacuum_vessel_geometry_single_null(

process/pfcoil.py → process/models/pfcoil.py

@@ -7,7 +7,7 @@
 from scipy.linalg import svd
 from scipy.special import ellipe, ellipk
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 from process import constants
 from process import process_output as op
 from process.data_structure import build_variables as bv

process/current_drive.py → process/models/physics/current_drive.py

@@ -12,7 +12,7 @@
     physics_variables,
 )
 from process.exceptions import ProcessError, ProcessValueError
-from process.plasma_profiles import PlasmaProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 logger = logging.getLogger(__name__)
 

process/fusion_reactions.py → process/models/physics/fusion_reactions.py

@@ -6,7 +6,7 @@
 
 from process import constants
 from process.data_structure import physics_variables
-from process.plasma_profiles import PlasmaProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 logger = logging.getLogger(__name__)