From 2fa7a447cbd5bbf4112bc48e0880f0cf1eb923a2 Mon Sep 17 00:00:00 2001
From: Rahul Mahajan <aerorahul@users.noreply.github.com>
Date: Wed, 7 Oct 2020 10:53:46 -0400
Subject: [PATCH] Preparation for S2S cmake (#183)

* replace #ifdef OPENMP with #ifdef _OPENMP
* OpenMP link libraries
* fix typos and missing stuff
* clean up compile defs
* move CCPP code generator call to FV3, where it belongs
* install targets are updated
* minor cleanups
---
 CMakeLists.txt                                | 246 +++++++++++-------
 atmos_model.F90                               |  50 ++--
 ccpp/config/ccpp_prebuild_config.py           | 240 ++++++++---------
 ccpp/driver/CCPP_driver.F90                   |   6 +-
 gfsphysics/CMakeLists.txt                     |  55 ++--
 gfsphysics/GFS_layer/GFS_driver.F90           |   4 +-
 gfsphysics/physics/GFS_debug.F90              |  15 +-
 io/CMakeLists.txt                             |  31 ++-
 ipd/CMakeLists.txt                            |  36 +--
 stochastic_physics/CMakeLists.txt             |  25 +-
 .../stochastic_physics_wrapper.F90            |  56 ++--
 11 files changed, 419 insertions(+), 345 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eaae5928c..320a1580b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,31 @@
 if(CCPP)
-    add_definitions(-DCCPP)
+
+  if(DEFINED CCPP_SUITES)
+    set(_ccpp_suites_arg "--suites=${CCPP_SUITES}")
+  endif()
+  message("Calling CCPP code generator (ccpp_prebuild.py) ... ${_ccpp_suites_arg}")
+  execute_process(COMMAND ${Python_EXECUTABLE}
+                          "ccpp/framework/scripts/ccpp_prebuild.py"
+                          "--config=ccpp/config/ccpp_prebuild_config.py"
+                          "--builddir=${CMAKE_CURRENT_BINARY_DIR}" ${_ccpp_suites_arg}
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                  OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/ccpp_prebuild.out
+                  ERROR_FILE  ${CMAKE_CURRENT_BINARY_DIR}/ccpp_prebuild.err
+                  RESULT_VARIABLE RC)
+  # Check return code from ccpp_prebuild.py
+  if(NOT RC EQUAL 0)
+    message(FATAL_ERROR "An error occured while running ccpp_prebuild.py, check ${CMAKE_CURRENT_BINARY_DIR}/ccpp_prebuild.{out,err}")
+  endif()
+  # this should not be necessary; including CCPP_*.cmake here and passing
+  # SCHEMES, CAPS and TYPEDEFS via environment variables to CCPP build.
+  # CCPP should be able to directly include those three .cmake files.
+  include(${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/CCPP_SCHEMES.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/CCPP_CAPS.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/CCPP_TYPEDEFS.cmake)
+  set(ENV{CCPP_SCHEMES} "${SCHEMES}")
+  set(ENV{CCPP_CAPS} "${CAPS}")
+  set(ENV{CCPP_TYPEDEFS} "${TYPEDEFS}")
+
 endif()
 
 add_subdirectory(cpl)
@@ -10,84 +36,108 @@ add_subdirectory(io)
 ###############################################################################
 ### fv3dycore
 ###############################################################################
+list(APPEND _fv3dycore_srcs
+  atmos_cubed_sphere/model/a2b_edge.F90
+  atmos_cubed_sphere/model/multi_gases.F90
+  atmos_cubed_sphere/model/boundary.F90
+  atmos_cubed_sphere/model/dyn_core.F90
+  atmos_cubed_sphere/model/fv_arrays.F90
+  atmos_cubed_sphere/model/fv_control.F90
+  atmos_cubed_sphere/model/fv_dynamics.F90
+  atmos_cubed_sphere/model/fv_fill.F90
+  atmos_cubed_sphere/model/fv_grid_utils.F90
+  atmos_cubed_sphere/model/fv_mapz.F90
+  atmos_cubed_sphere/model/fv_nesting.F90
+  atmos_cubed_sphere/model/fv_regional_bc.F90
+  atmos_cubed_sphere/model/fv_sg.F90
+  atmos_cubed_sphere/model/fv_tracer2d.F90
+  atmos_cubed_sphere/model/fv_update_phys.F90
+  atmos_cubed_sphere/model/sw_core.F90
+  atmos_cubed_sphere/model/tp_core.F90
+  atmos_cubed_sphere/model/nh_core.F90
+  atmos_cubed_sphere/model/nh_utils.F90
+  atmos_cubed_sphere/tools/external_ic.F90
+  atmos_cubed_sphere/tools/external_sst.F90
+  atmos_cubed_sphere/tools/fv_diagnostics.F90
+  atmos_cubed_sphere/tools/fv_eta.F90
+  atmos_cubed_sphere/tools/fv_grid_tools.F90
+  atmos_cubed_sphere/tools/fv_io.F90
+  atmos_cubed_sphere/tools/fv_mp_mod.F90
+  atmos_cubed_sphere/tools/fv_nudge.F90
+  atmos_cubed_sphere/tools/fv_treat_da_inc.F90
+  atmos_cubed_sphere/tools/fv_iau_mod.F90
+  atmos_cubed_sphere/tools/fv_restart.F90
+  atmos_cubed_sphere/tools/fv_surf_map.F90
+  atmos_cubed_sphere/tools/fv_timing.F90
+  atmos_cubed_sphere//tools/init_hydro.F90
+  atmos_cubed_sphere/tools/sim_nc_mod.F90
+  atmos_cubed_sphere/tools/sorted_index.F90
+  atmos_cubed_sphere/tools/test_cases.F90
+  atmos_cubed_sphere/driver/fvGFS/DYCORE_typedefs.F90
+  atmos_cubed_sphere/driver/fvGFS/fv_nggps_diag.F90
+  atmos_cubed_sphere/driver/fvGFS/atmosphere.F90)
+
 if(NOT CCPP)
-    set(FAST_PHYSICS_SRCS_F90 atmos_cubed_sphere/model/fv_cmp.F90)
+  list(APPEND _fv3dycore_srcs atmos_cubed_sphere/model/fv_cmp.F90)
+endif()
+
+add_library(fv3dycore ${_fv3dycore_srcs})
+
+list(APPEND _fv3dycore_defs_private SPMD
+                                    use_WRTCOMP
+                                    GFS_PHYS
+                                    USE_GFSL63
+                                    MOIST_CAPPA
+                                    USE_COND)
+
+if(MULTI_GASES)
+  list(APPEND _fv3dycore_defs_private MULTI_GASES)
+endif()
+
+if(32BIT)
+  list(APPEND _fv3dycore_defs_private OVERLOAD_R4
+                                      OVERLOAD_R8)
+endif()
+
+if(CCPP)
+  list(APPEND _fv3dycore_defs_private CCPP)
 endif()
 
-add_library(
-    fv3dycore
-
-    atmos_cubed_sphere/model/a2b_edge.F90
-    atmos_cubed_sphere/model/multi_gases.F90
-    atmos_cubed_sphere/model/boundary.F90
-    atmos_cubed_sphere/model/dyn_core.F90
-    atmos_cubed_sphere/model/fv_arrays.F90
-    ${FAST_PHYSICS_SRCS_F90}
-    atmos_cubed_sphere/model/fv_control.F90
-    atmos_cubed_sphere/model/fv_dynamics.F90
-    atmos_cubed_sphere/model/fv_fill.F90
-    atmos_cubed_sphere/model/fv_grid_utils.F90
-    atmos_cubed_sphere/model/fv_mapz.F90
-    atmos_cubed_sphere/model/fv_nesting.F90
-    atmos_cubed_sphere/model/fv_regional_bc.F90
-    atmos_cubed_sphere/model/fv_sg.F90
-    atmos_cubed_sphere/model/fv_tracer2d.F90
-    atmos_cubed_sphere/model/fv_update_phys.F90
-    atmos_cubed_sphere/model/sw_core.F90
-    atmos_cubed_sphere/model/tp_core.F90
-    atmos_cubed_sphere/model/nh_core.F90
-    atmos_cubed_sphere/model/nh_utils.F90
-    atmos_cubed_sphere/tools/external_ic.F90
-    atmos_cubed_sphere/tools/external_sst.F90
-    atmos_cubed_sphere/tools/fv_diagnostics.F90
-    atmos_cubed_sphere/tools/fv_eta.F90
-    atmos_cubed_sphere/tools/fv_grid_tools.F90
-    atmos_cubed_sphere/tools/fv_io.F90
-    atmos_cubed_sphere/tools/fv_mp_mod.F90
-    atmos_cubed_sphere/tools/fv_nudge.F90
-    atmos_cubed_sphere/tools/fv_treat_da_inc.F90
-    atmos_cubed_sphere/tools/fv_iau_mod.F90
-    atmos_cubed_sphere/tools/fv_restart.F90
-    atmos_cubed_sphere/tools/fv_surf_map.F90
-    atmos_cubed_sphere/tools/fv_timing.F90
-    atmos_cubed_sphere//tools/init_hydro.F90
-    atmos_cubed_sphere/tools/sim_nc_mod.F90
-    atmos_cubed_sphere/tools/sorted_index.F90
-    atmos_cubed_sphere/tools/test_cases.F90
-    atmos_cubed_sphere/driver/fvGFS/DYCORE_typedefs.F90
-    atmos_cubed_sphere/driver/fvGFS/fv_nggps_diag.F90
-    atmos_cubed_sphere/driver/fvGFS/atmosphere.F90
-)
+if(OpenMP_Fortran_FOUND)
+  list(APPEND _fv3dycore_defs_private OPENMP)
+endif()
 
 set_property(SOURCE atmos_cubed_sphere/model/nh_utils.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}")
 set_property(SOURCE atmos_cubed_sphere/model/fv_mapz.F90  APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}")
 
 set_target_properties(fv3dycore PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(fv3dycore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
-
-target_link_libraries(fv3dycore PRIVATE fms)
-target_link_libraries(fv3dycore PRIVATE gfsphysics)
-target_link_libraries(fv3dycore PRIVATE ipd)
-target_link_libraries(fv3dycore PRIVATE esmf)
 
-target_include_directories(fv3dycore PRIVATE atmos_cubed_sphere ${ESMF_MOD})
+target_compile_definitions(fv3dycore PRIVATE "${_fv3dycore_defs_private}")
+target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/atmos_cubed_sphere)
+target_include_directories(fv3dycore INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
+                                               $<INSTALL_INTERFACE:mod>)
+
+target_link_libraries(fv3dycore PUBLIC fms
+                                       gfsphysics
+                                       ipd
+                                       esmf)
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(fv3dycore PUBLIC OpenMP::OpenMP_Fortran)
+endif()
 
 ###############################################################################
 ### ccpp
 ###############################################################################
 if(CCPP)
-    add_subdirectory(ccpp)
-    add_subdirectory(ccpp/driver)
-
-    add_dependencies(gfsphysics ccpp ccppphys)
-    add_dependencies(ccppdriver ccpp ccppphys)
-    add_dependencies(ccppphys ccpp)
-
-    target_include_directories(fv3dycore PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src)
-    target_include_directories(fv3dycore PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/driver)
-
-    target_link_libraries(ccppphys PRIVATE sp::sp_d)
-    target_link_libraries(ccppphys PRIVATE w3nco::w3nco_d)
+  add_subdirectory(ccpp)
+  add_subdirectory(ccpp/driver)
+  add_dependencies(gfsphysics ccpp ccppphys)
+  add_dependencies(ccppdriver ccpp ccppphys)
+  add_dependencies(ccppphys ccpp)
+  target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/framework/src
+                                               ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver)
+  target_link_libraries(ccppphys PRIVATE sp::sp_d
+                                         w3nco::w3nco_d)
 endif()
 
 ###############################################################################
@@ -100,44 +150,51 @@ add_subdirectory(stochastic_physics)
 ###############################################################################
 ### fv3atm
 ###############################################################################
-add_library(
-    fv3atm
+add_library(fv3atm
+  atmos_model.F90
+  fv3_cap.F90
+  module_fv3_config.F90
+  module_fcst_grid_comp.F90
+  time_utils.F90)
 
-    atmos_model.F90
-    fv3_cap.F90
-    module_fv3_config.F90
-    module_fcst_grid_comp.F90
-    time_utils.F90
-)
+list(APPEND _fv3atm_defs_private GFS_PHYS
+                                 INTERNAL_FILE_NML
+                                 ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR})
 
 set_target_properties(fv3atm PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(fv3atm PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_include_directories(fv3atm INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
+                                            $<INSTALL_INTERFACE:mod>)
 
 if(CCPP)
-    target_include_directories(fv3atm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod)
-    set(CCPP_LIBRARIES ccppdriver ccppphys ccpp)
-    add_dependencies(fv3atm ccppdriver ccppphys ccpp)
-    target_link_libraries(fv3atm PUBLIC ccppdriver ccppphys ccpp)
+  list(APPEND _fv3atm_defs_private CCPP)
+  target_include_directories(fv3atm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod)
+  set(CCPP_LIBRARIES ccppdriver ccppphys ccpp)
+  add_dependencies(fv3atm ccppdriver ccppphys ccpp)
+  target_link_libraries(fv3atm PUBLIC ccppdriver ccppphys ccpp)
 endif()
 target_include_directories(fv3atm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/stochastic_physics)
-target_compile_definitions(fv3atm PRIVATE -DESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR})
-
-target_link_libraries(fv3atm PUBLIC fms)
-target_link_libraries(fv3atm PUBLIC cpl)
-target_link_libraries(fv3atm PUBLIC gfsphysics)
-target_link_libraries(fv3atm PUBLIC ipd)
-target_link_libraries(fv3atm PUBLIC io)
-target_link_libraries(fv3atm PUBLIC fv3dycore)
-target_link_libraries(fv3atm PUBLIC stochastic_physics)
-target_link_libraries(fv3atm PUBLIC stochastic_physics_wrapper)
-
-target_link_libraries(fv3atm PUBLIC
-                      nemsio::nemsio w3emc::w3emc_d w3nco::w3nco_d sp::sp_d bacio::bacio_4)
+target_compile_definitions(fv3atm PRIVATE "${_fv3atm_defs_private}")
+
+target_link_libraries(fv3atm PUBLIC fv3dycore
+                                    cpl
+                                    io
+                                    stochastic_physics
+                                    stochastic_physics_wrapper)
+
+target_link_libraries(fv3atm PUBLIC nemsio::nemsio
+                                    w3emc::w3emc_d
+                                    w3nco::w3nco_d
+                                    sp::sp_d
+                                    bacio::bacio_4
+                                    esmf)
+
 if(INLINE_POST)
   target_link_libraries(fv3atm PUBLIC nceppost::nceppost)
 endif()
 
-target_link_libraries(fv3atm PUBLIC esmf)
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(fv3atm PUBLIC OpenMP::OpenMP_Fortran)
+endif()
 
 ###############################################################################
 ### Install
@@ -147,9 +204,8 @@ install(
   EXPORT fv3atm-config
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib)
+
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 install(EXPORT fv3atm-config
-  DESTINATION lib/cmake
-)
-
+  DESTINATION lib/cmake)
diff --git a/atmos_model.F90 b/atmos_model.F90
index 81589c3864..860079949c 100644
--- a/atmos_model.F90
+++ b/atmos_model.F90
@@ -131,7 +131,7 @@ module atmos_model_mod
 
 !<PUBLICTYPE >
  type atmos_data_type
-     integer                       :: axes(4)            ! axis indices (returned by diag_manager) for the atmospheric grid 
+     integer                       :: axes(4)            ! axis indices (returned by diag_manager) for the atmospheric grid
                                                          ! (they correspond to the x, y, pfull, phalf axes)
      integer, pointer              :: pelist(:) =>null() ! pelist where atmosphere is running.
      integer                       :: layout(2)          ! computer task laytout
@@ -152,7 +152,7 @@ module atmos_model_mod
      type(time_type)               :: Time               ! current time
      type(time_type)               :: Time_step          ! atmospheric time step.
      type(time_type)               :: Time_init          ! reference time.
-     type(grid_box_type)           :: grid               ! hold grid information needed for 2nd order conservative flux exchange 
+     type(grid_box_type)           :: grid               ! hold grid information needed for 2nd order conservative flux exchange
      type(IPD_diag_type), pointer, dimension(:) :: Diag
  end type atmos_data_type
                                                          ! to calculate gradient on cubic sphere grid.
@@ -235,7 +235,7 @@ module atmos_model_mod
 !   atmospheric tendencies for dynamics, radiation, vertical diffusion of
 !   momentum, tracers, and heat/moisture.  For heat/moisture only the
 !   downward sweep of the tridiagonal elimination is performed, hence
-!   the name "_down". 
+!   the name "_down".
 !</DESCRIPTION>
 
 !   <TEMPLATE>
@@ -439,7 +439,7 @@ end subroutine update_atmos_radiation_physics
 
 subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
 
-#ifdef OPENMP
+#ifdef _OPENMP
   use omp_lib
 #endif
 #ifdef CCPP
@@ -533,11 +533,11 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
    call atmosphere_control_data (isc, iec, jsc, jec, nlev, p_hydro, hydro, tile_num)
    call define_blocks_packed ('atmos_model', Atm_block, isc, iec, jsc, jec, nlev, &
                               blocksize, block_message)
-   
+
    allocate(DYCORE_Data(Atm_block%nblks))
    allocate(IPD_Data(Atm_block%nblks))
 
-#ifdef OPENMP
+#ifdef _OPENMP
    nthrds = omp_get_max_threads()
 #else
    nthrds = 1
@@ -687,7 +687,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
 #endif
 
    !--- set the initial diagnostic timestamp
-   diag_time = Time 
+   diag_time = Time
    if (output_1st_tstep_rst) then
      diag_time = Time - real_to_time_type(mod(int((first_kdt - 1)*dt_phys/3600.),6)*3600.0)
    endif
@@ -905,7 +905,7 @@ subroutine update_atmos_model_state (Atmos)
       call FV3GFS_diag_output(Atmos%Time, IPD_DIag, Atm_block, IPD_Control%nx, IPD_Control%ny, &
                             IPD_Control%levs, 1, 1, 1.0_IPD_kind_phys, time_int, time_intfull,              &
                             IPD_Control%fhswr, IPD_Control%fhlwr)
-      if (nint(IPD_Control%fhzero) > 0) then 
+      if (nint(IPD_Control%fhzero) > 0) then
         if (mod(isec,3600*nint(IPD_Control%fhzero)) == 0) diag_time = Atmos%Time
       else
         if (mod(isec,nint(3600*IPD_Control%fhzero)) == 0) diag_time = Atmos%Time
@@ -917,7 +917,7 @@ subroutine update_atmos_model_state (Atmos)
     !!!call diag_send_complete_extra (Atmos%Time)
 
     !--- get bottom layer data from dynamical core for coupling
-    call atmosphere_get_bottom_layer (Atm_block, DYCORE_Data) 
+    call atmosphere_get_bottom_layer (Atm_block, DYCORE_Data)
 
     !if in coupled mode, set up coupled fields
     if (IPD_Control%cplflx .or. IPD_Control%cplwav) then
@@ -960,7 +960,7 @@ subroutine atmos_model_end (Atmos)
 
 !-----------------------------------------------------------------------
 !---- termination routine for atmospheric model ----
-                                              
+
     call atmosphere_end (Atmos % Time, Atmos%grid, restart_endfcst)
     if(restart_endfcst) then
       call FV3GFS_restart_write (IPD_Data, IPD_Restart, Atm_block, &
@@ -1558,7 +1558,7 @@ end subroutine update_atmos_chemistry
 ! </IN>
 !
 subroutine atmos_data_type_chksum(id, timestep, atm)
-type(atmos_data_type), intent(in) :: atm 
+type(atmos_data_type), intent(in) :: atm
     character(len=*),  intent(in) :: id
     integer         ,  intent(in) :: timestep
     integer :: n, outunit
@@ -1960,7 +1960,7 @@ subroutine assign_importdata(rc)
                                                    / max(0.01_IPD_kind_phys, IPD_Data(nb)%Sfcprop%fice(ix))
 !                                                  / max(0.01_IPD_kind_phys, IPD_Data(nb)%Coupling%ficein_cpl(ix))
               IPD_Data(nb)%Sfcprop%zorli(ix)       = z0ice
-            else 
+            else
 !             IPD_Data(nb)%Sfcprop%tisfc(ix)       = IPD_Data(nb)%Coupling%tseain_cpl(ix)
               IPD_Data(nb)%Sfcprop%tisfc(ix)       = IPD_Data(nb)%Sfcprop%tsfco(ix)
               IPD_Data(nb)%Sfcprop%fice(ix)        = zero
@@ -2043,7 +2043,7 @@ subroutine setup_exportdata (rc)
 
     ! set cpl fields to export Data
 
-    if (IPD_Control%cplflx .or. IPD_Control%cplwav) then 
+    if (IPD_Control%cplflx .or. IPD_Control%cplwav) then
     ! Instantaneous u wind (m/s) 10 m above ground
     idx = queryfieldlist(exportFieldsList,'inst_zonal_wind_height10m')
     if (idx > 0 ) then
@@ -2073,7 +2073,7 @@ subroutine setup_exportdata (rc)
       if (mpp_pe() == mpp_root_pe() .and. debug) print *,'cpl, get v10mi_cpl, exportData=',exportData(isc,jsc,idx),'idx=',idx
     endif
 
-    endif !if cplflx or cplwav 
+    endif !if cplflx or cplwav
 
     if (IPD_Control%cplflx) then
     ! MEAN Zonal compt of momentum flux (N/m**2)
@@ -2594,9 +2594,9 @@ subroutine setup_exportdata (rc)
         do i=isc,iec
           nb = Atm_block%blkno(i,j)
           ix = Atm_block%ixp(i,j)
-          if (associated(DYCORE_Data(nb)%coupling%t_bot)) then 
+          if (associated(DYCORE_Data(nb)%coupling%t_bot)) then
             exportData(i,j,idx) = DYCORE_Data(nb)%coupling%t_bot(ix)
-          else 
+          else
             exportData(i,j,idx) = zero
           endif
         enddo
@@ -2615,7 +2615,7 @@ subroutine setup_exportdata (rc)
           ix = Atm_block%ixp(i,j)
           if (associated(DYCORE_Data(nb)%coupling%tr_bot)) then
             exportData(i,j,idx) = DYCORE_Data(nb)%coupling%tr_bot(ix,1)
-          else 
+          else
             exportData(i,j,idx) = zero
           endif
         enddo
@@ -2634,7 +2634,7 @@ subroutine setup_exportdata (rc)
             exportData(i,j,idx) = DYCORE_Data(nb)%coupling%u_bot(ix)
           else
             exportData(i,j,idx) = zero
-          endif 
+          endif
         enddo
       enddo
     endif
@@ -2649,9 +2649,9 @@ subroutine setup_exportdata (rc)
           ix = Atm_block%ixp(i,j)
           if (associated(DYCORE_Data(nb)%coupling%v_bot)) then
             exportData(i,j,idx) = DYCORE_Data(nb)%coupling%v_bot(ix)
-          else 
-            exportData(i,j,idx) = zero 
-          endif 
+          else
+            exportData(i,j,idx) = zero
+          endif
         enddo
       enddo
     endif
@@ -2666,7 +2666,7 @@ subroutine setup_exportdata (rc)
           ix = Atm_block%ixp(i,j)
           if (associated(DYCORE_Data(nb)%coupling%p_bot)) then
             exportData(i,j,idx) = DYCORE_Data(nb)%coupling%p_bot(ix)
-          else 
+          else
             exportData(i,j,idx) = zero
           endif
         enddo
@@ -2683,7 +2683,7 @@ subroutine setup_exportdata (rc)
           ix = Atm_block%ixp(i,j)
           if (associated(DYCORE_Data(nb)%coupling%z_bot)) then
             exportData(i,j,idx) = DYCORE_Data(nb)%coupling%z_bot(ix)
-          else 
+          else
             exportData(i,j,idx) = zero
           endif
         enddo
@@ -2795,7 +2795,7 @@ subroutine addLsmask2grid(fcstGrid, rc)
 !    print *,'in set up grid, aft get maskptr, rc=',rc, 'size=',size(maskPtr,1),size(maskPtr,2), &
 !      'bound(maskPtr)=', LBOUND(maskPtr,1),LBOUND(maskPtr,2),UBOUND(maskPtr,1),UBOUND(maskPtr,2)
       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
-!    
+!
 !$omp parallel do default(shared) private(i,j)
     do j=jsc,jec
       do i=isc,iec
@@ -2804,7 +2804,7 @@ subroutine addLsmask2grid(fcstGrid, rc)
     enddo
 !      print *,'in set set lsmask, maskPtr=', maxval(maskPtr), minval(maskPtr)
 !
-    deallocate(lsmask)  
+    deallocate(lsmask)
 
   end subroutine addLsmask2grid
 !------------------------------------------------------------------------------
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
index 4d61fbbaed..a3d727317f 100755
--- a/ccpp/config/ccpp_prebuild_config.py
+++ b/ccpp/config/ccpp_prebuild_config.py
@@ -15,17 +15,17 @@
 # dependencies of these files to the list.
 VARIABLE_DEFINITION_FILES = [
     # actual variable definition files
-    'FV3/ccpp/physics/physics/machine.F',
-    'FV3/ccpp/physics/physics/radsw_param.f',
-    'FV3/ccpp/physics/physics/radlw_param.f',
-    'FV3/gfsphysics/CCPP_layer/CCPP_typedefs.F90',
-    'FV3/gfsphysics/GFS_layer/GFS_typedefs.F90',
-    'FV3/gfsphysics/CCPP_layer/CCPP_data.F90',
-    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
-    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
-    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
-    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
-    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
+    'ccpp/physics/physics/machine.F',
+    'ccpp/physics/physics/radsw_param.f',
+    'ccpp/physics/physics/radlw_param.f',
+    'gfsphysics/CCPP_layer/CCPP_typedefs.F90',
+    'gfsphysics/GFS_layer/GFS_typedefs.F90',
+    'gfsphysics/CCPP_layer/CCPP_data.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
     ]
 
 TYPEDEFS_NEW_METADATA = {
@@ -92,113 +92,113 @@
     # Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ];
     # current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the
     # suite definition file have to belong to the same physics set
-    'FV3/ccpp/physics/physics/GFS_DCNV_generic.F90',
-    'FV3/ccpp/physics/physics/GFS_GWD_generic.F90',
-    'FV3/ccpp/physics/physics/GFS_MP_generic.F90',
-    'FV3/ccpp/physics/physics/GFS_PBL_generic.F90',
-    'FV3/ccpp/physics/physics/GFS_SCNV_generic.F90',
-    'FV3/ccpp/physics/physics/GFS_debug.F90',
-    'FV3/ccpp/physics/physics/GFS_phys_time_vary.fv3.F90',
-    'FV3/ccpp/physics/physics/GFS_rad_time_vary.fv3.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmg_post.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmg_pre.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmg_setup.F90',
-    'FV3/ccpp/physics/physics/GFS_stochastics.F90',
-    'FV3/ccpp/physics/physics/GFS_suite_interstitial.F90',
-    'FV3/ccpp/physics/physics/GFS_surface_generic.F90',
-    'FV3/ccpp/physics/physics/GFS_surface_composites.F90',
-    'FV3/ccpp/physics/physics/GFS_surface_loop_control.F90',
-    'FV3/ccpp/physics/physics/GFS_time_vary_pre.fv3.F90',
-    'FV3/ccpp/physics/physics/cires_ugwp.F90',
-    'FV3/ccpp/physics/physics/cires_ugwp_post.F90',
-    'FV3/ccpp/physics/physics/cnvc90.f',
-    'FV3/ccpp/physics/physics/cs_conv.F90',
-    'FV3/ccpp/physics/physics/cs_conv_aw_adj.F90',
-    'FV3/ccpp/physics/physics/cu_ntiedtke_pre.F90',
-    'FV3/ccpp/physics/physics/cu_ntiedtke.F90',
-    'FV3/ccpp/physics/physics/cu_ntiedtke_post.F90',
-    'FV3/ccpp/physics/physics/dcyc2.f',
-    'FV3/ccpp/physics/physics/drag_suite.F90',
-    'FV3/ccpp/physics/physics/gcm_shoc.F90',
-    'FV3/ccpp/physics/physics/get_prs_fv3.F90',
-    'FV3/ccpp/physics/physics/gfdl_cloud_microphys.F90',
-    'FV3/ccpp/physics/physics/gfdl_fv_sat_adj.F90',
-    'FV3/ccpp/physics/physics/gscond.f',
-    'FV3/ccpp/physics/physics/gwdc.f',
-    'FV3/ccpp/physics/physics/gwdps.f',
-    'FV3/ccpp/physics/physics/h2ophys.f',
-    'FV3/ccpp/physics/physics/samfdeepcnv.f',
-    'FV3/ccpp/physics/physics/samfshalcnv.f',
-    'FV3/ccpp/physics/physics/sascnvn.F',
-    'FV3/ccpp/physics/physics/shalcnv.F',
-    'FV3/ccpp/physics/physics/maximum_hourly_diagnostics.F90',
-    'FV3/ccpp/physics/physics/m_micro.F90',
-    'FV3/ccpp/physics/physics/m_micro_interstitial.F90',
-    'FV3/ccpp/physics/physics/cu_gf_driver_pre.F90',
-    'FV3/ccpp/physics/physics/cu_gf_driver.F90',
-    'FV3/ccpp/physics/physics/cu_gf_driver_post.F90',
-    'FV3/ccpp/physics/physics/moninedmf.f',
-    'FV3/ccpp/physics/physics/moninedmf_hafs.f',
-    'FV3/ccpp/physics/physics/moninshoc.f',
-    'FV3/ccpp/physics/physics/satmedmfvdif.F',
-    'FV3/ccpp/physics/physics/satmedmfvdifq.F',
-    'FV3/ccpp/physics/physics/shinhongvdif.F90',
-    'FV3/ccpp/physics/physics/ysuvdif.F90',
-    'FV3/ccpp/physics/physics/module_MYNNPBL_wrapper.F90',
-    'FV3/ccpp/physics/physics/module_MYNNSFC_wrapper.F90',
-    'FV3/ccpp/physics/physics/module_SGSCloud_RadPre.F90',
-    'FV3/ccpp/physics/physics/module_SGSCloud_RadPost.F90',
-    'FV3/ccpp/physics/physics/module_MYJSFC_wrapper.F90',
-    'FV3/ccpp/physics/physics/module_MYJPBL_wrapper.F90',
-    'FV3/ccpp/physics/physics/mp_thompson_pre.F90',
-    'FV3/ccpp/physics/physics/mp_thompson.F90',
-    'FV3/ccpp/physics/physics/mp_thompson_post.F90',
-    'FV3/ccpp/physics/physics/ozphys.f',
-    'FV3/ccpp/physics/physics/ozphys_2015.f',
-    'FV3/ccpp/physics/physics/precpd.f',
-    'FV3/ccpp/physics/physics/phys_tend.F90',
-    'FV3/ccpp/physics/physics/radlw_main.f',
-    'FV3/ccpp/physics/physics/radsw_main.f',
-    'FV3/ccpp/physics/physics/rascnv.F90',
-    'FV3/ccpp/physics/physics/rayleigh_damp.f',
-    'FV3/ccpp/physics/physics/rrtmg_lw_post.F90',
-    'FV3/ccpp/physics/physics/rrtmg_lw_pre.F90',
-    'FV3/ccpp/physics/physics/rrtmg_sw_post.F90',
-    'FV3/ccpp/physics/physics/rrtmg_sw_pre.F90',
-    'FV3/ccpp/physics/physics/sfc_diag.f',
-    'FV3/ccpp/physics/physics/sfc_diag_post.F90',
-    'FV3/ccpp/physics/physics/sfc_drv_ruc.F90',
-    'FV3/ccpp/physics/physics/lsm_ruc_sfc_sice_interstitial.F90',
-    'FV3/ccpp/physics/physics/sfc_cice.f',
-    'FV3/ccpp/physics/physics/sfc_diff.f',
-    'FV3/ccpp/physics/physics/sfc_drv.f',
-    'FV3/ccpp/physics/physics/sfc_noahmp_drv.f',
-    'FV3/ccpp/physics/physics/flake_driver.F90',
-    'FV3/ccpp/physics/physics/sfc_nst.f',
-    'FV3/ccpp/physics/physics/sfc_ocean.F',
-    'FV3/ccpp/physics/physics/sfc_sice.f',
+    'ccpp/physics/physics/GFS_DCNV_generic.F90',
+    'ccpp/physics/physics/GFS_GWD_generic.F90',
+    'ccpp/physics/physics/GFS_MP_generic.F90',
+    'ccpp/physics/physics/GFS_PBL_generic.F90',
+    'ccpp/physics/physics/GFS_SCNV_generic.F90',
+    'ccpp/physics/physics/GFS_debug.F90',
+    'ccpp/physics/physics/GFS_phys_time_vary.fv3.F90',
+    'ccpp/physics/physics/GFS_rad_time_vary.fv3.F90',
+    'ccpp/physics/physics/GFS_rrtmg_post.F90',
+    'ccpp/physics/physics/GFS_rrtmg_pre.F90',
+    'ccpp/physics/physics/GFS_rrtmg_setup.F90',
+    'ccpp/physics/physics/GFS_stochastics.F90',
+    'ccpp/physics/physics/GFS_suite_interstitial.F90',
+    'ccpp/physics/physics/GFS_surface_generic.F90',
+    'ccpp/physics/physics/GFS_surface_composites.F90',
+    'ccpp/physics/physics/GFS_surface_loop_control.F90',
+    'ccpp/physics/physics/GFS_time_vary_pre.fv3.F90',
+    'ccpp/physics/physics/cires_ugwp.F90',
+    'ccpp/physics/physics/cires_ugwp_post.F90',
+    'ccpp/physics/physics/cnvc90.f',
+    'ccpp/physics/physics/cs_conv.F90',
+    'ccpp/physics/physics/cs_conv_aw_adj.F90',
+    'ccpp/physics/physics/cu_ntiedtke_pre.F90',
+    'ccpp/physics/physics/cu_ntiedtke.F90',
+    'ccpp/physics/physics/cu_ntiedtke_post.F90',
+    'ccpp/physics/physics/dcyc2.f',
+    'ccpp/physics/physics/drag_suite.F90',
+    'ccpp/physics/physics/gcm_shoc.F90',
+    'ccpp/physics/physics/get_prs_fv3.F90',
+    'ccpp/physics/physics/gfdl_cloud_microphys.F90',
+    'ccpp/physics/physics/gfdl_fv_sat_adj.F90',
+    'ccpp/physics/physics/gscond.f',
+    'ccpp/physics/physics/gwdc.f',
+    'ccpp/physics/physics/gwdps.f',
+    'ccpp/physics/physics/h2ophys.f',
+    'ccpp/physics/physics/samfdeepcnv.f',
+    'ccpp/physics/physics/samfshalcnv.f',
+    'ccpp/physics/physics/sascnvn.F',
+    'ccpp/physics/physics/shalcnv.F',
+    'ccpp/physics/physics/maximum_hourly_diagnostics.F90',
+    'ccpp/physics/physics/m_micro.F90',
+    'ccpp/physics/physics/m_micro_interstitial.F90',
+    'ccpp/physics/physics/cu_gf_driver_pre.F90',
+    'ccpp/physics/physics/cu_gf_driver.F90',
+    'ccpp/physics/physics/cu_gf_driver_post.F90',
+    'ccpp/physics/physics/moninedmf.f',
+    'ccpp/physics/physics/moninedmf_hafs.f',
+    'ccpp/physics/physics/moninshoc.f',
+    'ccpp/physics/physics/satmedmfvdif.F',
+    'ccpp/physics/physics/satmedmfvdifq.F',
+    'ccpp/physics/physics/shinhongvdif.F90',
+    'ccpp/physics/physics/ysuvdif.F90',
+    'ccpp/physics/physics/module_MYNNPBL_wrapper.F90',
+    'ccpp/physics/physics/module_MYNNSFC_wrapper.F90',
+    'ccpp/physics/physics/module_SGSCloud_RadPre.F90',
+    'ccpp/physics/physics/module_SGSCloud_RadPost.F90',
+    'ccpp/physics/physics/module_MYJSFC_wrapper.F90',
+    'ccpp/physics/physics/module_MYJPBL_wrapper.F90',
+    'ccpp/physics/physics/mp_thompson_pre.F90',
+    'ccpp/physics/physics/mp_thompson.F90',
+    'ccpp/physics/physics/mp_thompson_post.F90',
+    'ccpp/physics/physics/ozphys.f',
+    'ccpp/physics/physics/ozphys_2015.f',
+    'ccpp/physics/physics/precpd.f',
+    'ccpp/physics/physics/phys_tend.F90',
+    'ccpp/physics/physics/radlw_main.f',
+    'ccpp/physics/physics/radsw_main.f',
+    'ccpp/physics/physics/rascnv.F90',
+    'ccpp/physics/physics/rayleigh_damp.f',
+    'ccpp/physics/physics/rrtmg_lw_post.F90',
+    'ccpp/physics/physics/rrtmg_lw_pre.F90',
+    'ccpp/physics/physics/rrtmg_sw_post.F90',
+    'ccpp/physics/physics/rrtmg_sw_pre.F90',
+    'ccpp/physics/physics/sfc_diag.f',
+    'ccpp/physics/physics/sfc_diag_post.F90',
+    'ccpp/physics/physics/sfc_drv_ruc.F90',
+    'ccpp/physics/physics/lsm_ruc_sfc_sice_interstitial.F90',
+    'ccpp/physics/physics/sfc_cice.f',
+    'ccpp/physics/physics/sfc_diff.f',
+    'ccpp/physics/physics/sfc_drv.f',
+    'ccpp/physics/physics/sfc_noahmp_drv.f',
+    'ccpp/physics/physics/flake_driver.F90',
+    'ccpp/physics/physics/sfc_nst.f',
+    'ccpp/physics/physics/sfc_ocean.F',
+    'ccpp/physics/physics/sfc_sice.f',
     # HAFSFER_HIRES
-    'FV3/ccpp/physics/physics/mp_fer_hires.F90',
+    'ccpp/physics/physics/mp_fer_hires.F90',
     # RRTMGP
-    'FV3/ccpp/physics/physics/rrtmgp_lw_gas_optics.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_sw_gas_optics.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_lw_rte.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_sw_rte.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_setup.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_pre.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_lw_pre.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_lw_post.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90',
-    'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90',
-    'FV3/ccpp/physics/physics/GFS_cloud_diagnostics.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_gfdlmp_pre.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_zhaocarr_pre.F90',
-    'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'
+    'ccpp/physics/physics/rrtmgp_lw_gas_optics.F90',
+    'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90',
+    'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90',
+    'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90',
+    'ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90',
+    'ccpp/physics/physics/rrtmgp_lw_rte.F90',
+    'ccpp/physics/physics/rrtmgp_sw_rte.F90',
+    'ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_setup.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_pre.F90',
+    'ccpp/physics/physics/rrtmgp_lw_pre.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_lw_post.F90',
+    'ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90',
+    'ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90',
+    'ccpp/physics/physics/GFS_cloud_diagnostics.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_gfdlmp_pre.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_zhaocarr_pre.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'
     ]
 
 # Default build dir, relative to current working directory,
@@ -224,7 +224,7 @@
 CAPS_DIR = '{build_dir}/ccpp/physics'
 
 # Directory where the suite definition files are stored
-SUITES_DIR = 'FV3/ccpp/suites'
+SUITES_DIR = 'ccpp/suites'
 
 # Optional arguments - only required for schemes that use
 # optional arguments. ccpp_prebuild.py will throw an exception
@@ -297,12 +297,12 @@
              'RRTMGP_jacobian_of_lw_flux_profile_upward',
              'RRTMGP_jacobian_of_lw_flux_profile_downward',
              ],
-         },          
+         },
     'rrtmgp_sw_rte' : {
          'rrtmgp_sw_rte_run' : [
              'components_of_surface_downward_shortwave_fluxes',
              ],
-         },        
+         },
     'GFS_rrtmgp_sw_post' : {
          'GFS_rrtmgp_sw_post_run' : [
              'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
@@ -319,7 +319,7 @@
              'RRTMGP_jacobian_of_lw_flux_profile_upward',
              'RRTMGP_lw_flux_profile_upward_allsky',
              ],
-         },  
+         },
     #'subroutine_name_1' : 'all',
     #'subroutine_name_2' : 'none',
     #'subroutine_name_2' : [ 'var1', 'var3'],
diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90
index 89c41672f7..6760c08ae3 100644
--- a/ccpp/driver/CCPP_driver.F90
+++ b/ccpp/driver/CCPP_driver.F90
@@ -43,7 +43,7 @@ module CCPP_driver
 !-------------------------------
   subroutine CCPP_step (step, nblks, ierr)
 
-#ifdef OPENMP
+#ifdef _OPENMP
     use omp_lib
 #endif
 
@@ -62,7 +62,7 @@ subroutine CCPP_step (step, nblks, ierr)
 
       ! Get and set number of OpenMP threads (module
       ! variable) that are available to run physics
-#ifdef OPENMP
+#ifdef _OPENMP
       nthrds = omp_get_max_threads()
 #else
       nthrds = 1
@@ -134,7 +134,7 @@ subroutine CCPP_step (step, nblks, ierr)
 !$OMP          default (shared)          &
 !$OMP          private (nb,nt,ntX,ierr2) &
 !$OMP          reduction (+:ierr)
-#ifdef OPENMP
+#ifdef _OPENMP
       nt = omp_get_thread_num()+1
 #else
       nt = 1
diff --git a/gfsphysics/CMakeLists.txt b/gfsphysics/CMakeLists.txt
index 2c50405886..819c5b4c08 100644
--- a/gfsphysics/CMakeLists.txt
+++ b/gfsphysics/CMakeLists.txt
@@ -1,17 +1,14 @@
-
 if(32BIT)
