Reorganization of scheme simulator. Now stateless.

physics/GFS_ccpp_scheme_sim_pre.meta

@@ -5,170 +5,14 @@
 
 ########################################################################
 [ccpp-arg-table]
- name = GFS_ccpp_scheme_sim_pre_init
+ name = GFS_ccpp_scheme_sim_pre_run
  type = scheme
-[mpirank]
- standard_name = mpi_rank
- long_name = MPI rank of current process
- units = index
- dimensions = ()
- type = integer
- intent = in
-[mpiroot]
- standard_name = mpi_root
- long_name = MPI rank of master process
- units = index
- dimensions = ()
- type = integer
- intent = in
-[mpicomm]
- standard_name = mpi_communicator
- long_name = MPI communicator
- units = index
- dimensions = ()
- type = integer
- intent = in
-[prc_LWRAD_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_LWRAD
- long_name = configuration for physics process in CCPP scheme simulator LWRAD
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[prc_SWRAD_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_SWRAD
- long_name = configuration for physics process in CCPP scheme simulator SWRAD
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[prc_PBL_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_PBL
- long_name = configuration for physics process in CCPP scheme simulator PBL
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[prc_GWD_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_GWD
- long_name = configuration for physics process in CCPP scheme simulator GWD
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[prc_SCNV_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_SCNV
- long_name = configuration for physics process in CCPP scheme simulator SCNV
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[prc_DCNV_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_DCNV
- long_name = configuration for physics process in CCPP scheme simulator DCNV
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[prc_cldMP_cfg]
- standard_name = configuration_for_physics_process_in_CCPP_scheme_simulator_cldMP
- long_name = configuration for physics process in CCPP scheme simulator cldMP
- units = flag
- dimensions = (3)
- type = integer
- intent = in
-[nprg_active]
- standard_name = number_of_prognostics_varaibles_in_CCPP_scheme_simulator
- long_name = number of prognostic variables used in CCPP scheme simulator
- units = count
- dimensions = ()
- type = integer
- intent = in
-[do_ccpp_scheme_sim]
- standard_name = flag_for_ccpp_scheme_simulator
- long_name = flag for ccpp scheme simulator
- units = flag
- dimensions = ()
- type = logical
- intent = in
-[scheme_sim_data]
- standard_name = filename_for_ccpp_scheme_simulator_data_file
- long_name = filename for cccpp scheme simulator data file
- units = none
- dimensions = ()
- type = character
- kind = len=256
- intent = in
-[nprc_sim]
- standard_name = number_of_physics_process_in_CCPP_scheme_simulator
- long_name = number of physics process in CCPP scheme simulator
- units = count
- dimensions = ()
- type = integer
- intent = in
-[active_name]
- standard_name = name_of_active_physics_schemes_in_CCPP_scheme_simulator
- long_name = name of active physics schemes in CCPP scheme simulator
- units =
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = character
- kind = len=16
- intent = inout
-[iactive_scheme]
- standard_name = index_of_active_physics_schemes_in_CCPP_scheme_simulator
- long_name = index of active physics schemes in CCPP scheme simulator
- units = count
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = integer
- intent = inout
-[active_time_split_process]
- standard_name = flag_to_indicate_process_type_in_CCPP_scheme_simulator
- long_name = flag to indicate if active physics schemes are time-split process
- units = flag
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = logical
- intent = inout
 [physics_process]
  standard_name = physics_process_type_for_CCPP_scheme_simulator
  long_name = physics process type for CCPP scheme simulator
  units = mixed
  dimensions = (number_of_physics_process_in_CCPP_scheme_simulator)
  type = base_physics_process
- intent = inout
-[errmsg]
- standard_name = ccpp_error_message
- long_name = error message for error handling in CCPP
- units = none
- dimensions = ()
- type = character
- kind = len=*
- intent = out
-[errflg]
- standard_name = ccpp_error_code
- long_name = error code for error handling in CCPP
- units = 1
- dimensions = ()
- type = integer
- intent = out
-
-########################################################################
-[ccpp-arg-table]
- name = GFS_ccpp_scheme_sim_pre_run
- type = scheme
-[iactive_scheme_inloop]
- standard_name = count_for_active_scheme_in_CCPP_scheme_simulator
- long_name = count for active physics scheme in CCPP scheme simulator
- units = count
- dimensions = ()
- type = integer
- intent = in
-[active_name]
- standard_name = name_of_active_physics_schemes_in_CCPP_scheme_simulator
- long_name = name of active physics schemes in CCPP scheme simulator
- units =
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = character
- kind = len=16
  intent = in
 [dtend]
  standard_name = cumulative_change_of_state_variables

physics/ccpp_scheme_simulator.F90

@@ -22,26 +22,21 @@ module ccpp_scheme_simulator
 !! \htmlinclude ccpp_scheme_simulator_run.html
 !!
  subroutine ccpp_scheme_simulator_run(do_ccpp_scheme_sim, kdt, nCol, nLay, dtp, jdat, &
- nactive_proc, proc_start, proc_end, active_name, iactive_scheme, physics_process, &
- active_time_split_process, iactive_scheme_inloop, in_pre_active, in_post_active, &
- tgrs, ugrs, vgrs, qgrs, active_phys_tend, gt0, gu0, gv0, gq0, dtdq_pbl, dtdq_mp, &
- errmsg, errflg)
+ proc_start, proc_end, physics_process, in_pre_active, in_post_active, tgrs, ugrs, &
+ vgrs, qgrs, active_phys_tend, gt0, gu0, gv0, gq0, errmsg, errflg)
 
  ! Inputs
- logical, intent(in) :: do_ccpp_scheme_sim, active_time_split_process(:)
- integer, intent(in) :: kdt, nCol, nLay, nactive_proc, jdat(8), &
- iactive_scheme(:)
+ logical, intent(in) :: do_ccpp_scheme_sim
+ integer, intent(in) :: kdt, nCol, nLay, jdat(8)
  real(kind_phys), intent(in) :: dtp, tgrs(:,:), ugrs(:,:), vgrs(:,:), qgrs(:,:,:), &
  active_phys_tend(:,:,:)
- character(len=16), intent(in) :: active_name(:)
 
  ! Outputs
  type(base_physics_process),intent(inout) :: physics_process(:)
- real(kind_phys), intent(inout) :: gt0(:,:), gu0(:,:), gv0(:,:), gq0(:,:), &
- dtdq_pbl(:,:), dtdq_mp(:,:)
+ real(kind_phys), intent(inout) :: gt0(:,:), gu0(:,:), gv0(:,:), gq0(:,:)
  character(len=*),intent(out) :: errmsg
  integer, intent(out) :: errflg
- integer, intent(inout) :: proc_start, proc_end, iactive_scheme_inloop
+ integer, intent(inout) :: proc_start, proc_end
  logical, intent(inout) :: in_pre_active, in_post_active
 
  ! Locals
@@ -77,10 +72,10 @@ subroutine ccpp_scheme_simulator_run(do_ccpp_scheme_sim, kdt, nCol, nLay, dtp, j
  !
  if (in_pre_active) then
  proc_start = 1
- proc_end = max(1,iactive_scheme(iactive_scheme_inloop)-1)
+ proc_end = max(1,physics_process(1)%iactive_scheme-1)
  endif
  if (in_post_active) then
- proc_start = iactive_scheme(iactive_scheme_inloop)
+ proc_start = physics_process(1)%iactive_scheme
  proc_end = size(physics_process)
  endif
 
@@ -179,11 +174,6 @@ subroutine ccpp_scheme_simulator_run(do_ccpp_scheme_sim, kdt, nCol, nLay, dtp, j
  if (size(physics_process)+1 == iprc) then
  in_pre_active = .true.
  in_post_active = .false.
- iactive_scheme_inloop = 1
- endif
-
- if (iactive_scheme_inloop < nactive_proc) then
- iactive_scheme_inloop = iactive_scheme_inloop + 1
  endif
 
  end subroutine ccpp_scheme_simulator_run

physics/ccpp_scheme_simulator.meta

@@ -49,13 +49,6 @@
  dimensions = (8)
  type = integer
  intent = in
-[nactive_proc]
- standard_name = number_of_active_physics_process_in_CCPP_scheme_simulator
- long_name = number of active physics process in CCPP scheme simulator
- units = count
- dimensions = ()
- type = integer
- intent = in
 [proc_start]
  standard_name = index_for_first_physics_process_in_CCPP_scheme_simulator
  long_name = index for first physics process in CCPP scheme simulator
@@ -70,13 +63,6 @@
  dimensions = ()
  type = integer
  intent = inout
-[iactive_scheme_inloop]
- standard_name = count_for_active_scheme_in_CCPP_scheme_simulator
- long_name = count for active physics scheme in CCPP scheme simulator
- units = count
- dimensions = ()
- type = integer
- intent = inout
 [in_pre_active]
  standard_name = flag_to_indicate_location_in_physics_process_loop_before_active_scheme
  long_name = flag to indicate location in physics process loop before active scheme
@@ -91,28 +77,6 @@
  dimensions = ()
  type = logical
  intent = inout
-[active_name]
- standard_name = name_of_active_physics_schemes_in_CCPP_scheme_simulator
- long_name = name of active physics schemes in CCPP scheme simulator
- units =
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = character
- kind = len=16
- intent = in
-[iactive_scheme]
- standard_name = index_of_active_physics_schemes_in_CCPP_scheme_simulator
- long_name = index of active physics schemes in CCPP scheme simulator
- units = count
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = integer
- intent = in
-[active_time_split_process]
- standard_name = flag_to_indicate_process_type_in_CCPP_scheme_simulator
- long_name = flag to indicate if active physics schemes are time-split process
- units = flag
- dimensions = (number_of_active_physics_process_in_CCPP_scheme_simulator)
- type = logical
- intent = in
 [tgrs]
  standard_name = air_temperature
  long_name = model layer mean temperature
@@ -185,22 +149,6 @@
  type = real
  kind = kind_phys
  intent = inout
-[dtdq_pbl]
- standard_name = instantaneous_tendency_of_specific_humidity_due_to_PBL
- long_name = instantaneous_tendency_of_specific_humidity_due_to_PBL
- units = kg kg-1 s-1
- dimensions = (horizontal_loop_extent,vertical_layer_dimension)
- type = real
- kind = kind_phys
- intent = inout
-[dtdq_mp]
- standard_name = instantaneous_tendency_of_specific_humidity_due_to_microphysics
- long_name = moisture tendency due to microphysics
- units = kg kg-1 s-1
- dimensions = (horizontal_loop_extent,vertical_layer_dimension)
- type = real
- kind = kind_phys
- intent = inout
 [physics_process]
  standard_name = physics_process_type_for_CCPP_scheme_simulator
  long_name = physics process type for CCPP scheme simulator