From 5e8198b81d61ed581491c642284d5af353e41f50 Mon Sep 17 00:00:00 2001 From: Alice Bertini Date: Tue, 19 Feb 2019 14:14:39 -0700 Subject: [PATCH] update for stand-alone CMIP6 query outside of a caseroot --- scripts/Tools/archive_metadata | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/Tools/archive_metadata b/scripts/Tools/archive_metadata index af1a39bd2204..85f4930b7ec8 100755 --- a/scripts/Tools/archive_metadata +++ b/scripts/Tools/archive_metadata @@ -1429,13 +1429,6 @@ def main_func(options): (case_dict, username, password) = initialize_main(options) - # loop through the _xml_vars gathering values - with Case(case_dict['CASEROOT'], read_only=True) as case: - if case_dict['dryrun']: - logger.info('Dryrun - calling get_case_vars') - else: - case_dict = get_case_vars(case_dict, case) - # check if query_cmip6 argument is specified if options.query_cmip6: if case_dict['dryrun']: @@ -1443,10 +1436,10 @@ def main_func(options): else: if query_expdb_cmip6(case_dict, username, password): logger.info('Casename "%s" CMIP6 global attribute '\ - 'metadata written to "./archive_files/%s" ' \ + 'metadata written to "%s/archive_files/%s" ' \ 'from "%s"', - case_dict['q_casename'], case_dict['q_outfile'], - case_dict['query_expdb_url']) + case_dict['workdir'], case_dict['q_casename'], + case_dict['q_outfile'], case_dict['query_expdb_url']) logger.info('Successful completion of archive_metadata') sys.exit(0) else: @@ -1455,6 +1448,13 @@ def main_func(options): case_dict['q_casename'], case_dict['query_expdb_url']) sys.exit(1) + # loop through the _xml_vars gathering values + with Case(case_dict['CASEROOT'], read_only=True) as case: + if case_dict['dryrun']: + logger.info('Dryrun - calling get_case_vars') + else: + case_dict = get_case_vars(case_dict, case) + # check reserved casename expdb for CMIP6 experiments if case_dict['expType'].lower() == 'cmip6': if case_dict['dryrun']: