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

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

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

revision 1.64 by jmc, Fri Jan 17 21:58:57 2014 UTC revision 1.66 by heimbach, Wed May 21 10:44:59 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_SALT_PLUME
7    #include "SALT_PLUME_OPTIONS.h"
8    #endif
9    
10  C--  File external_forcing.F:  C--  File external_forcing.F:
11  C--   Contents  C--   Contents
# Line 392  C         conversion from W/m^2/r_unit t Line 395  C         conversion from W/m^2/r_unit t
395            tmpFac = (tmpFac/atm_Cp) * mass2rUnit            tmpFac = (tmpFac/atm_Cp) * mass2rUnit
396          ELSE          ELSE
397  C         conversion from W/m^2/r_unit to K/s  C         conversion from W/m^2/r_unit to K/s
398            tmpFac = recip_Cp * mass2rUnit            tmpFac = mass2rUnit/HeatCapacity_Cp
399          ENDIF          ENDIF
400          DO j=1,sNy          DO j=1,sNy
401            DO i=1,sNx            DO i=1,sNx
# Line 539  c     IF ( usePenetratingSW ) THEN Line 542  c     IF ( usePenetratingSW ) THEN
542           gT(i,j,klev,bi,bj) = gT(i,j,klev,bi,bj)           gT(i,j,klev,bi,bj) = gT(i,j,klev,bi,bj)
543       &   -Qsw(i,j,bi,bj)*(swfracb(1)*maskC(i,j,klev,bi,bj)       &   -Qsw(i,j,bi,bj)*(swfracb(1)*maskC(i,j,klev,bi,bj)
544       &                   -swfracb(2)*maskC(i,j,kp1, bi,bj))       &                   -swfracb(2)*maskC(i,j,kp1, bi,bj))
545       &    *recip_Cp*mass2rUnit       &    *mass2rUnit/HeatCapacity_Cp
546       &    *recip_drF(klev)*_recip_hFacC(i,j,kLev,bi,bj)       &    *recip_drF(klev)*_recip_hFacC(i,j,kLev,bi,bj)
547          ENDDO          ENDDO
548         ENDDO         ENDDO
# Line 728  C     Ocean: Add salinity surface forcin Line 731  C     Ocean: Add salinity surface forcin
731       &     bi,bj, kLev, myTime, myThid )       &     bi,bj, kLev, myTime, myThid )
732  #endif /* ALLOW_ICEFRONT */  #endif /* ALLOW_ICEFRONT */
733    
734    Catn: org. version of SP: do within k-loop
735    Catn  new version: outside k-loop; called from [temp,salt]_integrate.F
736  #ifdef ALLOW_SALT_PLUME  #ifdef ALLOW_SALT_PLUME
737    CC#ifndef SALT_PLUME_VOLUME
738        IF ( useSALT_PLUME )        IF ( useSALT_PLUME )
739       &     CALL SALT_PLUME_TENDENCY_APPLY_S(       &     CALL SALT_PLUME_TENDENCY_APPLY_S(
740       I     iMin,iMax, jMin,jMax, bi,bj, kLev,       I     iMin,iMax, jMin,jMax, bi,bj, kLev,
741       I     myTime, myThid )       I     myTime, myThid )
742    #ifdef SALT_PLUME_VOLUME
743          IF ( useSALT_PLUME )
744         &     CALL SALT_PLUME_TENDENCY_APPLY_T(
745         I     iMin,iMax, jMin,jMax, bi,bj, kLev,
746         I     myTime, myThid )
747    #endif /* ndef SALT_PLUME_VOLUME */
748  #endif /* ALLOW_SALT_PLUME */  #endif /* ALLOW_SALT_PLUME */
749    
750  #ifdef ALLOW_RBCS  #ifdef ALLOW_RBCS
Legend:
Removed from v.1.64  
changed lines
  Added in v.1.66
  ViewVC Help
Powered by ViewVC 1.1.22