From becac8ee07a7c3bf51c71d6e6a47c023d8b7de87 Mon Sep 17 00:00:00 2001 From: Patrick Callaghan Date: Mon, 29 Jul 2024 16:01:26 -0600 Subject: [PATCH 1/2] Pertlim fix for MPAS --- src/dynamics/mpas/dyn_comp.F90 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/dynamics/mpas/dyn_comp.F90 b/src/dynamics/mpas/dyn_comp.F90 index a1b02c1f86..a82978f2cf 100644 --- a/src/dynamics/mpas/dyn_comp.F90 +++ b/src/dynamics/mpas/dyn_comp.F90 @@ -11,7 +11,7 @@ module dyn_comp use const_init, only: cnst_init_default use cam_control_mod, only: initial_run -use cam_initfiles, only: initial_file_get_id, topo_file_get_id +use cam_initfiles, only: initial_file_get_id, topo_file_get_id, pertlim use cam_grid_support, only: cam_grid_id, & cam_grid_get_latvals, cam_grid_get_lonvals @@ -813,6 +813,11 @@ subroutine read_inidat(dyn_in) logical :: readvar + integer :: rndm_seed_sz + integer, allocatable :: rndm_seed(:) + real(r8) :: pertval + integer :: nc + character(len=shr_kind_cx) :: str type(mpas_pool_type), pointer :: mesh_pool @@ -1083,6 +1088,29 @@ subroutine read_inidat(dyn_in) call endrun(subname//': failed to read theta from initial file') end if + ! optionally introduce random perturbations to theta values + if (pertlim.ne.0.0_r8) then + if (masterproc) then + write(iulog,*) trim(subname), ': Adding random perturbation bounded', & + 'by +/- ', pertlim, ' to initial theta field' + end if + + call random_seed(size=rndm_seed_sz) + allocate(rndm_seed(rndm_seed_sz)) + + do nc = 1,nCellsSolve + rndm_seed = glob_ind(nc) + call random_seed(put=rndm_seed) + do kk = 1,plev + call random_number(pertval) + pertval = 2.0_r8*pertlim*(0.5_r8 - pertval) + theta(kk,nc) = theta(kk,nc)*(1.0_r8 + pertval) + end do + end do + + deallocate(rndm_seed) + end if + ! read rho call infld('rho', fh_ini, 'lev', 'nCells', 1, plev, 1, nCellsSolve, 1, 1, & mpas3d, readvar, gridname='mpas_cell') From 043632076b8a6afd89eefb559a0cfa526d8df8a3 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Tue, 4 Feb 2025 11:32:56 -0700 Subject: [PATCH 2/2] Add MPAS pertlim test (from Patrick Callaghan). --- cime_config/testdefs/testlist_cam.xml | 9 +++++++++ .../cam/outfrq9s_mpasa480_pertlim/shell_commands | 2 ++ .../cam/outfrq9s_mpasa480_pertlim/user_nl_cam | 7 +++++++ .../cam/outfrq9s_mpasa480_pertlim/user_nl_clm | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_cam create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_clm diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 99241b39c7..6539a9fcac 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1379,6 +1379,15 @@ + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/shell_commands new file mode 100644 index 0000000000..eb40ad83e0 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/shell_commands @@ -0,0 +1,2 @@ +./xmlchange ROF_NCPL=\$ATM_NCPL +./xmlchange GLC_NCPL=\$ATM_NCPL diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_cam new file mode 100644 index 0000000000..3edf536070 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_cam @@ -0,0 +1,7 @@ +mfilt=1,1,1,1,1,1 +ndens=1,1,1,1,1,1 +nhtfrq=9,9,9,9,9,9 +inithist='ENDOFRUN' +mpas_cam_coef=1.0D0 +mpas_cam_damping_levels=3 +pertlim = 1.e-14 diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_clm new file mode 100644 index 0000000000..c4cb9d28d6 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_clm @@ -0,0 +1,3 @@ +hist_nhtfrq = 9 +hist_mfilt = 1 +hist_ndens = 1