Merge pull request #107 from NCAR/mvertens/validation_fixes

hard-wire WIND_STAGGER=AGRID in nuopc cap as well

config_src/nuopc_driver/MOM_surface_forcing.F90

@@ -686,7 +686,13 @@ subroutine convert_IOB_to_forces(IOB, forces, index_bounds, Time, G, US, CS)
   endif
   forces%accumulate_p_surf = .true. ! Multiple components may contribute to surface pressure.
 
+  ! TODO: this does not seem correct for NEMS
+#ifdef CESMCOUPLED
+  wind_stagger = AGRID
+#else
   wind_stagger = CS%wind_stagger
+#endif
+
   if ((IOB%wind_stagger == AGRID) .or. (IOB%wind_stagger == BGRID_NE) .or. &
       (IOB%wind_stagger == CGRID_NE)) wind_stagger = IOB%wind_stagger
   if (wind_stagger == BGRID_NE) then
@@ -763,8 +769,12 @@ subroutine convert_IOB_to_forces(IOB, forces, index_bounds, Time, G, US, CS)
     enddo ; enddo
 
   elseif (wind_stagger == AGRID) then
-    call pass_vector(taux_at_h, tauy_at_h, G%Domain, To_All+Omit_Corners, &
-                     stagger=AGRID, halo=1)
+     !TODO: which one of these is correct?
+#ifdef CESMCOUPLED
+    call pass_vector(taux_at_h, tauy_at_h, G%Domain,stagger=AGRID)
+#else
+    call pass_vector(taux_at_h, tauy_at_h, G%Domain, To_All+Omit_Corners, stagger=AGRID, halo=1)
+#endif
 
     do j=js,je ; do I=Isq,Ieq
       forces%taux(I,j) = 0.0