Skip to content

expand user home path '~' #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2025
Merged

expand user home path '~' #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1946f3e
expand user home path '~'
weiyuan-jiang Jul 18, 2025
d19f146
Update CHANGELOG.md
sdrabenh Aug 25, 2025
eb69cc2
Merge branch 'main' into feature/wjiang/expand_userpath
sdrabenh Aug 25, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion pre/remap_restart/remap_catchANDcn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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')
Expand All @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions pre/remap_restart/remap_command_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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":
Expand Down
4 changes: 2 additions & 2 deletions pre/remap_restart/remap_questions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down