From 9302b06aa32d8e219b9f5e6b24dc906294bba555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Br=C3=BCggemann?= <nils.brueggemann@mpimet.mpg.de>
Date: Tue, 18 Mar 2025 12:47:58 +0100
Subject: [PATCH] quickstart: Applying now an updated
 config_ckdtree_r2b4_oce_r0004.py for the quickstart.

---
 .../config_ckdtree_r2b4_oce_r0004.py          |  65 ++++++++--
 quickstart/config_ckdtree_r2b4_oce_r0004.py   | 111 ------------------
 2 files changed, 56 insertions(+), 120 deletions(-)
 delete mode 100644 quickstart/config_ckdtree_r2b4_oce_r0004.py

diff --git a/config_ckdtree/config_ckdtree_r2b4_oce_r0004.py b/config_ckdtree/config_ckdtree_r2b4_oce_r0004.py
index d562ad6..66352ef 100644
--- a/config_ckdtree/config_ckdtree_r2b4_oce_r0004.py
+++ b/config_ckdtree/config_ckdtree_r2b4_oce_r0004.py
@@ -1,19 +1,18 @@
 import numpy as np
 from netCDF4 import Dataset
 import sys, os
-from importlib import reload
-
 import pyicon as pyic
-reload(pyic)
 
 ts = pyic.timing([0], 'start')
 
+HOME = os.path.expanduser('~')
+
 rev           = f'r0004'
 tgname        = f'r2b4_oce_{rev}'
 gname         = 'icon_grid_0036_R02B04_O'
-path_tgrid    = f'/pool/data/ICON/oes/input/{rev}/{gname}/'
+path_tgrid    = f'{HOME}/pyicon_data/grids/{tgname}/'
 fname_tgrid   = f'{gname}.nc'
-path_ckdtree  = f'/work/mh0033/m300602/icon/grids/{tgname}/ckdtree/'
+path_ckdtree  = f'{HOME}/pyicon_data/grids/{tgname}/ckdtree/'
 path_rgrid    = path_ckdtree + 'rectgrids/' 
 path_sections = path_ckdtree + 'sections/' 
 
@@ -30,10 +29,9 @@ all_secs = [
   '170W_300pts',
             ]
 
-#all_grids = []
-#all_secs = []
-
-gnames = [gname]
+load_cgrid=True,
+load_egrid=True,
+load_vgrid=True,
 
 if not os.path.exists(path_rgrid): 
   os.makedirs(path_rgrid)
@@ -43,6 +41,8 @@ fpath = f'{path_ckdtree}/../{tgname}_tgrid.nc'
 if not os.path.exists(fpath):
   os.symlink(path_tgrid+fname_tgrid, fpath)
 
+gnames = [gname]
+print(gnames)
 for gname in gnames:
   ts = pyic.timing(ts, gname)
   print(gname)
@@ -57,6 +57,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
   
   sname = 'global_0.3'
@@ -68,6 +72,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
   
   sname = 'global_0.1'
@@ -79,6 +87,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
 
   sname = 'global_0.02'
@@ -90,6 +102,25 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
+                      )
+
+  sname = 'global_0.01'
+  if sname in all_grids:
+    pyic.ckdtree_hgrid(lon_reg=[-180.,180.], lat_reg=[-90.,90.], res=0.01,
+                      fname_tgrid  = fname_tgrid,
+                      path_tgrid   = path_tgrid,
+                      path_ckdtree = path_rgrid,
+                      sname = sname,
+                      gname = gname,
+                      tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
   
 
@@ -103,6 +134,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
     
   sname = '170W_200pts'
@@ -114,6 +149,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
 
   sname = '30W_300pts'
@@ -125,6 +164,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
     
   sname = '170W_300pts'
@@ -136,6 +179,10 @@ for gname in gnames:
                       sname = sname,
                       gname = gname,
                       tgname = tgname,
+                      load_cgrid=load_cgrid,
+                      load_egrid=load_egrid,
+                      load_vgrid=load_vgrid,
+                      save_as='both',
                       )
 
 print('make_ckdtree.py: All done!')
