From 067941531d9743596417b34e055c77eb301149a1 Mon Sep 17 00:00:00 2001 From: "clara.bayley" Date: Sun, 17 Nov 2024 20:13:10 +0100 Subject: [PATCH] chore: fix spelling mistakes chore: fix typos --- .../src/config/as2017_config.yaml | 4 +- .../src/config/cuspbifurc_config.yaml | 4 +- .../boxmodelcollisions/breakup_config.yaml | 2 +- .../boxmodelcollisions/shima2009_config.yaml | 2 +- .../bubble3d/src/config/bubble3d_config.yaml | 2 +- .../src/config/const2d_config.yaml | 4 +- .../src/config/divfree2d_config.yaml | 2 +- .../src/config/eurec4a1d_config.yaml | 4 +- .../fromfile/src/config/fromfile_config.yaml | 2 +- .../src/config/fromfile_irreg_config.yaml | 2 +- .../rainshaft1d/src/config/rain1d_config.yaml | 4 +- .../src/config/speedtest_config.yaml | 4 +- libs/initialise/optional_config_params.hpp | 2 +- roughpaper/src/config/config.yaml | 46 +++++++++---------- scripts/create_thermobinaries_script.py | 4 +- 15 files changed, 44 insertions(+), 44 deletions(-) diff --git a/examples/adiabaticparcel/src/config/as2017_config.yaml b/examples/adiabaticparcel/src/config/as2017_config.yaml index 51bbc2159..f388aa6a0 100644 --- a/examples/adiabaticparcel/src/config/as2017_config.yaml +++ b/examples/adiabaticparcel/src/config/as2017_config.yaml @@ -15,7 +15,7 @@ # ----- # File Description: # Configuration file for CLEO SDM coupled to a CVODE dynamics solver for an adiabatic parcel example -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -58,7 +58,7 @@ microphysics: maxniters: 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP: 0.001 # minimum subtimestep in cases of substepping [s] rtol: 0.0 # relative tolerance for implicit Euler integration - atol: 0.01 # abolute tolerance for implicit Euler integration + atol: 0.01 # absolute tolerance for implicit Euler integration ### Coupled Dynamics Parameters ### coupled_dynamics: diff --git a/examples/adiabaticparcel/src/config/cuspbifurc_config.yaml b/examples/adiabaticparcel/src/config/cuspbifurc_config.yaml index fb645d740..d3c5f16c5 100644 --- a/examples/adiabaticparcel/src/config/cuspbifurc_config.yaml +++ b/examples/adiabaticparcel/src/config/cuspbifurc_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for CLEO SDM coupled to a CVODE dynamics solver for an adiabatic parcel example -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -59,7 +59,7 @@ microphysics: maxniters : 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP : 0.0001 # minimum subtimestep in cases of substepping [s] rtol : 0.0 # relative tolerance for implicit Euler integration - atol : 0.01 # abolute tolerance for implicit Euler integration + atol : 0.01 # absolute tolerance for implicit Euler integration ### Coupled Dynamics Parameters ### coupled_dynamics: diff --git a/examples/boxmodelcollisions/breakup_config.yaml b/examples/boxmodelcollisions/breakup_config.yaml index 83b6cad6c..76bfd6667 100644 --- a/examples/boxmodelcollisions/breakup_config.yaml +++ b/examples/boxmodelcollisions/breakup_config.yaml @@ -15,7 +15,7 @@ # ----- # File Description: # Configuration file for example of collisions in CLEO SDM 0-D box model. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". diff --git a/examples/boxmodelcollisions/shima2009_config.yaml b/examples/boxmodelcollisions/shima2009_config.yaml index da6a19170..df8ee11dc 100644 --- a/examples/boxmodelcollisions/shima2009_config.yaml +++ b/examples/boxmodelcollisions/shima2009_config.yaml @@ -15,7 +15,7 @@ # ----- # File Description: # Configuration file for example of collisions in CLEO SDM 0-D box model. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". diff --git a/examples/bubble3d/src/config/bubble3d_config.yaml b/examples/bubble3d/src/config/bubble3d_config.yaml index b42da1c5a..cfd5fb1fb 100644 --- a/examples/bubble3d/src/config/bubble3d_config.yaml +++ b/examples/bubble3d/src/config/bubble3d_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for test of YAC with 3D time varying thermodynamics example. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". diff --git a/examples/constthermo2d/src/config/const2d_config.yaml b/examples/constthermo2d/src/config/const2d_config.yaml index 85772a911..5d6e0e930 100644 --- a/examples/constthermo2d/src/config/const2d_config.yaml +++ b/examples/constthermo2d/src/config/const2d_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for CLEO 2-D example with constant thermodynamics read from a file. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -59,7 +59,7 @@ microphysics: maxniters : 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP : 0.001 # minimum subtimestep in cases of substepping [s] rtol : 0.0 # relative tolerance for implicit Euler integration - atol : 0.01 # abolute tolerance for implicit Euler integration + atol : 0.01 # absolute tolerance for implicit Euler integration ### Coupled Dynamics Parameters ### coupled_dynamics: diff --git a/examples/divfreemotion/src/config/divfree2d_config.yaml b/examples/divfreemotion/src/config/divfree2d_config.yaml index 8cbcc9f26..a42790b50 100644 --- a/examples/divfreemotion/src/config/divfree2d_config.yaml +++ b/examples/divfreemotion/src/config/divfree2d_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for divergence free motion 2-D CLEO example. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". diff --git a/examples/eurec4a1d/src/config/eurec4a1d_config.yaml b/examples/eurec4a1d/src/config/eurec4a1d_config.yaml index bff296b83..00baa325b 100644 --- a/examples/eurec4a1d/src/config/eurec4a1d_config.yaml +++ b/examples/eurec4a1d/src/config/eurec4a1d_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for CLEO eurec4a 1-D rainshaft example. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -60,7 +60,7 @@ microphysics: maxniters : 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP : 0.001 # minimum subtimestep in cases of substepping [s] rtol : 0.0 # relative tolerance for implicit Euler integration - atol : 0.01 # abolute tolerance for implicit Euler integration + atol : 0.01 # absolute tolerance for implicit Euler integration ### Coupled Dynamics Parameters ### coupled_dynamics: diff --git a/examples/fromfile/src/config/fromfile_config.yaml b/examples/fromfile/src/config/fromfile_config.yaml index 934b2562a..d08d81b60 100644 --- a/examples/fromfile/src/config/fromfile_config.yaml +++ b/examples/fromfile/src/config/fromfile_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for contol example of 3D time varying thermodyanamics read from a file. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". diff --git a/examples/fromfile_irreg/src/config/fromfile_irreg_config.yaml b/examples/fromfile_irreg/src/config/fromfile_irreg_config.yaml index ea29a6f10..caae7697c 100644 --- a/examples/fromfile_irreg/src/config/fromfile_irreg_config.yaml +++ b/examples/fromfile_irreg/src/config/fromfile_irreg_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for contol example of 3D time varying thermodyanamics read from a file. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile_irreg". diff --git a/examples/rainshaft1d/src/config/rain1d_config.yaml b/examples/rainshaft1d/src/config/rain1d_config.yaml index 89ca0b4b3..53034ce72 100644 --- a/examples/rainshaft1d/src/config/rain1d_config.yaml +++ b/examples/rainshaft1d/src/config/rain1d_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for CLEO 1-D rainshaft example with constant thermodynamics. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -59,7 +59,7 @@ microphysics: maxniters : 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP : 0.001 # minimum subtimestep in cases of substepping [s] rtol : 0.0 # relative tolerance for implicit Euler integration - atol : 0.01 # abolute tolerance for implicit Euler integration + atol : 0.01 # absolute tolerance for implicit Euler integration ### Coupled Dynamics Parameters ### coupled_dynamics: diff --git a/examples/speedtest/src/config/speedtest_config.yaml b/examples/speedtest/src/config/speedtest_config.yaml index bda10c627..090c03950 100644 --- a/examples/speedtest/src/config/speedtest_config.yaml +++ b/examples/speedtest/src/config/speedtest_config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for CLEO SDM speed test with constant thermodynamics. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -59,7 +59,7 @@ microphysics: maxniters : 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP : 0.1 # minimum subtimestep in cases of substepping [s] rtol : 0.0 # relative tolerance for implicit Euler integration - atol : 0.01 # abolute tolerance for implicit Euler integration + atol : 0.01 # absolute tolerance for implicit Euler integration ### Coupled Dynamics Parameters ### coupled_dynamics: diff --git a/libs/initialise/optional_config_params.hpp b/libs/initialise/optional_config_params.hpp index eeda68b4f..7b6be47fa 100644 --- a/libs/initialise/optional_config_params.hpp +++ b/libs/initialise/optional_config_params.hpp @@ -64,7 +64,7 @@ struct OptionalConfigParams { size_t maxniters = NaNVals::sizet(); /**< maximum no. iterations of Newton Raphson Method */ double MINSUBTSTEP = NaNVals::dbl(); /**< minimum subtimestep in cases of substepping [s] */ double rtol = NaNVals::dbl(); /**< relative tolerance for implicit Euler integration */ - double atol = NaNVals::dbl(); /**< abolute tolerance for implicit Euler integration */ + double atol = NaNVals::dbl(); /**< absolute tolerance for implicit Euler integration */ } condensation; struct BreakupParams { diff --git a/roughpaper/src/config/config.yaml b/roughpaper/src/config/config.yaml index da3902f72..0ad0357d5 100644 --- a/roughpaper/src/config/config.yaml +++ b/roughpaper/src/config/config.yaml @@ -16,7 +16,7 @@ # ----- # File Description: # Configuration file for CLEO SDM coupled to a dynamics solver. -# Note: The inital superdroplets data read from file "initsupers_filename" can be made with +# Note: The initial superdroplets data read from file "initsupers_filename" can be made with # CLEO's pySD module (see Python script "create_initsuperdropsbinary_script.py" for usage). # Likewise the "grid_filename" can be made using pySD (see "create_gbxboundariesbinary_script.py"), # and so can the thermodynamics files when using coupled thermodynamics "fromfile". @@ -60,34 +60,34 @@ microphysics: maxniters : 50 # maximum no. iterations of Newton Raphson Method MINSUBTSTEP : 0.01 # minimum subtimestep in cases of substepping [s] rtol : 0.0 # relative tolerance for implicit Euler integration - atol : 0.001 # abolute tolerance for implicit Euler integration + atol : 0.001 # absolute tolerance for implicit Euler integration # breakup: # constnfrags: # nfrags: 5.0 # average no. of fragments per droplet breakup -# ### Coupled Dynamics Parameters ### -# coupled_dynamics: -# type : fromfile # type of coupled dynamics to configure -# press : ./share/dimlessthermo_press.dat # binary filename for pressure -# temp : ./share/dimlessthermo_temp.dat # binary filename for temperature -# qvap : ./share/dimlessthermo_qvap.dat # binary filename for vapour mixing ratio -# qcond : ./share/dimlessthermo_qcond.dat # binary filename for liquid mixing ratio -# wvel : ./share/dimlessthermo_wvel.dat # binary filename for vertical (coord3) velocity -# uvel : ./share/dimlessthermo_uvel.dat # binary filename for eastwards (coord1) velocity -# vvel : ./share/dimlessthermo_vvel.dat # binary filename for northwards (coord2) velocity - ### Coupled Dynamics Parameters ### coupled_dynamics: - type: cvode # type of coupled dynamics to configure - # initial (uniform) thermodynamic conditions # - P_init: 100000.0 # initial pressure [Pa] - TEMP_init: 273.15 # initial temperature [T] - relh_init: 98.0 # initial relative humidity (%) - # ODE solver parameters # - W_avg: 0.5 # average amplitude of sinusoidal w [m/s] (dP/dt ~ w*dP/dz) - TAU_half: 300 # timescale for w sinusoid, tau_half = TAU_half/pi [s] - rtol: 1e-6 # relative tolerance for integration of [P, T, qv, qc] ODEs - atol: 1e-6 # relative tolerance for integration of [P, T, qv, qc] ODEs + type : fromfile # type of coupled dynamics to configure + press : ./share/dimlessthermo_press.dat # binary filename for pressure + temp : ./share/dimlessthermo_temp.dat # binary filename for temperature + qvap : ./share/dimlessthermo_qvap.dat # binary filename for vapour mixing ratio + qcond : ./share/dimlessthermo_qcond.dat # binary filename for liquid mixing ratio + wvel : ./share/dimlessthermo_wvel.dat # binary filename for vertical (coord3) velocity + uvel : ./share/dimlessthermo_uvel.dat # binary filename for eastwards (coord1) velocity + vvel : ./share/dimlessthermo_vvel.dat # binary filename for northwards (coord2) velocity + +# ### Coupled Dynamics Parameters ### +# coupled_dynamics: +# type: cvode # type of coupled dynamics to configure +# # initial (uniform) thermodynamic conditions # +# P_init: 100000.0 # initial pressure [Pa] +# TEMP_init: 273.15 # initial temperature [T] +# relh_init: 98.0 # initial relative humidity (%) +# # ODE solver parameters # +# W_avg: 0.5 # average amplitude of sinusoidal w [m/s] (dP/dt ~ w*dP/dz) +# TAU_half: 300 # timescale for w sinusoid, tau_half = TAU_half/pi [s] +# rtol: 1e-6 # relative tolerance for integration of [P, T, qv, qc] ODEs +# atol: 1e-6 # relative tolerance for integration of [P, T, qv, qc] ODEs # ### Bounday Conditions Parameters ### # boundary_conditions: diff --git a/scripts/create_thermobinaries_script.py b/scripts/create_thermobinaries_script.py index 753adb1f3..cc8e9a35b 100644 --- a/scripts/create_thermobinaries_script.py +++ b/scripts/create_thermobinaries_script.py @@ -138,7 +138,7 @@ config_filename, constants_filename, grid_filename, - isfigures=[False, False], - savefigpath=False, + isfigures=isfigures, + savefigpath=savefigpath, ) ### ---------------------------------------------------------------- ###