Revert unnecessary changes made in original PR

hannahcbarnes · Apr 16, 2020 · 522342e · 522342e
1 parent 8c8137c
commit 522342e
Show file tree

Hide file tree

Showing 10 changed files with 292 additions and 451 deletions.
diff --git a/atmos_model.F90 b/atmos_model.F90
@@ -297,7 +297,6 @@ subroutine update_atmos_radiation_physics (Atmos)
 
 !--- execute the IPD atmospheric setup step
       call mpp_clock_begin(setupClock)
-
 #ifdef CCPP
       call CCPP_step (step="time_vary", nblks=Atm_block%nblks, ierr=ierr)
       if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP time_vary step failed')
@@ -332,11 +331,6 @@ subroutine update_atmos_radiation_physics (Atmos)
 !        print *,'in atmos_model, after assign_importdata, rc=',rc
       endif
 
-#ifdef CCPP
-      call CCPP_step (step="timestep_init", nblks=Atm_block%nblks, ierr=ierr)
-      if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP timestep_init step failed')
-#endif
-
       call mpp_clock_end(setupClock)
 
       if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "radiation driver"
@@ -400,9 +394,6 @@ subroutine update_atmos_radiation_physics (Atmos)
 #ifdef CCPP
       call CCPP_step (step="stochastics", nblks=Atm_block%nblks, ierr=ierr)
       if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP stochastics step failed')
-
-      call CCPP_step (step="timestep_final", nblks=Atm_block%nblks, ierr=ierr)
-      if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP timestep_final step failed')
 #else
       Func0d => physics_step2
 !$OMP parallel do default (none) &
@@ -413,16 +404,13 @@ subroutine update_atmos_radiation_physics (Atmos)
         call IPD_step (IPD_Control, IPD_Data(nb:nb), IPD_Diag, IPD_Restart, IPD_func0d=Func0d)
       enddo
 #endif
-
       call mpp_clock_end(physClock)
 
       if (chksum_debug) then
         if (mpp_pe() == mpp_root_pe()) print *,'PHYSICS STEP2   ', IPD_Control%kdt, IPD_Control%fhour
         call FV3GFS_IPD_checksum(IPD_Control, IPD_Data, Atm_block)
       endif
-
       call getiauforcing(IPD_Control,IAU_data)
-
       if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "end of radiation and physics step"
     endif
 

diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -114,9 +114,6 @@
     'FV3/ccpp/physics/physics/mfpblt.f',
     'FV3/ccpp/physics/physics/mfpbltq.f',
     'FV3/ccpp/physics/physics/mfscu.f',
-    'FV3/ccpp/physics/physics/total_tend.F90',
-    'FV3/ccpp/physics/physics/model_tend_pre.F90',
-    'FV3/ccpp/physics/physics/model_tend_post.F90',
     'FV3/ccpp/physics/physics/mfscuq.f',
     'FV3/ccpp/physics/physics/noahmp_tables.f90',
     'FV3/ccpp/physics/physics/num_parthds.F',
@@ -187,10 +184,7 @@
     'FV3/ccpp/physics/physics/gcm_shoc.F90'                      : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/get_prs_fv3.F90'                   : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/gfdl_cloud_microphys.F90'          : [ 'slow_physics' ],
-    'FV3/ccpp/physics/physics/gfdl_fv_sat_adj.F90'               : [ 'slow_physics' ],
-    'FV3/ccpp/physics/physics/total_tend.F90'                    : [ 'slow_physics' ],
-    'FV3/ccpp/physics/physics/model_tend_pre.F90'                : [ 'slow_physics' ],
-    'FV3/ccpp/physics/physics/model_tend_post.F90'               : [ 'slow_physics' ],
+    'FV3/ccpp/physics/physics/gfdl_fv_sat_adj.F90'               : [ 'fast_physics' ],
     'FV3/ccpp/physics/physics/gscond.f'                          : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/gwdc.f'                            : [ 'slow_physics' ],
     'FV3/ccpp/physics/physics/gwdps.f'                           : [ 'slow_physics' ],

diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90
@@ -49,7 +49,7 @@ module CCPP_driver
 !  number nthrdsX in case of non-uniform block sizes)    !
 !--------------------------------------------------------!
   logical :: non_uniform_blocks
-  integer :: nthrds, nthrdsX, ithread
+  integer :: nthrds, nthrdsX
 
 !----------------
 ! Public Entities
@@ -205,8 +205,7 @@ subroutine CCPP_step (step, nblks, ierr)
       end if
 
    ! Radiation and stochastic physics
-   else if (trim(step)=="radiation" .or. trim(step)=="physics" .or. trim(step)=="stochastics" &
-       .or. trim(step)=="timestep_init" .or. trim(step)=="timestep_final") then
+   else if (trim(step)=="radiation" .or. trim(step)=="physics" .or. trim(step)=="stochastics") then
 
       ! Set number of threads available to physics schemes to one,
       ! because threads are used on the outside for blocking

diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml
@@ -15,11 +15,6 @@
       <scheme>GFS_phys_time_vary</scheme>
     </subcycle>
   </group>
-  <group name="timestep_init">
-    <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
-    </subcycle>
-  </group>
   <group name="radiation">
     <subcycle loop="1">
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
@@ -95,11 +90,5 @@
       <scheme>GFS_stochastics</scheme>
     </subcycle>
   </group>
-  <group name="timestep_final">
-    <subcycle loop="1">
-      <scheme>model_tend_post</scheme>
-      <scheme>total_tend</scheme>
-    </subcycle>
-  </group>
   <!-- <finalize></finalize> -->
 </suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15plus.xml b/ccpp/suites/suite_FV3_GFS_v15plus.xml
@@ -9,17 +9,14 @@
   </group>
   <group name="time_vary">
     <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
       <scheme>GFS_time_vary_pre</scheme>
       <scheme>GFS_rrtmg_setup</scheme>
       <scheme>GFS_rad_time_vary</scheme>
       <scheme>GFS_phys_time_vary</scheme>
-      <scheme>model_tend_post</scheme>
     </subcycle>
   </group>
   <group name="radiation">
     <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>rrtmg_sw_pre</scheme>
@@ -29,13 +26,10 @@
       <scheme>rrtmg_lw</scheme>
       <scheme>rrtmg_lw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>
-      <scheme>model_tend_post</scheme>
     </subcycle>
   </group>
   <group name="physics">
     <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
-      <scheme>total_tend</scheme>
       <scheme>GFS_suite_interstitial_phys_reset</scheme>
       <scheme>GFS_suite_stateout_reset</scheme>
       <scheme>get_prs_fv3</scheme>
@@ -45,11 +39,9 @@
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_surface_composites_inter</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>model_tend_post</scheme>
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>model_tend_pre</scheme>
       <scheme>sfc_diff</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
@@ -58,11 +50,9 @@
       <scheme>lsm_noah</scheme>
       <scheme>sfc_sice</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
-      <scheme>model_tend_post</scheme>
     </subcycle>
     <!-- End of surface iteration loop -->
     <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
       <scheme>GFS_surface_composites_post</scheme>
       <scheme>dcyc2t3_post</scheme>
       <scheme>sfc_diag</scheme>
@@ -93,14 +83,11 @@
       <scheme>gfdl_cloud_microphys</scheme>
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>model_tend_post</scheme>
     </subcycle>
   </group>
   <group name="stochastics">
     <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
       <scheme>GFS_stochastics</scheme>
-      <scheme>model_tend_post</scheme>
     </subcycle>
   </group>
   <!-- <finalize></finalize> -->

diff --git a/ccpp/suites/suite_FV3_GFS_v16beta.xml b/ccpp/suites/suite_FV3_GFS_v16beta.xml
@@ -15,11 +15,6 @@
       <scheme>GFS_phys_time_vary</scheme>
     </subcycle>
   </group>
-  <group name="timestep_init">
-    <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
-    </subcycle>
-  </group>
   <group name="radiation">
     <subcycle loop="1">
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
@@ -95,11 +90,5 @@
       <scheme>GFS_stochastics</scheme>
     </subcycle>
   </group>
-  <group name="timestep_final">
-    <subcycle loop="1">
-      <scheme>model_tend_post</scheme>
-      <scheme>total_tend</scheme>
-    </subcycle>
-  </group>
   <!-- <finalize></finalize> -->
 </suite>
diff --git a/ccpp/suites/suite_FV3_GSD_v0.xml b/ccpp/suites/suite_FV3_GSD_v0.xml
@@ -10,11 +10,6 @@
       <scheme>GFS_phys_time_vary</scheme>
     </subcycle>
   </group>
-  <group name="timestep_init">
-    <subcycle loop="1">
-      <scheme>model_tend_pre</scheme>
-    </subcycle>
-  </group>
   <group name="radiation">
     <subcycle loop="1">
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
@@ -25,7 +20,7 @@
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>
       <scheme>rrtmg_lw</scheme>
-      <scheme>sgscloud_radpre</scheme>
+      <scheme>sgscloud_radpost</scheme>
       <scheme>rrtmg_lw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>
     </subcycle>
@@ -95,11 +90,5 @@
       <scheme>GFS_stochastics</scheme>
     </subcycle>
   </group>
-  <group name="timestep_final">
-    <subcycle loop="1">
-      <scheme>model_tend_post</scheme>
-      <scheme>total_tend</scheme>
-    </subcycle>
-  </group>
   <!-- <finalize></finalize> -->
 </suite>