From 0b899c7883e569ad00fbc3fd338851957c48198a Mon Sep 17 00:00:00 2001
From: Kugler Lukas <lukas.kugler@univie.ac.at>
Date: Tue, 20 Oct 2020 17:28:43 +0200
Subject: [PATCH] fix

---
 config/cfg.py            | 13 +++++++++----
 scripts/create_obsseq.py | 11 ++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/cfg.py b/config/cfg.py
index ab01c00..0b1d737 100755
--- a/config/cfg.py
+++ b/config/cfg.py
@@ -9,7 +9,7 @@ class ExperimentConfiguration(object):
 
 
 exp = ExperimentConfiguration()
-exp.expname = "exp_v1.12_LMU_so_VIS"
+exp.expname = "exp_v1.12_LMU_radar_vertloc1km"
 exp.model_dx = 2000
 exp.timestep = 10
 exp.n_ens = 40
@@ -19,10 +19,15 @@ n_obs = 64  # radar: n_obs for each observation height level
 
 vis = dict(sat=True, channel=1, n_obs=n_obs, err_std=0.03,
            cov_loc_radius_km=10)
-radar = dict(sat=False, kind='radar', n_obs=n_obs, err_std=5.,
-             cov_loc_radius_km=10, cov_loc_vert_km=5)
+wv = dict(sat=True, channel=6, n_obs=n_obs, err_std=5.,
+           cov_loc_radius_km=10)
+
+radar = dict(sat=False, kind='RADAR', n_obs=n_obs, err_std=5.,
+             cov_loc_radius_km=10, cov_loc_vert_km=1)
+psfc = dict(sat=False, kind='PSFC', n_obs=n_obs, err_std=50.,
+             cov_loc_radius_km=10)
 
-exp.observations = [vis, ]
+exp.observations = [radar, ]
 
 # directory paths depend on the name of the experiment
 cluster.expname = exp.expname
diff --git a/scripts/create_obsseq.py b/scripts/create_obsseq.py
index d803534..b292d40 100755
--- a/scripts/create_obsseq.py
+++ b/scripts/create_obsseq.py
@@ -121,7 +121,8 @@ def write_generic_obsseq(obs_name, obs_kind_nr, error_var, coords,
     if vert_coord_sfc:
         vert_coord_sys = -1
 
-    n_obs_str = str(int(n_obs))
+    n_obs = len(coords)
+    n_obs_str = str(n_obs)
     error_var = str(error_var)
     line_obstypedef = obs_kind_nr+' '+obs_name
     vert_coord_sys = str(vert_coord_sys)
@@ -299,13 +300,13 @@ def calc_obs_locations_3d(coords, heights):
 def generic_obs(obs_type, time_dt, coords, error_var, output_path='./'):
 
     obs_codes = {'RASO_T': {'name': 'RADIOSONDE_TEMPERATURE', 'nr': '5'},
-                 'RADAR': {'name': 'RADAR_REFLECTIVITY', 'nr': '37'}
-                 }
+                 'RADAR': {'name': 'RADAR_REFLECTIVITY', 'nr': '37'},
+                 'PSFC': {'name': 'LAND_SFC_PRESSURE', 'nr': '29'},}
 
-    heights = np.arange(1000, 15001, 1000)
+    heights = [5000., ] #np.arange(5000, 15001, 1000)
     coords = calc_obs_locations_3d(coords, heights)
 
-    dart_date_day, secs_thatday = get_dart_date(time_dt)
+    dart_date_day, secs_thatday = get_dart_date(add_timezone_UTC(time_dt))
     print('secs, days:', secs_thatday, dart_date_day)
 
     obs_name = obs_codes[obs_type]['name']
-- 
GitLab