Skip to content

cam6_3_027: Bug fixes for WACCMX #382

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.

Sign up for GitHub

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

Merged
fvitt merged 11 commits into from
Jul 20, 2021
Merged

cam6_3_027: Bug fixes for WACCMX #382

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e9952e
merge in changes from waccmx_bugs_cam6_3_016 branch
fvitt May 25, 2021
24ee806
merge in changes from waccmx_cslam branch
fvitt May 25, 2021
4656a71
init Te and Ti to T when not read from IC file; fix issue with writin…
fvitt May 19, 2021
9806546
adjust test list
fvitt May 25, 2021
8b760fb
adjust test list
fvitt May 26, 2021
6bcaef9
fix for high-res edyn mag grid
fvitt Jul 5, 2021
c5b45e9
changes in response to nusbaume's review
fvitt Jul 7, 2021
92fea3a
check pbuf indices > 0 before setting fields to neutral temp
fvitt Jul 9, 2021
05dac20
merge to head of cam_development
fvitt Jul 19, 2021
3f7c85b
update ChangeLog
fvitt Jul 19, 2021
a130011
update ChangeLog
fvitt Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path = components/cice
required = True

[cime]
tag = cime5.8.37
tag = cime5.8.38
protocol = git
repo_url = https://github.com/ESMCI/cime
local_path = cime
Expand Down
3 changes: 2 additions & 1 deletion bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,9 @@
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="1.9x2.5">atm/cam/coords/fv1.9x2.5_esmf_200428.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="4x5">atm/cam/coords/fv4x5_esmf_c210305.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="ne5np4">atm/cam/coords/ne5np4_esmf_20191204.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="ne30np4">atm/cam/coords/ne30np4_esmf_c210305.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="ne5np4" npg="3">atm/cam/coords/ne5np4.pg3_esmf_mesh_c210121.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="ne16np4">atm/cam/coords/ne16np4_esmf_c210305.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="ne30np4">atm/cam/coords/ne30np4_esmf_c210305.nc</cam_physics_mesh>
<cam_physics_mesh waccmx_opt="ionosphere" hgrid="ne30np4" npg="3">atm/cam/coords/ne30pg3_esmf_20200428.nc</cam_physics_mesh>

<!-- For scaling lightning sources of NOx -->
Expand Down
43 changes: 42 additions & 1 deletion cime_config/testdefs/testlist_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,14 +562,39 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC4X" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="QPC4X" grid="ne5_ne5_mg37" name="SMS_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="izumi" compiler="pgi" category="waccmx"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPX2000" grid="ne5pg3_ne5pg3_mg37" name="SMS_D_Ln3" testmods="cam/outfrq3s">
<machines>
<machine name="izumi" compiler="nag" category="aux_cam"/>
<machine name="izumi" compiler="nag" category="waccmx"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPX2000" grid="ne5pg3_ne5pg3_mg37" name="SMS_D_Ln3" testmods="cam/outfrq3s_edyngrid_160x193">
<machines>
<machine name="izumi" compiler="nag" category="waccmx"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
</options>
</test>
<test compset="QPX2000" grid="ne5_ne5_mg37" name="SMS_D_Ln3" testmods="cam/outfrq3s_edyngrid_320x385">
<machines>
<machine name="izumi" compiler="nag" category="waccmx"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
</options>
</test>
<!-- 430 -->
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s_carma">
<machines>
Expand Down Expand Up @@ -909,6 +934,22 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FX2000" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln3_P1728x1" testmods="cam/outfrq3s_edyngrid_320x385">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FX2000" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln3_P1728x1" testmods="cam/outfrq3s_edyngrid_640x769">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
<options>
<option name="wallclock">01:00:00</option>
</options>
</test>
<!-- 730 -->
<test compset="FADIAB" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/terminator">
<machines>
Expand Down
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_160x193/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
6 changes: 6 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_160x193/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mfilt=1,1,1,1,1,1,1,1,1
ndens=1,1,1,1,1,1,1,1,1
nhtfrq=3,3,3,3,3,3,3,3,3
inithist='ENDOFRUN'
oplus_grid=288,192
edyn_grid='160x193'
27 changes: 27 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_160x193/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
!----------------------------------------------------------------------------------
! Users should add all user specific namelist changes below in the form of
! namelist_var = new_namelist_value
!
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
! are set in the CLM_NAMELIST_OPTS env variable.
!
! EXCEPTIONS:
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
! Set dtime with L_NCPL option
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
! (includes $inst_string for multi-ensemble cases)
! Set glc_grid with CISM_GRID option
! Set glc_smb with GLC_SMB option
! Set maxpatch_glcmec with GLC_NEC option
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
!----------------------------------------------------------------------------------
hist_nhtfrq = 3
hist_mfilt = 1
hist_ndens = 1

