Fix variable names cut off in MFile

process/availability.py

@@ -4,13 +4,13 @@
 from scipy.special import comb as combinations
 
 from process import fortran as ft
+from process import process_output as po
 from process.fortran import constraint_variables as ctv
 from process.fortran import cost_variables as cv
 from process.fortran import divertor_variables as dv
 from process.fortran import fwbs_variables as fwbsv
 from process.fortran import ife_variables as ifev
 from process.fortran import physics_variables as pv
-from process.fortran import process_output as po
 from process.fortran import tfcoil_variables as tfv
 from process.fortran import times_variables as tv
 from process.fortran import vacuum_variables as vacv

process/blanket_library.py

@@ -5,6 +5,9 @@
 
 import numpy as np
 
+from process import (
+    process_output as po,
+)
 from process.coolprop_interface import FluidProperties
 from process.fortran import (
     blanket_library,
@@ -22,9 +25,6 @@
 from process.fortran import (
     error_handling as eh,
 )
-from process.fortran import (
-    process_output as po,
-)
 from process.utilities.f2py_string_patch import f2py_compatible_to_string
 
 # Acronyms for this module:

process/build.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 
+from process import process_output as po
 from process.blanket_library import dshellarea, eshellarea
 from process.fortran import (
     blanket_library,
@@ -17,7 +18,6 @@
     physics_variables,
     tfcoil_variables,
 )
-from process.fortran import process_output as po
 from process.variables import AnnotatedVariable
 
 logger = logging.getLogger(__name__)
@@ -973,7 +973,7 @@ def divgeom(self, output: bool):
                 po.ovarrf(
                     self.outfile,
                     "Plasma geometric centre, radial (m)",
-                    "(physics_variables.rmajor.)",
+                    "(rmajor.)",
                     physics_variables.rmajor,
                     "OP ",
                 )
@@ -986,15 +986,15 @@ def divgeom(self, output: bool):
                 )
                 po.ovarrf(
                     self.outfile,
-                    "Plasma lower physics_variables.triangularity",
+                    "Plasma lower triangularity",
                     "(tril)",
                     tril,
                     "OP ",
                 )
                 po.ovarrf(
                     self.outfile,
                     "Plasma elongation",
-                    "(physics_variables.kappa.)",
+                    "(kappa.)",
                     kap,
                     "OP ",
                 )

process/buildings.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 
+from process import process_output as po
 from process.fortran import (
     build_variables,
     buildings_variables,
@@ -15,7 +16,6 @@
     physics_variables,
     tfcoil_variables,
 )
-from process.fortran import process_output as po
 
 logger = logging.getLogger(__name__)
 

process/costs.py

@@ -1,5 +1,6 @@
 import numpy as np
 
+from process import process_output as po
 from process.fortran import (
     build_variables,
     buildings_variables,
@@ -20,7 +21,6 @@
     times_variables,
     vacuum_variables,
 )
-from process.fortran import process_output as po
 from process.variables import AnnotatedVariable
 
 

process/costs_2015.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 
+from process import process_output as po
 from process.fortran import (
     build_variables,
     constants,
@@ -15,7 +16,6 @@
     physics_variables,
     tfcoil_variables,
 )
-from process.fortran import process_output as po
 from process.variables import AnnotatedVariable
 
 logger = logging.getLogger(__name__)

process/current_drive.py

@@ -1,5 +1,8 @@
 import numpy as np
 
