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

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

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

revision 1.18 by adcroft, Mon Mar 4 17:26:41 2002 UTC revision 1.19 by jmc, Mon Oct 7 16:24:45 2002 UTC
# Line 25  C     |part1: update U,V,T,S Line 25  C     |part1: update U,V,T,S
25  C     |  U*,V* (contained in gUnm1,gVnm1) have the surface          C     |  U*,V* (contained in gUnm1,gVnm1) have the surface        
26  C     |     pressure gradient term added and the result stored      C     |     pressure gradient term added and the result stored    
27  C     |     in U,V (contained in uVel, vVel)                        C     |     in U,V (contained in uVel, vVel)                      
28  C     |  T* (contained in gTnm1) is copied to T (theta)            C     |  T* (contained in gT) is copied to T (theta)          
29  C     |  S* (contained in gSnm1) is copied to S (salt)              C     |  S* (contained in gS) is copied to S (salt)            
30  C     |                                                            C     |                                                          
31  C     |part2: Adjustments.                                          C     |part2: Adjustments & Diagnostics                                        
32  C     |   o Filter  U,V,T,S (Shapiro Filter, Zonal_Filter)          C     |   o Filter  U,V,T,S (Shapiro Filter, Zonal_Filter)        
33  C     |   o Convective Adjustment                                  C     |   o Convective Adjustment                                
34  C     |   o Compute again Eta (exact volume conservation)          C     |   o Compute again Eta (exact volume conservation)    
35    C     |   o Compute vertical velocity
36  C     |   o Diagmnostic of state variables (Time average)          C     |   o Diagmnostic of state variables (Time average)        
37  C     *==========================================================*  C     *==========================================================*
38  C     \ev  C     \ev
# Line 184  C--     Convectively adjust new fields t Line 185  C--     Convectively adjust new fields t
185       I       bi, bj, iMin, iMax, jMin, jMax,       I       bi, bj, iMin, iMax, jMin, jMax,
186       I       myTime, myIter, myThid )       I       myTime, myIter, myThid )
187    
188  #ifdef EXACT_CONSERV  C--     Integrate continuity vertically
189          IF (exactConserv) THEN  C--     for vertical velocity and "etaN" (exact volume conservation) :
190  C--     Compute again "eta" to satisfy exactly the total Volume Conservation :          CALL INTEGR_CONTINUITY( bi, bj, uVel, vVel,
191            CALL CALC_EXACT_ETA( .TRUE., bi,bj, uVel,vVel,       I                          myTime, myIter, myThid )
      I                         myTime, myIter, myThid )  
         ENDIF  
 #endif /* EXACT_CONSERV */  
192    
193  #ifdef ALLOW_TIMEAVE  #ifdef ALLOW_TIMEAVE
194          IF (taveFreq.GT.0.) THEN          IF (taveFreq.GT.0.) THEN
# Line 202  C--    End of 2nd bi,bj loop Line 200  C--    End of 2nd bi,bj loop
200         ENDDO         ENDDO
201        ENDDO        ENDDO
202    
 #ifdef EXACT_CONSERV  
        IF (exactConserv .AND. implicDiv2Dflow .NE. 0. _d 0)  
      &    _EXCH_XY_R8(etaN, myThid )  
 #endif /* EXACT_CONSERV */  
   
203        RETURN        RETURN
204        END        END
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19
  ViewVC Help
Powered by ViewVC 1.1.22