Skip to content

3014 convert sig tfdat statements to json #3016

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
jonmaddock merged 2 commits into from
Dec 15, 2023
Merged

3014 convert sig tfdat statements to json #3016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3134cfa
plot stress.py file changes
chris-ashe Dec 13, 2023
8e99848
sctfcoil comment changes
chris-ashe Dec 13, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ MFILE.DAT
PLOT.DAT
OUT.DAT
OPT.DAT
SIG_TF.DAT
SIG_TF.json
tag.num
tests.x
Expand Down
2 changes: 1 addition & 1 deletion documentation/proc-pages/io/utilities.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ By convention, we have designated metadata about the PROCESS runs as having a pr

- `uncertainties_data.h5`: This file contains the output variables of each successfully converged PROCESS run generated by the `evaluate_uncertainties.py` script. PROCESS output variables can be plotted using using the `hdf_to_scatter_plot.py` script. This file uses the [HDF format](https://www.hdfgroup.org/solutions/hdf5/) and requires [software](https://www.hdfgroup.org/downloads/hdfview/) to view its contents in a human legible format.

- `README.txt`, `process.log`, `MFILE.DAT`, `OUT.DAT`, `SIG_TF.DAT`, `SIG_TF.json`, `OPT.DAT`, `PLOT.DAT`: Typical PROCESS output generated by the last run.
- `README.txt`, `process.log`, `MFILE.DAT`, `OUT.DAT`, `SIG_TF.json`, `OPT.DAT`, `PLOT.DAT`: Typical PROCESS output generated by the last run.

### Usage

Expand Down
4 changes: 2 additions & 2 deletions process/sctfcoil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5818,7 +5818,7 @@ def out_stress(
sig_tf_wp_av_z,
):
"""Subroutine showing the writing the TF midplane stress analysis
in the output file and the stress distribution in the SIG_TF.DAT
in the output file and the stress distribution in the SIG_TF.json
file used to plot stress distributions
Author : S. Kahn
"""
Expand Down Expand Up @@ -6021,7 +6021,7 @@ def table_format_arrays(a, mult=1, delim="\t\t"):
sig_tf_tresca_max[ii],
)

# SIG_TF.DAT storage
# SIG_TF.json storage
sig_file_data = {
"Points per layers": n_radial_array,
"Radius (m)": radial_array,
Expand Down
1 change: 0 additions & 1 deletion source/fortran/init_module.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ subroutine init
open(unit=nplot ,file=trim(output_prefix)//'PLOT.DAT' ,status='unknown')
open(unit=mfile ,file=trim(output_prefix)//'MFILE.DAT' ,status='unknown')
open(unit=opt_file ,file=trim(output_prefix)//'OPT.DAT' ,status='unknown')
open(unit=sig_file ,file=trim(output_prefix)//'SIG_TF.DAT',status='unknown')

! Input any desired new initial values
call input
Expand Down
6 changes: 3 additions & 3 deletions utilities/plot_stress_tf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Author: S. Kahn (sebastien.kahn@ukaea.uk)

Input file:
SIG_TF.DAT
SIG_TF.json
"""

import json
Expand Down Expand Up @@ -61,8 +61,8 @@
parser.add_argument(
"-f",
"--input_file",
default="SIG_TF.DAT",
help="specify input file path (default = SIG_TF.DAT)",
default="SIG_TF.json",
help="specify input file path (default = SIG_TF.json)",
)

# Option argument extraction
Expand Down