--- MITgcm/model/src/update_etah.F	2005/11/04 01:19:24	1.7
+++ MITgcm/model/src/update_etah.F	2005/12/07 23:57:00	1.8
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/update_etah.F,v 1.7 2005/11/04 01:19:24 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/update_etah.F,v 1.8 2005/12/07 23:57:00 jmc Exp $
 C $Name:  $
 
 #include "PACKAGES_CONFIG.h"
@@ -79,17 +79,16 @@
         ENDIF
 
 #ifdef ALLOW_OBCS
-#ifdef NONLIN_FRSURF
-C- note: 1) needs to apply OBC to etaH since viscous terms depend on hFacZ.
+C- note (with Non-Lin Free-Surface):
+C        1) needs to apply OBC to etaH since viscous terms depend on hFacZ.
 C           that is not only function of boundaries hFac values.
 C        2) has to be done before calc_surf_dr; but since obcs_calc is 
 C           called later, hFacZ will lag 1 time step behind OBC update. 
 C        3) avoid also unrealistic value of etaH in OB regions that
 C           might produce many "WARNING" message from calc_surf_dr.  
 C-------
-       IF ( useOBCS .AND. nonlinFreeSurf.GT.0 )
-     &    CALL OBCS_APPLY_ETA( bi, bj, etaH, myThid )   
-#endif /* NONLIN_FRSURF */
+C--    Apply OBC to etaH if NonLin-FreeSurf, reset to zero otherwise:
+       IF ( useOBCS ) CALL OBCS_APPLY_ETA( bi, bj, etaH, myThid )   
 #endif /* ALLOW_OBCS */
 
 C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|