-
Notifications
You must be signed in to change notification settings - Fork 181
Remove standard_wrf_dirs and use wildcard for WRF paths #248
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.
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
Open
IncubatorShokuhou
wants to merge
2
commits into
wrf-model:develop
Choose a base branch
from
IncubatorShokuhou:standard_wrd_dir
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -192,7 +192,6 @@ if [ $? -eq 0 ] ; then | |
| fi | ||
|
|
||
| wrf_dir="none" | ||
| standard_wrf_dirs="WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3" | ||
|
|
||
| if [ ${nowrf} -eq 0 ]; then | ||
| # | ||
|
|
@@ -201,14 +200,25 @@ if [ ${nowrf} -eq 0 ]; then | |
| # the WRF I/O library from the code in $WRF_DIR | ||
| # | ||
| if [ -z "$WRF_DIR" ]; then | ||
| # for d in WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3; do | ||
| for d in ${standard_wrf_dirs}; do | ||
| if [ -e ../${d}/external/io_netcdf/libwrfio_nf.a ]; then | ||
| echo "Found what looks like a valid WRF I/O library in ../${d}" | ||
| wrf_dir="../${d}" | ||
| # find WRF dir | ||
| if [ -e "../WRF/external/io_netcdf/libwrfio_nf.a" ]; then | ||
| echo "Found what looks like a valid WRF I/O library in ../WRF" | ||
| WRF_DIR="../WRF" | ||
| else | ||
| # If the WRF directory does not exist or libwrfio_nf.a is not found, search for directories starting with WRF-4 in descending order of version number | ||
| for dir in $(ls .. | grep '^WRF-4' | sort -rV); do | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Following the discussion on this PR, I'd suggest we change |
||
| if [ -e "../$dir/external/io_netcdf/libwrfio_nf.a" ]; then | ||
| echo "Found what looks like a valid WRF I/O library in ../$dir" | ||
| WRF_DIR="../$dir" | ||
| break | ||
| fi | ||
| done | ||
| fi | ||
| done | ||
| # If still not found, finally try to search for the WRFV3 directory | ||
| if [ -z "$WRF_DIR" ] && [ -e "../WRFV3/external/io_netcdf/libwrfio_nf.a" ]; then | ||
| echo "Found what looks like a valid WRF I/O library in ../WRFV3" | ||
| WRF_DIR="../WRFV3" | ||
| fi | ||
| fi | ||
| else | ||
| if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then | ||
| echo "" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here, as well as on lines 212 and 219, I think
WRF_DIRshould bewrf_dir; otherwise, the check on line 235 will fail.