Merge branch 'develop'

.gitignore

@@ -21,6 +21,7 @@ notebooks/Untitled*
 tools/log.o*
 config_ckdtree/log.o*
 pyicon/quickplots/log.o*
+config_qp_compare/log.o*
 
 tools/config_qp_???.py
 
@@ -29,3 +30,4 @@ trash
 
 # all_qps
 all_qps
+all_qp_compare

config_ckdtree/config_ckdtree_r2b4_oce_r0004.py

@@ -13,7 +13,7 @@ tgname        = f'r2b4_oce_{rev}'
 gname         = 'icon_grid_0036_R02B04_O'
 path_tgrid    = f'/pool/data/ICON/oes/input/{rev}/{gname}/'
 fname_tgrid   = f'{gname}.nc'
-path_ckdtree  = f'/mnt/lustre01/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
+path_ckdtree  = f'/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
 path_rgrid    = path_ckdtree + 'rectgrids/' 
 path_sections = path_ckdtree + 'sections/' 
 

config_ckdtree/config_ckdtree_r2b6_oce_r0004.py

@@ -13,7 +13,7 @@ tgname        = f'r2b6_oce_{rev}'
 gname         = f'OceanOnly_Global_IcosSymmetric_0039km_rotatedZ37d_BlackSea_Greenland_modified_sills_srtm30_1min'
 path_tgrid    = f'/pool/data/ICON/oes/input/{rev}/OceanOnly_Global_IcosSymmetric_0039km_rotatedZ37d_BlackSea_Greenland_modified_srtm30_1min/'
 fname_tgrid   = f'{gname}.nc'
-path_ckdtree  = f'/mnt/lustre01/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
+path_ckdtree  = f'/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
 path_rgrid    = path_ckdtree + 'rectgrids/' 
 path_sections = path_ckdtree + 'sections/' 
 

config_ckdtree/config_ckdtree_r2b8_oce_r0004.py

@@ -13,7 +13,7 @@ tgname        = f'r2b8_oce_{rev}'
 gname         = f'OceanOnly_Global_IcosSymmetric_0010km_rotatedZ37d_modified_sills_srtm30_1min'
 path_tgrid    = f'/pool/data/ICON/oes/input/{rev}/OceanOnly_Global_IcosSymmetric_0010km_rotatedZ37d_modified_srtm30_1min/'
 fname_tgrid   = f'{gname}.nc'
-path_ckdtree  = f'/mnt/lustre01/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
+path_ckdtree  = f'/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
 path_rgrid    = path_ckdtree + 'rectgrids/' 
 path_sections = path_ckdtree + 'sections/' 
 

config_ckdtree/convert_npz_to_nc.py

@@ -8,7 +8,9 @@ import xarray as xr
 #gname = 'r2b6_oce_r0004'
 #gname = 'r2b8_oce_r0004'
 #gname = 'r2b9_oce_r0004'
-gname = 'r2b10_oce'
+gname = 'r2b9_atm_r0015'
+#gname = 'r2b10_oce'
+#gname = 'r2b11_oce'
 #gname = 'smtwv_oce_2018'
 #gname = 'smt'
 #gname = 'smt20km'
@@ -17,7 +19,7 @@ gname = 'r2b10_oce'
 #gname = 'r2b4_atm_r0013'
 
 # --- rectgrids
-path_grid = f'/mnt/lustre01/work/mh0033/m300602/icon/grids/{gname}/ckdtree/rectgrids/'
+path_grid = f'/work/mh0033/m300602/icon/grids/{gname}/ckdtree/rectgrids/'
 flist = glob.glob(path_grid+'/*.npz')
 flist.sort()
 

config_qp_compare/config_r2b6_idemix_levante.py

