Get tools and their testing working as well as build-namelist testing #228
Conversation
…-namleist unit-tester working
…et build-namleist unit-tester working" This reverts commit a6ae2b9.
…-namleist unit-tester working
There was a problem hiding this comment.
@ekluzek Thanks a lot for doing this! I have a few inline comments.
Also: Will the tools testing now only work within a standalone checkout, or will it still work from a CESM checkout, too? If the former, this should be mentioned somewhere (maybe in a README file in the tools testing directory?)
| @@ -27,6 +27,24 @@ CMakeFiles/ | |||
| # don't ignore cism build utilities directory | |||
| !components/cism/**/build | |||
|
|
|||
| # configure / build files | |||
There was a problem hiding this comment.
I assume that all of these new entries are referring to files that appear in specific places in the directory tree? If so, the rules should be more specific, listing the exact paths where these files occur.
Also: I started doing this by having multiple .gitignore files in different places. However, I was just doing some googling, and it sounds like the most common convention is to put everything in this top-level .gitignore file. So I'd like to rework things to do that. So, for example, this entry in src/unit_test_stubs/utils/.gitignore: restUtilMod_stub.F90 would go in the top-level as /src/unit_test_stubs/utils/restUtilMod_stub.F90 (I think it's correct to have this leading slash here: I think this says to match exactly this path). I can do this myself in a following PR if you don't want to deal with it.
bld/queryDefaultNamelist.pl
Outdated
| @@ -34,7 +34,8 @@ | |||
|
|
|||
| #----------------------------------------------------------------------------------------------- | |||
| # Add $cfgdir to the list of paths that Perl searches for modules | |||
| my @dirs = ( $cfgdir, "$cfgdir/../../../cime/utils/perl5lib" ); | |||
| my @dirs = ( $cfgdir, "$cfgdir/../../../cime/utils/perl5lib", | |||
There was a problem hiding this comment.
Is this going to first look in $cfgdir/../../../cime/utils/perl5lib, then look in $cfgdir/../cime/utils/perl5lib? If so, I'd change the order of these. My rationale is: If you're within a standalone checkout, there's a chance that there would be an unrelated cime directory at $cfgdir/../../../cime/utils/perl5lib.
tools/mksurfdata_map/mksurfdata.pl
Outdated
| @@ -28,6 +28,7 @@ | |||
| #----------------------------------------------------------------------------------------------- | |||
| # Add $scrdir to the list of paths that Perl searches for modules | |||
| my @dirs = ( $scrdir, "$scrdir/../../../../cime/utils/perl5lib", | |||
| "$scrdir/../../cime/utils/perl5lib" | |||
There was a problem hiding this comment.
As above, I'd change the order of these search paths.
…checking, and make some of the gitignore specific to directories, add a few more required path changes
Get tools and their testing working as well as build-namelist testing
Update stream definitions for new coupler history file format ### Description of changes Modify stream_definition_datm.xml to generate a streams file (datm.streams.xml) with the new coupler history file format. ### Specific notes Changes to accommodate new coupler history file names. Change offset for solar stream from 2700 to -900 to accommodate changes due to time stamps. These changes work in conjunction with CDEPS PR ESCOMP#224 and CDEPS PR ESCOMP#222 . Note that I did not change the file names for ndep, or remove that stream. See ESCOMP/CDEPS#230 Contributors other than yourself, if any: @billsacks CDEPS Issues Fixed (include github issue #): N/A Are there dependencies on other component PRs (if so list): No Are changes expected to change answers (bfb, different to roundoff, more substantial): Yes, in coupler history mode. Any User Interface Changes (namelist or namelist defaults changes): No Testing performed (e.g. aux_cdeps, CESM prealpha, etc): I have conducted a pair of cases, an F-case to generate coupler history files, and an I-case to read those files, using the new file name convention, and compared the forcing output variables from clm history files between the two cases. @billsacks and I reviewed these differences and found them to be acceptable. @billsacks ran SMS_D_Ld1.ne30pg3_t061.I1850Clm50BgcSpinup.cheyenne_intel.clm-cplhist in the context of ESCOMP#1999 Hashes used for testing: N/A
These changes get the tools and their testing working as well as the build-namelist testing. Currently it doesn't get PTCLM working though.