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

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

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

revision 1.50 by jmc, Tue Oct 7 04:31:30 2003 UTC revision 1.52 by heimbach, Fri Oct 10 22:56:08 2003 UTC
# Line 1  Line 1 
1  C $Header$  C $Header$
2  C $Name$  C $Name$
3    
4    #include "PACKAGES_CONFIG.h"
5  #include "CPP_OPTIONS.h"  #include "CPP_OPTIONS.h"
6    
7  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
8  # ifdef ALLOW_GMREDI  # ifdef ALLOW_GMREDI
9  #  include "GMREDI_OPTIONS.h"  #  include "GMREDI_OPTIONS.h"
# Line 247  C- tracer tendency needs to be set to ze Line 249  C- tracer tendency needs to be set to ze
249             gT(i,j,k,bi,bj)   = 0. _d 0             gT(i,j,k,bi,bj)   = 0. _d 0
250             gS(i,j,k,bi,bj)   = 0. _d 0             gS(i,j,k,bi,bj)   = 0. _d 0
251  # ifdef ALLOW_PASSIVE_TRACER  # ifdef ALLOW_PASSIVE_TRACER
252    ceh3 needs an IF ( use PASSIVE_TRACER) THEN
253             gTr1(i,j,k,bi,bj) = 0. _d 0             gTr1(i,j,k,bi,bj) = 0. _d 0
254  # endif  # endif
255  # ifdef ALLOW_PTRACERS  # ifdef ALLOW_PTRACERS
256    ceh3 this should have an   IF ( usePTRACERS ) THEN
257             DO iTracer=1,PTRACERS_numInUse             DO iTracer=1,PTRACERS_numInUse
258              gPTr(i,j,k,bi,bj,itracer) = 0. _d 0              gPTr(i,j,k,bi,bj,itracer) = 0. _d 0
259             ENDDO             ENDDO
# Line 525  CADJ &                 = comlev1_bibj, k Line 529  CADJ &                 = comlev1_bibj, k
529  #endif  /* ALLOW_KPP */  #endif  /* ALLOW_KPP */
530    
531  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
 CADJ STORE KappaRT(:,:,:)     = comlev1_bibj, key=itdkey, byte=isbyte  
 CADJ STORE KappaRS(:,:,:)     = comlev1_bibj, key=itdkey, byte=isbyte  
532  CADJ STORE theta(:,:,:,bi,bj) = comlev1_bibj, key=itdkey, byte=isbyte  CADJ STORE theta(:,:,:,bi,bj) = comlev1_bibj, key=itdkey, byte=isbyte
533  CADJ STORE salt (:,:,:,bi,bj) = comlev1_bibj, key=itdkey, byte=isbyte  CADJ STORE salt (:,:,:,bi,bj) = comlev1_bibj, key=itdkey, byte=isbyte
534  CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key=itdkey, byte=isbyte  CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key=itdkey, byte=isbyte
# Line 650  CADJ STORE rTrans(:,:)    = comlev1_bibj Line 652  CADJ STORE rTrans(:,:)    = comlev1_bibj
652    
653  #endif /* ALLOW_GMREDI */  #endif /* ALLOW_GMREDI */
654    
 #ifdef ALLOW_AUTODIFF_TAMC  
 CADJ STORE KappaRT(:,:,k)    = comlev1_bibj_k, key=kkey, byte=isbyte  
 CADJ STORE KappaRS(:,:,k)    = comlev1_bibj_k, key=kkey, byte=isbyte  
 #endif /* ALLOW_AUTODIFF_TAMC */  
   
