cmeps directory refactor #256
Merged
Conversation
This file contains 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
Add explicit types to literals in COARE ocean surface flux scheme The COARE ocean surface flux scheme had un-typed literals (including some in functions that caused a build issue on Summit). This change adds explicit types - in most cases converting to "_R8" reals. This shouldn't affect the climate of "out of the box" cases (which use a different ocean surface flux scheme). But, when using the COARE scheme (ocn_surface_flux_scheme = 1 in user_nl_cpl), it is non-BFB with the earlier COARE implementation. Fixes #3105 [BFB] [FCC] * jackreeveseyre/cime/sfc_flux_bug_fix: Adds explicit types to literals in COARE ocean surface flux scheme.
Update CIME to ESMCI cime5.8.9 Squash merge of jgfouca/branch-for-to-acme-2019-09-24 Features: * Add support for running Radiative Convective Equilibrium including new aquaplanet mode 11. * Add support to archive metadata for lens experiment type. * Make the streams file legitimate xml files so that we can parse them. Bug fixes: * Fix script_regression_tests directory cleanup * fix issue with workflow prior to run on master * dont call bcast on mpi_comm_null in seq_flux_mct [BFB]
Minimum wind speed for atmOcn fluxes had been hardwired up until this point. Introduced a namelist variable and changed the default setting only for AQP11. Test suite: all aux_cam tests, cime_developer tests Test baseline: Test namelist changes: Ran the AQP11 test, and it's namelist has the new value of 1 Test status: [bit for bit, roundoff, climate changing] BFB Fixes [CIME Github issue #] User interface changes?: Added "seq_flux_atmocn_minwind" namelist. The default for all jobs is 0.5, which is the previous jobs. The only exception is AQP11, which now has the value of 1.0 Update gh-pages html (Y/N)?:n Code review:
modified: src/components/data_comps/docn/cime_config/buildnml modified: src/components/data_comps/docn/cime_config/config_component.xml modified: src/components/data_comps/docn/cime_config/namelist_definition_docn.xml modified: src/components/data_comps/docn/mct/docn_comp_mod.F90 modified: src/components/data_comps/docn/mct/docn_shr_mod.F90 modified: src/share/util/shr_scam_mod.F90
Change globally uniform SST mode from AQP11 to AQPCONST
* esmci_remote_for_split/master: (1961 commits) Update for cime5.8.13 add a raw xml option to query_config, useful for gui development fix potential issue in LIDS add --only-job option commit to move to cheyenne lock and unlock env_batch for changing BATCH_SYSTEM unlock batch to change BATCH_SYSTEM and lock when completed Update for cime5.8.12 Fix T5_T5_mg37 grid Change globally uniform SST mode from AQP11 to AQPCONST Changes for cam testing fix nuopc esmf paths Update for cime5.8.11 update esmf libs for nuopc, no longer need external yaml lib correct the way esmf is built to avoid library mismatch Update for cime5.6.24 Add namelist for minimum wind speed for atmOcn fluxes Fix gnu on cheyenne Update for cime5.8.10 tag dont call bcast on mpi_comm_null ... # Conflicts: # ChangeLog # config/cesm/machines/config_machines.xml # src/components/data_comps/docn/cime_config/config_component.xml # src/components/data_comps/docn/cime_config/namelist_definition_docn.xml # src/components/data_comps/docn/mct/docn_comp_mod.F90 # src/components/data_comps/docn/mct/docn_shr_mod.F90 # src/drivers/mct/cime_config/namelist_definition_drv.xml # src/drivers/mct/main/seq_flux_mct.F90 # src/share/util/shr_scam_mod.F90
Update CIME to ESMCI cime5.8.13 Squash merge of jgfouca/branch-for-to-acme-2019-10-28 Features: * Updates to workflow support in CIME. * Add namelist for minimum wind speed for atmOcn fluxes. * Change globally uniform SST mode from AQP11 to AQPCONST * Add --only-job option to case.submit: run only jobname and ignore any defined workflow * Adds a raw xml option to the query_config interface. * Refactor how run_cmd handles strings Bug fixes: * Fix an issue with Lockedfile error when case.submit is used with the --no-batch flag [NML] [BFB]
Two calls to memset in gptl.c in the timing library have their arguments in the wrong order. The other calls to memset in gptl.c are correct. In practice this has not caused any problems (due to the values being swapped), and the result is BFB. To avoid future issues, it is still important to fix this. [BFB]
Also, don't estimate memusage in Fortran: rely on C sys-calls
Fix memory highwater and usage reporting Fixes #3292 [BFB]
This new variable allows the behavior of shr_orb_cosz() in shr_orb_mod to be overridden globally. By setting constant_zenith_deg with a value >=0 shr_orb_cosz() will always return the cosine of that value. The motivation behind this is to allow special idealized cases, like RCE with a coupled ocean. modified: cime/src/drivers/mct/cime_config/namelist_definition_drv.xml modified: cime/src/drivers/mct/shr/seq_infodata_mod.F90 modified: cime/src/share/util/shr_orb_mod.F90
The function shr_sys_irtc can be made thread safe in the current usage context by adding !$omp threadprivate(last_count,count_offset) where last_count and count_offset are the two local saved variables. With this change, the critical sections around the calls to shr_sys_irtc in physpkg.F90 are no longer necessary, and are removed here. [BFB]
mvertens
requested review from
uturuncoglu and
jedwards4b
and removed request for
cacraigucar
jedwards4b
reviewed
Nov 15, 2021
| @@ -0,0 +1,2299 @@ | |||
| module shr_flux_mod | |||
There was a problem hiding this comment.
Why was this file put into a new directory?
There was a problem hiding this comment.
Because CAM needs it for physconst mod. And it is its own directory since it relates to atm/ocn fluxes. I thought it would be a good idea to separate that out explicitly.
jedwards4b
approved these changes
Nov 15, 2021
|
@uturuncoglu @DeniseWorthen - could you please test this in your configurations and make sure they work. @jedwards4b and I talked and we are not worried about the Travis test failure. |
|
I tested the compile after the last commit and was able to compile after changing our CMakeLists. I also tested deleting the dtypes.h and genf90.pl. I expect everything to pass but I will test again just to verify. |
|
Thank you!
On Mon, Nov 15, 2021 at 6:58 PM Denise Worthen ***@***.***> wrote:
I tested the compile after the last commit and was able to compile after
changing our CMakeLists. I also tested deleting the dtypes.h and genf90.pl.
I expect everything to pass but I will test again just to verify.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#256 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AB4XCE67E2K4WADPPV3ZI23UMG3EPANCNFSM5H7L2D4Q>
.
Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
--
Dr. Mariana Vertenstein
CESM Software Engineering Group Head
National Center for Atmospheric Research
Boulder, Colorado
Office 303-497-1349
Email: ***@***.***
|
uturuncoglu
approved these changes
Nov 16, 2021
|
The full RT suite passes for ufs-weather for both INTEL and GNU. We can remove dtypes.h and genf90.pl from the CMEPS/ufs directory. |
DeniseWorthen
approved these changes
Nov 16, 2021
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.
Description of changes
CMEPS directory refactor
Specific notes
The following directory changes were made:
Also shr_constants_mod.F90 is now only used by cesm and the the file util/shr_const_mod.F90 has been moved and renamed to ufs/ufs_constants_mod.F90
In addition med_aofluxes_mod.F90 now has separate calls to the ufs and cesm atmocn flux computation.
Contributors other than yourself, if any:
CMEPS Issues Fixed: None
Are changes expected to change answers? bit-for-bit
Any User Interface Changes (namelist or namelist defaults changes)? No
Testing performed:
CESM testing: verified that the following tests are bfb with cesm2_3_alpha07a on cheyenne :
IRT_Ld7.f09_g17.BHIST.cheyenne_intel.allactive-defaultio
ERS_Ld3.f45_g37_rx1.A.cheyenne_intel
UFS testing: ufs-weather-model 0cf60348 using CMEPS e703499