/[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.51 by edhill, Thu Oct 9 04:19:18 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 703  C        and step forward storing result Line 707  C        and step forward storing result
707       I         myIter, myThid)       I         myIter, myThid)
708           ENDIF           ENDIF
709  #ifdef ALLOW_PASSIVE_TRACER  #ifdef ALLOW_PASSIVE_TRACER
710    ceh3 needs an IF ( usePASSIVE_TRACER ) THEN
711           IF ( tr1Stepping ) THEN           IF ( tr1Stepping ) THEN
712             CALL CALC_GTR1(             CALL CALC_GTR1(
713       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 754  C--     end of thermodynamic k loop (Nr:
754  cswdice -- add ---  cswdice -- add ---
755  #ifdef ALLOW_THERM_SEAICE  #ifdef ALLOW_THERM_SEAICE
756  c timeaveraging for ice model values  c timeaveraging for ice model values
757    ceh3 This should be wrapped in an IF ( useThermSeaIce ) THEN
758             CALL ICE_AVE(bi,bj,iMin,iMax,jMin,jMax,myThid )             CALL ICE_AVE(bi,bj,iMin,iMax,jMin,jMax,myThid )
759  #endif  #endif
760  cswdice --- end add ---  cswdice --- end add ---
# Line 814  C--     End If implicitDiffusion Line 820  C--     End If implicitDiffusion
820          ENDIF          ENDIF
821    
822  #ifdef ALLOW_TIMEAVE  #ifdef ALLOW_TIMEAVE
823    ceh3 needs an IF ( useTIMEAVE ) THEN
824          IF (taveFreq.GT.0. .AND. ivdc_kappa.NE.0.) THEN          IF (taveFreq.GT.0. .AND. ivdc_kappa.NE.0.) THEN
825            CALL TIMEAVE_CUMUL_1T(ConvectCountTave, ConvectCount,            CALL TIMEAVE_CUMUL_1T(ConvectCountTave, ConvectCount,
826       I                           Nr, deltaTclock, bi, bj, myThid)       I                           Nr, deltaTclock, bi, bj, myThid)
Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51
  ViewVC Help
Powered by ViewVC 1.1.22