655  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL
656  C--      Calculate the total vertical diffusivity  C--      Calculate the total vertical diffusivity
657           CALL CALC_DIFFUSIVITY(           CALL CALC_DIFFUSIVITY(
# Line 662  C--      Calculate the total vertical di Line 659  C--      Calculate the total vertical di
659       I        maskUp,       I        maskUp,
660       O        KappaRT,KappaRS,       O        KappaRT,KappaRS,
661       I        myThid)       I        myThid)
662    # ifdef ALLOW_AUTODIFF_TAMC
663    CADJ STORE KappaRT(:,:,k)    = comlev1_bibj_k, key=kkey, byte=isbyte
664    CADJ STORE KappaRS(:,:,k)    = comlev1_bibj_k, key=kkey, byte=isbyte
665    # endif /* ALLOW_AUTODIFF_TAMC */
666  #endif  #endif
667    
668            iMin = 1-OLx+2            iMin = 1-OLx+2
# Line 703  C        and step forward storing result Line 704  C        and step forward storing result
704       I         myIter, myThid)       I         myIter, myThid)
705           ENDIF           ENDIF
706  #ifdef ALLOW_PASSIVE_TRACER  #ifdef ALLOW_PASSIVE_TRACER
707    ceh3 needs an IF ( usePASSIVE_TRACER ) THEN
708           IF ( tr1Stepping ) THEN           IF ( tr1Stepping ) THEN
709             CALL CALC_GTR1(             CALL CALC_GTR1(
710       I         bi,bj,iMin,iMax,jMin,jMax, k,km1,kup,kDown,       I         bi,bj,iMin,iMax,jMin,jMax, k,km1,kup,kDown,
# Line 749  C--     end of thermodynamic k loop (Nr: Line 751  C--     end of thermodynamic k loop (Nr:
751  cswdice -- add ---  cswdice -- add ---
752  #ifdef ALLOW_THERM_SEAICE  #ifdef ALLOW_THERM_SEAICE
753  c timeaveraging for ice model values  c timeaveraging for ice model values
754    ceh3 This should be wrapped in an IF ( useThermSeaIce ) THEN
755             CALL ICE_AVE(bi,bj,iMin,iMax,jMin,jMax,myThid )             CALL ICE_AVE(bi,bj,iMin,iMax,jMin,jMax,myThid )
756  #endif  #endif
757  cswdice --- end add ---  cswdice --- end add ---
# Line 761  C--     Implicit diffusion Line 764  C--     Implicit diffusion
764    
765           IF (tempStepping) THEN           IF (tempStepping) THEN
766  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
767    CADJ STORE KappaRT(:,:,:) = comlev1_bibj , key=itdkey, byte=isbyte
768  CADJ STORE gT(:,:,:,bi,bj) = comlev1_bibj , key=itdkey, byte=isbyte  CADJ STORE gT(:,:,:,bi,bj) = comlev1_bibj , key=itdkey, byte=isbyte
769  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
770              CALL IMPLDIFF(              CALL IMPLDIFF(
# Line 772  CADJ STORE gT(:,:,:,bi,bj) = comlev1_bib Line 776  CADJ STORE gT(:,:,:,bi,bj) = comlev1_bib
776    
777           IF (saltStepping) THEN           IF (saltStepping) THEN
778  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
779    CADJ STORE KappaRS(:,:,:) = comlev1_bibj , key=itdkey, byte=isbyte
780  CADJ STORE gS(:,:,:,bi,bj) = comlev1_bibj , key=itdkey, byte=isbyte  CADJ STORE gS(:,:,:,bi,bj) = comlev1_bibj , key=itdkey, byte=isbyte
781  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
782              CALL IMPLDIFF(              CALL IMPLDIFF(
# Line 814  C--     End If implicitDiffusion Line 819  C--     End If implicitDiffusion
819          ENDIF          ENDIF
820    
821  #ifdef ALLOW_TIMEAVE  #ifdef ALLOW_TIMEAVE
822    ceh3 needs an IF ( useTIMEAVE ) THEN
823          IF (taveFreq.GT.0. .AND. ivdc_kappa.NE.0.) THEN          IF (taveFreq.GT.0. .AND. ivdc_kappa.NE.0.) THEN
824            CALL TIMEAVE_CUMUL_1T(ConvectCountTave, ConvectCount,            CALL TIMEAVE_CUMUL_1T(ConvectCountTave, ConvectCount,
825       I                           Nr, deltaTclock, bi, bj, myThid)       I                           Nr, deltaTclock, bi, bj, myThid)
Legend:
Removed from v.1.50  
changed lines
  Added in v.1.52
  ViewVC Help
Powered by ViewVC 1.1.22