-remove_definitions(-DOVERLOAD_R4)
-remove_definitions(-DOVERLOAD_R8)
-message ("Force 64 bits in gfsphysics")
-if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+  message ("Force 64 bits in gfsphysics")
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
     if(REPRO)
-        string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
+      string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
     else()
-        string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64 -no-prec-div -no-prec-sqrt" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
+      string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64 -no-prec-div -no-prec-sqrt" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
     endif()
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8")
-endif()
+  endif()
 endif()
 
 set(CCPP_SOURCES
@@ -193,30 +190,46 @@ set(IPD_SOURCES
     GFS_layer/GFS_typedefs.F90
 )
 
+list(APPEND _gfsphysics_defs_private NEMS_GSM
+                                     MOIST_CAPPA
+                                     USE_COND
+                                     INTERNAL_FILE_NML)
+
+if(MULTI_GASES)
+  list(APPEND _gfsphysics_defs_private MULTI_GASES)
+endif()
+
 if(CCPP)
-  add_definitions(-DCCPP)
+  list(APPEND _gfsphysics_srcs ${CCPP_SOURCES})
+  list(APPEND _gfsphysics_defs_private CCPP)
   if(DYN32)
-    add_definitions(-DOVERLOAD_R4)
+    list(APPEND _gfsphysics_defs_private OVERLOAD_R4)
   endif()
-  add_library(gfsphysics ${CCPP_SOURCES})
-  target_include_directories(gfsphysics PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src)
-  target_include_directories(gfsphysics PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
-  target_link_libraries(gfsphysics PRIVATE ccppphys ccpp)
 else()
-  add_library(gfsphysics ${IPD_SOURCES})
+  list(APPEND _gfsphysics_srcs ${IPD_SOURCES})
+endif()
+
+add_library(gfsphysics ${_gfsphysics_srcs})
+
+if(CCPP)
+  target_include_directories(gfsphysics PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src
+                                                ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
+  target_link_libraries(gfsphysics PRIVATE ccppphys ccpp)
 endif()
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   if(CMAKE_Platform MATCHES "jet")
-    set_property(SOURCE physics/radiation_aerosols.f  APPEND_STRING PROPERTY COMPILE_FLAGS "-axSSE4.2,AVX,CORE-AVX-I")
+    set_property(SOURCE physics/radiation_aerosols.f APPEND_STRING PROPERTY COMPILE_FLAGS "-axSSE4.2,AVX,CORE-AVX-I")
   else()
-    set_property(SOURCE physics/radiation_aerosols.f  APPEND_STRING PROPERTY COMPILE_FLAGS "-xCORE-AVX-I")
+    set_property(SOURCE physics/radiation_aerosols.f APPEND_STRING PROPERTY COMPILE_FLAGS "-xCORE-AVX-I")
   endif()
 endif()
 set_property(SOURCE GFS_layer/GFS_diagnostics.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "-O0")
 
-target_compile_definitions(gfsphysics PRIVATE -DNEMS_GSM)
-target_link_libraries(gfsphysics PRIVATE NetCDF::NetCDF_Fortran)
-
 set_target_properties(gfsphysics PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
+target_compile_definitions(gfsphysics PRIVATE "${_gfsphysics_defs_private}")
 target_include_directories(gfsphysics PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_link_libraries(gfsphysics PRIVATE NetCDF::NetCDF_Fortran)
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(gfsphysics PUBLIC OpenMP::OpenMP_Fortran)
+endif()
diff --git a/gfsphysics/GFS_layer/GFS_driver.F90 b/gfsphysics/GFS_layer/GFS_driver.F90
index e32ec4c266..2d676d8d41 100644
--- a/gfsphysics/GFS_layer/GFS_driver.F90
+++ b/gfsphysics/GFS_layer/GFS_driver.F90
@@ -119,7 +119,7 @@ subroutine GFS_initialize (Model, Statein, Stateout, Sfcprop,     &
                              Diag, Init_parm)
 #endif
 
-#ifdef OPENMP
+#ifdef _OPENMP
     use omp_lib
 #endif
 
@@ -176,7 +176,7 @@ subroutine GFS_initialize (Model, Statein, Stateout, Sfcprop,     &
     blksz(:) = Init_parm%blksz(:)
 
 #ifdef CCPP
-#ifdef OPENMP
+#ifdef _OPENMP
     nthrds = omp_get_max_threads()
 #else
     nthrds = 1
diff --git a/gfsphysics/physics/GFS_debug.F90 b/gfsphysics/physics/GFS_debug.F90
index e1953a9ffb..4dfef4aed5 100644
--- a/gfsphysics/physics/GFS_debug.F90
+++ b/gfsphysics/physics/GFS_debug.F90
@@ -1,5 +1,4 @@
 #define MPI
-#define OPENMP
 !> \file GFS_debug.F90
 
     module GFS_diagtoscreen
@@ -49,7 +48,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
 #ifdef MPI
          use mpi
 #endif
-#ifdef OPENMP
+#ifdef _OPENMP
          use omp_lib
 #endif
          use machine,               only: kind_phys
@@ -89,7 +88,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
          mpisize = 1
          mpicomm = 0
 #endif
-#ifdef OPENMP
+#ifdef _OPENMP
          omprank = OMP_GET_THREAD_NUM()
          ompsize = OMP_GET_NUM_THREADS()
 #else
@@ -97,7 +96,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
          ompsize = 1
 #endif
 
-#ifdef OPENMP
+#ifdef _OPENMP
 !$OMP BARRIER
 #endif
 #ifdef MPI
@@ -504,7 +503,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
                      ! Model/Control
                      ! not yet
                  end if
-#ifdef OPENMP
+#ifdef _OPENMP
 !$OMP BARRIER
 #endif
              end do
@@ -513,7 +512,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
 #endif
          end do
 
-#ifdef OPENMP
+#ifdef _OPENMP
 !$OMP BARRIER
 #endif
 #ifdef MPI
@@ -737,7 +736,7 @@ function print_my_stuff(mpitoprint,omptoprint) result(flag)
 #ifdef MPI
          use mpi
 #endif
-#ifdef OPENMP
+#ifdef _OPENMP
          use omp_lib
 #endif
          implicit none
@@ -749,7 +748,7 @@ function print_my_stuff(mpitoprint,omptoprint) result(flag)
 #else
          mpirank = 0
 #endif
-#ifdef OPENMP
+#ifdef _OPENMP
          ompthread = OMP_GET_THREAD_NUM()
 #else
          ompthread = 0
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
index 1fc2ea77e5..a45608354f 100644
--- a/io/CMakeLists.txt
+++ b/io/CMakeLists.txt
@@ -1,12 +1,18 @@
+list(APPEND _io_defs_private use_WRTCOMP)
+
 if(INLINE_POST)
   set(POST_SRC post_gfs.F90 post_nems_routines.F90)
 else()
   set(POST_SRC post_gfs_stub.F90)
-  add_definitions(-DNO_INLINE_POST)
+  list(APPEND _io_defs_private NO_INLINE_POST)
 endif()
 
 if(NOT PARALLEL_NETCDF)
-  add_definitions(-DNO_PARALLEL_NETCDF)
+  list(APPEND _io_defs_private NO_PARALLEL_NETCDF)
+endif()
+
+if(CCPP)
+  list(APPEND _io_defs_private CCPP)
 endif()
 
 add_library(
@@ -23,21 +29,22 @@ add_library(
     ${POST_SRC}
 )
 
-target_link_libraries(io PRIVATE fms)
-target_link_libraries(io PRIVATE gfsphysics)
-target_link_libraries(io PRIVATE ipd)
+set_target_properties(io PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
+target_compile_definitions(io PRIVATE "${_io_defs_private}")
+target_include_directories(io PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+
+target_link_libraries(io PRIVATE fms
+                                 gfsphysics
+                                 ipd)
 
 if(INLINE_POST)
   target_link_libraries(io PRIVATE nceppost::nceppost)
 endif()
 
 if(CCPP)
-  target_include_directories(io PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src)
-  target_include_directories(io PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
+  target_include_directories(io PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src
+                                        ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
 endif()
 
-target_link_libraries(io PRIVATE nemsio::nemsio)
-target_link_libraries(io PRIVATE esmf)
-
-set_target_properties(io PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(io PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_link_libraries(io PRIVATE nemsio::nemsio
+                                 esmf)
diff --git a/ipd/CMakeLists.txt b/ipd/CMakeLists.txt
index 3009fbfa5c..d0a6bba23e 100644
--- a/ipd/CMakeLists.txt
+++ b/ipd/CMakeLists.txt
@@ -1,17 +1,18 @@
-
 if(32BIT)
-remove_definitions(-DOVERLOAD_R4)
-remove_definitions(-DOVERLOAD_R8)
-message ("Force 64 bits in ipd")
-if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-    if(REPRO)
-        string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
-    else()
-        string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64 -no-prec-div -no-prec-sqrt" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
-    endif()
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8")
+  message ("Force 64 bits in ipd")
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+      if(REPRO)
+          string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
+      else()
+          string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64 -no-prec-div -no-prec-sqrt" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
+      endif()
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+      set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8")
+  endif()
 endif()
+
+if(CCPP)
+  list(APPEND _ipd_defs_private CCPP)
 endif()
 
 add_library(
@@ -20,12 +21,13 @@ add_library(
     IPD_driver.F90
     IPD_typedefs.F90
 )
-target_link_libraries(ipd PRIVATE gfsphysics)
+set_target_properties(ipd PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
+target_compile_definitions(ipd PRIVATE "${_ipd_defs_private}")
+target_include_directories(ipd PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 
 if(CCPP)
-  target_include_directories(ipd PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src)
-  target_include_directories(ipd PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
+  target_include_directories(ipd PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src
+                                         ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
 endif()
 
-set_target_properties(ipd PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(ipd PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_link_libraries(ipd PRIVATE gfsphysics)
diff --git a/stochastic_physics/CMakeLists.txt b/stochastic_physics/CMakeLists.txt
index c9131308b2..be58afc0db 100644
--- a/stochastic_physics/CMakeLists.txt
+++ b/stochastic_physics/CMakeLists.txt
@@ -1,19 +1,16 @@
-add_library(
-    stochastic_physics_wrapper
-
-    ./stochastic_physics_wrapper.F90
-)
+add_library(stochastic_physics_wrapper stochastic_physics_wrapper.F90)
 
 target_include_directories(stochastic_physics_wrapper PRIVATE ${CMAKE_BINARY_DIR}/stochastic_physics)
 if(CCPP)
-  target_include_directories(stochastic_physics_wrapper PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src)
-  target_include_directories(stochastic_physics_wrapper PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
+  target_include_directories(stochastic_physics_wrapper PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src
+                                                                ${CMAKE_BINARY_DIR}/FV3/ccpp/physics)
 endif()
-# DH* is there a better way to do this?
-target_include_directories(stochastic_physics_wrapper PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../mod>)
-# *DH
-target_link_libraries(stochastic_physics_wrapper fms)
-target_link_libraries(stochastic_physics_wrapper stochastic_physics)
-target_link_libraries(stochastic_physics_wrapper gfsphysics)
-target_link_libraries(stochastic_physics_wrapper fv3dycore)
+target_include_directories(stochastic_physics_wrapper PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
+target_link_libraries(stochastic_physics_wrapper PUBLIC fms
+                                                        stochastic_physics
+                                                        gfsphysics
+                                                        fv3dycore)
 
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(stochastic_physics_wrapper PUBLIC OpenMP::OpenMP_Fortran)
+endif()
diff --git a/stochastic_physics/stochastic_physics_wrapper.F90 b/stochastic_physics/stochastic_physics_wrapper.F90
index d4803c639b..b5a1be0653 100644
--- a/stochastic_physics/stochastic_physics_wrapper.F90
+++ b/stochastic_physics/stochastic_physics_wrapper.F90
@@ -13,9 +13,9 @@ module stochastic_physics_wrapper_mod
   real(kind=kind_phys), dimension(:,:,:), allocatable, save :: skebv_wts
   real(kind=kind_phys), dimension(:,:,:), allocatable, save :: sfc_wts
 
-  real(kind=kind_phys), dimension(:,:,:), allocatable, save :: smc 
-  real(kind=kind_phys), dimension(:,:,:), allocatable, save :: stc 
-  real(kind=kind_phys), dimension(:,:,:), allocatable, save :: slc 
+  real(kind=kind_phys), dimension(:,:,:), allocatable, save :: smc
+  real(kind=kind_phys), dimension(:,:,:), allocatable, save :: stc
+  real(kind=kind_phys), dimension(:,:,:), allocatable, save :: slc
   real(kind=kind_phys), dimension(:,:), allocatable, save :: vfrac
   real(kind=kind_phys), dimension(:,:), allocatable, save :: stype
 
@@ -45,7 +45,7 @@ module stochastic_physics_wrapper_mod
 !-------------------------------
   subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
 
-#ifdef OPENMP
+#ifdef _OPENMP
     use omp_lib
 #endif
 
@@ -70,12 +70,12 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
     integer :: nthreads, nb
     logical :: param_update_flag
 
-#ifdef OPENMP
+#ifdef _OPENMP
     nthreads = omp_get_max_threads()
 #else
     nthreads = 1
 #endif
-    ierr = 0 
+    ierr = 0
 
     ! Initialize
     initalize_stochastic_physics: if (GFS_Control%kdt==0) then
@@ -84,10 +84,10 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
         ! Initialize stochastic physics
         call init_stochastic_physics(GFS_Control%levs, GFS_Control%blksz, GFS_Control%dtp,                                               &
             GFS_Control%input_nml_file, GFS_Control%fn_nml, GFS_Control%nlunit, GFS_Control%do_sppt, GFS_Control%do_shum,                &
-            GFS_Control%do_skeb, GFS_Control%lndp_type, GFS_Control%n_var_lndp, GFS_Control%use_zmtnblck, GFS_Control%skeb_npass, & 
+            GFS_Control%do_skeb, GFS_Control%lndp_type, GFS_Control%n_var_lndp, GFS_Control%use_zmtnblck, GFS_Control%skeb_npass, &
             GFS_Control%lndp_var_list, GFS_Control%lndp_prt_list,    &
             GFS_Control%ak, GFS_Control%bk, nthreads, GFS_Control%master, GFS_Control%communicator, ierr)
-            if (ierr/=0)  then 
+            if (ierr/=0)  then
                     write(6,*) 'call to init_stochastic_physics failed'
                     return
             endif
@@ -112,7 +112,7 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
          deallocate(xlat)
          deallocate(xlon)
          deallocate(sfc_wts)
-      end if 
+      end if
       ! Consistency check for cellular automata
       if(GFS_Control%do_ca)then
         ! DH* The current implementation of cellular_automata assumes that all blocksizes are the
@@ -145,7 +145,7 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
          end if
          if ( GFS_Control%lndp_type .EQ. 2 ) then ! this scheme updates through forecast
             allocate(sfc_wts(1:Atm_block%nblks,maxval(GFS_Control%blksz),1:GFS_Control%n_var_lndp))
-         end if 
+         end if
 
          call run_stochastic_physics(GFS_Control%levs, GFS_Control%kdt, GFS_Control%phour, GFS_Control%blksz, xlat=xlat, xlon=xlon, &
                                  sppt_wts=sppt_wts, shum_wts=shum_wts, skebu_wts=skebu_wts, skebv_wts=skebv_wts, sfc_wts=sfc_wts, &
@@ -171,7 +171,7 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
             deallocate(skebu_wts)
             deallocate(skebv_wts)
          end if
-         if (GFS_Control%lndp_type .EQ. 2) then ! save wts, and apply lndp scheme 
+         if (GFS_Control%lndp_type .EQ. 2) then ! save wts, and apply lndp scheme
              do nb=1,Atm_block%nblks
                 GFS_Data(nb)%Coupling%sfc_wts(:,:) = sfc_wts(nb,1:GFS_Control%blksz(nb),:)
              end do
@@ -183,37 +183,37 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr)
              allocate(vfrac(1:Atm_block%nblks,maxval(GFS_Control%blksz)))
              do nb=1,Atm_block%nblks
                 stype(nb,1:GFS_Control%blksz(nb))  = GFS_Data(nb)%Sfcprop%stype(:)
-                smc(nb,1:GFS_Control%blksz(nb),:)  = GFS_Data(nb)%Sfcprop%smc(:,:) 
-                slc(nb,1:GFS_Control%blksz(nb),:)  = GFS_Data(nb)%Sfcprop%slc(:,:) 
-                stc(nb,1:GFS_Control%blksz(nb),:)  = GFS_Data(nb)%Sfcprop%stc(:,:) 
-                vfrac(nb,1:GFS_Control%blksz(nb))  = GFS_Data(nb)%Sfcprop%vfrac(:) 
+                smc(nb,1:GFS_Control%blksz(nb),:)  = GFS_Data(nb)%Sfcprop%smc(:,:)
+                slc(nb,1:GFS_Control%blksz(nb),:)  = GFS_Data(nb)%Sfcprop%slc(:,:)
+                stc(nb,1:GFS_Control%blksz(nb),:)  = GFS_Data(nb)%Sfcprop%stc(:,:)
+                vfrac(nb,1:GFS_Control%blksz(nb))  = GFS_Data(nb)%Sfcprop%vfrac(:)
              end do
 
-             ! determine whether land paramaters have been over-written 
+             ! determine whether land paramaters have been over-written
              if (mod(GFS_Control%kdt,GFS_Control%nscyc) == 1)  then ! logic copied from GFS_driver
-                    param_update_flag = .true. 
+                    param_update_flag = .true.
              else
                     param_update_flag = .false.
-             endif 
-             call lndp_apply_perts( GFS_Control%blksz, GFS_Control%lsm,  GFS_Control%lsoil, GFS_Control%dtf, & 
-                             GFS_Control%n_var_lndp, GFS_Control%lndp_var_list, GFS_Control%lndp_prt_list, & 
-                             sfc_wts, xlon, xlat, stype, maxsmc,param_update_flag, smc, slc,stc, vfrac, ierr) 
-             if (ierr/=0)  then 
+             endif
+             call lndp_apply_perts( GFS_Control%blksz, GFS_Control%lsm,  GFS_Control%lsoil, GFS_Control%dtf, &
+                             GFS_Control%n_var_lndp, GFS_Control%lndp_var_list, GFS_Control%lndp_prt_list, &
+                             sfc_wts, xlon, xlat, stype, maxsmc,param_update_flag, smc, slc,stc, vfrac, ierr)
+             if (ierr/=0)  then
                     write(6,*) 'call to GFS_apply_lndp failed'
                     return
              endif
-             deallocate(stype) 
-             deallocate(sfc_wts) 
+             deallocate(stype)
+             deallocate(sfc_wts)
              do nb=1,Atm_block%nblks
                  GFS_Data(nb)%Sfcprop%smc(:,:) =  smc(nb,1:GFS_Control%blksz(nb),:)
                  GFS_Data(nb)%Sfcprop%slc(:,:) =  slc(nb,1:GFS_Control%blksz(nb),:)
                  GFS_Data(nb)%Sfcprop%stc(:,:) =  stc(nb,1:GFS_Control%blksz(nb),:)
                  GFS_Data(nb)%Sfcprop%vfrac(:) =  vfrac(nb,1:GFS_Control%blksz(nb))
              enddo
-             deallocate(smc) 
-             deallocate(slc) 
-             deallocate(stc) 
-             deallocate(vfrac) 
+             deallocate(smc)
+             deallocate(slc)
+             deallocate(stc)
+             deallocate(vfrac)
          endif ! lndp block
          deallocate(xlat)
          deallocate(xlon)