change config import

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'
 
 

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

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.

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

dartwrf/dart_nml.py

 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
 

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):

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

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
 

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

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

dartwrf/obsseq_to_netcdf.py

 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):

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
 
 """

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,

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

dartwrf/run_obs_diag.py

 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/'

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 

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')

dartwrf/wrfout_add_geo.py

 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"]