Skip to content

Commit

Permalink
feat(config): new yaml files for more examples
Browse files Browse the repository at this point in the history
  • Loading branch information
yoctoyotta1024 committed Apr 17, 2024
1 parent 32dfbe5 commit b9f6f43
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 133 deletions.
6 changes: 3 additions & 3 deletions examples/adiabaticparcel/src/config/as2017_config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# ----- CLEO -----
# File: config.yaml
# File: as2017_config.yaml
# Project: config
# Created Date: Wednesday 17th April 2024
# Author: Clara Bayley (CB)
# Additional Contributors:
# -----
# Last Modified: Monday 15th April 2024
# Last Modified: Wednesday 17th April 2024
# Modified By: CB
# -----
# License: BSD 3-Clause "New" or "Revised" License
Expand Down Expand Up @@ -35,7 +35,7 @@ initsupers:
outputdata:
setup_filename: /home/m/m300950/CLEO/build_adia0D//bin/as2017_setup.txt # .txt filename to copy configuration to
stats_filename: /home/m/m300950/CLEO/build_adia0D//bin/as2017_stats.txt # .txt file to output runtime statistics to
zarrbasedir: /home/m/m300950/CLEO/build_adia0D//bin/as2017_sol2.zarr # zarr store base directory
zarrbasedir: /home/m/m300950/CLEO/build_adia0D//bin/as2017_sol8.zarr # zarr store base directory
maxchunk: 2500000 # maximum no. of elements in chunks of zarr store array

### SDM Runtime Parameters ###
Expand Down
4 changes: 2 additions & 2 deletions examples/adiabaticparcel/src/config/cuspbifurc_config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
# ----- CLEO -----
# File: config.yaml
# File: cusbifurc_config.yaml
# Project: config
# Created Date: Wednesday 17th April 2024
# Author: Clara Bayley (CB)
# Additional Contributors:
# -----
# Last Modified: Monday 15th April 2024
# Last Modified: Wednesday 17th April 2024
# Modified By: CB
# -----
# License: BSD 3-Clause "New" or "Revised" License
Expand Down
4 changes: 2 additions & 2 deletions examples/boxmodelcollisions/long/src/main_longcolls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Author: Clara Bayley (CB)
* Additional Contributors:
* -----
* Last Modified: Wednesday 17th April 2024
* Last Modified: Thursday 18th April 2024
* Modified By: CB
* -----
* License: BSD 3-Clause "New" or "Revised" License
Expand All @@ -18,7 +18,7 @@
* File Description:
* runs the CLEO super-droplet model (SDM) for 0-D box model with Long's kernel.
* After make/compiling, execute for example via:
* ./src/longcolls ../src/config/config.tx
* ./src/longcolls ../src/config/config.yaml
*/

#include <Kokkos_Core.hpp>
Expand Down
58 changes: 0 additions & 58 deletions examples/boxmodelcollisions/shima2009_config.txt

This file was deleted.

53 changes: 53 additions & 0 deletions examples/boxmodelcollisions/shima2009_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
# ----- CLEO -----
# File: shima2009_config.yaml
# Project: config
# Created Date: Wednesday 17th April 2024
# Author: Clara Bayley (CB)
# Additional Contributors:
# -----
# Last Modified: Wednesday 17th April 2024
# Modified By: CB
# -----
# License: BSD 3-Clause "New" or "Revised" License
# https://opensource.org/licenses/BSD-3-Clause
# -----
# Copyright (c) 2023 MPI-M, Clara Bayley
# -----
# 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
# 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".
#

### Initialisation Parameters ###
inputfiles:
constants_filename : ../libs/cleoconstants.hpp # name of file for values of physical constants
grid_filename : ./share/shima2009_dimlessGBxboundaries.dat # binary filename for initialisation of GBxs / GbxMaps

initsupers:
type : frombinary # type of initialisation of super-droplets
initsupers_filename : ./share/shima2009_dimlessSDsinit.dat # binary filename for initialisation of SDs
totnsupers : 4096 # initial total no. of SDs

### Output Parameters ###
outputdata:
setup_filename : ./bin/shima2009_setup.txt # .txt filename to copy configuration to
stats_filename : ./bin/shima2009_stats.txt # .txt file to output runtime statistics to
zarrbasedir : ./bin/shima2009_sol.zarr # zarr store base directory
maxchunk : 2500000 # maximum no. of elements in chunks of zarr store array

