diff --git a/src/core_init_atmosphere/Registry.xml b/src/core_init_atmosphere/Registry.xml index d45a115e33..8834c402a9 100644 --- a/src/core_init_atmosphere/Registry.xml +++ b/src/core_init_atmosphere/Registry.xml @@ -385,7 +385,7 @@ - + @@ -599,7 +599,7 @@ - + @@ -1025,15 +1025,15 @@ + packages="microphysics_aerosols"/> + packages="microphysics_aerosols"/> + packages="microphysics_aerosols"/> + packages="microphysics_aerosols"/> + packages="microphysics_aerosols"/> + @@ -1210,11 +1211,11 @@ + packages="microphysics_aerosols"/> + packages="microphysics_aerosols"/> diff --git a/src/core_init_atmosphere/mpas_init_atm_core_interface.F b/src/core_init_atmosphere/mpas_init_atm_core_interface.F index f277a4a72f..288ab3b246 100644 --- a/src/core_init_atmosphere/mpas_init_atm_core_interface.F +++ b/src/core_init_atmosphere/mpas_init_atm_core_interface.F @@ -120,7 +120,7 @@ function init_atm_setup_packages(configs, streamInfo, packages, iocontext) resul logical, pointer :: config_native_gwd_static, config_static_interp, config_vertical_grid, config_met_interp logical, pointer :: config_native_gwd_gsl_static logical, pointer :: first_guess_field - logical, pointer :: mp_thompson_aers_in + logical, pointer :: microphysics_aerosols integer, pointer :: config_init_case logical, pointer :: noahmp, config_noahmp_static @@ -167,8 +167,8 @@ function init_atm_setup_packages(configs, streamInfo, packages, iocontext) resul nullify(met_stage_out) call mpas_pool_get_package(packages, 'met_stage_outActive', met_stage_out) - nullify(mp_thompson_aers_in) - call mpas_pool_get_package(packages, 'mp_thompson_aers_inActive', mp_thompson_aers_in) + nullify(microphysics_aerosols) + call mpas_pool_get_package(packages, 'microphysics_aerosolsActive', microphysics_aerosols) if (.not. associated(initial_conds) .or. & .not. associated(sfc_update) .or. & @@ -179,7 +179,7 @@ function init_atm_setup_packages(configs, streamInfo, packages, iocontext) resul .not. associated(vertical_stage_out) .or. & .not. associated(met_stage_in) .or. & .not. associated(met_stage_out) .or. & - .not. associated(mp_thompson_aers_in)) then + .not. associated(microphysics_aerosols)) then call mpas_log_write('********************************************************************************', messageType=MPAS_LOG_ERR) call mpas_log_write('* Error while setting up packages for init_atmosphere core.', messageType=MPAS_LOG_ERR) call mpas_log_write('********************************************************************************', messageType=MPAS_LOG_ERR) @@ -197,12 +197,12 @@ function init_atm_setup_packages(configs, streamInfo, packages, iocontext) resul if (config_init_case == 9) then lbcs = .true. - mp_thompson_aers_in = .false. + microphysics_aerosols = .false. inquire(file="QNWFA_QNIFA_SIGMA_MONTHLY.dat",exist=lexist) - if(lexist) mp_thompson_aers_in = .true. + if(lexist) microphysics_aerosols = .true. else lbcs = .false. - mp_thompson_aers_in = .false. + microphysics_aerosols = .false. end if if (config_init_case == 7) then @@ -226,9 +226,9 @@ function init_atm_setup_packages(configs, streamInfo, packages, iocontext) resul (.not. config_vertical_grid) met_stage_out = config_met_interp - mp_thompson_aers_in = .false. + microphysics_aerosols = .false. inquire(file="QNWFA_QNIFA_SIGMA_MONTHLY.dat",exist=lexist) - if((lexist .and. met_stage_out) .or. (lexist .and. met_stage_in)) mp_thompson_aers_in = .true. + if((lexist .and. met_stage_out) .or. (lexist .and. met_stage_in)) microphysics_aerosols = .true. else if (config_init_case == 8) then gwd_stage_in = .false. @@ -252,9 +252,9 @@ function init_atm_setup_packages(configs, streamInfo, packages, iocontext) resul met_stage_in = .true. met_stage_out = .true. - mp_thompson_aers_in = .false. + microphysics_aerosols = .false. inquire(file="QNWFA_QNIFA_SIGMA_MONTHLY.dat",exist=lexist) - if((lexist .and. met_stage_out) .or. (lexist .and. met_stage_in)) mp_thompson_aers_in = .true. + if((lexist .and. met_stage_out) .or. (lexist .and. met_stage_in)) microphysics_aerosols = .true. initial_conds = .false. ! Also, turn off the initial_conds package to avoid writing the IC "output" stream