Hf ad3 #55
Hf ad3 #55
Conversation
…39) running parallel make. Only an issue if compiler does not allow switch to target a different directory to output mod files.
There was a problem hiding this comment.
So first I would say, that it's my opinion this does not rise to the level of a hot fix. That aside, the code changes I am seeing do not reflect the ad3 additions and have many other changes. If the target of this hotfix is master, then there are v7 edits coming in that should not.
@JessicaMeixner-NOAA good point! The bugfixes provided by @ukmo-ccbunney were made from the develop branch, so I'll change this to a bugfix branch into develop and contact the developer to provide a version of his fixes taking the master as the base branch. We can discuss with the code management group whether or not it qualifies as HF. I thus request your review on the basis of a reintegration to the develop branch. |
There was a problem hiding this comment.
@ukmo-ccbunney please review proposed changes by @JessicaMeixner-NOAA and provide your assessment.
|
Even moving this PR to develop, there are lots of changes in this code that are not relevant to the updates and should already be in develop. It needs to be cleaned up to only be the changes @ukmo-ccbunney made before it should be accepted. |
|
@ajhenrique, @JessicaMeixner-NOAA - My original PR was a bugfix made from develop branch of our repo (see develop...ukmo-waves:bf_paramake). As it currenly stands, the only file now showing any changes in this PR is the 'ad3' file which looks as I expect it to. |
Yes, I've redirected the pull request to the develop branch, so this is now the case. The request had been directed to the master, and that's where the changes were significant as mentioned by @JessicaMeixner-NOAA . Do you think your changes merit consideration for a HF to the master as well, or should we settle this as a develop branch change only? |
My opinion is to keep it just as a Bugfix - I don't think that its impact is significant enough to be added as a Hotfix to master as well. |
|
@ukmo-ccbunney I noticed that using mods= gives an error in our systems when there are no *.mod files. The correct form would be mods= Please check and confirm and I'll make the bugfix to ad3 when merging FB_libso. |
|
@ajhenrique - good spot. I've tested and your modification and it works correctly for me in the case of no .mod files. Thanks! |
When running parallel make, it is possible under certain circumstancs for ad3 to delete/move compiled MOD files too soon. This is only an issue if the compiler does not provide a switch to allow a different directory to specified to output MOD files. IWhen running parallel make, it is possible under certain circumstancs for ad3 to delete/move compiled MOD files too soon. This is only an issue if the compiler does not provide a switch to allow a different directory to specified to output MOD files. In this case, the ad3 program moves the MOD files from the scratch directory to the mod directory manually. Howerer, this uses a *.mod file glob which can erronously move/delete files from other compilation processes when running a parallel make.
In running the full regtests matrix prior to this pull request, there were the expected differences in mww3_test_03 case dN with load balancing options, and in mod_defs for one variation of 3 tests (mww3_test_07, ww3_tp2.7, and ww3_ts4). In my view these results are robust, they identify something that needs to be fine-combed in the generation of mod_defs for these latter tests, but that indicate that all branches are ready for merge.
regtests matrix output run on Theia
********************* non-identical cases ****************************
mww3_test_03/./work_PR3_UQ_MPI_d2 (8 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c (8 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2 (5 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2 (3 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c (3 files differ)
mww3_test_03/./work_PR1_MPI_d2 (7 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2 (4 files differ)
mww3_test_07/./work_PR3_UQ (3 files differ)
ww3_tic1.2/./work_IC3_CHENG (2 files differ)
ww3_tp1.6/./work_PR2_UNO (2 files differ)
ww3_tp1.6/./work_PR2_UQ (2 files differ)
ww3_tp1.6/./work_PR3_UNO (2 files differ)
ww3_tp1.6/./work_PR3_UQ (2 files differ)
ww3_tp2.7/./work_ST0 (1 files differ)
ww3_ts4/./work_ug_MPI (1 files differ)
******************** summary of comparison ***************************
********** only results of non-identical cases are listed ************
****** if less than 10 files differ for a case, they are listed ******
found 135 files in base directory
found 135 files in compare directory
124 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
8 files differ
out_pnt.low2 (binary) out_grd.low2 (binary) out_grd.low3 (binary) out_grd.low1 (binary) out_grd.hgh3 (binary) out_grd.hgh1 (binary) out_pnt.hgh2 (binary) out_grd.hgh2 (binary)
found 135 files in base directory
found 135 files in compare directory
124 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
8 files differ
out_pnt.low2 (binary) out_grd.low3 (binary) out_grd.low2 (binary) out_grd.low1 (binary) out_grd.hgh3 (binary) out_pnt.hgh2 (binary) out_grd.hgh2 (binary) out_grd.hgh1 (binary)
found 135 files in base directory
found 135 files in compare directory
127 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
5 files differ
out_pnt.low2 (binary) out_grd.low1 (binary) out_grd.low2 (binary) out_grd.hgh1 (binary) out_grd.hgh2 (binary)
found 135 files in base directory
found 135 files in compare directory
129 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
3 files differ
out_grd.low2 (binary) out_grd.hgh2 (binary) out_grd.hgh1 (binary)
found 135 files in base directory
found 135 files in compare directory
129 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
3 files differ
out_grd.low2 (binary) out_grd.hgh2 (binary) out_grd.hgh1 (binary)
found 135 files in base directory
found 135 files in compare directory
125 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
7 files differ
out_grd.low2 (binary) out_grd.low3 (binary) out_grd.low1 (binary) out_pnt.hgh2 (binary) out_grd.hgh2 (binary) out_grd.hgh3 (binary) out_grd.hgh1 (binary)
found 135 files in base directory
found 135 files in compare directory
128 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
4 files differ
out_grd.low2 (binary) out_grd.low1 (binary) out_grd.hgh2 (binary) out_grd.hgh1 (binary)
found 25 files in base directory
found 25 files in compare directory
19 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
3 files differ
mod_def.rect1 (binary) mod_def.points (binary) mod_def.zcmpl (binary)
found 60 files in base directory
found 60 files in compare directory
55 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
2 files differ
out_grd.ww3 (binary) out_pnt.ww3 (binary)
found 25 files in base directory
found 25 files in compare directory
20 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
2 files differ
out_grd.ww3 (binary) out_pnt.ww3 (binary)
found 25 files in base directory
found 25 files in compare directory
20 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
2 files differ
out_grd.ww3 (binary) out_pnt.ww3 (binary)
found 25 files in base directory
found 25 files in compare directory
20 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
2 files differ
out_grd.ww3 (binary) out_pnt.ww3 (binary)
found 25 files in base directory
found 25 files in compare directory
20 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
2 files differ
out_grd.ww3 (binary) out_pnt.ww3 (binary)
found 78 files in base directory
found 78 files in compare directory
74 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
1 files differ
mod_def.ww3 (binary)
found 13 files in base directory
found 13 files in compare directory
9 files are identical
3 files skipped
0 files in base directory only
0 files in comp directory only
1 files differ
mod_def.ww3 (binary)