From db6fabb3a41f1916284708a5f0578a063ad41bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oriol=20Tint=C3=B3?= <oriol.tinto@lmu.de>
Date: Thu, 23 Mar 2023 10:43:33 +0100
Subject: [PATCH] Move some configuration from the case folder to the common
folder. Splitting things up.
---
conf/common/build.yml | 15 +++++++
conf/common/data_management.yml | 3 ++
conf/common/icon.yml | 2 +
.../{proj.yml => simulation.yml} | 23 -----------
conf/real-from-ideal/proj.yml | 39 -------------------
conf/real-from-ideal/simulation.yml | 16 ++++++++
6 files changed, 36 insertions(+), 62 deletions(-)
create mode 100644 conf/common/build.yml
create mode 100644 conf/common/data_management.yml
create mode 100644 conf/common/icon.yml
rename conf/real-from-dwd-ana/{proj.yml => simulation.yml} (52%)
delete mode 100644 conf/real-from-ideal/proj.yml
create mode 100644 conf/real-from-ideal/simulation.yml
diff --git a/conf/common/build.yml b/conf/common/build.yml
new file mode 100644
index 0000000..13f1afd
--- /dev/null
+++ b/conf/common/build.yml
@@ -0,0 +1,15 @@
+spack:
+ url: git@gitlab.physik.uni-muenchen.de:LDAP_rbg/spack.git
+ branch: lmu/ubuntu20.04-icon
+ compiler: gcc@11.3.0
+
+python_environment:
+ # Name of the virtual environment in the remote platform experiment folder
+ folder_name: python_environment
+ requirements:
+ # Because there's an issue with numba, for now we need to keep a specific version of numpy
+ - numpy==1.23
+ - enstools-compression
+ # Just to try a library from a git repository.
+ - git+https://gitlab.physik.uni-muenchen.de/Oriol.Tinto/otils.git
+ - f90nml
diff --git a/conf/common/data_management.yml b/conf/common/data_management.yml
new file mode 100644
index 0000000..c76fafe
--- /dev/null
+++ b/conf/common/data_management.yml
@@ -0,0 +1,3 @@
+data_management:
+ # Where do we put the output files afterwards?
+ local_destination_folder: /scratch/o/Oriol.Tinto/tmp/
diff --git a/conf/common/icon.yml b/conf/common/icon.yml
new file mode 100644
index 0000000..387ab0d
--- /dev/null
+++ b/conf/common/icon.yml
@@ -0,0 +1,2 @@
+icon:
+ version: 2.6.5-nwp0
diff --git a/conf/real-from-dwd-ana/proj.yml b/conf/real-from-dwd-ana/simulation.yml
similarity index 52%
rename from conf/real-from-dwd-ana/proj.yml
rename to conf/real-from-dwd-ana/simulation.yml
index 15528b2..32b424f 100644
--- a/conf/real-from-dwd-ana/proj.yml
+++ b/conf/real-from-dwd-ana/simulation.yml
@@ -1,22 +1,3 @@
-spack:
- url: git@gitlab.physik.uni-muenchen.de:LDAP_rbg/spack.git
- branch: lmu/ubuntu20.04-icon
- compiler: gcc@11.3.0
-
-icon:
- version: 2.6.5-nwp0
-
-python_environment:
- # Name of the virtual environment in the remote platform experiment folder
- folder_name: python_environment
- requirements:
- # Because there's an issue with numba, for now we need to keep a specific version of numpy
- - numpy==1.23
- - enstools-compression
- # Just to try a library from a git repository.
- - git+https://gitlab.physik.uni-muenchen.de/Oriol.Tinto/otils.git
- - f90nml
-
simulation:
dynamics_grid_filename: icon_grid_0016_R02B06_G.nc
radiation_grid_filename: icon_grid_0015_R02B05_R.nc
@@ -31,10 +12,6 @@ simulation:
output_file_names: "init_DOM01_ML_*.nc latbc_DOM01_ML_*.nc"
files_to_clean: "*.nc"
-data_management:
- # Where do we put the output files afterwards?
- local_destination_folder: /scratch/o/Oriol.Tinto/tmp/
-
initial_conditions:
# Where are we getting our initial data from?
parent_folder: /archive/meteo/external-models/dwd/icon/oper/icon_oper_eps_gridded-global_rolling/
diff --git a/conf/real-from-ideal/proj.yml b/conf/real-from-ideal/proj.yml
deleted file mode 100644
index 5585b79..0000000
--- a/conf/real-from-ideal/proj.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-spack:
- url: git@gitlab.physik.uni-muenchen.de:LDAP_rbg/spack.git
- branch: lmu/ubuntu20.04-icon
- compiler: gcc@11.3.0
-
-icon:
- version: 2.6.5-nwp0
-
-python_environment:
- # Name of the virtual environment in the remote platform experiment folder
- folder_name: python_environment
- requirements:
- # Because there's an issue with numba, for now we need to keep a specific version of numpy
- - numpy==1.23
- - enstools-compression
- # Just to try a library from a git repository.
- - git+https://gitlab.physik.uni-muenchen.de/Oriol.Tinto/otils.git
- - f90nml
-
-simulation:
- dynamics_grid_filename: icon_grid_0012_R02B04_G.nc
- radiation_grid_filename: icon_grid_0011_R02B03_R.nc
- external_parameters_filename: extpar_DOM01.nc
- date_format: '%Y-%m-%dT%H:%M:%SZ'
- namelist_paths:
- # Path to the name lists
- master: "%HPCROOTDIR%/proj/namelists/real-from-ideal/icon_master.namelist"
- atmosphere:
- ideal: "%HPCROOTDIR%/proj/namelists/real-from-ideal/icon_atmosphere_ideal.namelist"
- real: "%HPCROOTDIR%/proj/namelists/real-from-ideal/icon_atmosphere_real.namelist"
-
-
- # List of output file names that will be copied (Wildcards * allowed)
- output_file_names: "latbc_DOM01_ML_*.nc"
- files_to_clean: "*.nc"
-
-data_management:
- # Where do we put the output files afterwards?
- local_destination_folder: /scratch/o/Oriol.Tinto/tmp/
diff --git a/conf/real-from-ideal/simulation.yml b/conf/real-from-ideal/simulation.yml
new file mode 100644
index 0000000..ebafd90
--- /dev/null
+++ b/conf/real-from-ideal/simulation.yml
@@ -0,0 +1,16 @@
+simulation:
+ dynamics_grid_filename: icon_grid_0012_R02B04_G.nc
+ radiation_grid_filename: icon_grid_0011_R02B03_R.nc
+ external_parameters_filename: extpar_DOM01.nc
+ date_format: '%Y-%m-%dT%H:%M:%SZ'
+ namelist_paths:
+ # Path to the name lists
+ master: "%HPCROOTDIR%/proj/namelists/real-from-ideal/icon_master.namelist"
+ atmosphere:
+ ideal: "%HPCROOTDIR%/proj/namelists/real-from-ideal/icon_atmosphere_ideal.namelist"
+ real: "%HPCROOTDIR%/proj/namelists/real-from-ideal/icon_atmosphere_real.namelist"
+
+
+ # List of output file names that will be copied (Wildcards * allowed)
+ output_file_names: "latbc_DOM01_ML_*.nc"
+ files_to_clean: "*.nc"
\ No newline at end of file
--
GitLab