Skip to content

Convert physics.f90 to Python #2993

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 1 commit into from
Jan 31, 2024
Merged

Convert physics.f90 to Python #2993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ LIST(APPEND PROCESS_SRCS
stellarator.f90
stellarator_configuration.f90
stellarator_fwbs.f90
startup_variables.f90
)

PREPROCESS()
Expand Down
2 changes: 1 addition & 1 deletion process/current_drive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ def cudriv(self, output: bool):
po.ovarrf(
self.outfile,
"Total",
"(current_drive_variables.plasipf+physics_variables.faccd+physics_variables.facoh)",
"(plasipf+faccd+facoh)",
current_drive_variables.plasipf
+ physics_variables.faccd
+ physics_variables.facoh,
Expand Down
6 changes: 3 additions & 3 deletions process/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ def write(models, outfile):
models.availability.run(output=True)

# Writing the output from physics.f90 into OUT.DAT + MFILE.DAT
ft.physics_module.outplas(outfile)
models.physics.outplas()

# TODO what is this? not in caller.f90
ft.physics_module.igmarcal(outfile)
models.physics.igmarcal()

# TODO what is this? Not in caller.f90?
models.current_drive.cudriv(output=True)

# Pulsed reactor model
models.pulse.run(output=True)
ft.physics_module.outtim(outfile)
models.physics.outtim()

models.divertor.run(output=True)

Expand Down
Loading