From 135ebcdda7c2ec542fc0989746548bddabae2fac Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 24 May 2024 14:18:28 -0600 Subject: [PATCH 1/8] improve performance of rh file write --- src/control/cam_history.F90 | 80 +++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/src/control/cam_history.F90 b/src/control/cam_history.F90 index a0b35e5a1d..7c6cd87dee 100644 --- a/src/control/cam_history.F90 +++ b/src/control/cam_history.F90 @@ -4833,44 +4833,48 @@ subroutine h_define (t, restart) call cam_pio_handle_error(ierr, & 'h_define: cannot define basename for '//trim(fname_tmp)) end if - - if (restart) then - ! For restart history files, we need to save accumulation counts - fname_tmp = trim(fname_tmp)//'_nacs' - if (.not. associated(tape(t)%hlist(fld)%nacs_varid)) then - allocate(tape(t)%hlist(fld)%nacs_varid) - end if - if (size(tape(t)%hlist(fld)%nacs, 1) > 1) then - call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & - nacsdims(1:num_hdims), tape(t)%hlist(fld)%nacs_varid) - else - ! Save just one value representing all chunks - call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & - tape(t)%hlist(fld)%nacs_varid) - end if - ! for standard deviation - if (associated(tape(t)%hlist(fld)%sbuf)) then - fname_tmp = strip_suffix(tape(t)%hlist(fld)%field%name) - fname_tmp = trim(fname_tmp)//'_var' - if ( .not.associated(tape(t)%hlist(fld)%sbuf_varid)) then - allocate(tape(t)%hlist(fld)%sbuf_varid) - endif - call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_double, & - dimids_tmp(1:fdims), tape(t)%hlist(fld)%sbuf_varid) - endif - end if - end do ! Loop over output patches - end do ! Loop over fields - ! - deallocate(mdimids) - ret = pio_enddef(tape(t)%Files(f)) - if (ret /= PIO_NOERR) then - call endrun('H_DEFINE: ERROR exiting define mode in PIO') - end if - - if(masterproc) then - write(iulog,*)'H_DEFINE: Successfully opened netcdf file ' - endif + enddo + enddo + ! For restart history files, we need to save accumulation counts + if (restart) then + do fld = 1, nflds(t) + do i = 1, num_patches + fname_tmp = strip_suffix(tape(t)%hlist(fld)%field%name) + fname_tmp = trim(fname_tmp)//'_nacs' + if (.not. associated(tape(t)%hlist(fld)%nacs_varid)) then + allocate(tape(t)%hlist(fld)%nacs_varid) + end if + if (size(tape(t)%hlist(fld)%nacs, 1) > 1) then + call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & + nacsdims(1:num_hdims), tape(t)%hlist(fld)%nacs_varid) + else + ! Save just one value representing all chunks + call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & + tape(t)%hlist(fld)%nacs_varid) + end if + ! for standard deviation + if (associated(tape(t)%hlist(fld)%sbuf)) then + fname_tmp = strip_suffix(tape(t)%hlist(fld)%field%name) + fname_tmp = trim(fname_tmp)//'_var' + if ( .not.associated(tape(t)%hlist(fld)%sbuf_varid)) then + allocate(tape(t)%hlist(fld)%sbuf_varid) + endif + call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_double, & + dimids_tmp(1:fdims), tape(t)%hlist(fld)%sbuf_varid) + endif + end do ! Loop over output patches + end do ! Loop over fields + end if + ! + deallocate(mdimids) + ret = pio_enddef(tape(t)%Files(f)) + if (ret /= PIO_NOERR) then + call endrun('H_DEFINE: ERROR exiting define mode in PIO') + end if + + if(masterproc) then + write(iulog,*)'H_DEFINE: Successfully opened netcdf file ' + endif end do ! Loop over files ! ! Write time-invariant portion of history header From 99e41eb86f8e31f31f1d009b6ebfee0ce8073650 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 28 May 2024 17:54:58 -0400 Subject: [PATCH 2/8] fix buildcpp to return configure error messages --- cime_config/buildcpp | 7 ++++-- doc/ChangeLog | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/cime_config/buildcpp b/cime_config/buildcpp index e7df81cecb..ef685a23ab 100644 --- a/cime_config/buildcpp +++ b/cime_config/buildcpp @@ -15,7 +15,7 @@ sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools")) from standard_script_setup import * -from CIME.utils import run_cmd_no_fail +from CIME.utils import run_cmd from CIME.case import Case from CIME.buildnml import parse_input @@ -136,7 +136,10 @@ def buildcpp(case): srcroot = testpath cmd = os.path.join(srcroot, "bld", "configure") + \ " " + " ".join(config_opts) - run_cmd_no_fail(cmd, from_dir=camconf) + + stat, output, err = run_cmd(cmd, from_dir=camconf) + if stat: + logger.warning(err) # determine cppdefs - caseroot/camconf/CESM_cppdefs is created by the call to configure with open(os.path.join(camconf, "CESM_cppdefs"), 'r') as f: diff --git a/doc/ChangeLog b/doc/ChangeLog index 9f4f0d348d..020684a5a5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,60 @@ +=============================================================== + +Tag name: +Originator(s): jedwards, eaton +Date: +One-line Summary: misc fixes: buildcpp, check_energy +Github PR URL: + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + +. Issue #1045 - buildcpp does not report errors reported by cam configure + - modify buildcpp so that error messages from CAM's configure appear in + the log output + + + +. resolves #1045 (and replaces PR #1046) + +Describe any changes made to build system: + +Describe any changes made to the namelist: + +List any changes to the defaults for the boundary datasets: + +Describe any substantial timing or memory changes: + +Code reviewed by: + +List all files eliminated: + +List all files added and what they do: + +List all existing files that have been modified, and describe the changes: + +cime_config/buildcpp +. run configure command from run_cmd() rather than run_cmd_no_fail() and + pass error output to logger.warning() + + + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. +derecho/intel/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers: + +=============================================================== =============================================================== Tag name: cam6_3_160 From 2a458db4bc61a2a98f4191598effb7a0b370a402 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 28 May 2024 18:41:52 -0400 Subject: [PATCH 3/8] fix SE specific treatment of subcolumns in check_energy --- doc/ChangeLog | 12 ++++++++++++ src/physics/cam/check_energy.F90 | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 020684a5a5..ab904b7443 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -12,9 +12,18 @@ Purpose of changes (include the issue number and title text for each relevant Gi - modify buildcpp so that error messages from CAM's configure appear in the log output +. Issue #1015 - SILHS subcolumns output as all zeros. + - testing for this issue revealed a bug when subcolumns were used with + the SE dycore. A fix is added to check_energy.F90. This doesn't fix + the problem with zeros in the subcolumn output, but this is the same + problem that was previously reported for COSP in issue #944. The + problem only appears when SE grid output is interpolated. A workaround + is to output the subcolumns on the native SE grid. + . resolves #1045 (and replaces PR #1046) +. resolves #1015 Describe any changes made to build system: @@ -36,6 +45,9 @@ cime_config/buildcpp . run configure command from run_cmd() rather than run_cmd_no_fail() and pass error output to logger.warning() +src/physics/cam/check_energy.F90 +. fix out of bounds array references when subcolumns are used in the SE + specific hydrostatic energy scaling. If there were any failures reported from running test_driver.sh on any test diff --git a/src/physics/cam/check_energy.F90 b/src/physics/cam/check_energy.F90 index 7615f0e432..1410a52a2f 100644 --- a/src/physics/cam/check_energy.F90 +++ b/src/physics/cam/check_energy.F90 @@ -485,13 +485,14 @@ subroutine check_energy_chng(state, tend, name, nstep, ztodt, & ! if (state%psetcols == pcols) then cp_or_cv(:ncol,:) = cp_or_cv_dycore(:ncol,:,lchnk) + scaling(:ncol,:) = cpairv(:ncol,:,lchnk)/cp_or_cv_dycore(:ncol,:,lchnk) else cp_or_cv(:ncol,:) = cpair + scaling(:ncol,:) = 1.0_r8 endif ! ! enthalpy scaling for energy consistency ! - scaling(:ncol,:) = cpairv(:ncol,:,lchnk)/cp_or_cv_dycore(:ncol,:,lchnk) temp(1:ncol,:) = state%temp_ini(1:ncol,:)+scaling(1:ncol,:)*(state%T(1:ncol,:)-state%temp_ini(1:ncol,:)) call get_hydrostatic_energy(state%q(1:ncol,1:pver,1:pcnst),.true., & state%pdel(1:ncol,1:pver), cp_or_cv(1:ncol,1:pver), & From fccd317529b7b67db1763f741a86b036ca9498d2 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 30 May 2024 12:57:26 -0400 Subject: [PATCH 4/8] remove solar_htng_spctrl_scl from cam5/6 aquaplanet use case files --- .../use_cases/aquaplanet_cam5.xml | 4 +-- .../use_cases/aquaplanet_cam6.xml | 4 +-- .../use_cases/aquaplanet_rce_cam6.xml | 35 ++++++++----------- doc/ChangeLog | 15 ++++++++ 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/bld/namelist_files/use_cases/aquaplanet_cam5.xml b/bld/namelist_files/use_cases/aquaplanet_cam5.xml index 814eecd98f..f5a3ed7988 100644 --- a/bld/namelist_files/use_cases/aquaplanet_cam5.xml +++ b/bld/namelist_files/use_cases/aquaplanet_cam5.xml @@ -18,9 +18,7 @@ 348.0e-6 -atm/cam/solar/ape_solar_ave_tsi_1365.nc -.true. -/ +atm/cam/solar/ape_solar_ave_tsi_1365.nc apeozone_cam3_5_54.nc diff --git a/bld/namelist_files/use_cases/aquaplanet_cam6.xml b/bld/namelist_files/use_cases/aquaplanet_cam6.xml index 814eecd98f..f5a3ed7988 100644 --- a/bld/namelist_files/use_cases/aquaplanet_cam6.xml +++ b/bld/namelist_files/use_cases/aquaplanet_cam6.xml @@ -18,9 +18,7 @@ 348.0e-6 -atm/cam/solar/ape_solar_ave_tsi_1365.nc -.true. -/ +atm/cam/solar/ape_solar_ave_tsi_1365.nc apeozone_cam3_5_54.nc diff --git a/bld/namelist_files/use_cases/aquaplanet_rce_cam6.xml b/bld/namelist_files/use_cases/aquaplanet_rce_cam6.xml index f03c4294b2..7b93fa8418 100644 --- a/bld/namelist_files/use_cases/aquaplanet_rce_cam6.xml +++ b/bld/namelist_files/use_cases/aquaplanet_rce_cam6.xml @@ -1,8 +1,9 @@ - - + + atm/cam/inic/se/initial_data.cam.ne30.L32.RCEMIP_c20190507.nc + 0. 0. @@ -12,18 +13,6 @@ false - atm/cam/ozone/ - ozone.cam.ne30.L32.RCEMIP_c20190507.nc - atm/cam/inic/se/initial_data.cam.ne30.L32.RCEMIP_c20190507.nc - atm/cam/solar/solar_tsi_551_with_ssi.cam.ne30.L32.RCEMIP_c20190507.nc - .false. - - true - I - 1 - 1 - 'T','Q','U','V','PS','PRECT','Z3' - 1.650e-6 0.306e-6 @@ -32,13 +21,12 @@ 0.0 0.0 - -atm/cam/solar/ape_solar_ave_tsi_1365.nc -.true. -/ + + atm/cam/solar/solar_tsi_551_with_ssi.cam.ne30.L32.RCEMIP_c20190507.nc + .false. - -apeozone_cam3_5_54.nc + + ozone.cam.ne30.L32.RCEMIP_c20190507.nc atm/cam/ozone OZONE CYCLICAL @@ -48,7 +36,6 @@ .true. 0.73391095 - 0.0 86164.10063718943 @@ -67,4 +54,10 @@ "" 0.0 + true + I + 1 + 1 + 'T','Q','U','V','PS','PRECT','Z3' + diff --git a/doc/ChangeLog b/doc/ChangeLog index ab904b7443..7f1fe984f6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -20,10 +20,17 @@ Purpose of changes (include the issue number and title text for each relevant Gi problem only appears when SE grid output is interpolated. A workaround is to output the subcolumns on the native SE grid. +. Issue #1044 - Remove solar_htng_spctrl_scl from aquaplanet use case + - also cleaned up the aquaplanet_rce_cam6.xml file which had duplicated + settings of several variables. The second setting is not used because + the first setting takes precedence. Note that the setting of + solar_htng_spctrl_scl to false in aquaplanet_rce_cam6.xml is needed + because it is overriding the default of true for cam6 with RRTMG. . resolves #1045 (and replaces PR #1046) . resolves #1015 +. resolves #1044 Describe any changes made to build system: @@ -41,6 +48,14 @@ List all files added and what they do: List all existing files that have been modified, and describe the changes: +bld/namelist_files/use_cases/aquaplanet_cam5.xml +bld/namelist_files/use_cases/aquaplanet_cam6.xml +. remove solar_htng_spctrl_scl + +bld/namelist_files/use_cases/aquaplanet_rce_cam6.xml +. remove duplicated (and hence unused) settings for solar_irrad_data_file, + prescribed_ozone_file, and solar_htng_spctrl_scl + cime_config/buildcpp . run configure command from run_cmd() rather than run_cmd_no_fail() and pass error output to logger.warning() From d02454c41c26fca67a68aa7e97219ba5ce0a4767 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 2 Jul 2024 14:57:21 -0400 Subject: [PATCH 5/8] update ChangeLog --- doc/ChangeLog | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index b04fffae12..68f24e477a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -15,10 +15,10 @@ Purpose of changes (include the issue number and title text for each relevant Gi . Issue #1015 - SILHS subcolumns output as all zeros. - testing for this issue revealed a bug when subcolumns were used with the SE dycore. A fix is added to check_energy.F90. This doesn't fix - the problem with zeros in the subcolumn output, but this is the same - problem that was previously reported for COSP in issue #944. The - problem only appears when SE grid output is interpolated. A workaround - is to output the subcolumns on the native SE grid. + the problem with zeros in the subcolumn output, but that is the same + problem previously reported for COSP in issue #944. The problem only + appears when SE grid output is interpolated. A workaround is to output + the subcolumns on the native SE grid. . Issue #1044 - Remove solar_htng_spctrl_scl from aquaplanet use case - also cleaned up the aquaplanet_rce_cam6.xml file which had duplicated @@ -27,10 +27,14 @@ Purpose of changes (include the issue number and title text for each relevant Gi solar_htng_spctrl_scl to false in aquaplanet_rce_cam6.xml is needed because it is overriding the default of true for cam6 with RRTMG. +. Issue #1042 - write performance of cam rh files + - Reorders variables in the rh files. Significantly improves file write + performance on derecho. . resolves #1045 (and replaces PR #1046) . resolves #1015 . resolves #1044 +. resolves #1042 (and replaces PR #1043) Describe any changes made to build system: @@ -60,6 +64,9 @@ cime_config/buildcpp . run configure command from run_cmd() rather than run_cmd_no_fail() and pass error output to logger.warning() +src/control/cam_history.F90 +. reorder variables in the rh files. + src/physics/cam/check_energy.F90 . fix out of bounds array references when subcolumns are used in the SE specific hydrostatic energy scaling. From ed640164e41cdf26851319028fd419c6b686bc1d Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 15 Jul 2024 19:18:01 -0400 Subject: [PATCH 6/8] update ChangeLog --- doc/ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 68f24e477a..affda6d0b8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,7 +4,7 @@ Tag name: Originator(s): jedwards, eaton Date: One-line Summary: misc fixes: buildcpp, check_energy -Github PR URL: +Github PR URL: https://github.com/ESCOMP/CAM/pull/1072 Purpose of changes (include the issue number and title text for each relevant GitHub issue): @@ -36,13 +36,13 @@ Purpose of changes (include the issue number and title text for each relevant Gi . resolves #1044 . resolves #1042 (and replaces PR #1043) -Describe any changes made to build system: +Describe any changes made to build system: none -Describe any changes made to the namelist: +Describe any changes made to the namelist: none -List any changes to the defaults for the boundary datasets: +List any changes to the defaults for the boundary datasets: none -Describe any substantial timing or memory changes: +Describe any substantial timing or memory changes: none Code reviewed by: From de6fff912dcb19a9c980dba206435289ef459ac6 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 23 Jul 2024 10:02:06 -0400 Subject: [PATCH 7/8] revert #1043; update ChangeLog --- doc/ChangeLog | 10 +---- src/control/cam_history.F90 | 80 ++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 526752e657..f1afcd19a8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,6 @@ =============================================================== -Tag name: +Tag name: cam6_4_015 Originator(s): jedwards, eaton Date: One-line Summary: misc fixes: buildcpp, check_energy @@ -27,14 +27,9 @@ Purpose of changes (include the issue number and title text for each relevant Gi solar_htng_spctrl_scl to false in aquaplanet_rce_cam6.xml is needed because it is overriding the default of true for cam6 with RRTMG. -. Issue #1042 - write performance of cam rh files - - Reorders variables in the rh files. Significantly improves file write - performance on derecho. - . resolves #1045 (and replaces PR #1046) . resolves #1015 . resolves #1044 -. resolves #1042 (and replaces PR #1043) Describe any changes made to build system: none @@ -64,9 +59,6 @@ cime_config/buildcpp . run configure command from run_cmd() rather than run_cmd_no_fail() and pass error output to logger.warning() -src/control/cam_history.F90 -. reorder variables in the rh files. - src/physics/cam/check_energy.F90 . fix out of bounds array references when subcolumns are used in the SE specific hydrostatic energy scaling. diff --git a/src/control/cam_history.F90 b/src/control/cam_history.F90 index 7c6cd87dee..a0b35e5a1d 100644 --- a/src/control/cam_history.F90 +++ b/src/control/cam_history.F90 @@ -4833,48 +4833,44 @@ subroutine h_define (t, restart) call cam_pio_handle_error(ierr, & 'h_define: cannot define basename for '//trim(fname_tmp)) end if - enddo - enddo - ! For restart history files, we need to save accumulation counts - if (restart) then - do fld = 1, nflds(t) - do i = 1, num_patches - fname_tmp = strip_suffix(tape(t)%hlist(fld)%field%name) - fname_tmp = trim(fname_tmp)//'_nacs' - if (.not. associated(tape(t)%hlist(fld)%nacs_varid)) then - allocate(tape(t)%hlist(fld)%nacs_varid) - end if - if (size(tape(t)%hlist(fld)%nacs, 1) > 1) then - call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & - nacsdims(1:num_hdims), tape(t)%hlist(fld)%nacs_varid) - else - ! Save just one value representing all chunks - call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & - tape(t)%hlist(fld)%nacs_varid) - end if - ! for standard deviation - if (associated(tape(t)%hlist(fld)%sbuf)) then - fname_tmp = strip_suffix(tape(t)%hlist(fld)%field%name) - fname_tmp = trim(fname_tmp)//'_var' - if ( .not.associated(tape(t)%hlist(fld)%sbuf_varid)) then - allocate(tape(t)%hlist(fld)%sbuf_varid) - endif - call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_double, & - dimids_tmp(1:fdims), tape(t)%hlist(fld)%sbuf_varid) - endif - end do ! Loop over output patches - end do ! Loop over fields - end if - ! - deallocate(mdimids) - ret = pio_enddef(tape(t)%Files(f)) - if (ret /= PIO_NOERR) then - call endrun('H_DEFINE: ERROR exiting define mode in PIO') - end if - - if(masterproc) then - write(iulog,*)'H_DEFINE: Successfully opened netcdf file ' - endif + + if (restart) then + ! For restart history files, we need to save accumulation counts + fname_tmp = trim(fname_tmp)//'_nacs' + if (.not. associated(tape(t)%hlist(fld)%nacs_varid)) then + allocate(tape(t)%hlist(fld)%nacs_varid) + end if + if (size(tape(t)%hlist(fld)%nacs, 1) > 1) then + call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & + nacsdims(1:num_hdims), tape(t)%hlist(fld)%nacs_varid) + else + ! Save just one value representing all chunks + call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_int, & + tape(t)%hlist(fld)%nacs_varid) + end if + ! for standard deviation + if (associated(tape(t)%hlist(fld)%sbuf)) then + fname_tmp = strip_suffix(tape(t)%hlist(fld)%field%name) + fname_tmp = trim(fname_tmp)//'_var' + if ( .not.associated(tape(t)%hlist(fld)%sbuf_varid)) then + allocate(tape(t)%hlist(fld)%sbuf_varid) + endif + call cam_pio_def_var(tape(t)%Files(f), trim(fname_tmp), pio_double, & + dimids_tmp(1:fdims), tape(t)%hlist(fld)%sbuf_varid) + endif + end if + end do ! Loop over output patches + end do ! Loop over fields + ! + deallocate(mdimids) + ret = pio_enddef(tape(t)%Files(f)) + if (ret /= PIO_NOERR) then + call endrun('H_DEFINE: ERROR exiting define mode in PIO') + end if + + if(masterproc) then + write(iulog,*)'H_DEFINE: Successfully opened netcdf file ' + endif end do ! Loop over files ! ! Write time-invariant portion of history header From 9f5bd87a9901feef3a394b8962e10f724b2716c4 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 23 Jul 2024 14:44:16 -0400 Subject: [PATCH 8/8] update ChangeLog --- doc/ChangeLog | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index f1afcd19a8..b198448dc7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,7 +2,7 @@ Tag name: cam6_4_015 Originator(s): jedwards, eaton -Date: +Date: 23 July 2024 One-line Summary: misc fixes: buildcpp, check_energy Github PR URL: https://github.com/ESCOMP/CAM/pull/1072 @@ -39,11 +39,11 @@ List any changes to the defaults for the boundary datasets: none Describe any substantial timing or memory changes: none -Code reviewed by: +Code reviewed by: cacraig -List all files eliminated: +List all files eliminated: none -List all files added and what they do: +List all files added and what they do: none List all existing files that have been modified, and describe the changes: @@ -71,14 +71,32 @@ appropriate machine below. All failed tests must be justified. derecho/intel/aux_cam: +ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) +- pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856 + +SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: PEND) +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) +- pre-existing failures -- need fix in CLM external + +SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s (Overall: FAIL) +- pre-existing failure -- need fix in CICE external + izumi/nag/aux_cam: +DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details: +- pre-existing failure - issue #670 + izumi/gnu/aux_cam: +ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp (Overall: DIFF) +- solution diffs because solar_htng_spctrl_scl is now getting the correct + value of .false. (what RRTMGP requires). The use case file was + previously incorrectly setting this value to .true. (what RRTMG requires). + CAM tag used for the baseline comparison tests if different than previous tag: -Summarize any changes to answers: +Summarize any changes to answers: BFB =============================================================== ===============================================================