/[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.30 by heimbach, Fri Nov 15 03:01:21 2002 UTC revision 1.31 by cheisey, Fri Nov 15 19:58:21 2002 UTC
# Line 9  C $Name$ Line 9  C $Name$
9  # ifdef ALLOW_KPP  # ifdef ALLOW_KPP
10  #  include "KPP_OPTIONS.h"  #  include "KPP_OPTIONS.h"
11  # endif  # endif
12    cswdice --- add ----
13    #ifdef ALLOW_TSEAICE
14    #include "ICE.h"
15    #endif
16    cswdice ------
17  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
18    
19  CBOP  CBOP
# Line 387  C--     Calculate future values on open Line 392  C--     Calculate future values on open
392          ENDIF          ENDIF
393  #endif  /* ALLOW_OBCS */  #endif  /* ALLOW_OBCS */
394    
395    
396    c********************************************
397    cswdice --- add ---
398    #ifdef ALLOW_TSEAICE
399    C--     Determines forcing terms based on external fields
400    c--     including effects from ice
401            CALL ICE_FORCING(
402         I             bi, bj, iMin, iMax, jMin, jMax,
403         I             myThid )
404    #else
405    
406    cswdice --- end add ---
407    
408  C--     Determines forcing terms based on external fields  C--     Determines forcing terms based on external fields
409  C       relaxation terms, etc.  C       relaxation terms, etc.
410          CALL EXTERNAL_FORCING_SURF(          CALL EXTERNAL_FORCING_SURF(
411       I             bi, bj, iMin, iMax, jMin, jMax,       I             bi, bj, iMin, iMax, jMin, jMax,
412       I             myThid )       I             myThid )
413    cswdice --- add ----
414    #endif
415    cswdice --- end add ---
416    c******************************************
417    
418    
419    
420    
421  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
422  cph needed for KPP  cph needed for KPP
423  CADJ STORE surfacetendencyU(:,:,bi,bj)  CADJ STORE surfacetendencyU(:,:,bi,bj)
# Line 646  CADJ &   , key = kkey, byte = isbyte Line 672  CADJ &   , key = kkey, byte = isbyte
672  C--     end of thermodynamic k loop (Nr:1)  C--     end of thermodynamic k loop (Nr:1)
673          ENDDO          ENDDO
674    
675    cswdice -- add ---
676    #ifdef ALLOW_TSEAICE
677    c timeaveraging for ice model values
678               CALL ICE_AVE(bi,bj,iMin,iMax,jMin,jMax,myThid )
679    #endif
680    cswdice --- end add ---
681    
682    
683    
684    
685  C--     Implicit diffusion  C--     Implicit diffusion
686          IF (implicitDiffusion) THEN          IF (implicitDiffusion) THEN
687    
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31
  ViewVC Help
Powered by ViewVC 1.1.22