Wrapper PR for ufs-community#261, ufs-community#271, ufs-community#268:…

… zorl interstitial, ocn -> wat, merra2 threading (ufs-community#279)

* changed .gitmodules to point to merra2 ccpp/physics
* remove GFDL_atmos_cubed_sphere and ccpp-framework from .git module
* remove IPD gfsphysics
* Update .gitmodules and submodule pointer for ccpp-physics for code review and testing
* Remove interstitial zorl composites
* Update .gitmodules and submodule pointer fpor ccpp-physics for code review and testing
* Remove or replace references to IPD in comments in atmos_model.F90
* Initialize Sfcprop%zorlx to clear_val instead of huge
* Update submodule pointer for ccpp-physics
* Rename Fortran variables and CCPP standard names / long names of surface composites from ocean to water
* Rename Sfcprop%zorlw to Sfcprop%zorlwav
* Rename Sfcprop%zorlo to Sfcprop%zorlw
* update submodule pointer for ccpp-physics
* Revert change to .gitmodules and update submodule pointer for ccpp-physics
Co-authored-by: anning.cheng <anning.cheng@noaa.gov>

atmos_model.F90

@@ -255,7 +255,7 @@ subroutine update_atmos_radiation_physics (Atmos)
                                  jdat(5), jdat(6), jdat(7))
       GFS_control%jdat(:) = jdat(:)
 
-!--- execute the IPD atmospheric setup step
+!--- execute the atmospheric setup step
       call mpp_clock_begin(setupClock)
       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')
@@ -279,8 +279,8 @@ subroutine update_atmos_radiation_physics (Atmos)
 
       endif
 
-      ! Calculate total non-physics tendencies by substracting old IPD Stateout
-      ! variables from new/updated IPD Statein variables (gives the tendencies
+      ! Calculate total non-physics tendencies by substracting old GFS Stateout
+      ! variables from new/updated GFS Statein variables (gives the tendencies
       ! due to anything else than physics)
       if (GFS_control%ldiag3d) then
         do nb = 1,Atm_block%nblks
@@ -305,7 +305,7 @@ subroutine update_atmos_radiation_physics (Atmos)
 
       if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "radiation driver"
 
-!--- execute the IPD atmospheric radiation subcomponent (RRTM)
+!--- execute the atmospheric radiation subcomponent (RRTM)
 
       call mpp_clock_begin(radClock)
       ! Performance improvement. Only enter if it is time to call the radiation physics.
@@ -322,7 +322,7 @@ subroutine update_atmos_radiation_physics (Atmos)
 
       if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "physics driver"
 
-!--- execute the IPD atmospheric physics step1 subcomponent (main physics driver)
+!--- execute the atmospheric physics step1 subcomponent (main physics driver)
 
       call mpp_clock_begin(physClock)
       call CCPP_step (step="physics", nblks=Atm_block%nblks, ierr=ierr)
@@ -336,7 +336,7 @@ subroutine update_atmos_radiation_physics (Atmos)
 
       if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "stochastic physics driver"
 
-!--- execute the IPD atmospheric physics step2 subcomponent (stochastic physics driver)
+!--- execute the atmospheric physics step2 subcomponent (stochastic physics driver)
 
       call mpp_clock_begin(physClock)
       call CCPP_step (step="stochastics", nblks=Atm_block%nblks, ierr=ierr)
@@ -350,7 +350,7 @@ subroutine update_atmos_radiation_physics (Atmos)
       call getiauforcing(GFS_control,IAU_data)
       if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "end of radiation and physics step"
 
-!--- execute the IPD atmospheric timestep finalize step
+!--- execute the atmospheric timestep finalize step
       call mpp_clock_begin(setupClock)
       call CCPP_step (step="timestep_finalize", nblks=Atm_block%nblks, ierr=ierr)
       if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP timestep_finalize step failed')
@@ -502,7 +502,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
    do i = 1, ntracers
      call get_tracer_names(MODEL_ATMOS, i, tracer_names(i))
    enddo
-!--- setup IPD Init_parm
+!--- setup Init_parm
    Init_parm%me              =  mpp_pe()
    Init_parm%master          =  mpp_root_pe()
    Init_parm%tile_num        =  tile_num
@@ -669,7 +669,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
 
     !if in coupled mode, set up coupled fields
     if (GFS_control%cplflx .or. GFS_control%cplwav) then
-      if (mpp_pe() == mpp_root_pe()) print *,'COUPLING: IPD layer'
+      if (mpp_pe() == mpp_root_pe()) print *,'COUPLING: CCPP layer'
       call setup_exportdata(ierr)
     endif
 
@@ -888,7 +888,7 @@ subroutine atmos_model_end (Atmos)
     call stochastic_physics_wrapper_end(GFS_control)
 
 !   Fast physics (from dynamics) are finalized in atmosphere_end above;
-!   standard/slow physics (from IPD) are finalized in CCPP_step 'finalize'.
+!   standard/slow physics (from CCPP) are finalized in CCPP_step 'finalize'.
 !   The CCPP framework for all cdata structures is finalized in CCPP_step 'finalize'.
     call CCPP_step (step="finalize", nblks=Atm_block%nblks, ierr=ierr)
     if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP finalize step failed')
@@ -1614,10 +1614,10 @@ subroutine assign_importdata(rc)
                   if (GFS_data(nb)%Sfcprop%oceanfrac(ix) > zero .and.  datar8(i,j) > zorlmin) then
                     tem = 100.0_GFS_kind_phys * min(0.1_GFS_kind_phys, datar8(i,j))
 !                   GFS_data(nb)%Coupling%zorlwav_cpl(ix) = tem
-                    GFS_data(nb)%Sfcprop%zorlo(ix)        = tem
                     GFS_data(nb)%Sfcprop%zorlw(ix)        = tem
+                    GFS_data(nb)%Sfcprop%zorlwav(ix)      = tem
                   else
-                    GFS_data(nb)%Sfcprop%zorlw(ix) = -999.0_GFS_kind_phys
+                    GFS_data(nb)%Sfcprop%zorlwav(ix) = -999.0_GFS_kind_phys
 
                   endif
                 enddo