From db3654961fbe007faad9ddf7ac2eca0ff8229cd6 Mon Sep 17 00:00:00 2001
From: lkugler <lukas.kugler@gmail.com>
Date: Tue, 23 May 2023 17:38:13 +0200
Subject: [PATCH] change config import

---
 dartwrf/assim_synth_obs.py             | 4 ++--
 dartwrf/create_obs_upfront.py          | 4 ++--
 dartwrf/create_obsseq.py               | 8 ++------
 dartwrf/create_wbubble_wrfinput.py     | 4 ++--
 dartwrf/dart_nml.py                    | 4 ++--
 dartwrf/evaluate_obs_space.py          | 4 ++--
 dartwrf/evaluate_posterior.py          | 6 +++---
 dartwrf/evaluate_prior.py              | 4 ++--
 dartwrf/obs/calculate_obs_locations.py | 4 ++--
 dartwrf/obsseq_2dim.py                 | 2 +-
 dartwrf/obsseq_to_netcdf.py            | 4 ++--
 dartwrf/prep_IC_prior.py               | 4 ++--
 dartwrf/prepare_namelist.py            | 4 ++--
 dartwrf/prepare_wrfrundir.py           | 4 ++--
 dartwrf/run_obs_diag.py                | 4 ++--
 dartwrf/update_IC.py                   | 4 ++--
 dartwrf/wrfinput_add_geo.py            | 4 ++--
 dartwrf/wrfout_add_geo.py              | 4 ++--
 18 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/dartwrf/assim_synth_obs.py b/dartwrf/assim_synth_obs.py
index a865331..7cbdfe9 100755
--- a/dartwrf/assim_synth_obs.py
+++ b/dartwrf/assim_synth_obs.py
@@ -10,8 +10,8 @@ from dartwrf import wrfout_add_geo
 from dartwrf import obsseq
 from dartwrf import dart_nml
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 wrfout_format = 'wrfout_d01_%Y-%m-%d_%H:%M:%S'
 
 
diff --git a/dartwrf/create_obs_upfront.py b/dartwrf/create_obs_upfront.py
index 510261c..d89b910 100755
--- a/dartwrf/create_obs_upfront.py
+++ b/dartwrf/create_obs_upfront.py
@@ -4,8 +4,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import copy, print
 import dartwrf.create_obsseq as osq
 from dartwrf import obsseq
diff --git a/dartwrf/create_obsseq.py b/dartwrf/create_obsseq.py
index c5998d1..bf3b049 100755
--- a/dartwrf/create_obsseq.py
+++ b/dartwrf/create_obsseq.py
@@ -7,14 +7,10 @@ import numpy as np
 import datetime as dt
 from pysolar.solar import get_altitude, get_azimuth
 
-from config.cluster import cluster
+from server_config import cluster
 from dartwrf.obs import calculate_obs_locations as col
 from dartwrf import utils
-
-
-#####################
-# Global variables
-from dartwrf.obskind import obs_kind_nrs  # DART internal indices
+from obskind import obs_kind_nrs # dictionary string => DART internal indices
 
 # position on earth for RTTOV ray geometry
 lat0 = 45.
diff --git a/dartwrf/create_wbubble_wrfinput.py b/dartwrf/create_wbubble_wrfinput.py
index f586102..5f354ad 100644
--- a/dartwrf/create_wbubble_wrfinput.py
+++ b/dartwrf/create_wbubble_wrfinput.py
@@ -3,8 +3,8 @@ from re import U
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 import netCDF4 as nc
 
 dx_km = 2
diff --git a/dartwrf/dart_nml.py b/dartwrf/dart_nml.py
index 2e4bf7c..15113e4 100644
--- a/dartwrf/dart_nml.py
+++ b/dartwrf/dart_nml.py
@@ -1,7 +1,7 @@
 from dartwrf.utils import append_file
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 earth_radius_km = 6370
 
diff --git a/dartwrf/evaluate_obs_space.py b/dartwrf/evaluate_obs_space.py
index 5cabade..5b113dd 100755
--- a/dartwrf/evaluate_obs_space.py
+++ b/dartwrf/evaluate_obs_space.py
@@ -3,8 +3,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf import assim_synth_obs as aso
 
 def get_previous_obsseq_file(time):
diff --git a/dartwrf/evaluate_posterior.py b/dartwrf/evaluate_posterior.py
index 0f97783..6b3c9a6 100755
--- a/dartwrf/evaluate_posterior.py
+++ b/dartwrf/evaluate_posterior.py
@@ -3,8 +3,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf import assim_synth_obs as aso
 
 
@@ -24,4 +24,4 @@ if __name__ == "__main__":
                oso_input = cluster.archivedir+'/obs_seq_out' + assim_time.strftime("/%Y-%m-%d_%H:%M_obs_seq.out")
           shutil.copy(oso_input, cluster.dart_rundir+'/obs_seq.out')
 
