Fix non-standard hexadecimal constant #1271
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
|
I did some testing of this on the PPE branch, and didn't see any answer changes for the intel compiler. |
|
I should have mentioned: I folded this into my upcoming bfb tag. |
billsacks
added a commit
that referenced
this pull request
Feb 23, 2021
Refactor ozone code, and misc. small fixes (1) Restructure ozone code (#1276) in preparation for new ozone parameterization. (2) Fix non-standard hexadecimal constant (#1271), needed for gfortran 10 (3) Remove support for CISM1 (#1226) (4) Move final WaterGridcellBalance call out to clm_driver (resolves #1286) (5) Only add WA and QCHARGE history fields if use_aquifer_layer is true (resolves #1281) (6) Consolidate conditional structures for VIC initialization (resolves #1287) - Resolves #1286 (Move call to WaterGridcellBalance out to the driver) - Resolves #1281 (Remove deprecated history output) - Resolves #1287 (Inconsistent logic for VIC initialization can cause crash in debug mode) - Resolves #1270 (Hexadecimal constants use non-standard Fortran)
ekluzek
added a commit
to ekluzek/CTSM
that referenced
this pull request
Mar 6, 2021
Refactor ozone code, and misc. small fixes (1) Restructure ozone code (ESCOMP#1276) in preparation for new ozone parameterization. (2) Fix non-standard hexadecimal constant (ESCOMP#1271), needed for gfortran 10 (3) Remove support for CISM1 (ESCOMP#1226) (4) Move final WaterGridcellBalance call out to clm_driver (resolves ESCOMP#1286) (5) Only add WA and QCHARGE history fields if use_aquifer_layer is true (resolves ESCOMP#1281) (6) Consolidate conditional structures for VIC initialization (resolves ESCOMP#1287) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml bld/unit_testers/build-namelist_test.pl
ekluzek
added a commit
to olyson/ctsm
that referenced
this pull request
Mar 12, 2021
Refactor ozone code, and misc. small fixes (1) Restructure ozone code (ESCOMP#1276) in preparation for new ozone parameterization. (2) Fix non-standard hexadecimal constant (ESCOMP#1271), needed for gfortran 10 (3) Remove support for CISM1 (ESCOMP#1226) (4) Move final WaterGridcellBalance call out to clm_driver (resolves ESCOMP#1286) (5) Only add WA and QCHARGE history fields if use_aquifer_layer is true (resolves ESCOMP#1281) (6) Consolidate conditional structures for VIC initialization (resolves ESCOMP#1287) Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml src/main/histFileMod.F90
ekluzek
added a commit
to djk2120/CTSM
that referenced
this pull request
Mar 13, 2021
Refactor ozone code, and misc. small fixes (1) Restructure ozone code (ESCOMP#1276) in preparation for new ozone parameterization. (2) Fix non-standard hexadecimal constant (ESCOMP#1271), needed for gfortran 10 (3) Remove support for CISM1 (ESCOMP#1226) (4) Move final WaterGridcellBalance call out to clm_driver (resolves ESCOMP#1286) (5) Only add WA and QCHARGE history fields if use_aquifer_layer is true (resolves ESCOMP#1281) (6) Consolidate conditional structures for VIC initialization (resolves ESCOMP#1287) Conflicts: src/biogeophys/CanopyFluxesMod.F90
yelizy
pushed a commit
to yelizy/ctsm
that referenced
this pull request
Jul 19, 2022
Refactor ozone code, and misc. small fixes (1) Restructure ozone code (ESCOMP#1276) in preparation for new ozone parameterization. (2) Fix non-standard hexadecimal constant (ESCOMP#1271), needed for gfortran 10 (3) Remove support for CISM1 (ESCOMP#1226) (4) Move final WaterGridcellBalance call out to clm_driver (resolves ESCOMP#1286) (5) Only add WA and QCHARGE history fields if use_aquifer_layer is true (resolves ESCOMP#1281) (6) Consolidate conditional structures for VIC initialization (resolves ESCOMP#1287)
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
See #1270 for details
This should be folded into an upcoming tag.
Specific notes
Contributors other than yourself, if any: none
CTSM Issues Fixed (include github issue #):
Are answers expected to change (and if so in what way)? no
Any User Interface Changes (namelist or namelist defaults changes)? no
Testing performed, if any:
Tested on my mac with test
SMS_D_Ld1_P4x1.f10_f10_musgs.I2000Clm50BgcCropQianRs.bishorn_gnu.clm-o3. With gfortran10, this passes and is bit-for-bit with a test without these changes but instead with FFLAG-fallow-invalid-bozadded.