diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c07cdc..21633a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Expand user home path '~' in remap python scripts - Moved from `f2py2` to `f2py3` to enable removal of Python 2 support ### Fixed diff --git a/pre/remap_restart/remap_catchANDcn.py b/pre/remap_restart/remap_catchANDcn.py index de7c276..de29e1e 100755 --- a/pre/remap_restart/remap_catchANDcn.py +++ b/pre/remap_restart/remap_catchANDcn.py @@ -256,6 +256,7 @@ def copy_merra2(self): def ask_catch_questions(): catch_input_shared_rst_dir = '' def has_rs_rc_out(path): + path = os.path.abspath(os.path.expanduser(path)) if os.path.exists(path): dirs = os.listdir(path) if 'rs' in dirs and 'rc_out' in dirs: @@ -391,6 +392,7 @@ def has_catch_rst(text): dd = answers['input:shared:yyyymmddhh'][6:8] hh = answers['input:shared:yyyymmddhh'][8:10] + answers['input:shared:rst_dir'] = os.path.abspath(os.path.expanduser(answers['input:shared:rst_dir'])) rst_dir = answers['input:shared:rst_dir']+'/rs/ens0000/Y'+yyyy +'/M'+mm+'/' rst_file = glob.glob(rst_dir+'*catch*_internal_rst.'+yyyy+mm+dd+'_'+hh+'00')[0] idx1 = rst_file.find('catch') @@ -411,7 +413,7 @@ def has_catch_rst(text): answers['output:surface:remap_catch'] = True bc_base= answers['output:shared:bc_base'].split(": ")[-1] answers['output:shared:bc_base'] = bc_base - answers['output:shared:out_dir'] = os.path.abspath(answers['output:shared:out_dir']) + answers['output:shared:out_dir'] = os.path.abspath(os.path.expanduser(answers['output:shared:out_dir'])) if answers['output:surface:EASE_grid'] == 'Cubed-Sphere' : remove_ogrid_comment(answers, 'OUT') diff --git a/pre/remap_restart/remap_command_line.py b/pre/remap_restart/remap_command_line.py index 8a8ea85..6d1b351 100755 --- a/pre/remap_restart/remap_command_line.py +++ b/pre/remap_restart/remap_command_line.py @@ -94,7 +94,7 @@ def get_answers_from_command_line(cml): answers["input:shared:MERRA-2"] = cml.merra2 answers["input:shared:GEOS-IT"] = cml.geosit answers["input:shared:yyyymmddhh"] = cml.ymdh - answers["output:shared:out_dir"] = os.path.abspath(cml.out_dir + '/') + answers["output:shared:out_dir"] = os.path.abspath(os.path.expanduser(cml.out_dir)) if cml.merra2: init_merra2(answers) elif cml.geosit: @@ -105,7 +105,7 @@ def get_answers_from_command_line(cml): answers["input:shared:bc_version"] = cml.bcvin answers["input:surface:catch_model"]= cml.catch_model answers["input:shared:stretch"] = cml.in_stretch - answers["input:shared:rst_dir"] = os.path.abspath(cml.rst_dir + '/') + answers["input:shared:rst_dir"] = os.path.abspath(os.path.expanduser(cml.rst_dir)) fvcore_info(answers) ogrid = cml.oceanin if ogrid == "CS": diff --git a/pre/remap_restart/remap_questions.py b/pre/remap_restart/remap_questions.py index 84db949..01ffd7c 100755 --- a/pre/remap_restart/remap_questions.py +++ b/pre/remap_restart/remap_questions.py @@ -456,8 +456,8 @@ def ask_questions(): }, ] answers = questionary.prompt(questions) - answers['input:shared:rst_dir'] = os.path.abspath(answers['input:shared:rst_dir']) - answers['output:shared:out_dir'] = os.path.abspath(answers['output:shared:out_dir']) + answers['input:shared:rst_dir'] = os.path.abspath(os.path.expanduser(answers['input:shared:rst_dir'])) + answers['output:shared:out_dir'] = os.path.abspath(os.path.expanduser(answers['output:shared:out_dir'])) if answers.get('input:air:nlevel') : del answers['input:air:nlevel'] if answers["output:surface:remap"] and not answers["input:shared:MERRA-2"] and not answers["input:shared:GEOS-IT"]: