Skip to content

Convert iteration_variables.f90 to Python #3570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timothy-nunn merged 6 commits into from
Apr 10, 2025
Merged

Convert iteration_variables.f90 to Python #3570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ed0bce
Convert loadxc to Python
timothy-nunn Feb 28, 2025
09deafc
Convert convxc to Python
timothy-nunn Mar 6, 2025
79b31e2
Convert boundxc to Python
timothy-nunn Mar 6, 2025
fc3b3b8
Remove iteration_variables.f90 and use new Python API for initialisat…
timothy-nunn Mar 6, 2025
81c9a01
Correct warning message in Fotran-Python string handler
timothy-nunn Mar 12, 2025
ac5eca1
Comment and style updates
timothy-nunn Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ LIST(APPEND PROCESS_SRCS
ife_variables.f90
heat_transport_variables.f90
buildings_variables.f90
iteration_variables.f90
water_usage_variables.f90
constraint_equations.f90
constants.f90
Expand Down
3 changes: 2 additions & 1 deletion process/caller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from process import fortran as ft
from process.final import finalise
from process.io.mfile import MFile
from process.iteration_variables import set_scaled_iteration_variable
from process.objectives import objective_function
from process.utilities.f2py_string_patch import f2py_compatible_to_string

Expand Down Expand Up @@ -229,7 +230,7 @@ def _call_models_once(self, xc: np.ndarray) -> None:
ft.numerics.ncalls = ft.numerics.ncalls + 1

# Convert variables
ft.define_iteration_variables.convxc(xc, nvars)
set_scaled_iteration_variable(xc, nvars)

# Perform the various function calls
# Stellarator caller
Expand Down
174 changes: 2 additions & 172 deletions process/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import process
import process.fortran as fortran
import process.iteration_variables as iteration_variables
import process.process_output as process_output
from process.blanket_library import init_blanket_library, init_primary_pumping_variables
from process.build import init_build_variables
Expand Down Expand Up @@ -53,7 +54,7 @@ def init_process():
fortran.error_handling.initialise_error_list()

# Initialise the program variables
initialise_iterative_variables()
iteration_variables.initialise_iteration_variables()

# Initialise the Fortran file specifiers
# (creating and opening the files in the process)
Expand Down Expand Up @@ -267,7 +268,6 @@ def init_all_module_vars():
init_pulse_variables()
init_rebco_variables()
init_reinke_variables()
fortran.define_iteration_variables.init_define_iteration_variables()
init_watuse_variables()
init_cs_fatigue_variables()
init_blanket_library()
Expand All @@ -276,176 +276,6 @@ def init_all_module_vars():
fortran.init_module.init_fortran_modules()


def initialise_iterative_variables():
"""Initialise each of the iteration variables"""
fortran.define_iteration_variables.init_itv_1()
fortran.define_iteration_variables.init_itv_2()
fortran.define_iteration_variables.init_itv_3()
fortran.define_iteration_variables.init_itv_4()
fortran.define_iteration_variables.init_itv_5()
fortran.define_iteration_variables.init_itv_6()
fortran.define_iteration_variables.init_itv_7()
fortran.define_iteration_variables.init_itv_8()
fortran.define_iteration_variables.init_itv_9()
fortran.define_iteration_variables.init_itv_10()
fortran.define_iteration_variables.init_itv_11()
fortran.define_iteration_variables.init_itv_12()
fortran.define_iteration_variables.init_itv_13()
fortran.define_iteration_variables.init_itv_14()
fortran.define_iteration_variables.init_itv_15()
fortran.define_iteration_variables.init_itv_16()
fortran.define_iteration_variables.init_itv_17()
fortran.define_iteration_variables.init_itv_18()
fortran.define_iteration_variables.init_itv_19()
fortran.define_iteration_variables.init_itv_20()
fortran.define_iteration_variables.init_itv_21()

fortran.define_iteration_variables.init_itv_23()

fortran.define_iteration_variables.init_itv_25()
fortran.define_iteration_variables.init_itv_26()
fortran.define_iteration_variables.init_itv_27()
fortran.define_iteration_variables.init_itv_28()
fortran.define_iteration_variables.init_itv_29()
fortran.define_iteration_variables.init_itv_30()
fortran.define_iteration_variables.init_itv_31()
fortran.define_iteration_variables.init_itv_32()
fortran.define_iteration_variables.init_itv_33()
fortran.define_iteration_variables.init_itv_35()
fortran.define_iteration_variables.init_itv_36()
fortran.define_iteration_variables.init_itv_37()
fortran.define_iteration_variables.init_itv_38()
fortran.define_iteration_variables.init_itv_39()
fortran.define_iteration_variables.init_itv_40()
fortran.define_iteration_variables.init_itv_41()
fortran.define_iteration_variables.init_itv_42()

fortran.define_iteration_variables.init_itv_44()
fortran.define_iteration_variables.init_itv_45()
fortran.define_iteration_variables.init_itv_46()
fortran.define_iteration_variables.init_itv_47()
fortran.define_iteration_variables.init_itv_48()
fortran.define_iteration_variables.init_itv_49()
fortran.define_iteration_variables.init_itv_50()
fortran.define_iteration_variables.init_itv_51()

fortran.define_iteration_variables.init_itv_53()
fortran.define_iteration_variables.init_itv_54()

fortran.define_iteration_variables.init_itv_56()
fortran.define_iteration_variables.init_itv_57()
fortran.define_iteration_variables.init_itv_58()
fortran.define_iteration_variables.init_itv_59()
fortran.define_iteration_variables.init_itv_60()
fortran.define_iteration_variables.init_itv_61()
fortran.define_iteration_variables.init_itv_62()
fortran.define_iteration_variables.init_itv_63()
fortran.define_iteration_variables.init_itv_64()
fortran.define_iteration_variables.init_itv_65()
fortran.define_iteration_variables.init_itv_66()
fortran.define_iteration_variables.init_itv_67()
fortran.define_iteration_variables.init_itv_68()
fortran.define_iteration_variables.init_itv_69()
fortran.define_iteration_variables.init_itv_70()
fortran.define_iteration_variables.init_itv_71()
fortran.define_iteration_variables.init_itv_72()
fortran.define_iteration_variables.init_itv_73()
fortran.define_iteration_variables.init_itv_74()
fortran.define_iteration_variables.init_itv_75()

fortran.define_iteration_variables.init_itv_79()

fortran.define_iteration_variables.init_itv_81()
fortran.define_iteration_variables.init_itv_82()
fortran.define_iteration_variables.init_itv_83()

fortran.define_iteration_variables.init_itv_85()
fortran.define_iteration_variables.init_itv_86()

fortran.define_iteration_variables.init_itv_89()
fortran.define_iteration_variables.init_itv_90()
fortran.define_iteration_variables.init_itv_91()
fortran.define_iteration_variables.init_itv_92()
fortran.define_iteration_variables.init_itv_93()
fortran.define_iteration_variables.init_itv_94()
fortran.define_iteration_variables.init_itv_95()
fortran.define_iteration_variables.init_itv_96()
fortran.define_iteration_variables.init_itv_97()
fortran.define_iteration_variables.init_itv_98()

fortran.define_iteration_variables.init_itv_103()
fortran.define_iteration_variables.init_itv_104()
fortran.define_iteration_variables.init_itv_105()
fortran.define_iteration_variables.init_itv_106()
fortran.define_iteration_variables.init_itv_107()
fortran.define_iteration_variables.init_itv_108()
fortran.define_iteration_variables.init_itv_109()
fortran.define_iteration_variables.init_itv_110()
fortran.define_iteration_variables.init_itv_111()
fortran.define_iteration_variables.init_itv_112()
fortran.define_iteration_variables.init_itv_113()
fortran.define_iteration_variables.init_itv_114()
fortran.define_iteration_variables.init_itv_115()
fortran.define_iteration_variables.init_itv_116()
fortran.define_iteration_variables.init_itv_117()
fortran.define_iteration_variables.init_itv_118()
fortran.define_iteration_variables.init_itv_119()
fortran.define_iteration_variables.init_itv_120()
fortran.define_iteration_variables.init_itv_121()
fortran.define_iteration_variables.init_itv_122()
fortran.define_iteration_variables.init_itv_123()
fortran.define_iteration_variables.init_itv_124()
fortran.define_iteration_variables.init_itv_125()
fortran.define_iteration_variables.init_itv_126()
fortran.define_iteration_variables.init_itv_127()
fortran.define_iteration_variables.init_itv_128()
fortran.define_iteration_variables.init_itv_129()
fortran.define_iteration_variables.init_itv_130()
fortran.define_iteration_variables.init_itv_131()
fortran.define_iteration_variables.init_itv_132()
fortran.define_iteration_variables.init_itv_133()
fortran.define_iteration_variables.init_itv_134()
fortran.define_iteration_variables.init_itv_135()
fortran.define_iteration_variables.init_itv_136()
fortran.define_iteration_variables.init_itv_137()
fortran.define_iteration_variables.init_itv_138()
fortran.define_iteration_variables.init_itv_139()
fortran.define_iteration_variables.init_itv_140()
fortran.define_iteration_variables.init_itv_141()
fortran.define_iteration_variables.init_itv_142()
fortran.define_iteration_variables.init_itv_143()
fortran.define_iteration_variables.init_itv_144()
fortran.define_iteration_variables.init_itv_145()
fortran.define_iteration_variables.init_itv_146()
fortran.define_iteration_variables.init_itv_147()
fortran.define_iteration_variables.init_itv_148()
fortran.define_iteration_variables.init_itv_149()
fortran.define_iteration_variables.init_itv_152()
fortran.define_iteration_variables.init_itv_153()
fortran.define_iteration_variables.init_itv_154()
fortran.define_iteration_variables.init_itv_155()
fortran.define_iteration_variables.init_itv_156()
fortran.define_iteration_variables.init_itv_157()
fortran.define_iteration_variables.init_itv_158()
fortran.define_iteration_variables.init_itv_159()
fortran.define_iteration_variables.init_itv_160()
fortran.define_iteration_variables.init_itv_161()
fortran.define_iteration_variables.init_itv_162()
fortran.define_iteration_variables.init_itv_163()
fortran.define_iteration_variables.init_itv_164()
fortran.define_iteration_variables.init_itv_165()
fortran.define_iteration_variables.init_itv_166()
fortran.define_iteration_variables.init_itv_167()
fortran.define_iteration_variables.init_itv_168()
fortran.define_iteration_variables.init_itv_169()
fortran.define_iteration_variables.init_itv_170()
fortran.define_iteration_variables.init_itv_171()
fortran.define_iteration_variables.init_itv_172()
fortran.define_iteration_variables.init_itv_173()
fortran.define_iteration_variables.init_itv_174()
fortran.define_iteration_variables.init_itv_175()


def check_process(inputs): # noqa: ARG001
"""Routine to reset specific variables if certain options are
being used
Expand Down
Loading
Loading