### SDM Runtime Parameters ###
domain:
nspacedims : 0 # no. of spatial dimensions to model
ngbxs : 1 # total number of Gbxs

timesteps:
CONDTSTEP : 200 # time between SD condensation [s]
COLLTSTEP : 1 # time between SD collision [s]
MOTIONTSTEP : 200 # time between SDM motion [s]
COUPLTSTEP : 2000 # time between dynamic couplings [s]
OBSTSTEP : 200 # time between SDM observations [s]
T_END : 4000 # time span of integration from 0s to T_END [s]
67 changes: 0 additions & 67 deletions examples/constthermo2d/src/config/const2d_config.txt

This file was deleted.

73 changes: 73 additions & 0 deletions examples/constthermo2d/src/config/const2d_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
---
# ----- CLEO -----
# File: const2d_config.yaml
# Project: config
# Created Date: Wednesday 17th April 2024
# Author: Clara Bayley (CB)
# Additional Contributors:
# -----
# Last Modified: Wednesday 17th April 2024
# Modified By: CB
# -----
# License: BSD 3-Clause "New" or "Revised" License
# https://opensource.org/licenses/BSD-3-Clause
# -----
# Copyright (c) 2023 MPI-M, Clara Bayley
# -----
# 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
# 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".
#

### Initialisation Parameters ###
inputfiles:
constants_filename : ../libs/cleoconstants.hpp # name of file for values of physical constants
grid_filename : ./share/const2d_dimlessGBxboundaries.dat # binary filename for initialisation of GBxs / GbxMaps

initsupers:
type : frombinary # type of initialisation of super-droplets
initsupers_filename : ./share/const2d_dimlessSDsinit.dat # binary filename for initialisation of SDs
totnsupers : 960 # initial total no. of SDs

### Output Parameters ###
outputdata:
setup_filename : ./bin/const2d_setup.txt # .txt filename to copy configuration to
stats_filename : ./bin/const2d_stats.txt # .txt file to output runtime statistics to
zarrbasedir : ./bin/const2d_sol.zarr # zarr store base directory
maxchunk : 2500000 # maximum no. of elements in chunks of zarr store array

### SDM Runtime Parameters ###
domain:
nspacedims : 2 # no. of spatial dimensions to model
ngbxs : 400 # total number of Gbxs

timesteps:
CONDTSTEP : 1 # time between SD condensation [s]
COLLTSTEP : 1 # time between SD collision [s]
MOTIONTSTEP : 2 # time between SDM motion [s]
COUPLTSTEP : 7200 # time between dynamic couplings [s]
OBSTSTEP : 120 # time between SDM observations [s]
T_END : 7200 # time span of integration from 0s to T_END [s]

### Microphysics Parameters ###
microphysics:
condensation:
do_alter_thermo : false # true = cond/evap alters the thermodynamic state
niters : 2 # no. iterations of Newton Raphson Method before testing for convergence
SUBTSTEP : 0.1 # smallest subtimestep in cases of substepping [s]
rtol : 0.0 # relative tolerance for implicit Euler integration
atol : 0.01 # abolute tolerance for implicit Euler integration

### Coupled Dynamics Parameters ###
coupled_dynamics:
type : fromfile # type of coupled dynamics to configure
press : ./share/const2d_dimlessthermo_press.dat # binary filename for pressure
temp : ./share/const2d_dimlessthermo_temp.dat # binary filename for temperature
qvap : ./share/const2d_dimlessthermo_qvap.dat # binary filename for vapour mixing ratio
qcond : ./share/const2d_dimlessthermo_qcond.dat # binary filename for liquid mixing ratio
wvel : ./share/const2d_dimlessthermo_wvel.dat # binary filename for vertical (coord3) velocity
uvel : ./share/const2d_dimlessthermo_uvel.dat # binary filename for eastwards (coord1) velocity
vvel : ./share/const2d_dimlessthermo_vvel.dat # binary filename for northwards (coord2) velocity
2 changes: 1 addition & 1 deletion src/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Author: Clara Bayley (CB)
# Additional Contributors:
# -----
# Last Modified: Monday 15th April 2024
# Last Modified: Wednesday 17th April 2024
# Modified By: CB
# -----
# License: BSD 3-Clause "New" or "Revised" License
Expand Down

0 comments on commit b9f6f43

Please sign in to comment.