Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
61a7a3a
Squashed 'scripts/python/tc_diag_driver/' content from commit 2faf117e3
JohnHalleyGotway Sep 19, 2023
4b93ed8
Merge commit '61a7a3ad8cc5b6c12012980e9745fa3551416439' as 'scripts/p…
JohnHalleyGotway Sep 19, 2023
17c8705
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Sep 28, 2023
807106e
Per #2550, restructuring the tc_diag python directory.
JohnHalleyGotway Sep 28, 2023
6a5ee58
Per #2550, trying to install python directories but it isn't working …
JohnHalleyGotway Sep 28, 2023
b08b21a
Per #2550, more restructuring.
JohnHalleyGotway Sep 28, 2023
08a6b74
Per #2550, update Makefile structure to install the python tc_diag co…
JohnHalleyGotway Sep 29, 2023
d443c5c
Per #2550, renaming compute_tc_diagnostics.py to compute_tc_diag.py.
JohnHalleyGotway Sep 29, 2023
f61fba9
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Sep 29, 2023
dc879a0
Per #2550, update tc_diag to import the atcf_tools, diag_lib, and tc_…
JohnHalleyGotway Sep 29, 2023
1f7efd0
Per #2550, only whitespace changes
JohnHalleyGotway Oct 2, 2023
547ffa4
Per #2550, update tc_diag_driver code to version 0.6.1 from https://g…
JohnHalleyGotway Oct 3, 2023
8858160
Per #2550, add the global distance to land data file to the tc_data d…
JohnHalleyGotway Oct 3, 2023
2a16674
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Oct 4, 2023
6350597
Per #2550, add scripts/python/tc_diag/config directory and stash the …
JohnHalleyGotway Oct 4, 2023
a45d5d7
Per #2550, update configure and Makefile.in for tc_diag/config after …
JohnHalleyGotway Oct 4, 2023
559fd12
Per #2550, update to version 0.7.0 of tc_diag_driver to make the land…
JohnHalleyGotway Oct 6, 2023
d0a9a8a
Per #2550, work in progress. Updates to compute_tc_diag.yml to use tc…
JohnHalleyGotway Oct 6, 2023
676231f
Per #2550, work in progress. Getting closer but getting a segfault wh…
JohnHalleyGotway Oct 7, 2023
e1abc15
Per #2550, add StringArray::serialize() member function.
JohnHalleyGotway Oct 13, 2023
782f0c6
Per #2550, allow option to disable the alignment of decimals for Asci…
JohnHalleyGotway Oct 13, 2023
b253946
Per #2550, enhance NumArray::sort_array(bool increasing) to support s…
JohnHalleyGotway Oct 13, 2023
0b1b49d
Per #2550, ensure that at least one of the three output types is requ…
JohnHalleyGotway Oct 13, 2023
f0e52c9
Per #2550, update the unit test to write 3 output types and the xml t…
JohnHalleyGotway Oct 13, 2023
596d262
Per #2550, update tc_diag python embedding logic to keep track of the…
JohnHalleyGotway Oct 13, 2023
56c4b14
Per #2550, major upgrade to tc_diag to actually retrieve the diagnost…
JohnHalleyGotway Oct 13, 2023
7af67a8
Per #2550, need to install python/tc_diag/config directory.
JohnHalleyGotway Oct 18, 2023
92812b6
Per #2550, install python/tc_diag/config directory.
JohnHalleyGotway Oct 18, 2023
3bfb46b
Per #2550, need to call Xarray.data with this python version to avoid…
JohnHalleyGotway Oct 18, 2023
e3db0c6
Per #2550, add SKIP_DATA_NAMES and make the script more pythonic
JohnHalleyGotway Oct 18, 2023
65e7e10
Per #2550, just make ConcatString::replace() error message more infor…
JohnHalleyGotway Oct 23, 2023
3caee17
Per #2550, add output_base_format and switch from nc_rng_azi_flag to …
JohnHalleyGotway Oct 23, 2023
7fe5ab0
Merge branch 'feature_2550_compute_diagnostics' of https://github.com…
JohnHalleyGotway Oct 23, 2023
caaa7aa
Per #2550, don't actually create the output file streams until we're …
JohnHalleyGotway Oct 23, 2023
8f38418
Per #2550, the output dicts must be defined global
JohnHalleyGotway Oct 23, 2023
a2bc140
Per #2550, move the checking for non-zero diags further down in the l…
JohnHalleyGotway Oct 23, 2023
a8dd44d
Per #2550, reverting back
JohnHalleyGotway Oct 23, 2023
fa7160c
Per #2550, correct writing the number of custom diags
JohnHalleyGotway Oct 23, 2023
730a27f
Per #2550, incorporate version TC-Diag python driver code version 0.8…
JohnHalleyGotway Oct 24, 2023
e2458c1
Per #2550, add new met_post_process.py file to the list of python scr…
JohnHalleyGotway Oct 24, 2023
c0f827e
Per #2550, fix list of diags to skip from 850DVRG to 850DVG
JohnHalleyGotway Oct 24, 2023
46b0640
Per #2550, pass the diagnostics comments through to the output cira d…
JohnHalleyGotway Oct 24, 2023
fa166f8
Per #2550, update StringArray::serialize(const char *sep=" ") to take…
JohnHalleyGotway Oct 25, 2023
8e2ae72
Per #2550, add support for the override_diags config option. Still ne…
JohnHalleyGotway Oct 25, 2023
054d2a0
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Oct 25, 2023
58beee3
Per #2550, update the documentation about override_diags and add to t…
JohnHalleyGotway Oct 25, 2023
f9e26c4
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Oct 26, 2023
289985d
Per #2550, update compute_tc_diag.py to serve up diagnostics in the e…
JohnHalleyGotway Oct 26, 2023
a2a2b18
Per #2550, correct the naming convention from DVG to DVRG to match pr…
JohnHalleyGotway Oct 26, 2023
6e1fa94
Per #2550, add long_name and domain NetCDF variable attributes for ea…
JohnHalleyGotway Oct 27, 2023
25037d4
Per #2550, slight tweak to long names
JohnHalleyGotway Oct 27, 2023
9833cd3
Per #2550, enable separate regridding logic for each field and also w…
JohnHalleyGotway Oct 27, 2023
812067a
Per #2550, rename read/write_tmp_tc_diag.py to just read/write_tmp_di…
JohnHalleyGotway Oct 30, 2023
62d2267
Per #2550, update TC diag python script to group all the data into a …
JohnHalleyGotway Oct 30, 2023
3951610
Per #2550, delete unneeded read_tmp_diag.py script since the function…
JohnHalleyGotway Oct 30, 2023
867c40b
Per #2550, update compute_tc_diag.py to group all the diag data into …
JohnHalleyGotway Oct 30, 2023
6d48512
Per #2550, fix divergence abbreviation as DVRG in the MET python script
JohnHalleyGotway Oct 31, 2023
4822197
Per #2550, update the pyembed logic to support MET_PYTHON_EXE for pyt…
JohnHalleyGotway Oct 31, 2023
c5ab032
Per #2550, add support for MET_PYTHON_EXE for python embedding in TC-…
JohnHalleyGotway Oct 31, 2023
ad217f1
Per #2550, make DEBUG level consistently 3 when reporting the python …
JohnHalleyGotway Oct 31, 2023
49884c3
Per #2550, remove censor_thresh, censor_val, and convert(x) from the …
JohnHalleyGotway Oct 31, 2023
b560cbd
Per #2550, move progress updates out of code comments and into GitHub…
JohnHalleyGotway Nov 1, 2023
d6ee8d6
Per #2550, update tc_diag_driver config files to report Z in units of…
JohnHalleyGotway Nov 1, 2023
62f8884
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Nov 6, 2023
1265748
Per #2550, update long names to match those listed in https://docs.go…
JohnHalleyGotway Nov 6, 2023
4e08f20
Per #2550, add yaml to the list of required Python packages for MET l…
JohnHalleyGotway Nov 7, 2023
0bde3c2
Per #2550, update the MET Dockerfiles to build from METbaseimage vers…
JohnHalleyGotway Nov 7, 2023
678b4eb
Per #2550, update the METbaseimage version number in 2 more spots. Th…
JohnHalleyGotway Nov 7, 2023
3e0aa7d
Per #2550, comment out the unused code from cyclindrical_grid.py to e…
JohnHalleyGotway Nov 7, 2023
9b19b9b
Per #2550, redirect standard error to standard out so that it can be …
JohnHalleyGotway Nov 9, 2023
208217e
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Nov 9, 2023
9a18a9f
Per #2550, update the MET Dockerfiles to call to update the OS as ne…
JohnHalleyGotway Nov 10, 2023
e354b55
Per #2550, merge in changes for tc_diag_driver version 0.9.0 which in…
JohnHalleyGotway Nov 14, 2023
b6cb0be
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Nov 16, 2023
bb51db9
Per #2550, update list of expected output file names for unit_tc_diag…
JohnHalleyGotway Nov 16, 2023
b3b767c
Per #2550, TC-Diag documentation updates recommended by @jvigh.
JohnHalleyGotway Nov 17, 2023
ddc49b0
Per #2550, remove note about missing functionality since its been add…
JohnHalleyGotway Nov 17, 2023
d1cb7e6
Per #2550, fix typo
JohnHalleyGotway Nov 17, 2023
769d442
Merge remote-tracking branch 'origin/develop' into feature_2550_compu…
JohnHalleyGotway Nov 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2021 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -136,8 +136,8 @@ am__recursive_targets = \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
Expand All @@ -154,14 +154,11 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = data src scripts/Rscripts scripts/python \
internal/test_util
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in INSTALL \
compile config.guess config.sub depcomp install-sh missing \
ylwrap
README.md compile config.guess config.sub depcomp install-sh \
missing ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Expand Down Expand Up @@ -200,6 +197,8 @@ am__relativize = \
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
Expand All @@ -215,8 +214,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSCOPE = @CSCOPE@
CTAGS = @CTAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
Expand All @@ -226,13 +226,12 @@ DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
F77 = @F77@
FC_LIBS = @FC_LIBS@
FFLAGS = @FFLAGS@
FLIBS = @FLIBS@
GREP = @GREP@
GRIB2CLIB_NAME = @GRIB2CLIB_NAME@
GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@
GRIB2_MET_LIBS = @GRIB2_MET_LIBS@
Expand Down Expand Up @@ -537,7 +536,6 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

Expand Down Expand Up @@ -624,6 +622,10 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)

dist-zstd: distdir
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
$(am__post_remove_distdir)

dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
Expand Down Expand Up @@ -666,6 +668,8 @@ distcheck: dist
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
Expand All @@ -681,7 +685,7 @@ distcheck: dist
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
Expand Down Expand Up @@ -843,17 +847,17 @@ uninstall-am:
am--refresh check check-am clean clean-cscope clean-generic \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
dist-zip dist-zstd distcheck distclean distclean-generic \
distclean-hdr distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-am uninstall uninstall-am

.PRECIOUS: Makefile

Expand Down
Loading