/[MITgcm]/MITgcm/model/src/integr_continuity.F
ViewVC logotype

Diff of /MITgcm/model/src/integr_continuity.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.3 by jmc, Sun Jan 26 21:06:11 2003 UTC revision 1.4 by jmc, Mon Jan 27 20:45:59 2003 UTC
# Line 132  C     Incorporate the Implicit part of - Line 132  C     Incorporate the Implicit part of -
132         ENDIF         ENDIF
133    
134        ENDIF        ENDIF
 #endif /* EXACT_CONSERV */  
135    
136  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
137    
# Line 165  C     and was not in pickup-file ; try t Line 164  C     and was not in pickup-file ; try t
164    
165        ENDIF        ENDIF
166  #endif /* NONLIN_FRSURF */  #endif /* NONLIN_FRSURF */
167    #endif /* EXACT_CONSERV */
168    
169  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
170    
# Line 176  C--    Integrate continuity vertically f Line 176  C--    Integrate continuity vertically f
176       O                       wVel,       O                       wVel,
177       I                       myThid )       I                       myThid )
178    
179  #ifdef NONLIN_FRSURF  #if ( defined EXACT_CONSERV && defined NONLIN_FRSURF )
180         IF ( k.EQ.Nr .AND. myTime.NE. 0. _d 0 .AND.         IF ( k.EQ.Nr .AND. myTime.NE. 0. _d 0 .AND.
181       &      useRealFreshWaterFlux .AND.       &      useRealFreshWaterFlux .AND.
182       &      buoyancyRelation .EQ. 'OCEANICP' ) THEN       &      buoyancyRelation .EQ. 'OCEANICP' ) THEN
# Line 203  C     and was not in pickup-file ; try t Line 203  C     and was not in pickup-file ; try t
203          ENDIF          ENDIF
204    
205         ENDIF         ENDIF
206  #endif /* NONLIN_FRSURF */  #endif /* EXACT_CONSERV & NONLIN_FRSURF */
207    
208  #ifdef ALLOW_OBCS  #ifdef ALLOW_OBCS
209  #ifdef ALLOW_NONHYDROSTATIC  #ifdef ALLOW_NONHYDROSTATIC
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
  ViewVC Help
Powered by ViewVC 1.1.22