From d8faacf5ad5f1fb3d7b0bbacbe6593d4e61d9d45 Mon Sep 17 00:00:00 2001
From: lkugler <lukas.kugler@gmail.com>
Date: Tue, 23 May 2023 11:01:43 +0200
Subject: [PATCH] scriptsdir is now dartwrf_dir
---
config/jet.py | 6 +++---
dartwrf/utils.py | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/config/jet.py b/config/jet.py
index 377275f..631a7ad 100755
--- a/config/jet.py
+++ b/config/jet.py
@@ -69,12 +69,12 @@ cluster.archive_base = '/jetfs/home/lkugler/data/sim_archive/'
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.dartwrf_dir = '/jetfs/home/lkugler/DART-WRF/'
# other inputs
cluster.geo_em_for_WRF_ideal = '/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.obs_impact_filename = cluster.dartwrf_dir+'/templates/impactfactor_T.txt'
+cluster.namelist = cluster.dartwrf_dir+'/templates/namelist.input'
cluster.run_WRF = '/jetfs/home/lkugler/DART-WRF/dartwrf/run_ens.jet.sh'
cluster.slurm_cfg = {"account": "lkugler", "partition": "compute", #"nodelist": "jet07",
diff --git a/dartwrf/utils.py b/dartwrf/utils.py
index 3436857..4ad6421 100755
--- a/dartwrf/utils.py
+++ b/dartwrf/utils.py
@@ -34,14 +34,13 @@ class ClusterConfig(object):
"""Path to the directory where the DART-WRF scripts are executed
Note:
- If you want to execute scripts from the folder where you develop code, use `self.dartwrf_dir`
+ If you want to execute scripts from the folder where you develop code, use `self.dartwrf_dir` (not sure if this works)
If you want to execute the code from a different place ('research'), then use `self.archivedir+'/DART-WRF/'`
Example:
- `/user/data/sim_archive/DART-WRF/`
+ `/user/data/sim_archive/DART-WRF/dartwrf/`
"""
- # return self.dartwrf_dir
- return self.archivedir+'/DART-WRF/'
+ return self.archivedir+'/DART-WRF/dartwrf/'
@property
def dart_rundir(self):
--
GitLab