-
Notifications
You must be signed in to change notification settings - Fork 1
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
Dev/to ctsm5.1.dev128 #5
Dev/to ctsm5.1.dev128 #5
Commits on Jan 19, 2023
-
Configuration menu - View commit details
-
Copy full SHA for c8dee88 - Browse repository at this point
Copy the full SHA c8dee88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0178ca7 - Browse repository at this point
Copy the full SHA 0178ca7View commit details -
Add --out-surface option so you can specify the output surface datase…
…t name, add a simple check for using it
Configuration menu - View commit details
-
Copy full SHA for 50b5fd9 - Browse repository at this point
Copy the full SHA 50b5fd9View commit details -
Add a check that out-surface can not be given if create-surface is no…
…t set, and a test for it that passes
Configuration menu - View commit details
-
Copy full SHA for a41831c - Browse repository at this point
Copy the full SHA a41831cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3b841e5 - Browse repository at this point
Copy the full SHA 3b841e5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8a46808 - Browse repository at this point
Copy the full SHA 8a46808View commit details -
Have the defaults file read in the testinputs directory, run through …
…black, check some of the values from setup_files
Configuration menu - View commit details
-
Copy full SHA for 53af6f9 - Browse repository at this point
Copy the full SHA 53af6f9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 685c2b1 - Browse repository at this point
Copy the full SHA 685c2b1View commit details -
Add fsurf_out to setup_files returned dictionary, set to None, unless…
… args.out_surface is set
Configuration menu - View commit details
-
Copy full SHA for 9f79c7b - Browse repository at this point
Copy the full SHA 9f79c7bView commit details -
Configuration menu - View commit details
-
Copy full SHA for eb7e94f - Browse repository at this point
Copy the full SHA eb7e94fView commit details -
Configuration menu - View commit details
-
Copy full SHA for a74ac52 - Browse repository at this point
Copy the full SHA a74ac52View commit details -
Configuration menu - View commit details
-
Copy full SHA for 666d89c - Browse repository at this point
Copy the full SHA 666d89cView commit details -
Configuration menu - View commit details
-
Copy full SHA for e3a59fe - Browse repository at this point
Copy the full SHA e3a59feView commit details
Commits on Jan 20, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f933d51 - Browse repository at this point
Copy the full SHA f933d51View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3d25769 - Browse repository at this point
Copy the full SHA 3d25769View commit details -
adrifoster committed
Jan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for ba597a5 - Browse repository at this point
Copy the full SHA ba597a5View commit details -
Merge branch 'NEON_fates' of https://github.com/adrifoster/CTSM into …
…NEON_fates
adrifoster committedJan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for 249b140 - Browse repository at this point
Copy the full SHA 249b140View commit details -
adrifoster committed
Jan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for 3f4e880 - Browse repository at this point
Copy the full SHA 3f4e880View commit details -
adrifoster committed
Jan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for b26d33c - Browse repository at this point
Copy the full SHA b26d33cView commit details -
adrifoster committed
Jan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for ab5f0c9 - Browse repository at this point
Copy the full SHA ab5f0c9View commit details -
adrifoster committed
Jan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for d22eb00 - Browse repository at this point
Copy the full SHA d22eb00View commit details -
add NEON test, add 1pt fates compset alias
adrifoster committedJan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for 207091a - Browse repository at this point
Copy the full SHA 207091aView commit details -
exit if trying to run KONA or STER with FATES
adrifoster committedJan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for 02612b0 - Browse repository at this point
Copy the full SHA 02612b0View commit details -
adrifoster committed
Jan 20, 2023 Configuration menu - View commit details
-
Copy full SHA for 7982940 - Browse repository at this point
Copy the full SHA 7982940View commit details -
Configuration menu - View commit details
-
Copy full SHA for 85efdc5 - Browse repository at this point
Copy the full SHA 85efdc5View commit details -
Get test that fails if overwrite not selected and surface file is nam…
…ed and the file exists
Configuration menu - View commit details
-
Copy full SHA for 3293ef4 - Browse repository at this point
Copy the full SHA 3293ef4View commit details -
Configuration menu - View commit details
-
Copy full SHA for a7d672e - Browse repository at this point
Copy the full SHA a7d672eView commit details -
Change name of --file option to subset_data to --cfg-file option to m…
…ake it more clear in response to review
Configuration menu - View commit details
-
Copy full SHA for 040555c - Browse repository at this point
Copy the full SHA 040555cView commit details
Commits on Jan 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for dacc5a5 - Browse repository at this point
Copy the full SHA dacc5a5View commit details
Commits on Jan 22, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 53f3b7a - Browse repository at this point
Copy the full SHA 53f3b7aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d607d9 - Browse repository at this point
Copy the full SHA 2d607d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 02117d6 - Browse repository at this point
Copy the full SHA 02117d6View commit details -
Configuration menu - View commit details
-
Copy full SHA for df5e517 - Browse repository at this point
Copy the full SHA df5e517View commit details -
Configuration menu - View commit details
-
Copy full SHA for 484f490 - Browse repository at this point
Copy the full SHA 484f490View commit details -
Configuration menu - View commit details
-
Copy full SHA for ce30345 - Browse repository at this point
Copy the full SHA ce30345View commit details -
Add note that \$RM uses force option (\-f) so it does not generate an…
… error if the file does not exist
Configuration menu - View commit details
-
Copy full SHA for fedd4a6 - Browse repository at this point
Copy the full SHA fedd4a6View commit details -
Turn on silent for subset_data, move comment about remove so it isn't…
… echoed when the urban datasets are made
Configuration menu - View commit details
-
Copy full SHA for 8a96cc7 - Browse repository at this point
Copy the full SHA 8a96cc7View commit details
Commits on Jan 23, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 2aa7566 - Browse repository at this point
Copy the full SHA 2aa7566View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7ada54f - Browse repository at this point
Copy the full SHA 7ada54fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 59d2dff - Browse repository at this point
Copy the full SHA 59d2dffView commit details -
Configuration menu - View commit details
-
Copy full SHA for c92edb8 - Browse repository at this point
Copy the full SHA c92edb8View commit details -
Merge branch 'master' into NEON_fates
adrifoster committedJan 23, 2023 Configuration menu - View commit details
-
Copy full SHA for 2ecd83e - Browse repository at this point
Copy the full SHA 2ecd83eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6198e3c - Browse repository at this point
Copy the full SHA 6198e3cView commit details -
Always use --crop for the subset options, so that the 78pft dataset i…
…s always used, which will make it easier to remove the use of 16pft versions which we do want to do
Configuration menu - View commit details
-
Copy full SHA for f49a755 - Browse repository at this point
Copy the full SHA f49a755View commit details -
Increase size of PCT_CFT array to have 64 crop CFT's so that we can u…
…se the 78pft surface datasets
Configuration menu - View commit details
-
Copy full SHA for 9b962c0 - Browse repository at this point
Copy the full SHA 9b962c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d108b4 - Browse repository at this point
Copy the full SHA 5d108b4View commit details -
So that resolution isn't done twice, explicitly add f09 resolution to…
… list that also has specific resolutions
Configuration menu - View commit details
-
Copy full SHA for edfde60 - Browse repository at this point
Copy the full SHA edfde60View commit details -
Merge tag 'ctsm5.1.dev115' into zetamaxstableconsistent
This set of changes allows CTSM to continue API compatability with changes to the FATES API. FATES has updated its nutrient dynamics routine, and required a modification to the test environment, some minor updates to variable dimensions in the history, and a call to a new FATES history routine. Implicitly, the updating of the FATES tag introduces new content in the FATES model since the last API update (mostly bug fixes).
Configuration menu - View commit details
-
Copy full SHA for 1091710 - Browse repository at this point
Copy the full SHA 1091710View commit details -
Merge remote-tracking branch 'ekluzek/zetamaxstableconsistent' into f…
…surdat_4_1x1_from_subset
Configuration menu - View commit details
-
Copy full SHA for 71c233e - Browse repository at this point
Copy the full SHA 71c233eView commit details -
Merge pull request ESCOMP#1915 from olyson/masterdoc
Fix issue ESCOMP#1864 in master documentation
Configuration menu - View commit details
-
Copy full SHA for 91f4d97 - Browse repository at this point
Copy the full SHA 91f4d97View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1be7aa2 - Browse repository at this point
Copy the full SHA 1be7aa2View commit details
Commits on Jan 24, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 42709c2 - Browse repository at this point
Copy the full SHA 42709c2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6fea524 - Browse repository at this point
Copy the full SHA 6fea524View commit details -
Configuration menu - View commit details
-
Copy full SHA for 050f110 - Browse repository at this point
Copy the full SHA 050f110View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c2b5b6 - Browse repository at this point
Copy the full SHA 5c2b5b6View commit details
Commits on Jan 25, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 22fe11f - Browse repository at this point
Copy the full SHA 22fe11fView commit details -
Configuration menu - View commit details
-
Copy full SHA for b9ab8e0 - Browse repository at this point
Copy the full SHA b9ab8e0View commit details -
Check for existance before removing in the test, it will only be remo…
…ved if the test previously failed
Configuration menu - View commit details
-
Copy full SHA for f4e9ea8 - Browse repository at this point
Copy the full SHA f4e9ea8View commit details -
Make sure the read_ subroutines that are reading the config file cons…
…istently start with read_cfg_
Configuration menu - View commit details
-
Copy full SHA for c04e89f - Browse repository at this point
Copy the full SHA c04e89fView commit details
Commits on Jan 26, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6008d28 - Browse repository at this point
Copy the full SHA 6008d28View commit details -
Merge pull request ESCOMP#1812 from ekluzek/fsurdat_4_1x1_from_subset
Get single point surface datasets from subset_data rather than mksurfdata
Configuration menu - View commit details
-
Copy full SHA for f10353e - Browse repository at this point
Copy the full SHA f10353eView commit details -
Merge branch 'master' into NEON_fates
adrifoster committedJan 26, 2023 Configuration menu - View commit details
-
Copy full SHA for 5e768ba - Browse repository at this point
Copy the full SHA 5e768baView commit details -
adrifoster committed
Jan 26, 2023 Configuration menu - View commit details
-
Copy full SHA for a1130ef - Browse repository at this point
Copy the full SHA a1130efView commit details -
add fire_emis and fates test and check
adrifoster committedJan 26, 2023 Configuration menu - View commit details
-
Copy full SHA for aad7de1 - Browse repository at this point
Copy the full SHA aad7de1View commit details -
adrifoster committed
Jan 26, 2023 Configuration menu - View commit details
-
Copy full SHA for 435691e - Browse repository at this point
Copy the full SHA 435691eView commit details
Commits on Jan 27, 2023
-
Configuration menu - View commit details
-
Copy full SHA for ef82a68 - Browse repository at this point
Copy the full SHA ef82a68View commit details -
adrifoster committed
Jan 27, 2023 Configuration menu - View commit details
-
Copy full SHA for 72e252a - Browse repository at this point
Copy the full SHA 72e252aView commit details
Commits on Jan 31, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 0e09a64 - Browse repository at this point
Copy the full SHA 0e09a64View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a087c5 - Browse repository at this point
Copy the full SHA 0a087c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 29f9b59 - Browse repository at this point
Copy the full SHA 29f9b59View commit details
Commits on Feb 1, 2023
-
add PRT2 test to expected fails
adrifoster committedFeb 1, 2023 Configuration menu - View commit details
-
Copy full SHA for 47d61a6 - Browse repository at this point
Copy the full SHA 47d61a6View commit details -
adrifoster committed
Feb 1, 2023 Configuration menu - View commit details
-
Copy full SHA for 8f6c03e - Browse repository at this point
Copy the full SHA 8f6c03eView commit details -
adrifoster committed
Feb 1, 2023 Configuration menu - View commit details
-
Copy full SHA for 48a38b6 - Browse repository at this point
Copy the full SHA 48a38b6View commit details -
adrifoster committed
Feb 1, 2023 Configuration menu - View commit details
-
Copy full SHA for eb29c80 - Browse repository at this point
Copy the full SHA eb29c80View commit details
Commits on Feb 2, 2023
-
adrifoster committed
Feb 2, 2023 Configuration menu - View commit details
-
Copy full SHA for 0e83df3 - Browse repository at this point
Copy the full SHA 0e83df3View commit details -
Merge pull request ESCOMP#1932 from adrifoster/NEON_fates
NEON FATES capabilities
Configuration menu - View commit details
-
Copy full SHA for 2291307 - Browse repository at this point
Copy the full SHA 2291307View commit details -
Configuration menu - View commit details
-
Copy full SHA for c96735b - Browse repository at this point
Copy the full SHA c96735bView commit details
Commits on Feb 3, 2023
-
Merge remote-tracking branch 'escomp/master' into fsurdatsystest_conda
Resolved conflicts: cime_config/SystemTests/fsurdatmodifyctsm.py test/tools/test_driver.sh
Configuration menu - View commit details
-
Copy full SHA for 131cf0e - Browse repository at this point
Copy the full SHA 131cf0eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 07e8462 - Browse repository at this point
Copy the full SHA 07e8462View commit details
Commits on Feb 4, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 662bf92 - Browse repository at this point
Copy the full SHA 662bf92View commit details -
Rm override allow_dom_pft_and_idealized & corresponding restriction
Update ChangeLog and python tests
Configuration menu - View commit details
-
Copy full SHA for 6699c0d - Browse repository at this point
Copy the full SHA 6699c0dView commit details
Commits on Feb 6, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f3f26fb - Browse repository at this point
Copy the full SHA f3f26fbView commit details -
Merge pull request ESCOMP#1798 from ekluzek/fsurdatsystest_conda
Have fsurdat_modifier system test use conda environment rather than ncar_pylib
Configuration menu - View commit details
-
Copy full SHA for e099103 - Browse repository at this point
Copy the full SHA e099103View commit details -
Configuration menu - View commit details
-
Copy full SHA for 05fb17b - Browse repository at this point
Copy the full SHA 05fb17bView commit details
Commits on Feb 12, 2023
-
Updating new tests with longer walltimes again
ERP_D_Ld10.f09_f09_mg17.IHistClm50BgcCrop.cheyenne_gnu.clm-f09_dec1990Start ran out of time at 40 minutes, so I bumped it up to 59 and it passed
Configuration menu - View commit details
-
Copy full SHA for 463c8b9 - Browse repository at this point
Copy the full SHA 463c8b9View commit details
Commits on Feb 14, 2023
-
Merge tag 'ctsm5.1.dev045' into clm5_shiftingcultivation
Params file sets the respiration fractions for CWD to zero: rf_cwdl2_bgc = 0 rf_cwdl3_bgc = 0 The model has no code to handle rf_cwd* > 0. So... - I have introduced cwdhr_col to track this HR the same way that we track lithr_col for litter. - I have removed if-statements that prevented CWD HR pools and decomposition from writing to history. - I have introduced a new test to the cheyenne test-suite that makes active seven history fields pertaining to CWD HR and points to a params file with rf_cwd* > 0. I have confirmed that the new test returns the new active variables as greater than 0 when pointing to the new params file and equal to 0 when pointing to the default params file. Resolved conflicts: bld/CLMBuildNamelist.pm bld/unit_testers/build-namelist_test.pl cime_config/testdefs/testlist_clm.xml src/biogeochem/CNBalanceCheckMod.F90 src/biogeochem/CNDriverMod.F90 src/biogeochem/CNProductsMod.F90 src/biogeochem/CNVegCarbonFluxType.F90 src/dyn_subgrid/dynSubgridControlMod.F90 src/dyn_subgrid/dynSubgridDriverMod.F90 Cheyenne test-suite OK (against regenerated baselines for dev045)
Configuration menu - View commit details
-
Copy full SHA for 25c10f1 - Browse repository at this point
Copy the full SHA 25c10f1View commit details
Commits on Feb 15, 2023
-
Merge tag 'ctsm5.1.dev085' into clm5_shiftingcultivation
Expand crop reproductive pools; remove some unused options The main change in this tag is adding placeholder pools (and corresponding fluxes) that will be needed to couple the AgSys crop model: Rather than a single grain pool, AgSys has two different grain pools (meal & oil) as well as two different reproductive structure pools (pod & floret). This tag adds a dynamically-allocated second dimension to the relevant variables to accommodate these new pools. The new CropReprPoolsMod controls the allocation and naming of these pools, and facilitates looping over the new dimension. Currently parameters in there are hard-coded for the current crop model, but this will become more dynamic with the coupling of AgSys. This tag also removes experimental / untested options in NutrientCompetitionFlexibleCNMod. Although this is mostly unrelated to the main change, doing this simplified the changes needed for the main change. This tag also resolves ESCOMP#1666 (Isotopic values of grain_mr not set correctly when use_grainproduct is false). Finally, this tag removes or modifies some of the most expensive tests in the aux_clm test suite to reduce the cost of running the test suite. Resolved conflicts: src/biogeochem/CNBalanceCheckMod.F90 src/biogeochem/CNCIsoFluxMod.F90 src/biogeochem/CNDriverMod.F90 src/biogeochem/CNProductsMod.F90 src/biogeochem/CNVegCarbonFluxType.F90 src/biogeochem/CNVegNitrogenFluxType.F90 Cheyenne test-suite in progress and looks promising this far.
Configuration menu - View commit details
-
Copy full SHA for 4daa4f1 - Browse repository at this point
Copy the full SHA 4daa4f1View commit details -
Merge tag 'ctsm5.1.dev100' into clm5_shiftingcultivation
First Commit of CN Matrix Solution: Start bringing in the use_matrixcn and use_soil_matrixcn control options for the Carbon/Nitrogen BGC model using the matrix solution methodology developed by Dr. Yiqi Luo and his EcoLab members: Drs. Xingjie Lu, Yuanyuan Huang and Zhengguang Du, at Northern Arizona University Work on Anomaly forcing for SSEP scenarios: Do some work on anomoly forcing for SSP scenarios. Update the script in tools/contrib to work with the latest data and replicate results of Keith Oleson and Sean Swenson. Add some test cases for it. Python Environment Management using Conda: More work on the manage_python_env script to setup the "ctsm_py" conda environment. This now works for UCAR machines (such as cheyenne and casper) as well as CGD machines (like izumi). This script can also be called for tools, and the test tools mechanism is now using it rather than ncar_pylib. ./manage_python_env SCAM Fix: Add checkimport method for CMEPS so that single-column case can work with SCAM, from Jim Edwards. Black Formatter for Python Code: Run "black" python code reformatter on all code under the "python" directory. Add the commits to .git-blame-ignore-revs so they can be ignored when "git blame" is used, if you add this to each clone where you want this to apply: git config blame.ignoreRevsFile .git-blame-ignore-revs You can do it for your worktrees, but since the file only applies to CTSM for ctsm5.1.dev100 and forward, you'll need to do it for each CTSM clone seperately. Also there is now a github action that checks that python code under the "python" subdirectory is black clean. If it's not the action will fail and send you an email about it. Make Map Data Fix: Simple fix from Sam Rabin. Fix for DISPLA on History Output: Fix from Keith Oleson to set history output for DISPLA (displa_patch) to zero when vegetation is buried by snow. Resolved conflicts: bld/CLMBuildNamelist.pm src/biogeochem/CNDriverMod.F90 src/biogeochem/CNVegCarbonFluxType.F90 Cheyenne test-suite in progress and looks promising this far.
Configuration menu - View commit details
-
Copy full SHA for 639e6e2 - Browse repository at this point
Copy the full SHA 639e6e2View commit details -
Merge tag 'ctsm5.1.dev118' into clm5_shiftingcultivation
Use conda environment rather than ncar_pylib with the fsurdat_modifier system test Reason: ncar_pylib is going away soon.
Configuration menu - View commit details
-
Copy full SHA for 484248e - Browse repository at this point
Copy the full SHA 484248eView commit details
Commits on Feb 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 989c87f - Browse repository at this point
Copy the full SHA 989c87fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2286297 - Browse repository at this point
Copy the full SHA 2286297View commit details
Commits on Feb 22, 2023
-
Use ERP_D_Ld10_P36x2 on cheyenne only; add ERP_D_Ld10 test on izumi
These changes pertain to GU_LULCC tests in this commit.
Configuration menu - View commit details
-
Copy full SHA for 8ef3f28 - Browse repository at this point
Copy the full SHA 8ef3f28View commit details -
Configuration menu - View commit details
-
Copy full SHA for 093c075 - Browse repository at this point
Copy the full SHA 093c075View commit details
Commits on Feb 27, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 55c6be2 - Browse repository at this point
Copy the full SHA 55c6be2View commit details -
Returned hrv_xsmrpool_to_atm_patch to CNVegCarbonFluxType
This was an unintentional line removal that Erik realized. I also reordered the error checks that Erik recommended in dynSubgridControlMod.
Configuration menu - View commit details
-
Copy full SHA for 3f6c67a - Browse repository at this point
Copy the full SHA 3f6c67aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ee4aea - Browse repository at this point
Copy the full SHA 8ee4aeaView commit details -
Change order of if statement so that FATES error will trigger rather …
…than the CN one for it
Configuration menu - View commit details
-
Copy full SHA for 179de38 - Browse repository at this point
Copy the full SHA 179de38View commit details
Commits on Feb 28, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 91bbef6 - Browse repository at this point
Copy the full SHA 91bbef6View commit details -
Merge branch 'clm5_shiftingcultivation' of github.com:lawrencepj1/CTS…
…M into clm5_shiftingcultivation
Configuration menu - View commit details
-
Copy full SHA for ec368f4 - Browse repository at this point
Copy the full SHA ec368f4View commit details
Commits on Mar 3, 2023
-
Squashed 'manage_externals/' changes from 82d3b247f..7b6d92ef6
7b6d92ef6 Merge pull request ESCOMP#198 from johnpaulalex/gitdir 927ce3a98 Merge pull request ESCOMP#197 from johnpaulalex/testpath a04f1148f Merge pull request ESCOMP#196 from johnpaulalex/readmod d9c14bf25 Change the rest of the methods to use -C. Still some usage of getcwd in test_unit_repository_git. 332b10640 Fix incorrect logged path of checkout_externals in test_sys_checkout: it was basically the parent of the current directory, which varies throughout the test. (it called abspath with '{0}/../../', which adds arbitrary and not-interpolated subdir '{0}' to the path, then removes it and removes one more level). 932a7499b Remove printlog from read_gitmodules_file since read_externals_description_file() already has a nearly-the-same printlog (but add it to the other caller). 5d13719ed Merge pull request ESCOMP#195 from johnpaulalex/check_repo 423395449 Update utest to mock _git_remote_verbose in a new way, since it is now called via the GitRepository class rather than on the specific GitRepository instance. d7a42ae96 Check that desired repo was actually checked out. 71596bbc1 Merge pull request ESCOMP#194 from johnpaulalex/manic2 4c96e824e Make the MANIC_TEST_BARE_REPO_ROOT env var special - give it a constant for easy tracking, and automatically tear it down after each test. 259bfc04d test_sys_checkout: use actual paths in on-the-fly configs rather than MANIC_TEST_BARE_REPO_ROOT env var. This will make it easier to test (in the near future) that checkout_externals actually checked out the desired repo dir. 557bbd6eb Merge pull request ESCOMP#193 from johnpaulalex/manic 5314eede1 Remove MANIC_TEST_TMP_REPO_ROOT environment variable in favor of module-level variable. 345fc1e14 Merge pull request ESCOMP#191 from johnpaulalex/test_doc12 2117b843c test_sys_checkout: verify that basic by-tag/branch/hash tests actually take us to the correct git tag/branch/hash. 94d6e5f2b Merge pull request ESCOMP#190 from johnpaulalex/test_doc11 3ff33a6a8 Inline local-path-creation methods 47dea7f64 Merge pull request ESCOMP#189 from johnpaulalex/test_doc10 9ea75cbf8 Grab-bag of renamings: Remove redundant _NAME from repo constants, and consistently add _REPO suffix (This causes the majority of diffs). c0c847ec8 Merge pull request ESCOMP#188 from johnpaulalex/test_doc9 2dd5ce0f7 test_sys_checkout.py: only check for correct 'required' or 'optional' state in the test that exercises required vs optional behavior. Removed a lot of boilerplate. eb3085984 Merge pull request ESCOMP#187 from johnpaulalex/test_doc8 1832e1f84 test_sys_checkout: Simplify many tests to only use a single external. 8689d61ec Merge pull request ESCOMP#186 from johnpaulalex/test_doc7 fbee4253e Grab bag of test_sys_checkout cleanups: Doc inside of each test more clearly/consistently. TestSysCheckoutSVN didn’t get the inlining-of-helper-methods treatment, now it has that. Move various standalone repo helper methods (like create_branch) into a RepoUtils class. README.md was missing newlines when rendered as markdown. Doc the return value of checkout.main Fix test_container_exclude_component - it was looking for the wrong key (which is never present); now it looks for the correct key. f0ed44a6e Merge pull request ESCOMP#185 from johnpaulalex/test_doc6 a3d59f5f2 Merge pull request ESCOMP#184 from johnpaulalex/test_doc5 5329c8ba7 test_sys_checkout: Inline config generation functions that are only called once. 464f2c7a7 test_sys_checkout: Inline another layer (per-config-file checks). Rename the 4 methods that are used multiple times, to reflect what they do rather than what they're called. 8872c0df6 Merge pull request ESCOMP#183 from johnpaulalex/doc_test4 c045335f6 Merge pull request ESCOMP#182 from johnpaulalex/doc_test3 c583b956e Merge pull request ESCOMP#181 from johnpaulalex/doc_test2 e01cfe278 test_sys_checkout: less confusing handling of return values from checkout_externals. Specifically, when doing a checkout, don't return tree_status from _before_ the checkout. Make a new wrapper to call checkout_externals a second time, to calculate the new status after a checkout (very frequent pattern). 23286818c test_sys_checkout: Remove another layer (which generates test component names) c3717b6bc Merge pull request ESCOMP#180 from johnpaulalex/doc_test 36d7a4434 test_sys_checkout.py: remove one layer of functions (that check for local status enums). No-op. 2c4584bf7 More documentation about tests: * contents of test repositories (n a new README.md) * various constants in test_sys_checkout.py that point to those contents, and terminology like container/simple/mixed. * in each test method, the scenarios being tested. * The coupling between test methods. 55e74bd0a Merge pull request ESCOMP#179 from johnpaulalex/circ 66be84290 Remove circular dependency by making _External stop doing tricky things with sourcetrees. git-subtree-dir: manage_externals git-subtree-split: 7b6d92ef689e2f65733e27f8635ab91fb341356b
Configuration menu - View commit details
-
Copy full SHA for da8224f - Browse repository at this point
Copy the full SHA da8224fView commit details -
Configuration menu - View commit details
-
Copy full SHA for d17ccf6 - Browse repository at this point
Copy the full SHA d17ccf6View commit details
Commits on Mar 7, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6637536 - Browse repository at this point
Copy the full SHA 6637536View commit details -
Configuration menu - View commit details
-
Copy full SHA for 397eb22 - Browse repository at this point
Copy the full SHA 397eb22View commit details
Commits on Mar 9, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 4674b90 - Browse repository at this point
Copy the full SHA 4674b90View commit details -
Merge pull request ESCOMP#1965 from ESCOMP/wwieder-patch-1
Update README.md
Configuration menu - View commit details
-
Copy full SHA for 5daf154 - Browse repository at this point
Copy the full SHA 5daf154View commit details
Commits on Mar 10, 2023
-
Configuration menu - View commit details
-
Copy full SHA for c0bfe01 - Browse repository at this point
Copy the full SHA c0bfe01View commit details -
Configuration menu - View commit details
-
Copy full SHA for b49fdec - Browse repository at this point
Copy the full SHA b49fdecView commit details
Commits on Mar 14, 2023
-
Configuration menu - View commit details
-
Copy full SHA for fc3d493 - Browse repository at this point
Copy the full SHA fc3d493View commit details
Commits on Mar 16, 2023
-
Update externals to cesm2_3_alpha12c-ish
For CMEPS, use the latest (fixing an issue with multi-instance cases relative to what was in alpha12c).
Configuration menu - View commit details
-
Copy full SHA for ad8bc74 - Browse repository at this point
Copy the full SHA ad8bc74View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9e04b6a - Browse repository at this point
Copy the full SHA 9e04b6aView commit details -
Configuration menu - View commit details
-
Copy full SHA for deb0866 - Browse repository at this point
Copy the full SHA deb0866View commit details -
Merge pull request ESCOMP#309 from lawrencepj1/clm5_shiftingcultivation
Added new files to allow Gross Unrepresented Land Use transition
Configuration menu - View commit details
-
Copy full SHA for f72479b - Browse repository at this point
Copy the full SHA f72479bView commit details
Commits on Mar 17, 2023
-
This is needed to fix an issue with CTSM-defined system tests
Configuration menu - View commit details
-
Copy full SHA for 1bd5e9e - Browse repository at this point
Copy the full SHA 1bd5e9eView commit details
Commits on Mar 20, 2023
-
Configuration menu - View commit details
-
Copy full SHA for fa421c8 - Browse repository at this point
Copy the full SHA fa421c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4620ac4 - Browse repository at this point
Copy the full SHA 4620ac4View commit details
Commits on Mar 22, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f9e2a3b - Browse repository at this point
Copy the full SHA f9e2a3bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c0574b4 - Browse repository at this point
Copy the full SHA c0574b4View commit details
Commits on Mar 23, 2023
-
Update COMP_ROOT_DIR_LND to mostly match the version in CIME
The COMP_ROOT_DIR_LND is supposed to basically match the entry in CIME's config_files.xml except for the value for CLM. The motivation for this is to add an entry for SLIM: without this change, it seems like other config_files entries were using the CLM location of $SRCROOT for SLIM's COMP_ROOT_DIR_LND, which meant that we were getting duplicate entries of some files, which caused various problems (e.g., ESMCI/cime#4373 - which is now fixed with this change instead of the originally-suggested CIME change - and seeing duplicate results from CIME's query_testlists and query_config scripts). But while making this change, I figured I might as well update the entire entry to be consistent with the latest version in CIME.
Configuration menu - View commit details
-
Copy full SHA for a022f80 - Browse repository at this point
Copy the full SHA a022f80View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5b3e246 - Browse repository at this point
Copy the full SHA 5b3e246View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2399486 - Browse repository at this point
Copy the full SHA 2399486View commit details -
Re-raise caught exception after printing error message
Otherwise the test continues on after failure. Resolves ESCOMP#1971
Configuration menu - View commit details
-
Copy full SHA for af56c53 - Browse repository at this point
Copy the full SHA af56c53View commit details -
With the recent externals update, this C96 test barely finished in the 10-minute allotted time once, and timed out a different time. Increasing the wall-clock time. (There has been investigation into the cause of recent slowness... the culprit seems to be mpt 2.25.)
Configuration menu - View commit details
-
Copy full SHA for c9f8c28 - Browse repository at this point
Copy the full SHA c9f8c28View commit details
Commits on Mar 25, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 3cd1351 - Browse repository at this point
Copy the full SHA 3cd1351View commit details -
Add Fortran unit tests as a separate test to run
This is needed until ESCOMP#1972 is resolved
Configuration menu - View commit details
-
Copy full SHA for 2ee9024 - Browse repository at this point
Copy the full SHA 2ee9024View commit details
Commits on Mar 26, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 97855df - Browse repository at this point
Copy the full SHA 97855dfView commit details -
Merge branch 'update_externals_alpha12c'
Update externals and minor fixes Main change is to update externals to cesm2_3_alpha12c-ish. Doing this exposed a few issues that are also fixed here. Also, reduce GU_LULCC tests down to a single test. - Resolves ESCOMP#1968 (Reduce the GULU tests down to one) - Resolves ESCOMP#1971 (fsurdatmodifyctsm test should abort if it has trouble running the python script)
Configuration menu - View commit details
-
Copy full SHA for 4e126c7 - Browse repository at this point
Copy the full SHA 4e126c7View commit details -
Update externals and minor fixes Main change is to update externals to cesm2_3_alpha12c-ish. Doing this exposed a few issues that are also fixed here. Also, reduce GU_LULCC tests down to a single test.
Configuration menu - View commit details
-
Copy full SHA for 221dcff - Browse repository at this point
Copy the full SHA 221dcffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 83d31e1 - Browse repository at this point
Copy the full SHA 83d31e1View commit details
Commits on Mar 27, 2023
-
Configuration menu - View commit details
-
Copy full SHA for a1fb1a3 - Browse repository at this point
Copy the full SHA a1fb1a3View commit details -
Merge tag 'ctsm5.1.dev120' into modinitsoilwater
Update externals and minor fixes Main change is to update externals to cesm2_3_alpha12c-ish. Doing this exposed a few issues that are also fixed here. Also, reduce GU_LULCC tests down to a single test.
Configuration menu - View commit details
-
Copy full SHA for d71bd24 - Browse repository at this point
Copy the full SHA d71bd24View commit details -
Configuration menu - View commit details
-
Copy full SHA for ff48f33 - Browse repository at this point
Copy the full SHA ff48f33View commit details
Commits on Mar 28, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 2c48678 - Browse repository at this point
Copy the full SHA 2c48678View commit details -
Configuration menu - View commit details
-
Copy full SHA for 02a4f9c - Browse repository at this point
Copy the full SHA 02a4f9cView commit details
Commits on Mar 29, 2023
-
Configuration menu - View commit details
-
Copy full SHA for d94f5d0 - Browse repository at this point
Copy the full SHA d94f5d0View commit details
Commits on Mar 31, 2023
-
Configuration menu - View commit details
-
Copy full SHA for e09b21c - Browse repository at this point
Copy the full SHA e09b21cView commit details -
Configuration menu - View commit details
-
Copy full SHA for f11fe37 - Browse repository at this point
Copy the full SHA f11fe37View commit details -
Configuration menu - View commit details
-
Copy full SHA for 84d7f0d - Browse repository at this point
Copy the full SHA 84d7f0dView commit details
Commits on Apr 3, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 525d79e - Browse repository at this point
Copy the full SHA 525d79eView commit details
Commits on Apr 4, 2023
-
Update fates tag externals pointer
This tag includes a fix to avoid line continuation issues seen on izumi.
Configuration menu - View commit details
-
Copy full SHA for a0abc29 - Browse repository at this point
Copy the full SHA a0abc29View commit details -
Configuration menu - View commit details
-
Copy full SHA for 55ce27f - Browse repository at this point
Copy the full SHA 55ce27fView commit details
Commits on Apr 5, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 0c7b8c4 - Browse repository at this point
Copy the full SHA 0c7b8c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for bbe21f4 - Browse repository at this point
Copy the full SHA bbe21f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 21d656a - Browse repository at this point
Copy the full SHA 21d656aView commit details -
Merge pull request ESCOMP#1962 from ckoven/modinitsoilwater
change soil moisture initialization logic for FATES configurations
Configuration menu - View commit details
-
Copy full SHA for 0b98af4 - Browse repository at this point
Copy the full SHA 0b98af4View commit details
Commits on Apr 6, 2023
-
Configuration menu - View commit details
-
Copy full SHA for cecbe6a - Browse repository at this point
Copy the full SHA cecbe6aView commit details
Commits on Apr 7, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 8d15cb3 - Browse repository at this point
Copy the full SHA 8d15cb3View commit details
Commits on Apr 10, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 4424673 - Browse repository at this point
Copy the full SHA 4424673View commit details -
Rework handling of evaporation constraint in SoilFluxes
Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that the deleted lines in this commit have just been moved as-is to earlier in this subroutine.
Configuration menu - View commit details
-
Copy full SHA for c8b80d8 - Browse repository at this point
Copy the full SHA c8b80d8View commit details
Commits on Apr 11, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 3b35c9c - Browse repository at this point
Copy the full SHA 3b35c9cView commit details
Commits on Apr 14, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 00b8bf5 - Browse repository at this point
Copy the full SHA 00b8bf5View commit details
Commits on Apr 17, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 1214de9 - Browse repository at this point
Copy the full SHA 1214de9View commit details -
Don't allow qflx_liqevap and qflx_solidevap fluxes to be negative
These could sometimes be roundoff-level negative due to h2osoi_liq starting out roundoff-level negative.
Configuration menu - View commit details
-
Copy full SHA for 1c099f3 - Browse repository at this point
Copy the full SHA 1c099f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for dc70bc0 - Browse repository at this point
Copy the full SHA dc70bc0View commit details
Commits on Apr 18, 2023
-
Configuration menu - View commit details
-
Copy full SHA for a2693bd - Browse repository at this point
Copy the full SHA a2693bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 39de3a0 - Browse repository at this point
Copy the full SHA 39de3a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8f46308 - Browse repository at this point
Copy the full SHA 8f46308View commit details -
A few specific notes: - Needed to increase tolerances a bit in the matrix test to make tests pass on my Mac (with gfortran). - Needed to remove some assertions in an expected-failure test for quadratic (it seems like the new pFUnit hits these assertions whereas the old did not).
Configuration menu - View commit details
-
Copy full SHA for 81dda9d - Browse repository at this point
Copy the full SHA 81dda9dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9784e97 - Browse repository at this point
Copy the full SHA 9784e97View commit details -
Configuration menu - View commit details
-
Copy full SHA for e0c9b9f - Browse repository at this point
Copy the full SHA e0c9b9fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2eb7578 - Browse repository at this point
Copy the full SHA 2eb7578View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9ca2e3f - Browse repository at this point
Copy the full SHA 9ca2e3fView commit details
Commits on Apr 20, 2023
-
Configuration menu - View commit details
-
Copy full SHA for acc32ee - Browse repository at this point
Copy the full SHA acc32eeView commit details
Commits on Apr 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 686c64d - Browse repository at this point
Copy the full SHA 686c64dView commit details -
Configuration menu - View commit details
-
Copy full SHA for eb2704a - Browse repository at this point
Copy the full SHA eb2704aView commit details
Commits on Apr 22, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f92d389 - Browse repository at this point
Copy the full SHA f92d389View commit details -
Configuration menu - View commit details
-
Copy full SHA for e3ee314 - Browse repository at this point
Copy the full SHA e3ee314View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2e5913a - Browse repository at this point
Copy the full SHA 2e5913aView commit details
Commits on Apr 23, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 8fd2ee1 - Browse repository at this point
Copy the full SHA 8fd2ee1View commit details -
Update some other externals to more recent versions
Use versions of externals from latest CESM tag
Configuration menu - View commit details
-
Copy full SHA for a72ef45 - Browse repository at this point
Copy the full SHA a72ef45View commit details
Commits on Apr 24, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 4e58ce3 - Browse repository at this point
Copy the full SHA 4e58ce3View commit details -
Merge branch 'fix_negative_h2osoi'
Rework handling of evaporation constraint in SoilFluxes Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that I applied a max of 0 to the new fluxes because many initial conditions files have roundoff-level negative H2OSOI_LIQ, so without this limit, we were getting roundoff-level negative fluxes. Resolves ESCOMP#1979
Configuration menu - View commit details
-
Copy full SHA for cdb6187 - Browse repository at this point
Copy the full SHA cdb6187View commit details -
Configuration menu - View commit details
-
Copy full SHA for 46968da - Browse repository at this point
Copy the full SHA 46968daView commit details
Commits on Apr 25, 2023
-
Change the PRISM test to one of the sites where the dates were differ…
…ent for PRISM, and add a FATES PRISM test for another such site
Configuration menu - View commit details
-
Copy full SHA for 90fcb22 - Browse repository at this point
Copy the full SHA 90fcb22View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a89cae - Browse repository at this point
Copy the full SHA 0a89caeView commit details -
Configuration menu - View commit details
-
Copy full SHA for d2e9296 - Browse repository at this point
Copy the full SHA d2e9296View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f262d4 - Browse repository at this point
Copy the full SHA 0f262d4View commit details
Commits on Apr 26, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 64485ca - Browse repository at this point
Copy the full SHA 64485caView commit details -
Configuration menu - View commit details
-
Copy full SHA for d95ada6 - Browse repository at this point
Copy the full SHA d95ada6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 830af35 - Browse repository at this point
Copy the full SHA 830af35View commit details -
Add a warning if this is NEON and transient and the NEONSITE.transien…
…t casename is not being used (or if it's PRISM) for the user make sure the finidat file is appropriately spunup
Configuration menu - View commit details
-
Copy full SHA for b3d782c - Browse repository at this point
Copy the full SHA b3d782cView commit details
Commits on Apr 27, 2023
-
This just updates the nag compiler setup to remove the recently-added NaN flag, which is causing test failures.
Configuration menu - View commit details
-
Copy full SHA for 1acbca9 - Browse repository at this point
Copy the full SHA 1acbca9View commit details -
Configuration menu - View commit details
-
Copy full SHA for b2ee5d7 - Browse repository at this point
Copy the full SHA b2ee5d7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7f0c833 - Browse repository at this point
Copy the full SHA 7f0c833View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8303e3f - Browse repository at this point
Copy the full SHA 8303e3fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5b772a6 - Browse repository at this point
Copy the full SHA 5b772a6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 20ba106 - Browse repository at this point
Copy the full SHA 20ba106View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3602879 - Browse repository at this point
Copy the full SHA 3602879View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5b71760 - Browse repository at this point
Copy the full SHA 5b71760View commit details -
Configuration menu - View commit details
-
Copy full SHA for 42868ba - Browse repository at this point
Copy the full SHA 42868baView commit details -
Configuration menu - View commit details
-
Copy full SHA for 46d107a - Browse repository at this point
Copy the full SHA 46d107aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 95c5c87 - Browse repository at this point
Copy the full SHA 95c5c87View commit details -
Rework handling of evaporation constraint in SoilFluxes Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that I applied a max of 0 to the new fluxes because many initial conditions files have roundoff-level negative H2OSOI_LIQ, so without this limit, we were getting roundoff-level negative fluxes. Resolves ESCOMP#1979
Configuration menu - View commit details
-
Copy full SHA for 798c29c - Browse repository at this point
Copy the full SHA 798c29cView commit details -
Merge tag 'ctsm5.1.dev122' into ctsm.newtestgrids
Rework handling of evaporation constraint in SoilFluxes Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that I applied a max of 0 to the new fluxes because many initial conditions files have roundoff-level negative H2OSOI_LIQ, so without this limit, we were getting roundoff-level negative fluxes. Resolves ESCOMP#1979
Configuration menu - View commit details
-
Copy full SHA for 7572d07 - Browse repository at this point
Copy the full SHA 7572d07View commit details
Commits on May 1, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 1e57258 - Browse repository at this point
Copy the full SHA 1e57258View commit details -
Configuration menu - View commit details
-
Copy full SHA for d1092e7 - Browse repository at this point
Copy the full SHA d1092e7View commit details -
Merge branch 'support_pfunit4'
Updates needed for pFUnit 4 and other externals updates (1) Lots of small changes needed for the update to pFUnit4. Note that this is a backwards-incompatible update, so we will require pFUnit 4 moving forward. (2) Externals updates: some of these are needed for the update to pFUnit 4; others are included to update externals to those in a recent CESM alpha tag.
Configuration menu - View commit details
-
Copy full SHA for 8df94cb - Browse repository at this point
Copy the full SHA 8df94cbView commit details
Commits on May 3, 2023
-
Merge tag 'ctsm5.1.dev123' into neon_prism_work
Updates needed for pFUnit 4 and other externals updates (1) Lots of small changes needed for the update to pFUnit4. Note that this is a backwards-incompatible update, so we will require pFUnit 4 moving forward. (2) Externals updates: some of these are needed for the update to pFUnit 4; others are included to update externals to those in a recent CESM alpha tag. Update cdeps external to version with NEON.PRISM changes Conflicts: Externals.cfg
Configuration menu - View commit details
-
Copy full SHA for e2289d3 - Browse repository at this point
Copy the full SHA e2289d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for b369985 - Browse repository at this point
Copy the full SHA b369985View commit details -
Configuration menu - View commit details
-
Copy full SHA for 54dfe79 - Browse repository at this point
Copy the full SHA 54dfe79View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7f9e9ab - Browse repository at this point
Copy the full SHA 7f9e9abView commit details
Commits on May 5, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 13f5997 - Browse repository at this point
Copy the full SHA 13f5997View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3a875dc - Browse repository at this point
Copy the full SHA 3a875dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for b53ff45 - Browse repository at this point
Copy the full SHA b53ff45View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b46364 - Browse repository at this point
Copy the full SHA 0b46364View commit details -
Configuration menu - View commit details
-
Copy full SHA for f5f0438 - Browse repository at this point
Copy the full SHA f5f0438View commit details -
Configuration menu - View commit details
-
Copy full SHA for d1e9b43 - Browse repository at this point
Copy the full SHA d1e9b43View commit details -
Merge tag 'ctsm5.1.dev122' into feature/memory_scaling_master
Rework handling of evaporation constraint in SoilFluxes Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that I applied a max of 0 to the new fluxes because many initial conditions files have roundoff-level negative H2OSOI_LIQ, so without this limit, we were getting roundoff-level negative fluxes. Resolves ESCOMP#1979
Configuration menu - View commit details
-
Copy full SHA for 81b9472 - Browse repository at this point
Copy the full SHA 81b9472View commit details
Commits on May 6, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 7354df7 - Browse repository at this point
Copy the full SHA 7354df7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 96c58a9 - Browse repository at this point
Copy the full SHA 96c58a9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 052c670 - Browse repository at this point
Copy the full SHA 052c670View commit details -
Merge tag 'ctsm5.1.dev123' into feature/memory_scaling_master
Updates needed for pFUnit 4 and other externals updates (1) Lots of small changes needed for the update to pFUnit4. Note that this is a backwards-incompatible update, so we will require pFUnit 4 moving forward. (2) Externals updates: some of these are needed for the update to pFUnit 4; others are included to update externals to those in a recent CESM alpha tag.
Configuration menu - View commit details
-
Copy full SHA for ce306fd - Browse repository at this point
Copy the full SHA ce306fdView commit details -
Merge tag 'ctsm5.1.dev123' into ctsm.newtestgrids
Updates needed for pFUnit 4 and other externals updates (1) Lots of small changes needed for the update to pFUnit4. Note that this is a backwards-incompatible update, so we will require pFUnit 4 moving forward. (2) Externals updates: some of these are needed for the update to pFUnit 4; others are included to update externals to those in a recent CESM alpha tag.
Configuration menu - View commit details
-
Copy full SHA for 9d8ae93 - Browse repository at this point
Copy the full SHA 9d8ae93View commit details -
Configuration menu - View commit details
-
Copy full SHA for 13cb8a5 - Browse repository at this point
Copy the full SHA 13cb8a5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3044ca9 - Browse repository at this point
Copy the full SHA 3044ca9View commit details
Commits on May 7, 2023
-
Add two mpasa tests to help ensure MPASA resolutions will be function…
…al in CTSM tags and can be used in CAM
Configuration menu - View commit details
-
Copy full SHA for 45a902c - Browse repository at this point
Copy the full SHA 45a902cView commit details -
Add mpasa480 and mpasa120 to the standard resolution list as a remind…
…er to include mpasa resolutions as a standard for surface dataset creation
Configuration menu - View commit details
-
Copy full SHA for 1f8cae4 - Browse repository at this point
Copy the full SHA 1f8cae4View commit details -
Remove attributes no longer needed for init_interp_attributes, and ad…
…d one used in the others
Configuration menu - View commit details
-
Copy full SHA for b7f64b7 - Browse repository at this point
Copy the full SHA b7f64b7View commit details -
Use_crop attribute not needed for mpasa 1850 surface datasets as crop…
… datasets are used for both SP, BGC, and crop cases
Configuration menu - View commit details
-
Copy full SHA for 9593483 - Browse repository at this point
Copy the full SHA 9593483View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7001b8f - Browse repository at this point
Copy the full SHA 7001b8fView commit details
Commits on May 8, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 514a3b9 - Browse repository at this point
Copy the full SHA 514a3b9View commit details -
Configuration menu - View commit details
-
Copy full SHA for f688149 - Browse repository at this point
Copy the full SHA f688149View commit details -
Merge branch 'ctsm.newtestgrids' into combine_mem_prism_newgrids
Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml bld/namelist_files/namelist_definition_ctsm.xml bld/unit_testers/build-namelist_test.pl cime_config/testdefs/testlist_clm.xml tools/mksurfdata_map/Makefile.data
Configuration menu - View commit details
-
Copy full SHA for c6eca43 - Browse repository at this point
Copy the full SHA c6eca43View commit details -
Configuration menu - View commit details
-
Copy full SHA for 97448f3 - Browse repository at this point
Copy the full SHA 97448f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 434310d - Browse repository at this point
Copy the full SHA 434310dView commit details -
Merge remote-tracking branch 'TeaganKing/neon_prism_work' into combin…
…e_mem_prism_newgrids
Configuration menu - View commit details
-
Copy full SHA for 596c6e2 - Browse repository at this point
Copy the full SHA 596c6e2View commit details -
Configuration menu - View commit details
-
Copy full SHA for cae251a - Browse repository at this point
Copy the full SHA cae251aView commit details -
Make some changes to the cplhist testmod that should fix the cplhist test, based on testing done by Keith Oleson: - Point to new cplhist forcing data generated and used by Adam Herrington and Keith Oleson - Use DATM_PRESNDEP=none until ESCOMP#1844 is resolved Also, remove mct cplhist test
Configuration menu - View commit details
-
Copy full SHA for 18ac790 - Browse repository at this point
Copy the full SHA 18ac790View commit details
Commits on May 9, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 53ce361 - Browse repository at this point
Copy the full SHA 53ce361View commit details -
Configuration menu - View commit details
-
Copy full SHA for 08094df - Browse repository at this point
Copy the full SHA 08094dfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d3314b - Browse repository at this point
Copy the full SHA 5d3314bView commit details -
Merge pull request ESCOMP#1998 from ekluzek/combine_mem_prism_newgrids
New grids SE and MPASA, memory at initialization improvement, option for PRISM in NEON
Configuration menu - View commit details
-
Copy full SHA for 6f1b566 - Browse repository at this point
Copy the full SHA 6f1b566View commit details
Commits on May 12, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 4db1d20 - Browse repository at this point
Copy the full SHA 4db1d20View commit details
Commits on May 13, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 7b637e4 - Browse repository at this point
Copy the full SHA 7b637e4View commit details -
Configuration menu - View commit details
-
Copy full SHA for afa0ac0 - Browse repository at this point
Copy the full SHA afa0ac0View commit details
Commits on May 17, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6700961 - Browse repository at this point
Copy the full SHA 6700961View commit details -
Added cache for clock step_size in clm_time_manager.F90
Configuration menu - View commit details
-
Copy full SHA for 576f14d - Browse repository at this point
Copy the full SHA 576f14dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 002f95d - Browse repository at this point
Copy the full SHA 002f95dView commit details -
Configuration menu - View commit details
-
Copy full SHA for e5cb01b - Browse repository at this point
Copy the full SHA e5cb01bView commit details -
Configuration menu - View commit details
-
Copy full SHA for b93a1f7 - Browse repository at this point
Copy the full SHA b93a1f7View commit details
Commits on May 18, 2023
-
Configuration menu - View commit details
-
Copy full SHA for ff7eb05 - Browse repository at this point
Copy the full SHA ff7eb05View commit details -
Clean up some loops in UrbanTimeVarType Resolves ESCOMP#1514
Configuration menu - View commit details
-
Copy full SHA for a8e993a - Browse repository at this point
Copy the full SHA a8e993aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1babc8e - Browse repository at this point
Copy the full SHA 1babc8eView commit details
Commits on May 19, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 4ab7026 - Browse repository at this point
Copy the full SHA 4ab7026View commit details -
Fix nuopc cplhist test Make some changes to the cplhist testmod that fix the cplhist test, based on testing done by Keith Oleson: - Point to new cplhist forcing data generated and used by Adam Herrington and Keith Oleson - Use DATM_PRESNDEP=none until ESCOMP#1844 is resolved Also, remove mct cplhist test.
Configuration menu - View commit details
-
Copy full SHA for 394f9fd - Browse repository at this point
Copy the full SHA 394f9fdView commit details
Commits on May 22, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 1474f2a - Browse repository at this point
Copy the full SHA 1474f2aView commit details
Commits on May 26, 2023
-
Configuration menu - View commit details
-
Copy full SHA for ebf9601 - Browse repository at this point
Copy the full SHA ebf9601View commit details
Commits on Jun 1, 2023
-
Configuration menu - View commit details
-
Copy full SHA for cc33328 - Browse repository at this point
Copy the full SHA cc33328View commit details -
Merge pull request ESCOMP#2010 from glemieux/fates-history-doubleprec
Update fates history tests to use double precision
Configuration menu - View commit details
-
Copy full SHA for 5df6c98 - Browse repository at this point
Copy the full SHA 5df6c98View commit details
Commits on Jun 13, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 5249cc9 - Browse repository at this point
Copy the full SHA 5249cc9View commit details
Commits on Oct 6, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 9bf40a4 - Browse repository at this point
Copy the full SHA 9bf40a4View commit details