diff --git a/src/dynamics/mpas/driver/dyn_mpas_subdriver.F90 b/src/dynamics/mpas/driver/dyn_mpas_subdriver.F90 index ba500d12..b10f535c 100644 --- a/src/dynamics/mpas/driver/dyn_mpas_subdriver.F90 +++ b/src/dynamics/mpas/driver/dyn_mpas_subdriver.F90 @@ -24,7 +24,7 @@ module dyn_mpas_subdriver implicit none private - public :: mpas_dynamical_core_type, mpas_dynamical_core + public :: mpas_dynamical_core_type abstract interface ! This interface is compatible with `endrun` from CAM-SIMA. @@ -59,9 +59,6 @@ end subroutine model_error_if procedure, pass, public :: read_namelist => dyn_mpas_read_namelist procedure, pass, public :: init_phase2 => dyn_mpas_init_phase2 end type mpas_dynamical_core_type - - !> The "instance/object" of MPAS dynamical core. - type(mpas_dynamical_core_type) :: mpas_dynamical_core contains !> Print a debug message with optionally the value(s) of a variable. !> If `printer` is not supplied, the MPI master rank will print. Otherwise, the designated MPI rank will print instead. diff --git a/src/dynamics/mpas/dyn_comp.F90 b/src/dynamics/mpas/dyn_comp.F90 index 47c9f1a3..3895697d 100644 --- a/src/dynamics/mpas/dyn_comp.F90 +++ b/src/dynamics/mpas/dyn_comp.F90 @@ -1,5 +1,5 @@ module dyn_comp - use dyn_mpas_subdriver, only: mpas_dynamical_core + use dyn_mpas_subdriver, only: mpas_dynamical_core_type ! Modules from CAM. use cam_abortutils, only: endrun @@ -28,12 +28,16 @@ module dyn_comp public :: dyn_init ! public :: dyn_run ! public :: dyn_final + public :: mpas_dynamical_core - type dyn_import_t + type :: dyn_import_t end type dyn_import_t - type dyn_export_t + type :: dyn_export_t end type dyn_export_t + + !> The "instance/object" of MPAS dynamical core. + type(mpas_dynamical_core_type) :: mpas_dynamical_core contains !> Read MPAS namelist from supplied path. !> Additionally, perform early initialization of MPAS dynamical core.