diff --git a/.gitignore b/.gitignore index 29747a5fb5b90239cef82909abe6def18f991c51..39be9dbf0eda8bdd68103ce0c44fe93d39c60ebd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,9 @@ slurm-scripts/ logs/ dask-worker-space/ -DART_WRF.egg* +dartwrf.egg* build* ._* .vscode dist/ -experimental/ \ No newline at end of file +experimental/ diff --git a/dartwrf/assim_synth_obs.py b/dartwrf/assim_synth_obs.py index 35dcbb799df7f497afb6aeb79cfb13606cec15c4..29845ecc9cdc82a02aefc897afa539d7189bc20e 100755 --- a/dartwrf/assim_synth_obs.py +++ b/dartwrf/assim_synth_obs.py @@ -5,10 +5,10 @@ import numpy as np from scipy.interpolate import interp1d from config.cfg import exp, cluster -from utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove, print -import create_obsseq as osq -import wrfout_add_geo -import obsseq +from .utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove, print +from . import create_obsseq as osq +from . import wrfout_add_geo +from . import obsseq earth_radius_km = 6370 diff --git a/dartwrf/cleanup_exp.py b/dartwrf/cleanup_exp.py index bee76fe30311448c0d3771e8aac6677f4adbd5cf..244c30690de1871c08d580ea28c9afe29033757b 100644 --- a/dartwrf/cleanup_exp.py +++ b/dartwrf/cleanup_exp.py @@ -1,6 +1,6 @@ import os, glob from config.cfg import exp, cluster -from utils import try_remove +from .utils import try_remove """Run this script after an experiment to reduce cluster disk usage. diff --git a/dartwrf/link_dart_rttov.py b/dartwrf/link_dart_rttov.py index ec6d0aed9ae4a29419be63d7da6cc7eab41a9062..c5f8d849ed518e328d8fb1f738c3c7282535e0f8 100644 --- a/dartwrf/link_dart_rttov.py +++ b/dartwrf/link_dart_rttov.py @@ -1,6 +1,6 @@ import os from config.cfg import exp, cluster -from utils import symlink, copy_scp_srvx8, copy, sed_inplace +from .utils import symlink, copy_scp_srvx8, copy, sed_inplace joinp = os.path.join diff --git a/dartwrf/obsseq.py b/dartwrf/obsseq.py old mode 100644 new mode 100755 index 1a72ad3546f66410bda59d7508def5fc20e38d2d..5a06a7ceea4505d5bbc1ee670e787a0251535e40 --- a/dartwrf/obsseq.py +++ b/dartwrf/obsseq.py @@ -3,7 +3,7 @@ import numpy as np import pandas as pd from config.cfg import exp, cluster -from utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove +from .utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove def plot_box(m, lat, lon, label="", **kwargs): diff --git a/dartwrf/prep_IC_prior.py b/dartwrf/prep_IC_prior.py index a4d2a73d47c89cc2b983adb80dd16c0a9878cccd..1c5372ff9a9b714f26e2eac76889f0140d3f70d8 100755 --- a/dartwrf/prep_IC_prior.py +++ b/dartwrf/prep_IC_prior.py @@ -2,7 +2,7 @@ import os, sys, warnings, glob import datetime as dt from config.cfg import exp, cluster -from utils import copy, clean_wrfdir, try_remove +from .utils import copy, clean_wrfdir, try_remove """ Sets initial condition data (wrfinput/wrfrst file) in the run_WRF directory for each ensemble member diff --git a/dartwrf/prepare_namelist.py b/dartwrf/prepare_namelist.py index 4f2672b68204ad8963d27b2ed3fb4b5c3478524b..28bac3ede79721a0b1528894bd279ca4e53e072a 100755 --- a/dartwrf/prepare_namelist.py +++ b/dartwrf/prepare_namelist.py @@ -12,7 +12,7 @@ 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 +from .utils import sed_inplace, copy, symlink, mkdir def run(iens, begin, end, hist_interval=5, radt=5, archive=True, restart=False, restart_interval=720): diff --git a/dartwrf/prepare_wrfrundir.py b/dartwrf/prepare_wrfrundir.py index 981c31fc4da5062fbed52676d83a36e99007ae5e..d6ba5f6fb6a82c6b8af4ca9e88f43cf079066e56 100755 --- a/dartwrf/prepare_wrfrundir.py +++ b/dartwrf/prepare_wrfrundir.py @@ -1,9 +1,9 @@ import os, sys, shutil import datetime as dt from config.cfg import exp, cluster -from utils import symlink, copy, link_contents +from .utils import symlink, copy, link_contents -import prepare_namelist +from . import prepare_namelist init_time = dt.datetime.strptime(sys.argv[1], '%Y-%m-%d_%H:%M') diff --git a/dartwrf/run_obs_diag.py b/dartwrf/run_obs_diag.py index d3d3feb79d72e983a3e05e11d0e42516e3445629..15064774f1aa07f95cc3b539cf713f6411844292 100644 --- a/dartwrf/run_obs_diag.py +++ b/dartwrf/run_obs_diag.py @@ -1,6 +1,6 @@ import os, sys, shutil, glob from config.cfg import exp, cluster -from utils import symlink, copy, sed_inplace, append_file +from .utils import symlink, copy, sed_inplace, append_file rundir_program = '/home/fs71386/lkugler/data/run_DART/' diff --git a/setup.py b/setup.py index 4d0f4d4cf7d27474be3fa24f2635f6da847b191e..8438faa5f1e9e9d3e79e19aefd156658f461774d 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ def read_requirements(fname): setuptools.setup( - name="DART-WRF", + name="dartwrf", version="2021.12.14", author="Lukas Kugler", author_email="lukas.kugler@univie.ac.at",