+from process import (
+    process_output as po,
+)
 from process.fortran import (
     constants,
     cost_variables,
@@ -10,9 +13,6 @@
 from process.fortran import (
     error_handling as eh,
 )
-from process.fortran import (
-    process_output as po,
-)
 from process.plasma_profiles import PlasmaProfile
 
 

process/dcll.py

@@ -1,3 +1,6 @@
+from process import (
+    process_output as po,
+)
 from process.fortran import (
     build_variables,
     constants,
@@ -8,9 +11,6 @@
     physics_variables,
     primary_pumping_variables,
 )
-from process.fortran import (
-    process_output as po,
-)
 
 
 class DCLL:

process/divertor.py

@@ -1,11 +1,11 @@
 import math
 
+from process import process_output as po
 from process.fortran import build_variables as bv
 from process.fortran import constants
 from process.fortran import divertor_variables as dv
 from process.fortran import error_handling as eh
 from process.fortran import physics_variables as pv
-from process.fortran import process_output as po
 from process.fortran import tfcoil_variables as tfv
 
 

process/final.py

@@ -3,14 +3,14 @@
 from tabulate import tabulate
 
 from process import output as op
+from process import (
+    process_output as po,
+)
 from process.fortran import (
     constants,
     constraints,
     numerics,
 )
-from process.fortran import (
-    process_output as po,
-)
 from process.objectives import objective_function
 from process.utilities.f2py_string_patch import f2py_compatible_to_string
 

process/fw.py

@@ -1,5 +1,8 @@
 import numpy as np
 
+from process import (
+    process_output as po,
+)
 from process.coolprop_interface import FluidProperties
 from process.fortran import (
     constants,
@@ -9,9 +12,6 @@
 from process.fortran import (
     error_handling as eh,
 )
-from process.fortran import (
-    process_output as po,
-)
 from process.utilities.f2py_string_patch import f2py_compatible_to_string
 
 

process/hcpb.py

@@ -1,5 +1,8 @@
 import numpy as np
 
+from process import (
+    process_output as po,
+)
 from process.coolprop_interface import FluidProperties
 from process.fortran import (
     build_variables,
@@ -18,9 +21,6 @@
 from process.fortran import (
     error_handling as eh,
 )
-from process.fortran import (
-    process_output as po,
-)
 
 
 class CCFE_HCPB:

process/ife.py

@@ -7,6 +7,7 @@
 
 import numpy as np
 
+from process import process_output
 from process.fortran import (
     build_variables,
     buildings_variables,
@@ -17,7 +18,6 @@
     heat_transport_variables,
     ife_variables,
     physics_variables,
-    process_output,
     structure_variables,
     vacuum_variables,
 )

process/init.py

@@ -79,71 +79,71 @@ def run_summary():
     # Outfile and terminal #
     for outfile in [fortran.constants.nout, fortran.constants.iotty]:
         # PROCESS code header
-        fortran.process_output.oblnkl(outfile)
-        fortran.process_output.ostars(outfile, 110)
-        fortran.process_output.ocentr(outfile, "PROCESS", 110)
-        fortran.process_output.ocentr(outfile, "Power Reactor Optimisation Code", 110)
-        fortran.process_output.ostars(outfile, 110)
-        fortran.process_output.oblnkl(outfile)
+        process.process_output.oblnkl(outfile)
+        process.process_output.ostars(outfile, 110)
+        process.process_output.ocentr(outfile, "PROCESS", 110)
+        process.process_output.ocentr(outfile, "Power Reactor Optimisation Code", 110)
+        process.process_output.ostars(outfile, 110)
+        process.process_output.oblnkl(outfile)
 
         # Run execution details
         version = process.__version__
-        fortran.process_output.ocmmnt(outfile, f"Version : {version}")
+        process.process_output.ocmmnt(outfile, f"Version : {version}")
 
         git_branch, git_tag = get_git_summary()
 
-        fortran.process_output.ocmmnt(outfile, f"Git Tag : {git_tag}")
-        fortran.process_output.ocmmnt(outfile, f"Git Branch : {git_branch}")
+        process.process_output.ocmmnt(outfile, f"Git Tag : {git_tag}")
+        process.process_output.ocmmnt(outfile, f"Git Branch : {git_branch}")
 
         date_string = datetime.datetime.now(datetime.timezone.utc).strftime(
             "%d/%m/%Y %Z"
         )
         time_string = datetime.datetime.now(datetime.timezone.utc).strftime("%H:%M")
 
-        fortran.process_output.ocmmnt(outfile, f"Date : {date_string}")
-        fortran.process_output.ocmmnt(outfile, f"Time : {time_string}")
+        process.process_output.ocmmnt(outfile, f"Date : {date_string}")
+        process.process_output.ocmmnt(outfile, f"Time : {time_string}")
 
         user = getpass.getuser()
         machine = socket.gethostname()
 
-        fortran.process_output.ocmmnt(outfile, f"User : {user}")
-        fortran.process_output.ocmmnt(outfile, f"Computer : {machine}")
-        fortran.process_output.ocmmnt(outfile, f"Directory : {Path.cwd()}")
+        process.process_output.ocmmnt(outfile, f"User : {user}")
+        process.process_output.ocmmnt(outfile, f"Computer : {machine}")
+        process.process_output.ocmmnt(outfile, f"Directory : {Path.cwd()}")
 
         fileprefix = f2py_compatible_to_string(fortran.global_variables.fileprefix)
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile,
             f"Input : {fileprefix}",
         )
         runtitle = f2py_compatible_to_string(fortran.global_variables.runtitle)
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile,
             f"Run title : {runtitle}",
         )
 
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile,
             f"Run type : Reactor concept design: {f2py_compatible_to_string(fortran.global_variables.icase)}, (c) UK Atomic Energy Authority",
         )
 