+# Settings
+# --------
+Set.name = 'r2b6_idemix_levante'
+Set.omit_last_file = True
+Set.path_base = f'/home/m/m300602/pyicon/all_qp_compare/{Set.name}/'
+Set.path_pics = Set.path_base+'pics/'
+Set.do_diff = False
+Set.compare_with_reference = True
+
+Set.mfdset_kwargs = dict(combine='nested', concat_dim='time', use_cftime=True)
+#Set.mfdset_kwargs = dict(combine='nested', concat_dim='time')
+
+path_base = '/work/mh0033/m300602/proj_vmix/icon/icon_01/icon-oes/experiments/'
+path_grid = '/work/mh0033/m300602/icon/grids/'
+
+# Simulations
+# -----------
+Sims = []
+
+#S = Simulation()
+#S.run = 'nib0012'
+#S.name = S.run
+#S.gname = 'r2b4_oce_r0004'
+#S.lev = 'L40'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+
+## c_k=0.1
+#S = Simulation()
+#S.run = 'nib0033'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+
+#S = Simulation()
+#S.run = 'nib0035'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+#
+#S = Simulation()
+#S.run = 'nib0036'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+
+# c_k=0.3, tke_min=1e-6
+S = Simulation()
+S.run = 'nib0037'
+S.name = S.run
+S.gname = 'r2b6_oce_r0004'
+S.lev = 'L64'
+S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+Sims.append(S)
+
+## c_k=0.1, tke_min=5e-6
+#S = Simulation()
+#S.run = 'nib0038'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+
+#S = Simulation()
+#S.run = 'nib0039'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+#
+#S = Simulation()
+#S.run = 'nib0040'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+
+## c_k=0.2, IDEMIX Olbers/Eden parameters
+#S = Simulation()
+#S.run = 'nib0041'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+#
+## c_k=0.3, IDEMIX Olbers/Eden parameters
+#S = Simulation()
+#S.run = 'nib0042'
+#S.name = S.run
+#S.gname = 'r2b6_oce_r0004'
+#S.lev = 'L64'
+#S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+#S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+#Sims.append(S)
+
+# c_k=0.3, IDEMIX Pollmann parameters
+S = Simulation()
+S.run = 'nib0043'
+S.name = S.run
+S.gname = 'r2b6_oce_r0004'
+S.lev = 'L64'
+S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+Sims.append(S)
+
+# c_k=0.1, IDEMIX Pollmann parameters
+S = Simulation()
+S.run = 'nib0044'
+S.name = S.run
+S.gname = 'r2b6_oce_r0004'
+S.lev = 'L64'
+S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+Sims.append(S)
+
+# c_k=0.1, IDEMIX Pollmann parameters
+S = Simulation()
+S.run = 'nib0044'
+S.name = S.run
+S.gname = 'r2b6_oce_r0004'
+S.lev = 'L64'
+S.fpath_ckdtree = f'{path_grid}/{S.gname}/ckdtree/rectgrids/{S.gname}_res1.00_180W-180E_90S-90N.npz' 
+S.fpath_tgrid = f'{path_grid}/{S.gname}/{S.gname}_tgrid.nc'
+Sims.append(S)
+
+for nn, S in enumerate(Sims):
+  S.path_data = f'{path_base}/{S.run}/'
+  S.tave_int = ['2490', '2500']
+  S.fpath_fx      = f'{S.path_data}{S.run}_fx.nc'
+  S.namelist_oce  = f'{S.path_data}NAMELIST_{S.run}'
+  S.fpath_ref     = f'{S.path_data}initial_state.nc'

config_qp_compare/nidoall_qp_compare.sh

+#!/bin/bash
+#SBATCH --job-name=pyicon_qp
+#SBATCH --time=00:20:00
+#SBATCH --output=log.o-%j.out
+#SBATCH --error=log.o-%j.out
+#SBATCH --ntasks=1
+#SBATCH --partition=compute
+#SBATCH --account=mh0033
+
+module list
+source ~/pyicon/tools/act_pyicon_py39.sh
+which python
+
+qp_compare="../pyicon/quickplots/qp_compare.py"
+
+startdate=`date +%Y-%m-%d\ %H:%M:%S`
+
+srun --exclusive -n 1 -c 1 python -u $qp_compare config_r2b6_idemix_levante.py &
+wait
+
+enddate=`date +%Y-%m-%d\ %H:%M:%S`
+
+echo "--------------------------------------------------------------------------------"
+echo "Started at ${startdate}"
+echo "Ended at   ${enddate}"

pyicon/quickplots/nidoall_qp_compare.sh

+#!/bin/bash
+#SBATCH --job-name=pyicon_qp
+#SBATCH --time=00:20:00
+#SBATCH --output=log.o-%j.out
+#SBATCH --error=log.o-%j.out
+#SBATCH --ntasks=1
+#SBATCH --partition=compute,compute2
+#SBATCH --account=mh0033
+
+module list
+source ~/pyicon/tools/conda_act_mistral_pyicon_env.sh
+which python
+
+startdate=`date +%Y-%m-%d\ %H:%M:%S`
+
+srun --exclusive -n 1 -c 1 python -u qp_compare.py ../../config_qp_compare/config_r2b6_idemix_levante.py &
+wait
+
+enddate=`date +%Y-%m-%d\ %H:%M:%S`
+
+echo "--------------------------------------------------------------------------------"
+echo "Started at ${startdate}"
+echo "Ended at   ${enddate}"

tools/act_pyicon_py39.sh

@@ -4,9 +4,9 @@ t1=`date +%Y-%m-%d_%H-%M-%S`
 
 # --- conda env settings
 # script to working conda environment
-path_conda_bin="/home/mpim/m300602/miniconda3/bin/"
+path_conda_bin="/home/m/m300602/miniconda3/bin/"
 # name of working conda environment
-conda_env="/work/mh0033/m300602/miniconda3/envs/pyicon_py39"
+conda_env="/home/m/m300602/miniconda3/envs/pyicon_py39"
 
 # --- add pyicon to PYTHONPATH
 PYICON_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"  #problem: takes directory of source script as base