2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_320x385/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
6 changes: 6 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_320x385/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mfilt=1,1,1,1,1,1,1,1,1
ndens=1,1,1,1,1,1,1,1,1
nhtfrq=3,3,3,3,3,3,3,3,3
inithist='ENDOFRUN'
oplus_grid=576,384
edyn_grid='320x385'
27 changes: 27 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_320x385/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
!----------------------------------------------------------------------------------
! Users should add all user specific namelist changes below in the form of
! namelist_var = new_namelist_value
!
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
! are set in the CLM_NAMELIST_OPTS env variable.
!
! EXCEPTIONS:
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
! Set dtime with L_NCPL option
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
! (includes $inst_string for multi-ensemble cases)
! Set glc_grid with CISM_GRID option
! Set glc_smb with GLC_SMB option
! Set maxpatch_glcmec with GLC_NEC option
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
!----------------------------------------------------------------------------------
hist_nhtfrq = 3
hist_mfilt = 1
hist_ndens = 1

2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_640x769/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
6 changes: 6 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_640x769/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mfilt=1,1,1,1,1,1,1,1,1
ndens=1,1,1,1,1,1,1,1,1
nhtfrq=3,3,3,3,3,3,3,3,3
inithist='ENDOFRUN'
oplus_grid=576,384
edyn_grid='640x769'
27 changes: 27 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3s_edyngrid_640x769/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
!----------------------------------------------------------------------------------
! Users should add all user specific namelist changes below in the form of
! namelist_var = new_namelist_value
!
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
! are set in the CLM_NAMELIST_OPTS env variable.
!
! EXCEPTIONS:
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
! Set dtime with L_NCPL option
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
! (includes $inst_string for multi-ensemble cases)
! Set glc_grid with CISM_GRID option
! Set glc_smb with GLC_SMB option
! Set maxpatch_glcmec with GLC_NEC option
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
!----------------------------------------------------------------------------------
hist_nhtfrq = 3
hist_mfilt = 1
hist_ndens = 1

2 changes: 1 addition & 1 deletion src/dynamics/se/dyn_comp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ subroutine dyn_init(dyn_in, dyn_out)

do m_cnst = 1, qsize
call addfld ('F'//trim(cnst_name_gll(m_cnst))//'_gll', (/ 'lev' /), 'I', 'kg/kg/s', &
trim(cnst_longname(m_cnst))//' mixing ratio forcing term (q_new-q_old) on GLL grid', gridname='GLL')
trim(cnst_longname_gll(m_cnst))//' mixing ratio forcing term (q_new-q_old) on GLL grid', gridname='GLL')
end do

! Energy diagnostics and axial angular momentum diagnostics
Expand Down
2 changes: 1 addition & 1 deletion src/ionosphere/waccmx/edyn_geogrid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ subroutine set_geogrid(nlon_g, nlat_g, nlev_in, npes_in, iam, pres_mid_in, pres_

do ntasks_lon = 1,nlon_g
ntasks_lat = npes/ntasks_lon
if ( minlats_per_pe*ntasks_lat<nmlat .and. ntasks_lat*ntasks_lon==npes ) then
if ( minlats_per_pe*ntasks_lat<nmlat .and. minlats_per_pe*ntasks_lat<nlat_g .and. ntasks_lat*ntasks_lon==npes ) then
exit
endif
end do
Expand Down
Loading