Fix for ww3_ta1 regtest and ww3_from_ftp.sh version echo string#992
Merged
JessicaMeixner-NOAA merged 2 commits intoApr 25, 2023
Merged
Conversation
JessicaMeixner-NOAA
approved these changes
Apr 24, 2023
Collaborator
JessicaMeixner-NOAA
left a comment
There was a problem hiding this comment.
Got identical results to what @MatthewMasarik-NOAA has already posted. Thanks for finding and fixing this, Matt!
MatthewMasarik-NOAA
added a commit
to MatthewMasarik-NOAA/WW3
that referenced
this pull request
Apr 26, 2023
* develop: Check if irqrs is associated before use in w3iorsmd.F90 (NOAA-EMC#1001) Fix 0 files differ and ww3_from_ftp.sh file version string (NOAA-EMC#992)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request Summary
A fix for the
ww3_ta1result frommatrix.comp, additionally a fix forww3_from_ftp.shoutput.Description
Two small fixes:
ww3_ta1result frommatrix.compthat0 files differ. This problem occurs whenrun_cmake_testtries to create soft link from a file in theinput/directory, to thework/directory. However, the file it's trying to link (anl.grbtxt) does not exist in theinputdirectory, so thework/directory then contains a broken link to this file. Whenmatrix.compis executed, it finds this broken link in the respectivework/directories and leads to the0 files differresult. The solution is a one-line fix to only link this file if it exist ininput/.ww3_from_ftp.sh. Near the end of this script, text including a shell variable is enclosed in single quotes (' ') for anecho, which does not evaluate the variable when printed to the screen. This is fixed by switching to double quotes (" ") to allow for shell variable evaluation.run_cmake_test: https://github.com/MatthewMasarik-NOAA/WW3/blob/dc8368d7c8d10b716f111da8230a046d1b9f996c/regtests/bin/run_cmake_test#L2286ww3_from_ftp.sh: https://github.com/MatthewMasarik-NOAA/WW3/blob/dc8368d7c8d10b716f111da8230a046d1b9f996c/model/bin/ww3_from_ftp.sh#L123Please also include the following information:
Issue(s) addressed
Commit Message
Fix '0 files differ' and ww3_from_ftp.sh file version string
Check list
Testing
intel/heraww3_ta1fix.ww3_from_ftp.sh, andrun_cmake_test) outside the F90 source.hera,intel.ww3_ta1, no longer a non-identical.vs. develop
dev.matrixCompSummary.txt
dev.matrixCompFull.txt
dev.matrixDiff.txt
vs. itself
fix.matrixCompSummary.txt
fix.matrixCompFull.txt
fix.matrixDiff.txt