From f01349ae24c85c125c805a5a828c02895616fd0c Mon Sep 17 00:00:00 2001
From: lkugler <lukas.kugler@gmail.com>
Date: Fri, 31 Mar 2023 01:35:51 +0200
Subject: [PATCH] srvx1 config

---
 config/cluster.py | 41 +++++++++++++++++++----------------------
 config/srvx1.py   | 16 ++++++++--------
 dartwrf/utils.py  |  4 +++-
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/config/cluster.py b/config/cluster.py
index 96cffd3..2a986d3 100755
--- a/config/cluster.py
+++ b/config/cluster.py
@@ -42,38 +42,35 @@ slurm_cfg               python dictionary, containing options of SLURM
                             'cfg_update = {"nodes": "2"}'
 """
 
-
 cluster = utils.ClusterConfig(exp)
-cluster.name = 'jet'
-cluster.max_nproc = 12
-cluster.use_slurm = True
-cluster.size_jobarray = 40
+cluster.name = 'srvx1'
+cluster.max_nproc = 6
+cluster.use_slurm = False
 
 # binaries
-cluster.python = '/jetfs/home/lkugler/miniconda3/envs/DART/bin/python'
-cluster.python_verif = '/jetfs/home/lkugler/miniconda3/envs/enstools/bin/python'
-cluster.ncks = '/jetfs/spack/opt/spack/linux-rhel8-skylake_avx512/intel-20.0.2/nco-4.9.3-dhlqiyog7howjmaleyfhm6lkt7ra37xf/bin/ncks'
-cluster.ideal = '/jetfs/home/lkugler/bin/ideal-v4.3_v1.22.exe'
-cluster.wrfexe = '/jetfs/home/lkugler/bin/wrf-v4.3_v1.22.exe'
+cluster.python = 'python'
+cluster.python_verif = '/users/staff/lkugler/miniconda3/bin/python'
+cluster.ncks = '/home/swd/spack/opt/spack/linux-rhel8-skylake_avx512/gcc-8.5.0/nco-5.0.1-ntu44aoxlvwtr2tsrobfr4lht7cpvccf/bin/ncks'
+cluster.ideal = '' #/jetfs/home/lkugler/bin/ideal-v4.3_v1.22.exe'
+cluster.wrfexe = '' #/jetfs/home/lkugler/bin/wrf-v4.3_v1.22.exe'
 cluster.container = ''
 
 # paths for data output
-cluster.wrf_rundir_base = '/jetfs/home/lkugler/data/run_WRF/'  # path for temporary files
-cluster.dart_rundir_base = '/jetfs/home/lkugler/data/run_DART/'  # path for temporary files
-cluster.archive_base = '/jetfs/home/lkugler/data/sim_archive/'
+cluster.wrf_rundir_base = utils.userhome+'/AdvDA23/run_WRF/'  # path for temporary files
+cluster.dart_rundir_base = utils.userhome+'/AdvDA23/run_DART/'  # path for temporary files
+cluster.archive_base = utils.userhome+'/data/sim_archive/'
 
 # paths used as input
-cluster.srcdir = '/jetfs/home/lkugler/data/compile/WRF-4.3/run'
-cluster.dart_srcdir = '/jetfs/home/lkugler/data/compile/DART/DART-10.5.3/models/wrf/work'
-cluster.rttov_srcdir = '/jetfs/home/lkugler/data/compile/RTTOV13/rtcoef_rttov13/'
-cluster.scriptsdir = '/jetfs/home/lkugler/DART-WRF/dartwrf/'
+cluster.srcdir = '/users/staff/lkugler/AdvDA23/DART/WRF-4.3/run'
+cluster.dart_srcdir = '/users/students/lehre/advDA_s2023/DART/models/wrf/work'
+cluster.rttov_srcdir = '/users/students/lehre/advDA_s2023/RTTOV13/rtcoef_rttov13/'
+cluster.scriptsdir = utils.userhome+'/DART-WRF/dartwrf/'
+cluster.geo_em = '/users/students/lehre/advDA_s2023/data/geo_em.d01.nc'
 
-# other inputs
-cluster.geo_em = '/jetfs/home/lkugler/data/geo_em.d01.nc'
-cluster.obs_impact_filename = cluster.scriptsdir+'/../templates/impactfactor_T.txt'
+# templates/run scripts
 cluster.namelist = cluster.scriptsdir+'/../templates/namelist.input'
-cluster.run_WRF = '/jetfs/home/lkugler/DART-WRF/dartwrf/run_ens.jet.sh'
+cluster.run_WRF = cluster.scriptsdir+'/run_ens.jet.sh'
 
-cluster.slurm_cfg = {"account": "lkugler", "partition": "compute", #"nodelist": "jet07",
+cluster.slurm_cfg = {"account": "lkugler", "partition": "compute",
                  "ntasks": "1", "ntasks-per-core": "1", "mem": "50G",
                  "mail-type": "FAIL", "mail-user": "lukas.kugler@univie.ac.at"}
diff --git a/config/srvx1.py b/config/srvx1.py
index 9a60872..2a986d3 100755
--- a/config/srvx1.py
+++ b/config/srvx1.py
@@ -48,7 +48,7 @@ cluster.max_nproc = 6
 cluster.use_slurm = False
 
 # binaries
-cluster.python = '/users/staff/lkugler/miniconda3/bin/python'
+cluster.python = 'python'
 cluster.python_verif = '/users/staff/lkugler/miniconda3/bin/python'
 cluster.ncks = '/home/swd/spack/opt/spack/linux-rhel8-skylake_avx512/gcc-8.5.0/nco-5.0.1-ntu44aoxlvwtr2tsrobfr4lht7cpvccf/bin/ncks'
 cluster.ideal = '' #/jetfs/home/lkugler/bin/ideal-v4.3_v1.22.exe'
@@ -56,16 +56,16 @@ cluster.wrfexe = '' #/jetfs/home/lkugler/bin/wrf-v4.3_v1.22.exe'
 cluster.container = ''
 
 # paths for data output
-cluster.wrf_rundir_base = '/users/staff/lkugler/AdvDA23/run_WRF/'  # path for temporary files
-cluster.dart_rundir_base = '/users/staff/lkugler/AdvDA23/run_DART/'  # path for temporary files
-cluster.archive_base = '/mnt/jetfs/scratch/lkugler/data/sim_archive/'
+cluster.wrf_rundir_base = utils.userhome+'/AdvDA23/run_WRF/'  # path for temporary files
+cluster.dart_rundir_base = utils.userhome+'/AdvDA23/run_DART/'  # path for temporary files
+cluster.archive_base = utils.userhome+'/data/sim_archive/'
 
 # paths used as input
 cluster.srcdir = '/users/staff/lkugler/AdvDA23/DART/WRF-4.3/run'
-cluster.dart_srcdir = '/users/staff/lkugler/AdvDA23/DART/models/wrf/work'
-cluster.rttov_srcdir = '/users/staff/lkugler/AdvDA23/RTTOV13/rtcoef_rttov13/'
-cluster.scriptsdir = '/users/staff/lkugler/AdvDA23/DART-WRF/dartwrf/'
-cluster.geo_em = '/mnt/jetfs/scratch/lkugler/data/geo_em.d01.nc'
+cluster.dart_srcdir = '/users/students/lehre/advDA_s2023/DART/models/wrf/work'
+cluster.rttov_srcdir = '/users/students/lehre/advDA_s2023/RTTOV13/rtcoef_rttov13/'
+cluster.scriptsdir = utils.userhome+'/DART-WRF/dartwrf/'
+cluster.geo_em = '/users/students/lehre/advDA_s2023/data/geo_em.d01.nc'
 
 # templates/run scripts
 cluster.namelist = cluster.scriptsdir+'/../templates/namelist.input'
diff --git a/dartwrf/utils.py b/dartwrf/utils.py
index 0b7120b..1cab996 100755
--- a/dartwrf/utils.py
+++ b/dartwrf/utils.py
@@ -71,6 +71,8 @@ class ClusterConfig(object):
             print(cmd)
             os.system(cmd)
 
+userhome = os.path.expanduser('~')
+
 def shell(args):
     print(args)
     #subprocess.run(args.split(' ')) #, shell=True) #, stderr=subprocess.STDOUT) 
@@ -192,4 +194,4 @@ def write_txt(lines, fpath):
     try_remove(fpath)
     with open(fpath, "w") as file:
         for line in lines:
-            file.write(line+'\n')
\ No newline at end of file
+            file.write(line+'\n')
-- 
GitLab