-        fortran.process_output.oblnkl(outfile)
-        fortran.process_output.ostars(outfile, 110)
-        fortran.process_output.oblnkl(outfile)
+        process.process_output.oblnkl(outfile)
+        process.process_output.ostars(outfile, 110)
+        process.process_output.oblnkl(outfile)
 
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile, f"Equality constraints : {fortran.numerics.neqns.item()}"
         )
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile, f"Inequality constraints : {fortran.numerics.nineqns.item()}"
         )
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile,
             f"Total constraints : {fortran.numerics.nineqns.item() + fortran.numerics.neqns.item()}",
         )
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile, f"Iteration variables : {fortran.numerics.nvar.item()}"
         )
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile, f"Max iterations : {fortran.global_variables.maxcal.item()}"
         )
 
@@ -157,41 +157,41 @@ def run_summary():
         fom_string = f2py_compatible_to_string(
             fortran.numerics.lablmm[abs(fortran.numerics.minmax) - 1]
         )
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile,
             f"Figure of merit : {minmax_sign}{abs(fortran.numerics.minmax)}{minmax_string}{fom_string}",
         )
-        fortran.process_output.ocmmnt(
+        process.process_output.ocmmnt(
             outfile,
             f"Convergence parameter : {fortran.numerics.epsvmc}",
         )
 
-        fortran.process_output.oblnkl(outfile)
-        fortran.process_output.ostars(outfile, 110)
+        process.process_output.oblnkl(outfile)
+        process.process_output.ostars(outfile, 110)
 
     # MFile #
     mfile = fortran.constants.mfile
 
-    fortran.process_output.ovarst(mfile, "PROCESS version", "(procver)", f'"{version}"')
-    fortran.process_output.ovarst(mfile, "Date of run", "(date)", f'"{date_string}"')
-    fortran.process_output.ovarst(mfile, "Time of run", "(time)", f'"{time_string}"')
-    fortran.process_output.ovarst(mfile, "User", "(username)", f'"{user}"')
-    fortran.process_output.ovarst(
+    process.process_output.ovarst(mfile, "PROCESS version", "(procver)", f'"{version}"')
+    process.process_output.ovarst(mfile, "Date of run", "(date)", f'"{date_string}"')
+    process.process_output.ovarst(mfile, "Time of run", "(time)", f'"{time_string}"')
+    process.process_output.ovarst(mfile, "User", "(username)", f'"{user}"')
+    process.process_output.ovarst(
         mfile, "PROCESS run title", "(runtitle)", f'"{runtitle}"'
     )
-    fortran.process_output.ovarst(mfile, "PROCESS git tag", "(tagno)", f'"{git_tag}"')
-    fortran.process_output.ovarst(
+    process.process_output.ovarst(mfile, "PROCESS git tag", "(tagno)", f'"{git_tag}"')
+    process.process_output.ovarst(
         mfile, "PROCESS git branch", "(branch_name)", f'"{git_branch}"'
     )
-    fortran.process_output.ovarst(
+    process.process_output.ovarst(
         mfile, "Input filename", "(fileprefix)", f'"{fileprefix}"'
     )
 
-    fortran.process_output.ovarin(
+    process.process_output.ovarin(
         mfile, "Optimisation switch", "(ioptimz)", fortran.numerics.ioptimz
     )
     if fortran.numerics.ioptimz == -2:
-        fortran.process_output.ovarin(
+        process.process_output.ovarin(
             mfile, "Figure of merit switch", "(minmax)", fortran.numerics.minmax
         )