Stage everything.

*********1*********2*********3*********4*********5*********6*********7**
Longer commit message body describing the commit.
Can contain lists as follows:
	* Item 1
	* Item 2
	* Item 3

A good commit message should be written like an email, a subject
followed by a blank line, followed by a more descriptive body.

Can also contain a tag at the bottom describing what type of commit this is.
[BFB] - Bit-For-Bit
[FCC] - Flag Climate Changing
[Non-BFB] - Non Bit-For-Bit
[CC] - Climate Changing
[NML] - Namelist Changing

See confluence for a more detailed description about these tags.

components/eam/bld/build-namelist

@@ -4104,8 +4104,8 @@ if ($waccm_phys or $cfg->get('nlev') >= 60) {
 }
 add_default($nl, 'pgwv', 'val'=>'32');
 add_default($nl, 'gw_dc','val'=>'2.5D0');
-add_default($nl, 'od_ls_ncleff ','val'=>'3.D0');
-add_default($nl, 'od_bl_ncd    ','val'=>'3.D0');
+add_default($nl, 'od_ls_ncleff' ,'val'=>'3.D0');
+add_default($nl, 'od_bl_ncd'    ,'val'=>'3.D0');
 add_default($nl, 'od_ss_sncleff','val'=>'1.D0');
 
 if ($nl->get_value('use_gw_oro') =~ /$TRUE/io) {

components/eam/src/physics/cam/clubb_intr.F90

@@ -1176,7 +1176,7 @@ subroutine clubb_tend_cam( &
    use model_flags, only: ipdf_call_placement
    use advance_clubb_core_module, only: ipdf_post_advance_fields
 #endif
-   use gw_common,          only: grid_size,gw_oro_interface
+   use od_common,          only: grid_size, oro_drag_interface
    use hycoef,             only: etamid
    use physconst,          only: rh2o,pi,rearth,r_universal
    implicit none
@@ -2002,18 +2002,18 @@ subroutine clubb_tend_cam( &
         dummy_vtgw=0.0_r8
         dummy_ttgw=0.0_r8
         !sgh30 as the input for turbulent orographic form drag (TOFD) instead of sgh
-	call gw_oro_interface(state,cam_in,sgh30,pbuf,hdtime,dummy_nm,&
-                              gwd_ls,gwd_bl,gwd_ss,gwd_fd,&
-                              od_ls_ncleff,od_bl_ncd,od_ss_sncleff,&
-                              dummy_utgw,dummy_vtgw,dummy_ttgw,& 
-                              dtaux3_ls=dummx3_ls,dtauy3_ls=dummy3_ls,&
-                              dtaux3_bl=dummx3_bl,dtauy3_bl=dummy3_bl,&
-                              dtaux3_ss=dummx3_ss,dtauy3_ss=dummy3_ss,&
-                              dtaux3_fd=dtaux3_fd,dtauy3_fd=dtauy3_fd,&
-                              dusfc_ls=dummx_ls,dvsfc_ls=dummy_ls,&
-                              dusfc_bl=dummx_bl,dvsfc_bl=dummy_bl,&
-                              dusfc_ss=dummx_ss,dvsfc_ss=dummy_ss,&
-                              dusfc_fd=dusfc_fd,dvsfc_fd=dvsfc_fd)
+	call oro_drag_interface(state,cam_in,sgh30,pbuf,hdtime,dummy_nm,&
+                                gwd_ls,gwd_bl,gwd_ss,gwd_fd,&
+                                od_ls_ncleff,od_bl_ncd,od_ss_sncleff,&
+                                dummy_utgw,dummy_vtgw,dummy_ttgw,& 
+                                dtaux3_ls=dummx3_ls,dtauy3_ls=dummy3_ls,&
+                                dtaux3_bl=dummx3_bl,dtauy3_bl=dummy3_bl,&
+                                dtaux3_ss=dummx3_ss,dtauy3_ss=dummy3_ss,&
+                                dtaux3_fd=dtaux3_fd,dtauy3_fd=dtauy3_fd,&
+                                dusfc_ls=dummx_ls,dvsfc_ls=dummy_ls,&
+                                dusfc_bl=dummx_bl,dvsfc_bl=dummy_bl,&
+                                dusfc_ss=dummx_ss,dvsfc_ss=dummy_ss,&
+                                dusfc_fd=dusfc_fd,dvsfc_fd=dvsfc_fd)
 
         call outfld ('DTAUX3_FD', dtaux3_fd,  pcols, lchnk)
         call outfld ('DTAUY3_FD', dtauy3_fd,  pcols, lchnk)

components/eam/src/physics/cam/od_common.F90

@@ -9,7 +9,7 @@ module od_common
 ! turbulent orographic form drag (Beljaars et al.,2004).
 !
 use gw_utils,      only: r8
-use ppgrid,        only: nvar_dirOA,nvar_dirOL
+use ppgrid,        only: pver,nvar_dirOA,nvar_dirOL
 use cam_logfile,   only: iulog
 
 implicit none