-     aso.evaluate(assim_time, output_format="%Y-%m-%d_%H:%M_obs_seq.final-eval_posterior_allobs")
\ No newline at end of file
+     aso.evaluate(assim_time, output_format="%Y-%m-%d_%H:%M_obs_seq.final-evaluate")
\ No newline at end of file
diff --git a/dartwrf/evaluate_prior.py b/dartwrf/evaluate_prior.py
index 5340e5c..fec5f87 100755
--- a/dartwrf/evaluate_prior.py
+++ b/dartwrf/evaluate_prior.py
@@ -3,8 +3,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove, print, shell
 from dartwrf import assim_synth_obs as aso
 
diff --git a/dartwrf/obs/calculate_obs_locations.py b/dartwrf/obs/calculate_obs_locations.py
index e381133..422808f 100755
--- a/dartwrf/obs/calculate_obs_locations.py
+++ b/dartwrf/obs/calculate_obs_locations.py
@@ -7,8 +7,8 @@ import numpy as np
 import datetime as dt
 import xarray as xr
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 #####################
 # Global variables
diff --git a/dartwrf/obsseq_2dim.py b/dartwrf/obsseq_2dim.py
index 46bd605..ec08e03 100755
--- a/dartwrf/obsseq_2dim.py
+++ b/dartwrf/obsseq_2dim.py
@@ -19,7 +19,7 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cluster import cluster
+from server_config import cluster
 from dartwrf import utils
 from dartwrf import assim_synth_obs as aso
 from dartwrf import obsseq
diff --git a/dartwrf/obsseq_to_netcdf.py b/dartwrf/obsseq_to_netcdf.py
index 2b5ba45..7bdc670 100644
--- a/dartwrf/obsseq_to_netcdf.py
+++ b/dartwrf/obsseq_to_netcdf.py
@@ -1,7 +1,7 @@
 import os, sys, glob, warnings
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 import dartwrf.run_obs_diag as rod
 
 def listdir_dirs(path):
diff --git a/dartwrf/prep_IC_prior.py b/dartwrf/prep_IC_prior.py
index cff04dc..9b27d51 100755
--- a/dartwrf/prep_IC_prior.py
+++ b/dartwrf/prep_IC_prior.py
@@ -2,8 +2,8 @@ import os, sys, warnings, glob
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import copy, clean_wrfdir, try_remove
 
 """
diff --git a/dartwrf/prepare_namelist.py b/dartwrf/prepare_namelist.py
index d223aa3..293fc23 100755
--- a/dartwrf/prepare_namelist.py
+++ b/dartwrf/prepare_namelist.py
@@ -12,8 +12,8 @@ import os, sys, shutil, warnings
 import datetime as dt
 from docopt import docopt
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import sed_inplace, copy, symlink, mkdir
 
 def run(iens, begin, end, hist_interval=5, radt=5, archive=True,
diff --git a/dartwrf/prepare_wrfrundir.py b/dartwrf/prepare_wrfrundir.py
index 32e8c98..5fc2c5c 100755
--- a/dartwrf/prepare_wrfrundir.py
+++ b/dartwrf/prepare_wrfrundir.py
@@ -9,8 +9,8 @@ Returns:
 import os, sys, shutil
 import datetime as dt
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 from utils import symlink, copy, link_contents
 import prepare_namelist
diff --git a/dartwrf/run_obs_diag.py b/dartwrf/run_obs_diag.py
index bd1ef75..49132b0 100644
--- a/dartwrf/run_obs_diag.py
+++ b/dartwrf/run_obs_diag.py
@@ -1,7 +1,7 @@
 import os, sys, shutil, glob
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import symlink, copy, sed_inplace, append_file, shell
 
 rundir_program = '/home/fs71386/lkugler/data/run_DART/'
diff --git a/dartwrf/update_IC.py b/dartwrf/update_IC.py
index 60cec76..5e74b46 100755
--- a/dartwrf/update_IC.py
+++ b/dartwrf/update_IC.py
@@ -2,8 +2,8 @@ import os, sys, warnings
 import datetime as dt
 import netCDF4 as nc
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 def update_initials_in_WRF_rundir(time):
     """Updates wrfrst-files in `/run_WRF/` directory 
diff --git a/dartwrf/wrfinput_add_geo.py b/dartwrf/wrfinput_add_geo.py
index 1a2c266..c4317bf 100755
--- a/dartwrf/wrfinput_add_geo.py
+++ b/dartwrf/wrfinput_add_geo.py
@@ -11,8 +11,8 @@ example call:
 import os, sys
 import netCDF4 as nc
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 def run(geo_data_file, wrfinput_file):
     geo_ds = nc.Dataset(geo_data_file, 'r')
diff --git a/dartwrf/wrfout_add_geo.py b/dartwrf/wrfout_add_geo.py
index a13737c..48a9b96 100755
--- a/dartwrf/wrfout_add_geo.py
+++ b/dartwrf/wrfout_add_geo.py
@@ -1,8 +1,8 @@
 import os, sys
 import netCDF4 as nc
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 fields_old = ["XLAT_M",   "XLONG_M",      "CLAT",
                 "XLONG_U",  "XLONG_V",     "XLAT_U",    "XLAT_V"]
-- 
GitLab