From f8d6ced7cd7ee2b221fec93bcea4f4b22ba027c5 Mon Sep 17 00:00:00 2001 From: junmeiban Date: Wed, 12 Aug 2020 09:49:50 -0600 Subject: [PATCH] The modification is for file size reduction. --- src/core_atmosphere/Registry.xml | 326 +++++++++++------- src/core_atmosphere/mpas_atm_core.F | 7 + src/core_atmosphere/mpas_atm_core_interface.F | 13 +- 3 files changed, 215 insertions(+), 131 deletions(-) diff --git a/src/core_atmosphere/Registry.xml b/src/core_atmosphere/Registry.xml index e57e37e3cc..d53188e213 100644 --- a/src/core_atmosphere/Registry.xml +++ b/src/core_atmosphere/Registry.xml @@ -395,131 +395,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core_atmosphere/mpas_atm_core.F b/src/core_atmosphere/mpas_atm_core.F index 5b56d653a8..d2917d92c5 100644 --- a/src/core_atmosphere/mpas_atm_core.F +++ b/src/core_atmosphere/mpas_atm_core.F @@ -89,6 +89,13 @@ function atm_core_init(domain, startTimeStamp) result(ierr) ! input alarms for both input and restart before reading any remaining ! input streams. ! + call MPAS_stream_mgr_read(domain % streamManager, streamID='static', whence=MPAS_STREAM_NEAREST, ierr=ierr) + if (ierr /= MPAS_STREAM_MGR_NOERR) then + call mpas_log_write('********************************************************************************', messageType=MPAS_LOG_ERR) + call mpas_log_write('Error reading static fields', messageType=MPAS_LOG_ERR) + call mpas_log_write('********************************************************************************', messageType=MPAS_LOG_CRIT) + end if + call MPAS_stream_mgr_reset_alarms(domain % streamManager, streamID='static', direction=MPAS_STREAM_INPUT, ierr=ierr) if (config_do_restart) then call MPAS_stream_mgr_read(domain % streamManager, streamID='restart', ierr=ierr) else diff --git a/src/core_atmosphere/mpas_atm_core_interface.F b/src/core_atmosphere/mpas_atm_core_interface.F index 437502430e..908f8807d6 100644 --- a/src/core_atmosphere/mpas_atm_core_interface.F +++ b/src/core_atmosphere/mpas_atm_core_interface.F @@ -302,20 +302,9 @@ function atm_get_mesh_stream(configs, stream) result(ierr) character(len=StrKIND), intent(out) :: stream integer :: ierr - logical, pointer :: config_do_restart - ierr = 0 - call mpas_pool_get_config(configs, 'config_do_restart', config_do_restart) - - if (.not. associated(config_do_restart)) then - call mpas_log_write('config_do_restart was not found when defining mesh stream.', messageType=MPAS_LOG_ERR) - ierr = 1 - else if (config_do_restart) then - write(stream,'(a)') 'restart' - else - write(stream,'(a)') 'input' - end if + write(stream,'(a)') 'static' end function atm_get_mesh_stream