Skip to content

Commit a579f3a

Browse files
authored
Merge pull request #1442 from peverwhee/remove-messages
cam6_4_132: Remove extraneous log messages
2 parents 11d0035 + ea3772e commit a579f3a

File tree

6 files changed

+61
-17
lines changed

6 files changed

+61
-17
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
[submodule "atmos_phys"]
3030
path = src/atmos_phys
3131
url = https://github.com/ESCOMP/atmospheric_physics
32-
fxtag = atmos_phys0_18_002
32+
fxtag = atmos_phys0_18_003
3333
fxrequired = AlwaysRequired
3434
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
3535

bld/namelist_files/namelist_defaults_cam.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<ncdata nlev="58" analytic_ic="1" >atm/cam/inic/cam_vcoords_L58_c250227.nc</ncdata>
3838

3939
<!-- Vertical/Horizontal coordinates only - MPAS initial files for analytic cases-->
40+
<ncdata hgrid="mpasa120" nlev="26" analytic_ic="1" >atm/cam/inic/mpas/mpasa120_L26_notopo_coords_c251105.nc</ncdata>
4041
<ncdata hgrid="mpasa480" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240507.nc</ncdata>
4142
<ncdata hgrid="mpasa120" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc</ncdata>
4243
<ncdata hgrid="mpasa60" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc</ncdata>

doc/ChangeLog

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,62 @@
11
===============================================================
22

3+
Tag name: cam6_4_132
4+
Originator(s): peverwhee, jimmielin, cacraigucar, nusbaume
5+
Date: Nov 26, 2025
6+
One-line Summary: Remove extraneous log messages
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1442
8+
9+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
10+
Remove extraneous log messages from GEOS-Chem and RRTMGP
11+
Add new MPAS 120 km L26 analytic ICs.
12+
13+
Describe any changes made to build system: N/A
14+
15+
Describe any changes made to the namelist:
16+
M bld/namelist_files/namelist_defaults_cam.xml
17+
- Add new MPAS 120km L26 analystic ics
18+
19+
List any changes to the defaults for the boundary datasets: N/A
20+
21+
Describe any substantial timing or memory changes: N/A
22+
23+
Code reviewed by: cacraigucar
24+
25+
List all files eliminated: N/A
26+
27+
List all files added and what they do: N/A
28+
29+
List all existing files that have been modified, and describe the changes:
30+
M .gitmodules
31+
M src/atmos_phys/
32+
M src/physics/rrtmgp/radiation.F90
33+
- update atmospheric physics tag and rrtmgp_inputs_run interface to remove RRTMGP messages
34+
35+
M src/chemistry/geoschem/chemistry.F90
36+
- remove extraneous geoschem messages
37+
38+
If there were any failures reported from running test_driver.sh on any test
39+
platform, and checkin with these failures has been OK'd by the gatekeeper,
40+
then copy the lines from the td.*.status files for the failed tests to the
41+
appropriate machine below. All failed tests must be justified.
42+
43+
derecho/intel/aux_cam:
44+
SMS_D_Ln9_P1536x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
45+
- intermittent failure in CTSM code (lnd_set_decomp_and_domain.F90)
46+
47+
derecho/nvhpc/aux_cam:
48+
ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) details:
49+
- timing issue - Jian has determined this is due to changes on derecho with the the last upgrade. He has
50+
reported the issue to CISL. Note cam6_4_128 is the last CAM tag with baselines to use for comparison
51+
but answer changes are expected starting with cam6_4_130
52+
53+
izumi/nag/aux_cam: all BFB
54+
55+
izumi/gnu/aux_cam: all BFB
56+
57+
Summarize any changes to answers: n/a
58+
59+
===============================================================
360
Tag name: cam6_4_131
461
Originator(s): johnmauff, pel, cacraig, nusbaume
562
Date: Nov 26, 2025

src/atmos_phys

src/chemistry/geoschem/chemistry.F90

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -949,8 +949,6 @@ function chem_implements_cnst(name)
949949
! Purpose: return true if specified constituent is implemented by this package
950950
! Author: B. Eaton
951951

952-
IMPLICIT NONE
953-
954952
CHARACTER(LEN=*), INTENT(IN) :: name ! constituent name
955953
LOGICAL :: chem_implements_cnst ! return value
956954
INTEGER :: M
@@ -4640,12 +4638,8 @@ subroutine chem_init_restart(File)
46404638
use tracer_cnst, only : init_tracer_cnst_restart
46414639
use tracer_srcs, only : init_tracer_srcs_restart
46424640

4643-
IMPLICIT NONE
4644-
46454641
TYPE(file_desc_t) :: File
46464642

4647-
WRITE(iulog,'(a)') 'chem_init_restart: init restarts for tracer sources and offline fields'
4648-
46494643
!
46504644
! data for offline tracers
46514645
!
@@ -4665,12 +4659,8 @@ subroutine chem_write_restart( File )
46654659
use tracer_cnst, only : write_tracer_cnst_restart
46664660
use tracer_srcs, only : write_tracer_srcs_restart
46674661

4668-
IMPLICIT NONE
4669-
46704662
TYPE(file_desc_t) :: File
46714663

4672-
WRITE(iulog,'(a)') 'chem_write_restart: writing restarts for tracer sources and offline fields'
4673-
46744664
! data for offline tracers
46754665
call write_tracer_cnst_restart(File)
46764666
call write_tracer_srcs_restart(File)
@@ -4687,12 +4677,8 @@ subroutine chem_read_restart( File )
46874677
use tracer_cnst, only : read_tracer_cnst_restart
46884678
use tracer_srcs, only : read_tracer_srcs_restart
46894679

4690-
IMPLICIT NONE
4691-
46924680
TYPE(file_desc_t) :: File
46934681

4694-
WRITE(iulog,'(a)') 'GCCALL CHEM_READ_RESTART'
4695-
46964682
! data for offline tracers
46974683
call read_tracer_cnst_restart(File)
46984684
call read_tracer_srcs_restart(File)

src/physics/rrtmgp/radiation.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ subroutine radiation_tend( &
11721172
! Prepare state variables, daylit columns, albedos for RRTMGP
11731173
! Also calculate modified cloud fraction
11741174
call rrtmgp_inputs_run(dosw, dolw, associated(cldfsnow), associated(cldfgrau), &
1175-
masterproc, iulog, is_mpas, state%pmid(:ncol,:), state%pint(:ncol,:), state%t(:ncol,:), &
1175+
is_mpas, state%pmid(:ncol,:), state%pint(:ncol,:), state%t(:ncol,:), &
11761176
nday, idxday, cldfprime(:ncol,:), coszrs(:ncol), kdist_sw, t_sfc, &
11771177
emis_sfc, t_rad, pmid_rad, pint_rad, t_day, pmid_day, &
11781178
pint_day, coszrs_day, alb_dir, alb_dif, cam_in%lwup(:ncol), stebol, &

0 commit comments

Comments
 (0)