From 7330de92dbaf85882d609b73200ff34437384c81 Mon Sep 17 00:00:00 2001 From: pmocz Date: Sun, 25 Aug 2024 16:43:24 -0400 Subject: [PATCH 1/3] removing file_extension user option --- binary/defaults/pgbinary.defaults | 7 +++---- binary/private/pgbinary_ctrls_io.f90 | 2 -- binary/private/pgbinary_support.f90 | 8 +++++++- .../test_suite/evolve_both_stars/README.rst | 6 ------ binary/test_suite/jdot_gr_check/README.rst | 3 --- binary/test_suite/jdot_ls_check/README.rst | 3 --- binary/test_suite/jdot_ml_check/README.rst | 3 --- .../star_plus_point_mass/README.rst | 3 --- .../README.rst | 3 --- docs/source/using_mesa/using_pgstar.rst | 2 -- star/defaults/pgstar.defaults | 19 ++++--------------- star/private/pgstar_ctrls_io.f90 | 2 -- star/private/pgstar_support.f90 | 9 ++++++++- star/test_suite/1.3M_ms_high_Z/inlist_pgstar | 3 --- star/test_suite/1.4M_ms_op_mono/README.rst | 5 +---- .../inlist_1.5M_with_diffusion | 2 -- .../1.5M_with_diffusion/inlist_to_ZAMS | 2 -- .../12M_pre_ms_to_core_collapse/inlist_pgstar | 6 ------ star/test_suite/15M_dynamo/README.rst | 2 -- star/test_suite/15M_dynamo/inlist_common | 3 --- star/test_suite/16M_conv_premix/README.rst | 2 -- star/test_suite/16M_predictive_mix/README.rst | 2 -- star/test_suite/1M_pre_ms_to_wd/README.rst | 2 -- star/test_suite/1M_thermohaline/README.rst | 2 -- .../20M_pre_ms_to_core_collapse/inlist_pgstar | 7 ------- .../20M_z2m2_high_rotation/README.rst | 2 -- .../20M_z2m2_high_rotation/inlist_pgstar | 7 ------- .../5M_cepheid_blue_loop/README.rst | 2 -- star/test_suite/7M_prems_to_AGB/inlist_pgstar | 3 --- .../accreted_material_j/inlist_pgstar | 3 --- star/test_suite/adjust_net/README.rst | 2 -- star/test_suite/cburn_inward/README.rst | 2 -- star/test_suite/ccsn_IIp/README.rst | 7 +------ .../test_suite/conductive_flame/inlist_pgstar | 5 +---- .../conserve_angular_momentum/README.rst | 2 -- .../conv_core_cpm/inlist_conv_core_cpm | 1 - star/test_suite/custom_colors/README.rst | 2 -- star/test_suite/custom_rates/README.rst | 2 -- .../inlist_diffusion_smoothness | 3 --- .../README.rst | 2 -- star/test_suite/high_mass/inlist_pgstar | 3 --- star/test_suite/high_z/README.rst | 2 -- star/test_suite/hot_cool_wind/README.rst | 2 -- star/test_suite/hse_riemann/README.rst | 2 -- star/test_suite/irradiated_planet/README.rst | 2 -- star/test_suite/low_z/README.rst | 2 -- star/test_suite/make_brown_dwarf/README.rst | 2 -- star/test_suite/make_env/README.rst | 2 -- star/test_suite/make_he_wd/README.rst | 2 -- star/test_suite/make_metals/README.rst | 2 -- star/test_suite/make_o_ne_wd/inlist_pgstar | 8 -------- star/test_suite/make_planets/README.rst | 2 -- .../make_pre_ccsn_13bvn/inlist_pgstar | 8 -------- star/test_suite/make_sdb/README.rst | 2 -- star/test_suite/make_zams/inlist_zams | 1 - star/test_suite/make_zams_low_mass/README.rst | 2 -- .../make_zams_ultra_high_mass/README.rst | 2 -- star/test_suite/ns_c/README.rst | 2 -- star/test_suite/ns_c/inlist_pgstar | 8 -------- star/test_suite/ns_h/README.rst | 2 -- star/test_suite/ns_he/README.rst | 2 -- star/test_suite/ns_he/inlist_to_flash | 3 --- .../test_suite/other_physics_hooks/README.rst | 2 -- star/test_suite/pisn/inlist_pgstar | 8 -------- .../radiative_levitation/README.rst | 2 -- star/test_suite/rsp_BEP/README.rst | 2 -- star/test_suite/rsp_BLAP/README.rst | 2 -- star/test_suite/rsp_Cepheid/README.rst | 2 -- star/test_suite/rsp_Delta_Scuti/README.rst | 3 --- star/test_suite/rsp_RR_Lyrae/README.rst | 2 -- .../test_suite/rsp_Type_II_Cepheid/README.rst | 2 -- .../rsp_save_and_load_file/README.rst | 2 -- star/test_suite/semiconvection/README.rst | 2 -- .../simplex_solar_calibration/README.rst | 2 -- .../split_burn_big_net/inlist_pgstar | 8 -------- star/test_suite/starspots/inlist_starspots | 2 -- star/test_suite/twin_studies/README.rst | 4 ---- star/test_suite/twin_studies/inlist_pgstar | 8 -------- star/test_suite/tzo/inlist_pgstar | 8 -------- star/test_suite/wd_c_core_ignition/README.rst | 4 ---- star/test_suite/wd_cool_0.6M/README.rst | 3 --- star/test_suite/wd_diffusion/README.rst | 2 -- .../wd_he_shell_ignition/README.rst | 4 ---- star/test_suite/wd_nova_burst/inlist_pgstar | 3 --- star/test_suite/wd_stable_h_burn/README.rst | 5 +---- star/test_suite/zams_to_cc_80/inlist_pgstar | 7 ------- star_data/private/pgstar_controls.inc | 1 - 87 files changed, 26 insertions(+), 280 deletions(-) diff --git a/binary/defaults/pgbinary.defaults b/binary/defaults/pgbinary.defaults index 067b98ae8..27a83a035 100644 --- a/binary/defaults/pgbinary.defaults +++ b/binary/defaults/pgbinary.defaults @@ -87,15 +87,14 @@ ! file_device ! ~~~~~~~~~~~ - ! file_extension - ! ~~~~~~~~~~~~~~ - ! 'png' is Portable Network Graphics format; can also use 'pdf' + ! 'png' for Portable Network Graphics format + ! 'vcps' for Color PostScript ('ps') + ! 'ps' for PostScript ! :: file_device = 'png' - file_extension = 'png' ! file_digits diff --git a/binary/private/pgbinary_ctrls_io.f90 b/binary/private/pgbinary_ctrls_io.f90 index 96611294d..3e03005f9 100644 --- a/binary/private/pgbinary_ctrls_io.f90 +++ b/binary/private/pgbinary_ctrls_io.f90 @@ -35,7 +35,6 @@ module pgbinary_ctrls_io namelist /pgbinary/ & file_device, & - file_extension, & file_digits, & pgbinary_interval, & pause, & @@ -1455,7 +1454,6 @@ subroutine store_pgbinary_controls(b, ierr) pg => b% pg pg% file_device = file_device - pg% file_extension = file_extension pg% file_digits = file_digits pg% pgbinary_interval = pgbinary_interval pg% pause = pause diff --git a/binary/private/pgbinary_support.f90 b/binary/private/pgbinary_support.f90 index 3c0577f4b..80fb9b775 100644 --- a/binary/private/pgbinary_support.f90 +++ b/binary/private/pgbinary_support.f90 @@ -169,6 +169,7 @@ subroutine create_file_name(b, dir, prefix, name) character (len = *), intent(in) :: dir, prefix character (len = *), intent(out) :: name character (len = strlen) :: num_str, fstring + character (len = 4) :: file_extension write(fstring, '( "(i",i2.2,".",i2.2,")" )') & b% pg% file_digits, b% pg% file_digits write(num_str, fstring) b% model_number @@ -177,7 +178,12 @@ subroutine create_file_name(b, dir, prefix, name) else name = prefix end if - name = trim(name) // trim(num_str) // '.' // trim(b% pg% file_extension) + if (b%pg%file_device=='vcps') then + file_extension = 'ps' + else + file_extension = b%pg%file_device + end if + name = trim(name) // trim(num_str) // '.' // trim(file_extension) end subroutine create_file_name diff --git a/binary/test_suite/evolve_both_stars/README.rst b/binary/test_suite/evolve_both_stars/README.rst index d5de264fa..ad2a2581d 100644 --- a/binary/test_suite/evolve_both_stars/README.rst +++ b/binary/test_suite/evolve_both_stars/README.rst @@ -40,10 +40,7 @@ pgstar commands used for the binary and star1 plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 @@ -246,10 +243,7 @@ pgstar commands used for the star2 plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 diff --git a/binary/test_suite/jdot_gr_check/README.rst b/binary/test_suite/jdot_gr_check/README.rst index 926b8cbaf..26c16c056 100644 --- a/binary/test_suite/jdot_gr_check/README.rst +++ b/binary/test_suite/jdot_gr_check/README.rst @@ -37,10 +37,7 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 diff --git a/binary/test_suite/jdot_ls_check/README.rst b/binary/test_suite/jdot_ls_check/README.rst index 5c23a2c9d..706d91fd4 100644 --- a/binary/test_suite/jdot_ls_check/README.rst +++ b/binary/test_suite/jdot_ls_check/README.rst @@ -23,10 +23,7 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 diff --git a/binary/test_suite/jdot_ml_check/README.rst b/binary/test_suite/jdot_ml_check/README.rst index 5886468db..973359edc 100644 --- a/binary/test_suite/jdot_ml_check/README.rst +++ b/binary/test_suite/jdot_ml_check/README.rst @@ -43,10 +43,7 @@ pgstar commands used for the binary and star1 plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 diff --git a/binary/test_suite/star_plus_point_mass/README.rst b/binary/test_suite/star_plus_point_mass/README.rst index 2e23fd4a8..871532366 100644 --- a/binary/test_suite/star_plus_point_mass/README.rst +++ b/binary/test_suite/star_plus_point_mass/README.rst @@ -41,10 +41,7 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 diff --git a/binary/test_suite/star_plus_point_mass_explicit_mdot/README.rst b/binary/test_suite/star_plus_point_mass_explicit_mdot/README.rst index f50c8340a..74cb48d1e 100644 --- a/binary/test_suite/star_plus_point_mass_explicit_mdot/README.rst +++ b/binary/test_suite/star_plus_point_mass_explicit_mdot/README.rst @@ -40,10 +40,7 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 1 diff --git a/docs/source/using_mesa/using_pgstar.rst b/docs/source/using_mesa/using_pgstar.rst index 27f933409..e7b6d56e5 100644 --- a/docs/source/using_mesa/using_pgstar.rst +++ b/docs/source/using_mesa/using_pgstar.rst @@ -438,12 +438,10 @@ PGSTAR has a number of options to control its file output. The default output format is PNG:: file_device = 'png' - file_extension = 'png' but you can use PostScript output by setting:: file_device = 'vcps' - file_extension = 'ps' You can change the foreground/background color of your plots between black/white and white/black:: diff --git a/star/defaults/pgstar.defaults b/star/defaults/pgstar.defaults index 6d58543ff..06fcd2f0d 100644 --- a/star/defaults/pgstar.defaults +++ b/star/defaults/pgstar.defaults @@ -88,25 +88,14 @@ ! file_device ! ~~~~~~~~~~~ - ! 'png' is Portable Network Graphics format - ! can also use: - ! 'ps' (in combination with file_extension = 'ps') for PostScript - ! or: - ! 'vcps' (in combination with file_extension = 'eps') for Encapsulated PostScript + ! 'png' for Portable Network Graphics format + ! 'vcps' for Color PostScript ('ps') + ! 'ps' for PostScript ! :: file_device = 'png' - ! file_extension - ! ~~~~~~~~~~~~~~ - - ! Can use: 'png', 'ps', or 'eps' with the appropriate file_device - - ! :: - - file_extension = 'png' - ! file_digits ! ~~~~~~~~~~~ @@ -121,7 +110,7 @@ ! delta_HR_limit_for_file_output ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ! trigger file output by distance travelled on HR diagram + ! trigger file output by distance traveled on HR diagram ! negative means no limit ! HR distance since last file output = sum of dHR ! where per step dHR = same definition as used for timestep limits diff --git a/star/private/pgstar_ctrls_io.f90 b/star/private/pgstar_ctrls_io.f90 index b343bea73..0b473431c 100644 --- a/star/private/pgstar_ctrls_io.f90 +++ b/star/private/pgstar_ctrls_io.f90 @@ -36,7 +36,6 @@ module pgstar_ctrls_io namelist /pgstar/ & file_device, & - file_extension, & file_digits, & pgstar_interval, & pause, & @@ -3154,7 +3153,6 @@ subroutine store_pgstar_controls(s, ierr) ierr = 0 s% pg% file_device = file_device - s% pg% file_extension = file_extension s% pg% file_digits = file_digits s% pg% pgstar_interval = pgstar_interval s% pg% pause = pause diff --git a/star/private/pgstar_support.f90 b/star/private/pgstar_support.f90 index 3da1c7341..ac3700c28 100644 --- a/star/private/pgstar_support.f90 +++ b/star/private/pgstar_support.f90 @@ -203,6 +203,7 @@ subroutine create_file_name(s, dir, prefix, name) character (len = *), intent(in) :: dir, prefix character (len = *), intent(out) :: name character (len = strlen) :: num_str, fstring + character (len = 4) :: file_extension write(fstring, '( "(i",i2.2,".",i2.2,")" )') s% pg% file_digits, s% pg% file_digits write(num_str, fstring) s% model_number if (len_trim(dir) > 0) then @@ -210,7 +211,13 @@ subroutine create_file_name(s, dir, prefix, name) else name = prefix end if - name = trim(name) // trim(num_str) // '.' // trim(s% pg% file_extension) + if (s%pg%file_device=='vcps') then + file_extension = 'ps' + else + ! e.g.: png, ps + file_extension = s%pg%file_device + end if + name = trim(name) // trim(num_str) // '.' // trim(file_extension) end subroutine create_file_name diff --git a/star/test_suite/1.3M_ms_high_Z/inlist_pgstar b/star/test_suite/1.3M_ms_high_Z/inlist_pgstar index 8ace39dcc..fac97ae29 100644 --- a/star/test_suite/1.3M_ms_high_Z/inlist_pgstar +++ b/star/test_suite/1.3M_ms_high_Z/inlist_pgstar @@ -3,12 +3,9 @@ ! MESA uses PGPLOT for live plotting and gives the user a tremendous ! amount of control of the presentation of the information. - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' !file_device = 'png' ! png - !file_extension = 'png' pgstar_interval = 10 diff --git a/star/test_suite/1.4M_ms_op_mono/README.rst b/star/test_suite/1.4M_ms_op_mono/README.rst index a3afe3ba5..b9df77956 100644 --- a/star/test_suite/1.4M_ms_op_mono/README.rst +++ b/star/test_suite/1.4M_ms_op_mono/README.rst @@ -41,11 +41,8 @@ pgstar commands used for the plots above: pgstar_interval = 10 - ! device - file_white_on_black_flag = .true. - file_device = 'vcps' - file_extension = 'ps' + file_device = 'vcps' ! two profile panels Profile_Panels1_win_flag = .true. diff --git a/star/test_suite/1.5M_with_diffusion/inlist_1.5M_with_diffusion b/star/test_suite/1.5M_with_diffusion/inlist_1.5M_with_diffusion index fde5c4160..ddffc2c80 100644 --- a/star/test_suite/1.5M_with_diffusion/inlist_1.5M_with_diffusion +++ b/star/test_suite/1.5M_with_diffusion/inlist_1.5M_with_diffusion @@ -151,10 +151,8 @@ pgstar_interval = 50 - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' Abundance_win_flag = .false. ! switch to .true. to visualize in real-time Abundance_file_flag = .true. diff --git a/star/test_suite/1.5M_with_diffusion/inlist_to_ZAMS b/star/test_suite/1.5M_with_diffusion/inlist_to_ZAMS index 01cf10e5b..bdfd7605f 100644 --- a/star/test_suite/1.5M_with_diffusion/inlist_to_ZAMS +++ b/star/test_suite/1.5M_with_diffusion/inlist_to_ZAMS @@ -74,10 +74,8 @@ pgstar_interval = 50 - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' Grid2_win_flag = .false. ! switch to .true. to visualize in real-time file_digits = 7 diff --git a/star/test_suite/12M_pre_ms_to_core_collapse/inlist_pgstar b/star/test_suite/12M_pre_ms_to_core_collapse/inlist_pgstar index 12f6ea860..2a993ad57 100644 --- a/star/test_suite/12M_pre_ms_to_core_collapse/inlist_pgstar +++ b/star/test_suite/12M_pre_ms_to_core_collapse/inlist_pgstar @@ -667,13 +667,7 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. !file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - kipp_win_flag=.true. kipp_file_flag=.true. diff --git a/star/test_suite/15M_dynamo/README.rst b/star/test_suite/15M_dynamo/README.rst index a8c442da7..ded3b6119 100644 --- a/star/test_suite/15M_dynamo/README.rst +++ b/star/test_suite/15M_dynamo/README.rst @@ -62,10 +62,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 file_digits = 8 diff --git a/star/test_suite/15M_dynamo/inlist_common b/star/test_suite/15M_dynamo/inlist_common index 582e45e82..804569bd6 100644 --- a/star/test_suite/15M_dynamo/inlist_common +++ b/star/test_suite/15M_dynamo/inlist_common @@ -92,10 +92,7 @@ file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' - !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 50 file_digits = 8 diff --git a/star/test_suite/16M_conv_premix/README.rst b/star/test_suite/16M_conv_premix/README.rst index e82244074..019bbc773 100644 --- a/star/test_suite/16M_conv_premix/README.rst +++ b/star/test_suite/16M_conv_premix/README.rst @@ -30,10 +30,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 file_digits = 8 diff --git a/star/test_suite/16M_predictive_mix/README.rst b/star/test_suite/16M_predictive_mix/README.rst index d67cbdd58..15640a1f1 100644 --- a/star/test_suite/16M_predictive_mix/README.rst +++ b/star/test_suite/16M_predictive_mix/README.rst @@ -30,10 +30,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 file_digits = 8 diff --git a/star/test_suite/1M_pre_ms_to_wd/README.rst b/star/test_suite/1M_pre_ms_to_wd/README.rst index ab0b22ef8..84507a38c 100644 --- a/star/test_suite/1M_pre_ms_to_wd/README.rst +++ b/star/test_suite/1M_pre_ms_to_wd/README.rst @@ -44,10 +44,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 file_digits = 8 diff --git a/star/test_suite/1M_thermohaline/README.rst b/star/test_suite/1M_thermohaline/README.rst index 77cd7fea2..1bec2426a 100644 --- a/star/test_suite/1M_thermohaline/README.rst +++ b/star/test_suite/1M_thermohaline/README.rst @@ -62,10 +62,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 file_digits = 8 diff --git a/star/test_suite/20M_pre_ms_to_core_collapse/inlist_pgstar b/star/test_suite/20M_pre_ms_to_core_collapse/inlist_pgstar index cd1b476b7..44ebbd4aa 100644 --- a/star/test_suite/20M_pre_ms_to_core_collapse/inlist_pgstar +++ b/star/test_suite/20M_pre_ms_to_core_collapse/inlist_pgstar @@ -667,13 +667,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - kipp_win_flag=.true. kipp_file_flag=.true. diff --git a/star/test_suite/20M_z2m2_high_rotation/README.rst b/star/test_suite/20M_z2m2_high_rotation/README.rst index 93b9aefde..f0e0754ff 100644 --- a/star/test_suite/20M_z2m2_high_rotation/README.rst +++ b/star/test_suite/20M_z2m2_high_rotation/README.rst @@ -21,10 +21,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 file_digits = 8 diff --git a/star/test_suite/20M_z2m2_high_rotation/inlist_pgstar b/star/test_suite/20M_z2m2_high_rotation/inlist_pgstar index 1e79608fd..9f94e35db 100644 --- a/star/test_suite/20M_z2m2_high_rotation/inlist_pgstar +++ b/star/test_suite/20M_z2m2_high_rotation/inlist_pgstar @@ -677,13 +677,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - / ! end of pgstar namelist diff --git a/star/test_suite/5M_cepheid_blue_loop/README.rst b/star/test_suite/5M_cepheid_blue_loop/README.rst index c6e2e9643..b43d1b414 100644 --- a/star/test_suite/5M_cepheid_blue_loop/README.rst +++ b/star/test_suite/5M_cepheid_blue_loop/README.rst @@ -24,10 +24,8 @@ pgstar commands used: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/7M_prems_to_AGB/inlist_pgstar b/star/test_suite/7M_prems_to_AGB/inlist_pgstar index c80d425e1..a7c063eb4 100644 --- a/star/test_suite/7M_prems_to_AGB/inlist_pgstar +++ b/star/test_suite/7M_prems_to_AGB/inlist_pgstar @@ -1,11 +1,8 @@ &pgstar - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' !file_device = 'png' ! png - !file_extension = 'png' pgstar_interval = 10 diff --git a/star/test_suite/accreted_material_j/inlist_pgstar b/star/test_suite/accreted_material_j/inlist_pgstar index 9e1b2413c..81b95d561 100644 --- a/star/test_suite/accreted_material_j/inlist_pgstar +++ b/star/test_suite/accreted_material_j/inlist_pgstar @@ -1,11 +1,8 @@ &pgstar - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' !file_device = 'png' ! png - !file_extension = 'png' pgstar_interval = 10 diff --git a/star/test_suite/adjust_net/README.rst b/star/test_suite/adjust_net/README.rst index 8a6ea9490..502cf8b10 100644 --- a/star/test_suite/adjust_net/README.rst +++ b/star/test_suite/adjust_net/README.rst @@ -38,10 +38,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/cburn_inward/README.rst b/star/test_suite/cburn_inward/README.rst index 6c81944ed..4223153df 100644 --- a/star/test_suite/cburn_inward/README.rst +++ b/star/test_suite/cburn_inward/README.rst @@ -47,10 +47,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 1 diff --git a/star/test_suite/ccsn_IIp/README.rst b/star/test_suite/ccsn_IIp/README.rst index 165b8a9c8..be842e29e 100644 --- a/star/test_suite/ccsn_IIp/README.rst +++ b/star/test_suite/ccsn_IIp/README.rst @@ -59,11 +59,8 @@ pgstar commands used for the first 7 plots: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' - !file_device = 'vcps' ! postscript - !file_extension = 'ps' - + pgstar_interval = 10 pgstar_grid_title_disp = 1.8 @@ -245,10 +242,8 @@ pgstar commands used for the 8th plot: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 1 diff --git a/star/test_suite/conductive_flame/inlist_pgstar b/star/test_suite/conductive_flame/inlist_pgstar index c390b9375..9e8641269 100644 --- a/star/test_suite/conductive_flame/inlist_pgstar +++ b/star/test_suite/conductive_flame/inlist_pgstar @@ -1,11 +1,8 @@ &pgstar - ! device file_white_on_black_flag = .true. - !file_device = 'vcps' ! postscript - !file_extension = 'ps' + !file_device = 'vcps' ! postscript file_device = 'png' ! png - file_extension = 'png' pgstar_interval = 1 pause = .false. diff --git a/star/test_suite/conserve_angular_momentum/README.rst b/star/test_suite/conserve_angular_momentum/README.rst index d1f066a45..8249187ed 100644 --- a/star/test_suite/conserve_angular_momentum/README.rst +++ b/star/test_suite/conserve_angular_momentum/README.rst @@ -24,10 +24,8 @@ pgstar commands used for the first 7 plots: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/conv_core_cpm/inlist_conv_core_cpm b/star/test_suite/conv_core_cpm/inlist_conv_core_cpm index daa68d8c7..eb5983258 100644 --- a/star/test_suite/conv_core_cpm/inlist_conv_core_cpm +++ b/star/test_suite/conv_core_cpm/inlist_conv_core_cpm @@ -99,7 +99,6 @@ ! file output file_white_on_black_flag = .true. file_device = 'vcps' - file_extension = 'ps' Grid1_file_flag = .true. Grid1_file_dir = 'pgstar_out' Grid1_file_prefix = 'grid_' diff --git a/star/test_suite/custom_colors/README.rst b/star/test_suite/custom_colors/README.rst index b0673dd95..b099181e5 100644 --- a/star/test_suite/custom_colors/README.rst +++ b/star/test_suite/custom_colors/README.rst @@ -28,10 +28,8 @@ pgstar commands used for the first 7 plots: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 1 diff --git a/star/test_suite/custom_rates/README.rst b/star/test_suite/custom_rates/README.rst index 4f30bbe46..3678a05b9 100644 --- a/star/test_suite/custom_rates/README.rst +++ b/star/test_suite/custom_rates/README.rst @@ -42,10 +42,8 @@ pgstar commands used for the first 7 plots: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/diffusion_smoothness/inlist_diffusion_smoothness b/star/test_suite/diffusion_smoothness/inlist_diffusion_smoothness index b61943f0a..22ee58829 100644 --- a/star/test_suite/diffusion_smoothness/inlist_diffusion_smoothness +++ b/star/test_suite/diffusion_smoothness/inlist_diffusion_smoothness @@ -118,12 +118,9 @@ &pgstar - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' !file_device = 'png' ! png - !file_extension = 'png' pgstar_interval = 1 diff --git a/star/test_suite/extended_convective_penetration/README.rst b/star/test_suite/extended_convective_penetration/README.rst index bbde74541..4c226ec15 100644 --- a/star/test_suite/extended_convective_penetration/README.rst +++ b/star/test_suite/extended_convective_penetration/README.rst @@ -85,10 +85,8 @@ pgstar commands used for the plot: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background file_device = 'png' ! png - file_extension = 'png' !file_device = 'vcps' ! postscript - !file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/high_mass/inlist_pgstar b/star/test_suite/high_mass/inlist_pgstar index ecf511d13..5e350ae7b 100644 --- a/star/test_suite/high_mass/inlist_pgstar +++ b/star/test_suite/high_mass/inlist_pgstar @@ -1,11 +1,8 @@ &pgstar - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' !file_device = 'png' ! png - !file_extension = 'png' pgstar_interval = 10 diff --git a/star/test_suite/high_z/README.rst b/star/test_suite/high_z/README.rst index 6e1348e44..49683d469 100644 --- a/star/test_suite/high_z/README.rst +++ b/star/test_suite/high_z/README.rst @@ -29,10 +29,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/hot_cool_wind/README.rst b/star/test_suite/hot_cool_wind/README.rst index df3a751c0..0bd28e7d3 100644 --- a/star/test_suite/hot_cool_wind/README.rst +++ b/star/test_suite/hot_cool_wind/README.rst @@ -28,10 +28,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/hse_riemann/README.rst b/star/test_suite/hse_riemann/README.rst index 9dbc1d90b..cf2ad6189 100644 --- a/star/test_suite/hse_riemann/README.rst +++ b/star/test_suite/hse_riemann/README.rst @@ -27,10 +27,8 @@ pgstar commands used for the plots that ake the movie above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 2 diff --git a/star/test_suite/irradiated_planet/README.rst b/star/test_suite/irradiated_planet/README.rst index 09d155a04..f33b3c86d 100644 --- a/star/test_suite/irradiated_planet/README.rst +++ b/star/test_suite/irradiated_planet/README.rst @@ -30,10 +30,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/low_z/README.rst b/star/test_suite/low_z/README.rst index 61501c67c..a59dee41c 100644 --- a/star/test_suite/low_z/README.rst +++ b/star/test_suite/low_z/README.rst @@ -30,10 +30,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_brown_dwarf/README.rst b/star/test_suite/make_brown_dwarf/README.rst index 27910a290..c3727cad7 100644 --- a/star/test_suite/make_brown_dwarf/README.rst +++ b/star/test_suite/make_brown_dwarf/README.rst @@ -22,10 +22,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_env/README.rst b/star/test_suite/make_env/README.rst index 678e3cc1f..3dccf2bd0 100644 --- a/star/test_suite/make_env/README.rst +++ b/star/test_suite/make_env/README.rst @@ -22,10 +22,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_he_wd/README.rst b/star/test_suite/make_he_wd/README.rst index 6759f8cd8..3b24471c8 100644 --- a/star/test_suite/make_he_wd/README.rst +++ b/star/test_suite/make_he_wd/README.rst @@ -33,10 +33,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_metals/README.rst b/star/test_suite/make_metals/README.rst index ad532207d..fc60904de 100644 --- a/star/test_suite/make_metals/README.rst +++ b/star/test_suite/make_metals/README.rst @@ -33,10 +33,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_o_ne_wd/inlist_pgstar b/star/test_suite/make_o_ne_wd/inlist_pgstar index 6b0e10170..499e88ede 100644 --- a/star/test_suite/make_o_ne_wd/inlist_pgstar +++ b/star/test_suite/make_o_ne_wd/inlist_pgstar @@ -673,14 +673,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - / ! end of pgstar namelist diff --git a/star/test_suite/make_planets/README.rst b/star/test_suite/make_planets/README.rst index 334ee6e04..7a6ed5e83 100644 --- a/star/test_suite/make_planets/README.rst +++ b/star/test_suite/make_planets/README.rst @@ -34,10 +34,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_pre_ccsn_13bvn/inlist_pgstar b/star/test_suite/make_pre_ccsn_13bvn/inlist_pgstar index c9360d38c..4ebf2d853 100644 --- a/star/test_suite/make_pre_ccsn_13bvn/inlist_pgstar +++ b/star/test_suite/make_pre_ccsn_13bvn/inlist_pgstar @@ -13,14 +13,6 @@ pgstar_show_age = .true. ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - ! Text_Summary windows diff --git a/star/test_suite/make_sdb/README.rst b/star/test_suite/make_sdb/README.rst index d4149cc8d..6b12dc0aa 100644 --- a/star/test_suite/make_sdb/README.rst +++ b/star/test_suite/make_sdb/README.rst @@ -22,10 +22,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_zams/inlist_zams b/star/test_suite/make_zams/inlist_zams index 037803e28..b992eef77 100644 --- a/star/test_suite/make_zams/inlist_zams +++ b/star/test_suite/make_zams/inlist_zams @@ -52,7 +52,6 @@ file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_zams_low_mass/README.rst b/star/test_suite/make_zams_low_mass/README.rst index b47a60fb5..b50bc2c15 100644 --- a/star/test_suite/make_zams_low_mass/README.rst +++ b/star/test_suite/make_zams_low_mass/README.rst @@ -22,10 +22,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/make_zams_ultra_high_mass/README.rst b/star/test_suite/make_zams_ultra_high_mass/README.rst index 16d5ae958..03dc730f3 100644 --- a/star/test_suite/make_zams_ultra_high_mass/README.rst +++ b/star/test_suite/make_zams_ultra_high_mass/README.rst @@ -22,10 +22,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/ns_c/README.rst b/star/test_suite/ns_c/README.rst index 57316c5a2..9f3dee075 100644 --- a/star/test_suite/ns_c/README.rst +++ b/star/test_suite/ns_c/README.rst @@ -22,10 +22,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 pgstar_grid_title_disp = 1.8 diff --git a/star/test_suite/ns_c/inlist_pgstar b/star/test_suite/ns_c/inlist_pgstar index 57b9d83be..c273ba690 100644 --- a/star/test_suite/ns_c/inlist_pgstar +++ b/star/test_suite/ns_c/inlist_pgstar @@ -668,14 +668,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - / ! end of pgstar namelist diff --git a/star/test_suite/ns_h/README.rst b/star/test_suite/ns_h/README.rst index 2f87b4336..9aee80012 100644 --- a/star/test_suite/ns_h/README.rst +++ b/star/test_suite/ns_h/README.rst @@ -27,10 +27,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/ns_he/README.rst b/star/test_suite/ns_he/README.rst index d9a87d1f4..4eda33b76 100644 --- a/star/test_suite/ns_he/README.rst +++ b/star/test_suite/ns_he/README.rst @@ -23,10 +23,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 pgstar_grid_title_disp = 1.8 diff --git a/star/test_suite/ns_he/inlist_to_flash b/star/test_suite/ns_he/inlist_to_flash index bc4250bf3..3244604ab 100644 --- a/star/test_suite/ns_he/inlist_to_flash +++ b/star/test_suite/ns_he/inlist_to_flash @@ -192,10 +192,7 @@ Mixing_xaxis_reversed = .true. file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 pgstar_grid_title_disp = 1.8 diff --git a/star/test_suite/other_physics_hooks/README.rst b/star/test_suite/other_physics_hooks/README.rst index d57e07f2b..ac2a6fccd 100644 --- a/star/test_suite/other_physics_hooks/README.rst +++ b/star/test_suite/other_physics_hooks/README.rst @@ -38,10 +38,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/pisn/inlist_pgstar b/star/test_suite/pisn/inlist_pgstar index bdb637f5b..74d8ce2a7 100644 --- a/star/test_suite/pisn/inlist_pgstar +++ b/star/test_suite/pisn/inlist_pgstar @@ -699,14 +699,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - / ! end of pgstar namelist diff --git a/star/test_suite/radiative_levitation/README.rst b/star/test_suite/radiative_levitation/README.rst index 99120c1df..db1593d9f 100644 --- a/star/test_suite/radiative_levitation/README.rst +++ b/star/test_suite/radiative_levitation/README.rst @@ -27,10 +27,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/rsp_BEP/README.rst b/star/test_suite/rsp_BEP/README.rst index 71392bad5..931411170 100644 --- a/star/test_suite/rsp_BEP/README.rst +++ b/star/test_suite/rsp_BEP/README.rst @@ -28,10 +28,8 @@ pgstar commands, in addition to those in ``inlist_rsp_pgstar_default``, used for file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/rsp_BLAP/README.rst b/star/test_suite/rsp_BLAP/README.rst index 579d9cf03..0527c4abb 100644 --- a/star/test_suite/rsp_BLAP/README.rst +++ b/star/test_suite/rsp_BLAP/README.rst @@ -28,10 +28,8 @@ pgstar commands, in addition to those in ``inlist_rsp_pgstar_default``, used for file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/rsp_Cepheid/README.rst b/star/test_suite/rsp_Cepheid/README.rst index f26415c21..3c952f783 100644 --- a/star/test_suite/rsp_Cepheid/README.rst +++ b/star/test_suite/rsp_Cepheid/README.rst @@ -27,10 +27,8 @@ pgstar commands, in addition to those in ``inlist_rsp_pgstar_default``, used for file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/rsp_Delta_Scuti/README.rst b/star/test_suite/rsp_Delta_Scuti/README.rst index 562c3d98e..938cf3300 100644 --- a/star/test_suite/rsp_Delta_Scuti/README.rst +++ b/star/test_suite/rsp_Delta_Scuti/README.rst @@ -30,10 +30,7 @@ pgstar commands, in addition to those in ``inlist_rsp_pgstar_default``, used for file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/rsp_RR_Lyrae/README.rst b/star/test_suite/rsp_RR_Lyrae/README.rst index 364a6c671..c431d4d14 100644 --- a/star/test_suite/rsp_RR_Lyrae/README.rst +++ b/star/test_suite/rsp_RR_Lyrae/README.rst @@ -28,10 +28,8 @@ pgstar commands, in addition to those in ``inlist_rsp_pgstar_default``, used for file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/rsp_Type_II_Cepheid/README.rst b/star/test_suite/rsp_Type_II_Cepheid/README.rst index c60026c25..4d86961e5 100644 --- a/star/test_suite/rsp_Type_II_Cepheid/README.rst +++ b/star/test_suite/rsp_Type_II_Cepheid/README.rst @@ -28,10 +28,8 @@ pgstar commands, in addition to those in ``inlist_rsp_pgstar_default`` which cur file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/rsp_save_and_load_file/README.rst b/star/test_suite/rsp_save_and_load_file/README.rst index e3c4e4e75..08a7c50a4 100644 --- a/star/test_suite/rsp_save_and_load_file/README.rst +++ b/star/test_suite/rsp_save_and_load_file/README.rst @@ -30,10 +30,8 @@ pgstar commands, in addition to those in ``inlist_rsp_common`` and modifcations file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 100 diff --git a/star/test_suite/semiconvection/README.rst b/star/test_suite/semiconvection/README.rst index 96f2c575c..5f6d884a4 100644 --- a/star/test_suite/semiconvection/README.rst +++ b/star/test_suite/semiconvection/README.rst @@ -50,10 +50,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/simplex_solar_calibration/README.rst b/star/test_suite/simplex_solar_calibration/README.rst index c9a37a4b9..ceb51fdaf 100644 --- a/star/test_suite/simplex_solar_calibration/README.rst +++ b/star/test_suite/simplex_solar_calibration/README.rst @@ -87,10 +87,8 @@ pgstar commands used for the plot above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' pgstar_interval = 10 diff --git a/star/test_suite/split_burn_big_net/inlist_pgstar b/star/test_suite/split_burn_big_net/inlist_pgstar index a944b759c..d87fbb085 100644 --- a/star/test_suite/split_burn_big_net/inlist_pgstar +++ b/star/test_suite/split_burn_big_net/inlist_pgstar @@ -675,14 +675,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - / ! end of pgstar namelist diff --git a/star/test_suite/starspots/inlist_starspots b/star/test_suite/starspots/inlist_starspots index df1f3213b..1464757f5 100644 --- a/star/test_suite/starspots/inlist_starspots +++ b/star/test_suite/starspots/inlist_starspots @@ -143,10 +143,8 @@ pgstar_interval = 50 - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' HR_win_flag = .true. ! switch to .true. to visualize in real-time HR_file_flag = .true. diff --git a/star/test_suite/twin_studies/README.rst b/star/test_suite/twin_studies/README.rst index a676af1fd..0c794368e 100644 --- a/star/test_suite/twin_studies/README.rst +++ b/star/test_suite/twin_studies/README.rst @@ -39,10 +39,8 @@ for star 1: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' Grid1_file_flag = .true. Grid1_file_dir = 'png1' @@ -62,10 +60,8 @@ and for star 2: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' Grid1_title = 'star2 - without overshooting' diff --git a/star/test_suite/twin_studies/inlist_pgstar b/star/test_suite/twin_studies/inlist_pgstar index db50d93e2..f4c731241 100644 --- a/star/test_suite/twin_studies/inlist_pgstar +++ b/star/test_suite/twin_studies/inlist_pgstar @@ -667,14 +667,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - / ! end of pgstar namelist diff --git a/star/test_suite/tzo/inlist_pgstar b/star/test_suite/tzo/inlist_pgstar index 96e4a7133..e865b7ddf 100644 --- a/star/test_suite/tzo/inlist_pgstar +++ b/star/test_suite/tzo/inlist_pgstar @@ -8,14 +8,6 @@ pgstar_interval=1 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - - ! Text_Summary windows diff --git a/star/test_suite/wd_c_core_ignition/README.rst b/star/test_suite/wd_c_core_ignition/README.rst index 8e1c1f449..a67fc4c5c 100644 --- a/star/test_suite/wd_c_core_ignition/README.rst +++ b/star/test_suite/wd_c_core_ignition/README.rst @@ -37,10 +37,8 @@ pgstar commands used for the Part 1 plot above: &pgstar file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' Abundance_win_flag = .true. Abundance_win_width = 12 @@ -74,10 +72,8 @@ pgstar commands used for the Part 2 plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' TRho_win_flag = .true. TRho_win_width = 12 diff --git a/star/test_suite/wd_cool_0.6M/README.rst b/star/test_suite/wd_cool_0.6M/README.rst index d899bc797..36a999115 100644 --- a/star/test_suite/wd_cool_0.6M/README.rst +++ b/star/test_suite/wd_cool_0.6M/README.rst @@ -29,10 +29,7 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' Grid2_win_flag = .true. Grid2_win_width = 16 diff --git a/star/test_suite/wd_diffusion/README.rst b/star/test_suite/wd_diffusion/README.rst index 2543da0f0..e1f99eb8d 100644 --- a/star/test_suite/wd_diffusion/README.rst +++ b/star/test_suite/wd_diffusion/README.rst @@ -29,10 +29,8 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' file_device = 'vcps' ! postscript - file_extension = 'ps' Profile_Panels2_win_flag = .true. Profile_Panels2_win_width = 12 diff --git a/star/test_suite/wd_he_shell_ignition/README.rst b/star/test_suite/wd_he_shell_ignition/README.rst index 4cdd03df1..a4d93b574 100644 --- a/star/test_suite/wd_he_shell_ignition/README.rst +++ b/star/test_suite/wd_he_shell_ignition/README.rst @@ -38,11 +38,7 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' - Profile_Panels2_win_flag = .true. Profile_Panels2_win_width = 10 diff --git a/star/test_suite/wd_nova_burst/inlist_pgstar b/star/test_suite/wd_nova_burst/inlist_pgstar index d4cf93dbc..ab759cfef 100644 --- a/star/test_suite/wd_nova_burst/inlist_pgstar +++ b/star/test_suite/wd_nova_burst/inlist_pgstar @@ -1,11 +1,8 @@ &pgstar - ! device file_white_on_black_flag = .true. file_device = 'vcps' ! postscript - file_extension = 'ps' !file_device = 'png' ! png - !file_extension = 'png' pgstar_interval = 1 diff --git a/star/test_suite/wd_stable_h_burn/README.rst b/star/test_suite/wd_stable_h_burn/README.rst index e960b8cc9..226205191 100644 --- a/star/test_suite/wd_stable_h_burn/README.rst +++ b/star/test_suite/wd_stable_h_burn/README.rst @@ -24,12 +24,9 @@ pgstar commands used for the plots above: file_white_on_black_flag = .true. ! white_on_black flags -- true means white foreground color on black background !file_device = 'png' ! png - !file_extension = 'png' - file_device = 'vcps' ! postscript - file_extension = 'ps' - pgstar_interval = 1 + pgstar_interval = 1 pgstar_left_yaxis_label_disp = 4.0 diff --git a/star/test_suite/zams_to_cc_80/inlist_pgstar b/star/test_suite/zams_to_cc_80/inlist_pgstar index cd1b476b7..44ebbd4aa 100644 --- a/star/test_suite/zams_to_cc_80/inlist_pgstar +++ b/star/test_suite/zams_to_cc_80/inlist_pgstar @@ -667,13 +667,6 @@ pgstar_model_fjust = 1.0 ! white_on_black flags -- true means white foreground color on black background file_white_on_black_flag = .true. file_device = 'png' ! options 'png' and 'vcps' for png and postscript respectively -file_extension = 'png' ! common names are 'png' and 'ps' - - -!file_white_on_black_flag = .false. -!file_device = 'vcps' ! options 'png' and 'vcps' for png and postscript respectively -!file_extension = 'ps' ! common names are 'png' and 'ps' - kipp_win_flag=.true. kipp_file_flag=.true. diff --git a/star_data/private/pgstar_controls.inc b/star_data/private/pgstar_controls.inc index ff4befed7..fff61ac7f 100644 --- a/star_data/private/pgstar_controls.inc +++ b/star_data/private/pgstar_controls.inc @@ -10,7 +10,6 @@ ! PGstar controls integer :: pgstar_interval character (len=32) :: file_device - character (len=32) :: file_extension integer :: file_digits real :: delta_HR_limit_for_file_output From 3af4a1fc6481a019a96a247f4535473298dd45f1 Mon Sep 17 00:00:00 2001 From: pmocz Date: Sun, 25 Aug 2024 16:48:45 -0400 Subject: [PATCH 2/3] [ci skip] adding changelog --- docs/source/changelog.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index a565d59cd..41f8bdd08 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -9,6 +9,16 @@ Changelog Changes in main =============== +.. _Backwards-incompatible changes main: + +Backwards-incompatible changes +------------------------------ + +``pgstar`` / ``pgbinary`` +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Removed `file_extension` option because it is redundant with `file_device`. Delete `file_extension` from your inlists. + .. _New Features main: New Features From c5f0a7967dd92fa2d641136c22803ed641acb15b Mon Sep 17 00:00:00 2001 From: pmocz Date: Sun, 25 Aug 2024 16:55:17 -0400 Subject: [PATCH 3/3] [ci skip] change extension len to 32 --- binary/private/pgbinary_support.f90 | 2 +- star/private/pgstar_support.f90 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/binary/private/pgbinary_support.f90 b/binary/private/pgbinary_support.f90 index 80fb9b775..407401517 100644 --- a/binary/private/pgbinary_support.f90 +++ b/binary/private/pgbinary_support.f90 @@ -169,7 +169,7 @@ subroutine create_file_name(b, dir, prefix, name) character (len = *), intent(in) :: dir, prefix character (len = *), intent(out) :: name character (len = strlen) :: num_str, fstring - character (len = 4) :: file_extension + character (len = 32) :: file_extension write(fstring, '( "(i",i2.2,".",i2.2,")" )') & b% pg% file_digits, b% pg% file_digits write(num_str, fstring) b% model_number diff --git a/star/private/pgstar_support.f90 b/star/private/pgstar_support.f90 index ac3700c28..be03d2747 100644 --- a/star/private/pgstar_support.f90 +++ b/star/private/pgstar_support.f90 @@ -203,7 +203,7 @@ subroutine create_file_name(s, dir, prefix, name) character (len = *), intent(in) :: dir, prefix character (len = *), intent(out) :: name character (len = strlen) :: num_str, fstring - character (len = 4) :: file_extension + character (len = 32) :: file_extension write(fstring, '( "(i",i2.2,".",i2.2,")" )') s% pg% file_digits, s% pg% file_digits write(num_str, fstring) s% model_number if (len_trim(dir) > 0) then @@ -214,8 +214,7 @@ subroutine create_file_name(s, dir, prefix, name) if (s%pg%file_device=='vcps') then file_extension = 'ps' else - ! e.g.: png, ps - file_extension = s%pg%file_device + file_extension = s%pg%file_device ! e.g.: png, ps end if name = trim(name) // trim(num_str) // '.' // trim(file_extension) end subroutine create_file_name