diff --git a/quickstart/config_ckdtree_r2b4_oce_r0004.py b/quickstart/config_ckdtree_r2b4_oce_r0004.py
deleted file mode 100644
index 168c0c1..0000000
--- a/quickstart/config_ckdtree_r2b4_oce_r0004.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import numpy as np
-from netCDF4 import Dataset
-import sys, os
-from importlib import reload
-
-import pyicon as pyic
-reload(pyic)
-
-ts = pyic.timing([0], 'start')
-
-with open('path_data.txt') as f:
-  path_data = f.read()[:-1]
-
-tgname        = 'r2b4_oce_r0004'
-gname         = 'icon_grid_0036_R02B04_O'
-path_grid     = f'{path_data}/{tgname}/'
-path_tgrid    = f'{path_data}/icon_grid_0036_R02B04_O/'
-
-fname_tgrid   = f'{gname}.nc'
-#path_ckdtree  = f'{path_data}/{tgname}/ckdtree/'
-path_rgrid    = f'{path_data}/{tgname}/ckdtree/rectgrids/' 
-path_sections = f'{path_data}/{tgname}/ckdtree/sections/' 
-
-fpath_tgrid_source = f'{path_tgrid}/{fname_tgrid}'
-fpath_tgrid_target = f'{path_grid}/{tgname}_tgrid.nc'
-fpath_fx_source = f'{path_tgrid}/{gname}_fx.nc'
-fpath_fx_target = f'{path_grid}/{tgname}_L40_fx.nc'
-
-#print(fpath_tgrid_source)
-#print(fpath_tgrid_target)
-#print(fpath_fx_source)
-#print(fpath_fx_target)
-
-all_grids = [
-  'global_1.0',
-  'global_0.3',
-            ]
-
-all_secs = [
-  '30W_300pts',
-  '170W_300pts',
-            ]
-
-#all_grids = []
-#all_secs = []
-
-gnames = [gname]
-
-# --- create some paths
-if not os.path.exists(path_rgrid): 
-  os.makedirs(path_rgrid)
-if not os.path.exists(path_sections): 
-  os.makedirs(path_sections)
-# --- links grid file and fx file
-if not os.path.exists(fpath_tgrid_target):
-  os.symlink(fpath_tgrid_source, fpath_tgrid_target)
-if not os.path.exists(fpath_fx_target):
-  os.symlink(fpath_fx_source, fpath_fx_target)
-
-for gname in gnames:
-  ts = pyic.timing(ts, gname)
-  print(gname)
-
-  # --- grids
-  sname = 'global_1.0'
-  if sname in all_grids:
-    pyic.ckdtree_hgrid(lon_reg=[-180.,180.], lat_reg=[-90.,90.], res=1.0,
-                      fname_tgrid  = fname_tgrid,
-                      path_tgrid   = path_tgrid,
-                      path_ckdtree = path_rgrid,
-                      sname = sname,
-                      gname = gname,
-                      tgname = tgname,
-                      )
-  
-  sname = 'global_0.3'
-  if sname in all_grids:
-    pyic.ckdtree_hgrid(lon_reg=[-180.,180.], lat_reg=[-90.,90.], res=0.3,
-                      fname_tgrid  = fname_tgrid,
-                      path_tgrid   = path_tgrid,
-                      path_ckdtree = path_rgrid,
-                      sname = sname,
-                      gname = gname,
-                      tgname = tgname,
-                      )
-  
-  # --- sections
-  sname = '30W_300pts'
-  if sname in all_secs:
-    dckdtree, ickdtree, lon_sec, lat_sec, dist_sec = pyic.ckdtree_section(p1=[-30,-80], p2=[-30,80], npoints=300,
-                      fname_tgrid  = fname_tgrid,
-                      path_tgrid   = path_tgrid,
-                      path_ckdtree = path_sections,
-                      sname = sname,
-                      gname = gname,
-                      tgname = tgname,
-                      )
-    
-  sname = '170W_300pts'
-  if sname in all_secs:
-    dckdtree, ickdtree, lon_sec, lat_sec, dist_sec = pyic.ckdtree_section(p1=[-170,-80], p2=[-170,80], npoints=300,
-                      fname_tgrid  = fname_tgrid,
-                      path_tgrid   = path_tgrid,
-                      path_ckdtree = path_sections,
-                      sname = sname,
-                      gname = gname,
-                      tgname = tgname,
-                      )
-
-print('make_ckdtree.py: All done!')
-ts = pyic.timing(ts, 'All done!')
-- 
GitLab