From d6d77dbd2bd035fd1da90e9e22ca3f7b80983ad8 Mon Sep 17 00:00:00 2001 From: lkugler <lukas.kugler@gmail.com> Date: Wed, 2 Nov 2022 18:34:29 +0100 Subject: [PATCH] . --- dartwrf/assim_synth_obs.py | 2 +- dartwrf/create_obsseq.py | 4 ++-- dartwrf/evaluate_posterior.py | 1 - dartwrf/evaluate_prior.py | 1 + dartwrf/obsseq_to_netcdf.py | 1 + dartwrf/prepare_namelist.py | 1 + dartwrf/run_obs_diag.py | 2 +- dartwrf/wrfout_add_geo.py | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dartwrf/assim_synth_obs.py b/dartwrf/assim_synth_obs.py index 2d5db69..bc96d64 100755 --- a/dartwrf/assim_synth_obs.py +++ b/dartwrf/assim_synth_obs.py @@ -5,10 +5,10 @@ import numpy as np from config.cfg import exp, cluster from dartwrf.utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove, print, shell +from dartwrf.obs import error_models as err import dartwrf.create_obsseq as osq from dartwrf import wrfout_add_geo from dartwrf import obsseq -from dartwrf.obs import error_models as err earth_radius_km = 6370 diff --git a/dartwrf/create_obsseq.py b/dartwrf/create_obsseq.py index 9581d66..2b2e9c4 100755 --- a/dartwrf/create_obsseq.py +++ b/dartwrf/create_obsseq.py @@ -237,8 +237,8 @@ def create_obs_seq_in(time_dt, list_obscfg, assert len(coords) == n_obs, (len(coords), n_obs) # check if functions did what they supposed to for lat, lon in coords: - assert lat < 90 & lat > -90 - assert lon < 180 & lon > -180 + assert (lat < 90) & (lat > -90) + assert (lon < 180) & (lon > -180) kind = obscfg['kind'] print('obstype', kind) diff --git a/dartwrf/evaluate_posterior.py b/dartwrf/evaluate_posterior.py index e1e24a4..66e7ea2 100755 --- a/dartwrf/evaluate_posterior.py +++ b/dartwrf/evaluate_posterior.py @@ -7,7 +7,6 @@ from config.cfg import exp, cluster from dartwrf import assim_synth_obs as aso - if __name__ == "__main__": assim_time = dt.datetime.strptime(sys.argv[1], "%Y-%m-%d_%H:%M") diff --git a/dartwrf/evaluate_prior.py b/dartwrf/evaluate_prior.py index 0e0ec66..43a4388 100755 --- a/dartwrf/evaluate_prior.py +++ b/dartwrf/evaluate_prior.py @@ -6,6 +6,7 @@ import numpy as np from config.cfg import exp, cluster from dartwrf.utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove, print, shell from dartwrf import assim_synth_obs as aso + from osselyze.utils import get_prior_config if __name__ == "__main__": diff --git a/dartwrf/obsseq_to_netcdf.py b/dartwrf/obsseq_to_netcdf.py index ad41ffd..43feeda 100644 --- a/dartwrf/obsseq_to_netcdf.py +++ b/dartwrf/obsseq_to_netcdf.py @@ -1,4 +1,5 @@ import os, sys, glob, warnings + from config.cfg import exp, cluster import run_obs_diag as rod diff --git a/dartwrf/prepare_namelist.py b/dartwrf/prepare_namelist.py index 4f2672b..71cc747 100755 --- a/dartwrf/prepare_namelist.py +++ b/dartwrf/prepare_namelist.py @@ -11,6 +11,7 @@ Options: import os, sys, shutil, warnings import datetime as dt from docopt import docopt + from config.cfg import exp, cluster from utils import sed_inplace, copy, symlink, mkdir diff --git a/dartwrf/run_obs_diag.py b/dartwrf/run_obs_diag.py index fb327b5..5499103 100644 --- a/dartwrf/run_obs_diag.py +++ b/dartwrf/run_obs_diag.py @@ -1,10 +1,10 @@ import os, sys, shutil, glob + from config.cfg import exp, cluster from utils import symlink, copy, sed_inplace, append_file, shell rundir_program = '/home/fs71386/lkugler/data/run_DART/' - def prepare(obserr_iszero='.true.'): copy(cluster.scriptsdir+'/../templates/input.eval.nml', rundir_program+'/input.nml') diff --git a/dartwrf/wrfout_add_geo.py b/dartwrf/wrfout_add_geo.py index 08e6127..e399dcf 100755 --- a/dartwrf/wrfout_add_geo.py +++ b/dartwrf/wrfout_add_geo.py @@ -9,6 +9,7 @@ Example call: """ import os, sys import netCDF4 as nc + from config.cfg import exp, cluster fields_old = ["XLAT_M", "XLONG_M", "CLAT", -- GitLab