/[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.169 by gforget, Thu Feb 6 23:16:46 2014 UTC revision 1.172 by jmc, Thu Aug 14 16:52:40 2014 UTC
# Line 3  C $Name$ Line 3  C $Name$
3    
4  #include "PACKAGES_CONFIG.h"  #include "PACKAGES_CONFIG.h"
5  #include "CPP_OPTIONS.h"  #include "CPP_OPTIONS.h"
6    #ifdef ALLOW_AUTODIFF
7    # include "AUTODIFF_OPTIONS.h"
8    #endif
9  #ifdef ALLOW_MOM_COMMON  #ifdef ALLOW_MOM_COMMON
10  # include "MOM_COMMON_OPTIONS.h"  # include "MOM_COMMON_OPTIONS.h"
11  #endif  #endif
# Line 89  C     == Global variables === Line 92  C     == Global variables ===
92  #ifdef ALLOW_CD_CODE  #ifdef ALLOW_CD_CODE
93  # include "CD_CODE_VARS.h"  # include "CD_CODE_VARS.h"
94  #endif  #endif
95  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
96  # include "tamc.h"  # include "tamc.h"
97  # include "tamc_keys.h"  # include "tamc_keys.h"
98  # include "FFIELDS.h"  # include "FFIELDS.h"
# Line 111  C     == Global variables === Line 114  C     == Global variables ===
114  # ifdef ALLOW_MOM_FLUXFORM  # ifdef ALLOW_MOM_FLUXFORM
115  #  include "MOM_FLUXFORM.h"  #  include "MOM_FLUXFORM.h"
116  # endif  # endif
117  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF */
118    
119  C     !CALLING SEQUENCE:  C     !CALLING SEQUENCE:
120  C     DYNAMICS()  C     DYNAMICS()
# Line 483  C--       kDown  Cycles through 2,1 to p Line 486  C--       kDown  Cycles through 2,1 to p
486  CADJ STORE totPhiHyd (:,:,k,bi,bj)  CADJ STORE totPhiHyd (:,:,k,bi,bj)
487  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
488  CADJ STORE phiHydLow (:,:,bi,bj)  CADJ STORE phiHydLow (:,:,bi,bj)
489  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte      CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
490  CADJ STORE theta (:,:,k,bi,bj)  CADJ STORE theta (:,:,k,bi,bj)
491  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
492  CADJ STORE salt  (:,:,k,bi,bj)  CADJ STORE salt  (:,:,k,bi,bj)
# Line 531  CADJ &     = comlev1_bibj_k, key=kkey, b Line 534  CADJ &     = comlev1_bibj_k, key=kkey, b
534  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
535    
536  C--      Integrate hydrostatic balance for phiHyd with BC of phiHyd(z=0)=0  C--      Integrate hydrostatic balance for phiHyd with BC of phiHyd(z=0)=0
537           IF ( implicitIntGravWave ) THEN           CALL CALC_PHI_HYD(
            CALL CALC_PHI_HYD(  
      I        bi,bj,iMin,iMax,jMin,jMax,k,  
      I        gT, gS,  
      U        phiHydF,  
      O        phiHydC, dPhiHydX, dPhiHydY,  
      I        myTime, myIter, myThid )  
          ELSE  
            CALL CALC_PHI_HYD(  
538       I        bi,bj,iMin,iMax,jMin,jMax,k,       I        bi,bj,iMin,iMax,jMin,jMax,k,
539       I        theta, salt,       I        theta, salt,
540       U        phiHydF,       U        phiHydF,
541       O        phiHydC, dPhiHydX, dPhiHydY,       O        phiHydC, dPhiHydX, dPhiHydY,
542       I        myTime, myIter, myThid )       I        myTime, myIter, myThid )
          ENDIF  
543  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
544           IF ( dPhiHydDiagIsOn ) THEN           IF ( dPhiHydDiagIsOn ) THEN
545             tmpFac = -1. _d 0             tmpFac = -1. _d 0
# Line 655  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bib Line 649  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bib
649            CALL IMPLDIFF(            CALL IMPLDIFF(
650       I         bi, bj, iMin, iMax, jMin, jMax,       I         bi, bj, iMin, iMax, jMin, jMax,
651       I         -1, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj),       I         -1, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj),
652       U         gU,       U         gU(1-OLx,1-OLy,1,bi,bj),
653       I         myThid )       I         myThid )
654  #ifdef    ALLOW_AUTODIFF_TAMC  #ifdef    ALLOW_AUTODIFF_TAMC
655  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
# Line 663  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bib Line 657  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bib
657            CALL IMPLDIFF(            CALL IMPLDIFF(
658       I         bi, bj, iMin, iMax, jMin, jMax,       I         bi, bj, iMin, iMax, jMin, jMax,
659       I         -2, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj),       I         -2, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj),
660       U         gV,       U         gV(1-OLx,1-OLy,1,bi,bj),
661       I         myThid )       I         myThid )
662          ENDIF          ENDIF
663    
# Line 687  CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_ Line 681  CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_
681            CALL IMPLDIFF(            CALL IMPLDIFF(
682       I         bi, bj, iMin, iMax, jMin, jMax,       I         bi, bj, iMin, iMax, jMin, jMax,
683       I         0, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj),       I         0, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj),
684       U         vVelD,       U         vVelD(1-OLx,1-OLy,1,bi,bj),
685       I         myThid )       I         myThid )
686  #ifdef    ALLOW_AUTODIFF_TAMC  #ifdef    ALLOW_AUTODIFF_TAMC
687  CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte  CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
# Line 695  CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_ Line 689  CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_
689            CALL IMPLDIFF(            CALL IMPLDIFF(
690       I         bi, bj, iMin, iMax, jMin, jMax,       I         bi, bj, iMin, iMax, jMin, jMax,
691       I         0, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj),       I         0, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj),
692       U         uVelD,       U         uVelD(1-OLx,1-OLy,1,bi,bj),
693       I         myThid )       I         myThid )
694          ENDIF          ENDIF
695  #endif    /* ALLOW_CD_CODE */  #endif    /* ALLOW_CD_CODE */
Legend:
Removed from v.1.169  
changed lines
  Added in v.1.172
  ViewVC Help
Powered by ViewVC 1.1.22