search

CESM-Development / cime

Common Infrastructure for Modeling the Earth
Other
16 stars 13 forks source link

fix issue with user_compset option #407

Closed jedwards4b closed 8 years ago

jedwards4b commented 8 years ago

The original problem was that user compsets that matched compsets with aliases would not pick up the user mods associated with that alias. The original fix failed to handle user_compsets that did not have an associated alias. This fix first searches for a matching alias and then falls back to the old user_compset method.

Test suite: yellowstone preaplha intel drv Test baseline: cesm1_5_alpha06d Test namelist changes: none Test status: bit for bit

Fixes: #396

Code review:

billsacks commented 8 years ago

Other than the one line note I made, this looks good to me. I compared the following:

(1) case created with -compset:

./create_newcase -case stdcompset_0329 -compset IRCP85CLM45BGC -res f09_g16 -mach yellowstone

(2) Same case created with -user_compset:

./create_newcase -case user_compset_0329 -user_compset RCP8_DATM%QIA_CLM45%BGC_SICE_SOCN_RTM_SGLC_SWAV -res f09_g16 -mach yellowstone -user_pes_setby clm

(3) Slightly different case, for which there are no compset matches

./create_newcase -case user_compset_mod_0329 -user_compset RCP8_DATM%QIA_CLM50%BGC_SICE_SOCN_RTM_SGLC_SWAV -res f09_g16 -mach yellowstone -user_pes_setby clm

Differences were just as expected - so this looks good to me.

So this can be merged once the line note is resolved.

jedwards4b commented 8 years ago

Modified based on review.