From cb28f4d82a88f149a00df1330b555da5212aa96e Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 8 May 2024 12:06:22 -0600 Subject: [PATCH 01/25] Add updated ICs and topo files for MPASv8 The new IC files contain fields that are expected by routines in cam_dev (cam7) physics. The new topo files were regenerated due to changes in the NCAR/Topo software. These files are only used when 'phys="cam_dev"' to ensure previous compsets and/or tests aren't affected. --- bld/namelist_files/namelist_defaults_cam.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 5afa8a0155..370aebf832 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -45,11 +45,15 @@ atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c201125.nc +atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c201216.nc +atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c230707.nc +atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c230707.nc +atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc atm/cam/inic/fv/cami_0000-01-01_0.23x0.31_L26_c100513.nc @@ -276,8 +280,10 @@ atm/waccm/ic/mpasa120km.waccm_fulltopo_c220818.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c211013.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc atm/cam/topo/topo-from-cami_0000-01-01_256x512_L26_c030918.nc @@ -334,8 +340,10 @@ atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc -atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc atm/cam/topo/mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc +atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc +atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc +atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc 0.0D0 From ef45d6baed13d006c9f11b01697a3fe0702b37f8 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 13 May 2024 09:19:33 -0600 Subject: [PATCH 02/25] Update ChangeLog after creating PR --- doc/ChangeLog | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 5ea328d2c8..9ba1aab1b4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,70 @@ =============================================================== +Tag name: +Originator(s): gdicker1 (gdicker@ucar.edu) +Date: Mon 13 May 2024 +One-line Summary: Add updated meshes and topo for v8 MPAS-A dycore +Github PR URL: https://github.com/ESCOMP/CAM/pull/1029 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + +#995 - Runs with MPAS-A dycore and CAM7 physics fail - missing variables in inic files +https://github.com/ESCOMP/CAM/issues/995 + +Miscellaneous: + +Describe any changes made to build system: + +Describe any changes made to the namelist: + +List any changes to the defaults for the boundary datasets: none + +Describe any substantial timing or memory changes: + +Code reviewed by: + +List all files eliminated: + +List all files added and what they do: + +New input data w/o topology or real-data ICs (analytic-ICs only) +- mpasa480_L32_notopo_coords_c240508.nc +- mpasa120_L32_notopo_coords_c240507.nc +- mpasa60_L32_notopo_coords_c240507.nc +- mpasa30_L32_notopo_coords_c240507.nc + +New input data w/ topology and real-data ICs +- cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc +- cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc + +New bnd_topo files +- mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc +- mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc + +List all existing files that have been modified, and describe the changes: + +Add new files above so they can be used +- bld/namelist_files/namelist_defaults_cam.xml + +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: None. + +=============================================================== +=============================================================== + Tag name: cam6_3_148 Originator(s): brianpm, courtneyp, eaton Date: Wed 21 Feb 2024 From e988f4f3d14eef1b5aa31ee0d0230c1f1f685c5a Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 17 Jul 2024 12:01:36 -0600 Subject: [PATCH 03/25] Wrap MPAS longitude values to [0,2pi) range This commit addresses issues that were seen when using ncdata with longitudes in the [-pi, pi] range in cases with full physics. This would cause the atmosphere to become unphysical and runs to fail. This change is made just after the longitude values are read to ensure they are correct for the remainder of execution. --- src/dynamics/mpas/driver/cam_mpas_subdriver.F90 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 index 676bacd4af..7b9276acf3 100644 --- a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 +++ b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 @@ -884,15 +884,16 @@ subroutine cam_mpas_read_static(fh_ini, endrun) use pio, only : file_desc_t - use mpas_kind_types, only : StrKIND + use mpas_kind_types, only : StrKIND, RKIND use mpas_io_streams, only : MPAS_createStream, MPAS_closeStream, MPAS_streamAddField, MPAS_readStream use mpas_derived_types, only : MPAS_IO_READ, MPAS_IO_NETCDF, MPAS_Stream_type, MPAS_pool_type, & field0DReal, field1DReal, field2DReal, field3DReal, field1DInteger, field2DInteger, & MPAS_STREAM_NOERR use mpas_pool_routines, only : MPAS_pool_get_subpool, MPAS_pool_get_field, MPAS_pool_create_pool, MPAS_pool_destroy_pool, & - MPAS_pool_add_config + MPAS_pool_add_config, MPAS_pool_get_dimension, MPAS_pool_get_array use mpas_dmpar, only : MPAS_dmpar_exch_halo_field use mpas_stream_manager, only : postread_reindex + use mpas_constants, only : pii ! Arguments type (file_desc_t), pointer :: fh_ini @@ -929,8 +930,13 @@ subroutine cam_mpas_read_static(fh_ini, endrun) type (MPAS_Stream_type) :: mesh_stream + integer, pointer :: nCells + real(kind=RKIND), dimension(:), pointer :: lonCell_arr + nullify(cell_gradient_coef_x) nullify(cell_gradient_coef_y) + nullify(nCells) + nullify(lonCell_arr) call MPAS_createStream(mesh_stream, domain_ptr % ioContext, 'not_used', MPAS_IO_NETCDF, MPAS_IO_READ, & pio_file_desc=fh_ini, ierr=ierr) @@ -1171,6 +1177,12 @@ subroutine cam_mpas_read_static(fh_ini, endrun) call endrun(subname//': FATAL: Failed to close static input stream.') end if + call mpas_pool_get_dimension(meshPool, 'nCells', nCells) + call mpas_pool_get_array(meshPool, 'lonCell', lonCell_arr) + + ! Ensure longitudes w/i [0, 2*pi) range + lonCell_arr(:) = lonCell_arr(:) - (2.*pii) * floor(lonCell_arr(:) / (2.*pii)) + ! ! Perform halo updates for all decomposed fields (i.e., fields with ! an outermost dimension of nCells, nVertices, or nEdges) From 7edc1db74a07545d8cfeca0b020b51399a6c9e52 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 18 Jul 2024 12:22:10 -0600 Subject: [PATCH 04/25] Add initial ChangeLog after making PR NOTE: this is before the 'aux_cam' tests have been run --- doc/ChangeLog | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 5ea328d2c8..ab83bacb34 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,69 @@ =============================================================== +Tag name: +Originator(s): gdicker +Date: Jul 18, 2024 +One-line Summary: Address run failures due to MPAS-A longitudes +Github PR URL: https://github.com/ESCOMP/CAM/pull/1095 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - Wrap MPAS-A longitudes to [0,2pi) range: https://github.com/ESCOMP/CAM/issues/1094 + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: N/A + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: +M src/dynamics/mpas/driver/cam_mpas_subdriver.F90 + - Modifies cam_mpas_read_static to ensure lonCell values are in [0,2pi) range + +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, i.e., +- what code configurations: +- what platforms/compilers: +- nature of change (roundoff; larger than roundoff but same climate; new + climate): + +If bitwise differences were observed, how did you show they were no worse +than roundoff? + +If this tag changes climate describe the run(s) done to evaluate the new +climate in enough detail that it(they) could be reproduced, i.e., +- source tag (all code used must be in the repository): +- platform/compilers: +- configure commandline: +- build-namelist command (or complete namelist): +- MSS location of output: + +MSS location of control simulations used to validate new climate: + +URL for AMWG diagnostics output used to validate new climate: + +=============================================================== + Tag name: cam6_3_148 Originator(s): brianpm, courtneyp, eaton Date: Wed 21 Feb 2024 From f3dfa5173aea7d1c4a90dafd53f3e3fe2e0660a9 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 19 Jul 2024 16:27:35 -0600 Subject: [PATCH 05/25] Remove unused nCells from cam_mpas_read_static Previous versions of the lonCell_arr adjustment used an explicit loop. Without this loop, the nCells variable and the routine to fetch it are no longer needed. --- src/dynamics/mpas/driver/cam_mpas_subdriver.F90 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 index 7b9276acf3..d9a1b63144 100644 --- a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 +++ b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 @@ -890,7 +890,7 @@ subroutine cam_mpas_read_static(fh_ini, endrun) field0DReal, field1DReal, field2DReal, field3DReal, field1DInteger, field2DInteger, & MPAS_STREAM_NOERR use mpas_pool_routines, only : MPAS_pool_get_subpool, MPAS_pool_get_field, MPAS_pool_create_pool, MPAS_pool_destroy_pool, & - MPAS_pool_add_config, MPAS_pool_get_dimension, MPAS_pool_get_array + MPAS_pool_add_config, MPAS_pool_get_array use mpas_dmpar, only : MPAS_dmpar_exch_halo_field use mpas_stream_manager, only : postread_reindex use mpas_constants, only : pii @@ -930,12 +930,10 @@ subroutine cam_mpas_read_static(fh_ini, endrun) type (MPAS_Stream_type) :: mesh_stream - integer, pointer :: nCells real(kind=RKIND), dimension(:), pointer :: lonCell_arr nullify(cell_gradient_coef_x) nullify(cell_gradient_coef_y) - nullify(nCells) nullify(lonCell_arr) call MPAS_createStream(mesh_stream, domain_ptr % ioContext, 'not_used', MPAS_IO_NETCDF, MPAS_IO_READ, & @@ -1177,7 +1175,6 @@ subroutine cam_mpas_read_static(fh_ini, endrun) call endrun(subname//': FATAL: Failed to close static input stream.') end if - call mpas_pool_get_dimension(meshPool, 'nCells', nCells) call mpas_pool_get_array(meshPool, 'lonCell', lonCell_arr) ! Ensure longitudes w/i [0, 2*pi) range From 288f3ed05d3e3e8d475bc39f967ab420f87bb937 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 23 Jul 2024 18:07:43 -0600 Subject: [PATCH 06/25] Add kind to number literal in lonCell_arr adjustment Makes code consistent with CAM coding standards: 'All variables of type real must have a specified kind, including literals.' --- src/dynamics/mpas/driver/cam_mpas_subdriver.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 index d9a1b63144..376389efef 100644 --- a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 +++ b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 @@ -1178,7 +1178,7 @@ subroutine cam_mpas_read_static(fh_ini, endrun) call mpas_pool_get_array(meshPool, 'lonCell', lonCell_arr) ! Ensure longitudes w/i [0, 2*pi) range - lonCell_arr(:) = lonCell_arr(:) - (2.*pii) * floor(lonCell_arr(:) / (2.*pii)) + lonCell_arr(:) = lonCell_arr(:) - (2._RKIND*pii) * floor(lonCell_arr(:) / (2._RKIND*pii)) ! ! Perform halo updates for all decomposed fields (i.e., fields with From fabe37a9910838690e43b4a6695079971156e5aa Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 26 Jul 2024 10:39:34 -0600 Subject: [PATCH 07/25] Move lonCell wrap code to dyn_grid.F90 from cam_mpas_subdriver.F90 This commit also extends the comment that was with this code block, includes an if condition so valid values aren't modified, uses kinds and constants (pi) that are already used in the new file, and updates the ChangeLog so the correct file is referenced. --- doc/ChangeLog | 4 ++-- src/dynamics/mpas/driver/cam_mpas_subdriver.F90 | 13 ++----------- src/dynamics/mpas/dyn_grid.F90 | 13 +++++++++++++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ab83bacb34..48d6f320f7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -24,8 +24,8 @@ List all files eliminated: N/A List all files added and what they do: N/A List all existing files that have been modified, and describe the changes: -M src/dynamics/mpas/driver/cam_mpas_subdriver.F90 - - Modifies cam_mpas_read_static to ensure lonCell values are in [0,2pi) range +M src/dynamics/mpas/dyn_grid.F90 + - Modifies setup_time_invariant to ensure lonCell values are in [0,2pi) range 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, diff --git a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 index 376389efef..676bacd4af 100644 --- a/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 +++ b/src/dynamics/mpas/driver/cam_mpas_subdriver.F90 @@ -884,16 +884,15 @@ subroutine cam_mpas_read_static(fh_ini, endrun) use pio, only : file_desc_t - use mpas_kind_types, only : StrKIND, RKIND + use mpas_kind_types, only : StrKIND use mpas_io_streams, only : MPAS_createStream, MPAS_closeStream, MPAS_streamAddField, MPAS_readStream use mpas_derived_types, only : MPAS_IO_READ, MPAS_IO_NETCDF, MPAS_Stream_type, MPAS_pool_type, & field0DReal, field1DReal, field2DReal, field3DReal, field1DInteger, field2DInteger, & MPAS_STREAM_NOERR use mpas_pool_routines, only : MPAS_pool_get_subpool, MPAS_pool_get_field, MPAS_pool_create_pool, MPAS_pool_destroy_pool, & - MPAS_pool_add_config, MPAS_pool_get_array + MPAS_pool_add_config use mpas_dmpar, only : MPAS_dmpar_exch_halo_field use mpas_stream_manager, only : postread_reindex - use mpas_constants, only : pii ! Arguments type (file_desc_t), pointer :: fh_ini @@ -930,11 +929,8 @@ subroutine cam_mpas_read_static(fh_ini, endrun) type (MPAS_Stream_type) :: mesh_stream - real(kind=RKIND), dimension(:), pointer :: lonCell_arr - nullify(cell_gradient_coef_x) nullify(cell_gradient_coef_y) - nullify(lonCell_arr) call MPAS_createStream(mesh_stream, domain_ptr % ioContext, 'not_used', MPAS_IO_NETCDF, MPAS_IO_READ, & pio_file_desc=fh_ini, ierr=ierr) @@ -1175,11 +1171,6 @@ subroutine cam_mpas_read_static(fh_ini, endrun) call endrun(subname//': FATAL: Failed to close static input stream.') end if - call mpas_pool_get_array(meshPool, 'lonCell', lonCell_arr) - - ! Ensure longitudes w/i [0, 2*pi) range - lonCell_arr(:) = lonCell_arr(:) - (2._RKIND*pii) * floor(lonCell_arr(:) / (2._RKIND*pii)) - ! ! Perform halo updates for all decomposed fields (i.e., fields with ! an outermost dimension of nCells, nVertices, or nEdges) diff --git a/src/dynamics/mpas/dyn_grid.F90 b/src/dynamics/mpas/dyn_grid.F90 index d0b53c5fa0..d289d84499 100644 --- a/src/dynamics/mpas/dyn_grid.F90 +++ b/src/dynamics/mpas/dyn_grid.F90 @@ -453,6 +453,8 @@ subroutine setup_time_invariant(fh_ini) type(mpas_pool_type), pointer :: meshPool real(r8), pointer :: rdzw(:) real(r8), allocatable :: dzw(:) + integer, pointer :: nCells + real(r8), dimension(:), pointer :: lonCell integer :: k, kk integer :: ierr @@ -473,6 +475,7 @@ subroutine setup_time_invariant(fh_ini) call mpas_pool_get_dimension(meshPool, 'nEdgesSolve', nEdgesSolve) call mpas_pool_get_dimension(meshPool, 'nVerticesSolve', nVerticesSolve) call mpas_pool_get_dimension(meshPool, 'nVertLevels', nVertLevelsSolve) ! MPAS always solves over the full column + call mpas_pool_get_dimension(meshPool, 'nCells', nCells) ! check that number of vertical layers matches MPAS grid data if (plev /= nVertLevelsSolve) then @@ -482,6 +485,16 @@ subroutine setup_time_invariant(fh_ini) ') does not match plev ('//int2str(nVertLevelsSolve)//').') end if + ! Ensure longitudes are within the [0,2*pi) range, and only remap values that + ! are outside the range. Some non-simple physics in CAM require this + ! longitude range, MPAS may have any (radian) value in lonCell + call mpas_pool_get_array(meshPool, 'lonCell', lonCell) + do k=1,nCells + if (lonCell(k) < 0._r8 .or. lonCell(k) .ge. (2._r8 * pi)) then + lonCell(k) = lonCell(k) - (2._r8 * pi) * floor(lonCell(k) / (2._r8 * pi)) + end if + end do + ! Initialize fields needed for reconstruction of cell-centered winds from edge-normal winds ! Note: This same pair of calls happens a second time later in the initialization of ! the MPAS-A dycore (in atm_mpas_init_block), but the redundant calls do no harm From b608af1db20f1cfcdb70112ba0fa21223f4b8549 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Tue, 23 Jul 2024 16:11:23 -0600 Subject: [PATCH 08/25] Rename cam_dev to cam7 for files added in this branch This aligns the files with changes in cam6_4_001 (PR #1028). --- bld/namelist_files/namelist_defaults_cam.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 370aebf832..4d434ea4db 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -45,15 +45,15 @@ atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c201125.nc -atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc +atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c201216.nc -atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc +atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c230707.nc -atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc +atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c230707.nc -atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc +atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc atm/cam/inic/fv/cami_0000-01-01_0.23x0.31_L26_c100513.nc @@ -281,9 +281,9 @@ atm/waccm/ic/mpasa120km.waccm_fulltopo_c220818.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c211013.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc atm/cam/topo/topo-from-cami_0000-01-01_256x512_L26_c030918.nc @@ -341,9 +341,9 @@ atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc -atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc +atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc -atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc +atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc 0.0D0 From 005e7f45cdb8ec604dd707fc2af56f9351f7d25f Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 26 Jul 2024 16:11:55 -0600 Subject: [PATCH 09/25] Replace .ge. with >= in lonCell loop condition Conform to CAM Coding Standards: 'Use symbolic numerical comparison operators (e.g., ==, /=, <, >=) not old character versions (e.g., .eq.).' --- src/dynamics/mpas/dyn_grid.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dynamics/mpas/dyn_grid.F90 b/src/dynamics/mpas/dyn_grid.F90 index d289d84499..0b26e10b2f 100644 --- a/src/dynamics/mpas/dyn_grid.F90 +++ b/src/dynamics/mpas/dyn_grid.F90 @@ -490,7 +490,7 @@ subroutine setup_time_invariant(fh_ini) ! longitude range, MPAS may have any (radian) value in lonCell call mpas_pool_get_array(meshPool, 'lonCell', lonCell) do k=1,nCells - if (lonCell(k) < 0._r8 .or. lonCell(k) .ge. (2._r8 * pi)) then + if (lonCell(k) < 0._r8 .or. lonCell(k) >= (2._r8 * pi)) then lonCell(k) = lonCell(k) - (2._r8 * pi) * floor(lonCell(k) / (2._r8 * pi)) end if end do From 13259119275a64900e771931df912c5a4ea01982 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 26 Jul 2024 16:09:14 -0600 Subject: [PATCH 10/25] Update comment on lonCell wrap code --- src/dynamics/mpas/dyn_grid.F90 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dynamics/mpas/dyn_grid.F90 b/src/dynamics/mpas/dyn_grid.F90 index 0b26e10b2f..7efcc866dd 100644 --- a/src/dynamics/mpas/dyn_grid.F90 +++ b/src/dynamics/mpas/dyn_grid.F90 @@ -486,8 +486,9 @@ subroutine setup_time_invariant(fh_ini) end if ! Ensure longitudes are within the [0,2*pi) range, and only remap values that - ! are outside the range. Some non-simple physics in CAM require this - ! longitude range, MPAS may have any (radian) value in lonCell + ! are outside the range. Some non-simple physics in CAM require this + ! longitude range, the MPAS-A dycore does not require any specific range for + ! lonCell call mpas_pool_get_array(meshPool, 'lonCell', lonCell) do k=1,nCells if (lonCell(k) < 0._r8 .or. lonCell(k) >= (2._r8 * pi)) then From a39657105510643a33d1bd3701300ca514acbe3a Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 14 Aug 2024 21:50:59 -0600 Subject: [PATCH 11/25] Add mpasa120_32L ncdata for analytic-ic with cam6 and cam7 physics The correct file for these physics schemes must include topography. --- bld/namelist_files/namelist_defaults_cam.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 4d434ea4db..641a6ca197 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -49,7 +49,9 @@ atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c201216.nc atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc +atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc +atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c230707.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c230707.nc From 82fbdd001193e4f3fb17b9ff969ce6972a30d4ad Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Wed, 14 Aug 2024 22:03:50 -0600 Subject: [PATCH 12/25] Replace mpas L32 analytic IC files with v8 files --- bld/namelist_files/namelist_defaults_cam.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 641a6ca197..6ed8e3a087 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -44,18 +44,12 @@ atm/cam/inic/cam_vcoords_L32_c180105.nc -atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c201125.nc -atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc -atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c201216.nc -atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc -atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc +atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc +atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc -atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc -atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c230707.nc -atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc -atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c230707.nc -atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc +atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc +atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc atm/cam/inic/fv/cami_0000-01-01_0.23x0.31_L26_c100513.nc From 6a7564852db0578d4d4f3603e3231b789f0a108f Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 15 Aug 2024 11:14:19 -0600 Subject: [PATCH 13/25] Add mpasa 58L and 93L files for analytic ICs Enable no-topography, idealized test cases with the mpas dycore when running 58L or 93L on 480, 120, 60, and 30km grids. --- bld/namelist_files/namelist_defaults_cam.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 6ed8e3a087..22efa1a8ac 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -50,6 +50,14 @@ atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc +atm/cam/inic/mpas/mpasa480_L58_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa120_L58_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa60_L58_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa30_L58_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa480_L93_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa120_L93_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa60_L93_notopo_coords_c240814.nc +atm/cam/inic/mpas/mpasa30_L93_notopo_coords_c240814.nc atm/cam/inic/fv/cami_0000-01-01_0.23x0.31_L26_c100513.nc From c8238364d4c8f6043b624323c17f6cbc1cdc6f36 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 15 Aug 2024 11:45:12 -0600 Subject: [PATCH 14/25] Add real-data files {mpasa480,mpasa120} x {58L,93L} NOTE: these files also support running with analytic_ic. --- bld/namelist_files/namelist_defaults_cam.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 22efa1a8ac..c1654e0ab0 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -288,6 +288,10 @@ atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc atm/cam/topo/topo-from-cami_0000-01-01_256x512_L26_c030918.nc From c45fd68dfee23a677b7613e5836a8e3b255f5390 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 15 Aug 2024 12:06:31 -0600 Subject: [PATCH 15/25] Update ChangeLog after adding L58 and L93 files --- doc/ChangeLog | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 9ba1aab1b4..1e89725b54 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,10 +1,10 @@ =============================================================== -Tag name: +Tag name: Originator(s): gdicker1 (gdicker@ucar.edu) -Date: Mon 13 May 2024 +Date: Mon 15 Aug 2024 One-line Summary: Add updated meshes and topo for v8 MPAS-A dycore -Github PR URL: https://github.com/ESCOMP/CAM/pull/1029 +Github PR URL: https://github.com/ESCOMP/CAM/pull/1029 Purpose of changes (include the issue number and title text for each relevant GitHub issue): @@ -25,17 +25,39 @@ Code reviewed by: List all files eliminated: +Replaced by newer versions +- mpasa480_L32_notopo_coords_c201125.nc +- mpasa120_L32_notopo_coords_c201216.nc +- mpasa120_L32_topo_coords_c201022.nc +- mpasa60_L32_notopo_coords_c230707.nc +- mpasa30_L32_notopo_coords_c230707.nc + List all files added and what they do: -New input data w/o topology or real-data ICs (analytic-ICs only) +New input 32L data without real-data (analytic-ICs only) to replace existing - mpasa480_L32_notopo_coords_c240508.nc - mpasa120_L32_notopo_coords_c240507.nc +- mpasa120_L32_topo_coords_c240508.nc - mpasa60_L32_notopo_coords_c240507.nc - mpasa30_L32_notopo_coords_c240507.nc -New input data w/ topology and real-data ICs +New input 58 and 93L without topology and real-data (analytic-ICs only) +- mpasa480_L58_notopo_coords_c240814.nc +- mpasa120_L58_notopo_coords_c240814.nc +- mpasa60_L58_notopo_coords_c240814.nc +- mpasa30_L58_notopo_coords_c240814.nc +- mpasa480_L93_notopo_coords_c240814.nc +- mpasa120_L93_notopo_coords_c240814.nc +- mpasa60_L93_notopo_coords_c240814.nc +- mpasa30_L93_notopo_coords_c240814.nc + +New input data with topology and real-data ICs - cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc - cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc +- cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc +- cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc +- cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc +- cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc New bnd_topo files - mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc From 03b3a1850afa721e0fc696c7a0083dfacc7661f8 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 15 Aug 2024 14:09:33 -0600 Subject: [PATCH 16/25] Ensure v8 mpasa ncdata matches with correct bnd_topo Duplicates an entry to ensure that the following two files are used together: - mpasa120_L32_topo_coords_c240508.nc - mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc Matches the physics specification on new real-data ICs, so the correct *_20240507.nc bnd_topo files are used with them. --- bld/namelist_files/namelist_defaults_cam.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index c1654e0ab0..15bd2e1715 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -349,6 +349,7 @@ atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc +atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc From df17112022ec28424063b8408cf6766cc6389eae Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 15 Aug 2024 14:38:27 -0600 Subject: [PATCH 17/25] Actual changes for last commit... --- bld/namelist_files/namelist_defaults_cam.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 15bd2e1715..29137b34d0 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -288,10 +288,10 @@ atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc atm/cam/topo/topo-from-cami_0000-01-01_256x512_L26_c030918.nc @@ -349,9 +349,9 @@ atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc -atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc +atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc From 939a92d7615b4d1954be230f25f71bdd8c298293 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 19 Aug 2024 15:19:16 -0600 Subject: [PATCH 18/25] Remove mpasa120_L32_topo ncdata for analytic_ic --- bld/namelist_files/namelist_defaults_cam.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 29137b34d0..b1ca2fb156 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -46,8 +46,6 @@ atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc -atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc -atm/cam/inic/mpas/mpasa120_L32_topo_coords_c240508.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa480_L58_notopo_coords_c240814.nc From 9afb3cdf7eb8e125fd9e70541338bb458fb96d26 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 19 Aug 2024 15:23:33 -0600 Subject: [PATCH 19/25] Default L32,L58,L93 mpasa real-data cases to new files Remove old L32 real-data files and all physics specififiers from new real-data files. The old mpasa bnd_topo is similarly replaced. One entry with the old mpasa120 bnd_topo file remains, it is still used by the mpas120km.waccm_fulltopo_c220818.nc ncdata. Specifiers are used to match these entries. --- bld/namelist_files/namelist_defaults_cam.xml | 22 ++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index b1ca2fb156..4dbd4687de 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -282,14 +282,12 @@ atm/waccm/ic/mpasa120km.waccm_fulltopo_c220818.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c211013.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc -atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc +atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc atm/cam/topo/topo-from-cami_0000-01-01_256x512_L26_c030918.nc @@ -346,11 +344,9 @@ atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc -atm/cam/topo/mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc -atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc -atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc -atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc -atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc +atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc +atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc +atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc 0.0D0 From 24012df14922fcf45dc1ab9e78f57f43c1e6c21d Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Mon, 19 Aug 2024 16:33:35 -0600 Subject: [PATCH 20/25] Update ChangeLog after replacing bnd_topo and L32 ncdata --- doc/ChangeLog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 1e89725b54..14688b8bd4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -24,24 +24,24 @@ Describe any substantial timing or memory changes: Code reviewed by: List all files eliminated: +- mpasa120_L32_topo_coords_c201022.nc Replaced by newer versions - mpasa480_L32_notopo_coords_c201125.nc - mpasa120_L32_notopo_coords_c201216.nc -- mpasa120_L32_topo_coords_c201022.nc - mpasa60_L32_notopo_coords_c230707.nc - mpasa30_L32_notopo_coords_c230707.nc +- cami_01_01_2000_00Z_mpasa120_L32_CFSR_c210426.nc +- cami_01_01_2000_00Z_mpasa480_L32_CFSR_c211013.nc +- mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc List all files added and what they do: -New input 32L data without real-data (analytic-ICs only) to replace existing +New input 32, 58, and 93L without real-data (analytic-ICs only) - mpasa480_L32_notopo_coords_c240508.nc - mpasa120_L32_notopo_coords_c240507.nc -- mpasa120_L32_topo_coords_c240508.nc - mpasa60_L32_notopo_coords_c240507.nc - mpasa30_L32_notopo_coords_c240507.nc - -New input 58 and 93L without topology and real-data (analytic-ICs only) - mpasa480_L58_notopo_coords_c240814.nc - mpasa120_L58_notopo_coords_c240814.nc - mpasa60_L58_notopo_coords_c240814.nc @@ -65,7 +65,7 @@ New bnd_topo files List all existing files that have been modified, and describe the changes: -Add new files above so they can be used +Add new ncdata and bnd_topo files above so they can be used - bld/namelist_files/namelist_defaults_cam.xml If there were any failures reported from running test_driver.sh on any test From 773a6f6bd04e876ad351e27b875835ca03d9f991 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 5 Sep 2024 17:06:06 -0600 Subject: [PATCH 21/25] New mpasa120_L70 ncdata for waccm, remove now unused mpas120 bnd_topo The mpasa120km.waccm_fulltopo_c220818.nc was the last file using mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc, allowing it to be removed. --- bld/namelist_files/namelist_defaults_cam.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 4dbd4687de..5c5ef99b93 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -280,7 +280,7 @@ atm/waccm/ic/FW2000_CONUS_30x8_L70_01-01-0001_c200602.nc -atm/waccm/ic/mpasa120km.waccm_fulltopo_c220818.nc +atm/waccm/ic/mpasa120_L70.waccm_topography_SC_c240904.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc @@ -346,7 +346,6 @@ atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc -atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc 0.0D0 From 1fcdd7802a92d2278c09304c3facda10ec9dbba4 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 5 Sep 2024 17:06:58 -0600 Subject: [PATCH 22/25] Update ChangeLog after replacing waccm ncdata --- doc/ChangeLog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 14688b8bd4..d79712be46 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,7 +2,7 @@ Tag name: Originator(s): gdicker1 (gdicker@ucar.edu) -Date: Mon 15 Aug 2024 +Date: Thu 05 Sep 2024 One-line Summary: Add updated meshes and topo for v8 MPAS-A dycore Github PR URL: https://github.com/ESCOMP/CAM/pull/1029 @@ -31,8 +31,10 @@ Replaced by newer versions - mpasa120_L32_notopo_coords_c201216.nc - mpasa60_L32_notopo_coords_c230707.nc - mpasa30_L32_notopo_coords_c230707.nc +- mpasa120km.waccm_fulltopo_c220818.nc - cami_01_01_2000_00Z_mpasa120_L32_CFSR_c210426.nc - cami_01_01_2000_00Z_mpasa480_L32_CFSR_c211013.nc +- mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc - mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc List all files added and what they do: @@ -51,6 +53,9 @@ New input 32, 58, and 93L without real-data (analytic-ICs only) - mpasa60_L93_notopo_coords_c240814.nc - mpasa30_L93_notopo_coords_c240814.nc +New input L70 file for waccm cases, simple chemistry +- mpasa120_L70.waccm_topography_SC_c240904.nc + New input data with topology and real-data ICs - cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc - cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc From b36ac165656b3194e3668a893417bfe64b12da01 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 12 Sep 2024 14:54:53 -0600 Subject: [PATCH 23/25] Use the correct name for the mpasa480 notopo file --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index f24144eea6..a9d5fc16dc 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -44,7 +44,7 @@ atm/cam/inic/cam_vcoords_L32_c180105.nc -atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240508.nc +atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c240507.nc atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c240507.nc From 123d0fcb351b283d7d9d66f7d525b6da90a7d9e5 Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Fri, 13 Sep 2024 12:46:06 -0600 Subject: [PATCH 24/25] Remove mpasa30 L58 and L93 ncdata files These files currently can't be added to the CESM data repository due to size. Interested users may find these files within the CESM inputdata directory on Derecho and/or GLADE. --- bld/namelist_files/namelist_defaults_cam.xml | 2 -- doc/ChangeLog | 2 -- 2 files changed, 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index a9d5fc16dc..f55d17a59c 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -51,11 +51,9 @@ atm/cam/inic/mpas/mpasa480_L58_notopo_coords_c240814.nc atm/cam/inic/mpas/mpasa120_L58_notopo_coords_c240814.nc atm/cam/inic/mpas/mpasa60_L58_notopo_coords_c240814.nc -atm/cam/inic/mpas/mpasa30_L58_notopo_coords_c240814.nc atm/cam/inic/mpas/mpasa480_L93_notopo_coords_c240814.nc atm/cam/inic/mpas/mpasa120_L93_notopo_coords_c240814.nc atm/cam/inic/mpas/mpasa60_L93_notopo_coords_c240814.nc -atm/cam/inic/mpas/mpasa30_L93_notopo_coords_c240814.nc atm/cam/inic/fv/cami_0000-01-01_0.23x0.31_L26_c100513.nc diff --git a/doc/ChangeLog b/doc/ChangeLog index f589ce7fd4..3d909399f3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -47,11 +47,9 @@ New input 32, 58, and 93L without real-data (analytic-ICs only): - mpasa480_L58_notopo_coords_c240814.nc - mpasa120_L58_notopo_coords_c240814.nc - mpasa60_L58_notopo_coords_c240814.nc -- mpasa30_L58_notopo_coords_c240814.nc - mpasa480_L93_notopo_coords_c240814.nc - mpasa120_L93_notopo_coords_c240814.nc - mpasa60_L93_notopo_coords_c240814.nc -- mpasa30_L93_notopo_coords_c240814.nc New input L70 file for waccm cases: - mpasa120_L70.waccm_topography_SC_c240904.nc From 3c633186507968784657c8950d1063752160ac6c Mon Sep 17 00:00:00 2001 From: "G. Dylan Dickerson" Date: Thu, 12 Sep 2024 18:56:55 -0600 Subject: [PATCH 25/25] Update ChangeLog with Derecho and Izumi tests --- doc/ChangeLog | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 3d909399f3..1f35e8621b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -40,7 +40,7 @@ Eliminated, replaced by newer versions: List all files added and what they do: New input 32, 58, and 93L without real-data (analytic-ICs only): -- mpasa480_L32_notopo_coords_c240508.nc +- mpasa480_L32_notopo_coords_c240507.nc - mpasa120_L32_notopo_coords_c240507.nc - mpasa60_L32_notopo_coords_c240507.nc - mpasa30_L32_notopo_coords_c240507.nc @@ -79,9 +79,27 @@ 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.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) + - pre-existing failure -- need fix in CLM external + + ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) + ERS_Ln9_P36x1.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480 (Overall: DIFF) + - expected fails of BASELINE and NLCOMP steps, new mpas input data + +derecho/nvhpc/aux_cam: ALL PASS + izumi/nag/aux_cam: -izumi/gnu/aux_cam: + FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae + - pre-existing failure - issue #670 + + ERC_D_Ln9.mpasa480z32_mpasa480.FHS94.izumi_nag.cam-outfrq3s_usecase (Overall: DIFF) + - expected fails of BASELINE and NLCOMP steps, new mpas input data + +izumi/gnu/aux_cam: ALL PASS CAM tag used for the baseline comparison tests if different than previous tag: