From a783896eb7e100df877c770d61eec3c18a68a77b Mon Sep 17 00:00:00 2001
From: lkugler <lukas.kugler@gmail.com>
Date: Mon, 13 Mar 2023 12:12:35 +0100
Subject: [PATCH] minor changes
---
config/cluster.py | 41 ++++++++++++++++++++------------------
dartwrf/link_dart_rttov.py | 2 +-
dartwrf/utils.py | 4 ++--
3 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/config/cluster.py b/config/cluster.py
index 9a60872..96cffd3 100755
--- a/config/cluster.py
+++ b/config/cluster.py
@@ -42,35 +42,38 @@ slurm_cfg python dictionary, containing options of SLURM
'cfg_update = {"nodes": "2"}'
"""
+
cluster = utils.ClusterConfig(exp)
-cluster.name = 'srvx1'
-cluster.max_nproc = 6
-cluster.use_slurm = False
+cluster.name = 'jet'
+cluster.max_nproc = 12
+cluster.use_slurm = True
+cluster.size_jobarray = 40
# binaries
-cluster.python = '/users/staff/lkugler/miniconda3/bin/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.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.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 = '/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/'
# 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.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/'
-# templates/run scripts
+# other inputs
+cluster.geo_em = '/jetfs/home/lkugler/data/geo_em.d01.nc'
+cluster.obs_impact_filename = cluster.scriptsdir+'/../templates/impactfactor_T.txt'
cluster.namelist = cluster.scriptsdir+'/../templates/namelist.input'
-cluster.run_WRF = cluster.scriptsdir+'/run_ens.jet.sh'
+cluster.run_WRF = '/jetfs/home/lkugler/DART-WRF/dartwrf/run_ens.jet.sh'
-cluster.slurm_cfg = {"account": "lkugler", "partition": "compute",
+cluster.slurm_cfg = {"account": "lkugler", "partition": "compute", #"nodelist": "jet07",
"ntasks": "1", "ntasks-per-core": "1", "mem": "50G",
"mail-type": "FAIL", "mail-user": "lukas.kugler@univie.ac.at"}
diff --git a/dartwrf/link_dart_rttov.py b/dartwrf/link_dart_rttov.py
index ceee2d8..daf923b 100644
--- a/dartwrf/link_dart_rttov.py
+++ b/dartwrf/link_dart_rttov.py
@@ -1,7 +1,7 @@
import os
from config.cfg import exp
from config.cluster import cluster
-from dartwrf.utils import symlink, copy_scp_srvx8, copy, sed_inplace
+from dartwrf.utils import symlink, copy, sed_inplace
joinp = os.path.join
diff --git a/dartwrf/utils.py b/dartwrf/utils.py
index 05015db..92e66ca 100755
--- a/dartwrf/utils.py
+++ b/dartwrf/utils.py
@@ -22,7 +22,7 @@ class ClusterConfig(object):
Example:
`/users/abcd/data/sim_archive/experiment1/`
"""
- return self.archive_base+'/'+self.exp.expname
+ return self.archive_base+'/'+self.exp.expname+'/'
@property
def scripts_rundir(self):
@@ -44,7 +44,7 @@ class ClusterConfig(object):
"""Path to the directory where an ensemble member will run WRF
Includes the experiment name and the ensemble member index
"""
- return self.wrf_rundir_base+'/'+self.exp.expname+'/'+str(iens)
+ return self.wrf_rundir_base+'/'+self.exp.expname+'/'+str(iens)+'/'
def run_job(self, cmd, jobname='', cfg_update=dict(), depends_on=None):
"""Run scripts in a shell
--
GitLab