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

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

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

revision 1.151 by jmc, Mon Oct 25 23:02:35 2010 UTC revision 1.156 by jmc, Mon May 23 00:41:09 2011 UTC
# Line 247  C--- Line 247  C---
247  CEOP  CEOP
248    
249  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
250        IF ( debugLevel .GE. debLevB )        IF (debugMode) CALL DEBUG_ENTER( 'DYNAMICS', myThid )
      &   CALL DEBUG_ENTER( 'DYNAMICS', myThid )  
251  #endif  #endif
252    
253  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
# Line 265  C   if desired: Line 264  C   if desired:
264        CALL CALC_EP_FORCING(myThid)        CALL CALC_EP_FORCING(myThid)
265  #endif  #endif
266    
267    #ifdef ALLOW_AUTODIFF_MONITOR_DIAG
268          CALL DUMMY_IN_DYNAMICS( mytime, myiter, myThid )
269    #endif
270    
271  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
272  C--   HPF directive to help TAMC  C--   HPF directive to help TAMC
273  CHPF$ INDEPENDENT  CHPF$ INDEPENDENT
# Line 557  C Line 560  C
560       I         guDissip, gvDissip,       I         guDissip, gvDissip,
561       I         myTime, myIter, myThid)       I         myTime, myIter, myThid)
562    
 #ifdef   ALLOW_OBCS  
 C--      Apply open boundary conditions  
 c          IF (useOBCS) THEN  
 c            CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid )  
 c          ENDIF  
 #endif   /* ALLOW_OBCS */  
   
563           ENDIF           ENDIF
564    
565  C--     end of dynamics k loop (1:Nr)  C--     end of dynamics k loop (1:Nr)
# Line 603  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bib Line 599  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bib
599    
600  #ifdef   ALLOW_OBCS  #ifdef   ALLOW_OBCS
601  C--      Apply open boundary conditions  C--      Apply open boundary conditions
 c       IF ( useOBCS .AND.(implicitViscosity.OR.momImplVertAdv) ) THEN  
 c          DO K=1,Nr  
 c            CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid )  
 c          ENDDO  
602          IF ( useOBCS ) THEN          IF ( useOBCS ) THEN
603            CALL OBCS_APPLY_UV( bi, bj, 0, gU, gV, myThid )            CALL OBCS_APPLY_UV( bi, bj, 0, gU, gV, myThid )
604          ENDIF          ENDIF
# Line 640  C---+----1----+----2----+----3----+----4 Line 632  C---+----1----+----2----+----3----+----4
632  C--   Step forward W field in N-H algorithm  C--   Step forward W field in N-H algorithm
633          IF ( nonHydrostatic ) THEN          IF ( nonHydrostatic ) THEN
634  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
635           IF ( debugLevel .GE. debLevB )           IF (debugMode) CALL DEBUG_CALL('CALC_GW', myThid )
      &     CALL DEBUG_CALL('CALC_GW', myThid )  
636  #endif  #endif
637           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
638           CALL CALC_GW(           CALL CALC_GW(
# Line 661  C-    end of bi,bj loops Line 652  C-    end of bi,bj loops
652        ENDDO        ENDDO
653    
654  #ifdef ALLOW_OBCS  #ifdef ALLOW_OBCS
655  c     IF (useOBCS) THEN        IF (useOBCS) THEN
656  c      CALL OBCS_PRESCRIBE_EXCHANGES(myThid)          CALL OBCS_EXCHANGES( myThid )
657  c     ENDIF        ENDIF
658  #endif  #endif
659    
660  Cml(  Cml(
# Line 691  Cml) Line 682  Cml)
682  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */
683    
684  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
685        If ( debugLevel .GE. debLevB ) THEN        IF ( debugLevel .GE. debLevB ) THEN
686         CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)         CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)
687         CALL DEBUG_STATS_RL(Nr,uVel,'Uvel (DYNAMICS)',myThid)         CALL DEBUG_STATS_RL(Nr,uVel,'Uvel (DYNAMICS)',myThid)
688         CALL DEBUG_STATS_RL(Nr,vVel,'Vvel (DYNAMICS)',myThid)         CALL DEBUG_STATS_RL(Nr,vVel,'Vvel (DYNAMICS)',myThid)
# Line 721  C       but it does not mean that it is Line 712  C       but it does not mean that it is
712  #endif  #endif
713    
714  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
715        IF ( debugLevel .GE. debLevB )        IF (debugMode) CALL DEBUG_LEAVE( 'DYNAMICS', myThid )
      &   CALL DEBUG_LEAVE( 'DYNAMICS', myThid )  
716  #endif  #endif
717    
718        RETURN        RETURN
Legend:
Removed from v.1.151  
changed lines
  Added in v.1.156
  ViewVC Help
Powered by ViewVC 1.1.22