From 3134cfa380bf1ea57503c4cc1cccecd09d57182c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 13 Dec 2023 08:51:56 +0000 Subject: [PATCH 1/2] plot stress.py file changes remove .dat open statement in init_module gitignore doc changes --- .gitignore | 1 - documentation/proc-pages/io/utilities.md | 2 +- source/fortran/init_module.f90 | 1 - utilities/plot_stress_tf.py | 6 +++--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d3529e3229..370976e37c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,6 @@ MFILE.DAT PLOT.DAT OUT.DAT OPT.DAT -SIG_TF.DAT SIG_TF.json tag.num tests.x diff --git a/documentation/proc-pages/io/utilities.md b/documentation/proc-pages/io/utilities.md index d0ee6cec2a..b877e1fbcc 100644 --- a/documentation/proc-pages/io/utilities.md +++ b/documentation/proc-pages/io/utilities.md @@ -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 diff --git a/source/fortran/init_module.f90 b/source/fortran/init_module.f90 index bc5feb1e42..a6700c47dd 100644 --- a/source/fortran/init_module.f90 +++ b/source/fortran/init_module.f90 @@ -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 diff --git a/utilities/plot_stress_tf.py b/utilities/plot_stress_tf.py index 31ccfca5d1..263beac733 100644 --- a/utilities/plot_stress_tf.py +++ b/utilities/plot_stress_tf.py @@ -7,7 +7,7 @@ Author: S. Kahn (sebastien.kahn@ukaea.uk) Input file: -SIG_TF.DAT +SIG_TF.json """ import json @@ -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 From 8e998482a75ed7d2fee44e3bb4c34876c7dd1135 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 13 Dec 2023 09:00:47 +0000 Subject: [PATCH 2/2] sctfcoil comment changes black changes --- process/sctfcoil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 42a63ce53c..3016edf86a 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -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 """ @@ -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,