/[MITgcm]/MITgcm/pkg/generic_advdiff/gad_calc_rhs.F
ViewVC logotype

Diff of /MITgcm/pkg/generic_advdiff/gad_calc_rhs.F

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

revision 1.54 by jmc, Fri Apr 2 19:29:01 2010 UTC revision 1.55 by heimbach, Thu Oct 21 03:32:43 2010 UTC
# Line 247  cph with limiters in forward, but withou Line 247  cph with limiters in forward, but withou
247       I           uTrans, uFld, maskW(1-Olx,1-Oly,k,bi,bj), locABT,       I           uTrans, uFld, maskW(1-Olx,1-Oly,k,bi,bj), locABT,
248       O           af, myThid )       O           af, myThid )
249           ENDIF           ENDIF
250    #ifndef ALLOW_AUTODIFF_TAMC
251          ELSEIF (advectionScheme.EQ.ENUM_OS7MP ) THEN          ELSEIF (advectionScheme.EQ.ENUM_OS7MP ) THEN
252            CALL GAD_OS7MP_ADV_X( bi,bj,k, .TRUE., deltaTLev(k),            CALL GAD_OS7MP_ADV_X( bi,bj,k, .TRUE., deltaTLev(k),
253       I            uTrans, uFld, maskW(1-Olx,1-Oly,k,bi,bj), locABT,       I            uTrans, uFld, maskW(1-Olx,1-Oly,k,bi,bj), locABT,
254       O            af, myThid )       O            af, myThid )
255    #endif
256          ELSE          ELSE
257           STOP 'GAD_CALC_RHS: Bad advectionScheme (X)'           STOP 'GAD_CALC_RHS: Bad advectionScheme (X)'
258          ENDIF          ENDIF
# Line 360  cph with limiters in forward, but withou Line 362  cph with limiters in forward, but withou
362       I           vTrans, vFld, maskS(1-Olx,1-Oly,k,bi,bj), locABT,       I           vTrans, vFld, maskS(1-Olx,1-Oly,k,bi,bj), locABT,
363       O           af, myThid )       O           af, myThid )
364           ENDIF           ENDIF
365    #ifndef ALLOW_AUTODIFF_TAMC
366          ELSEIF (advectionScheme.EQ.ENUM_OS7MP ) THEN          ELSEIF (advectionScheme.EQ.ENUM_OS7MP ) THEN
367            CALL GAD_OS7MP_ADV_Y( bi,bj,k, .TRUE., deltaTLev(k),            CALL GAD_OS7MP_ADV_Y( bi,bj,k, .TRUE., deltaTLev(k),
368       I            vTrans, vFld, maskS(1-Olx,1-Oly,k,bi,bj), locABT,       I            vTrans, vFld, maskS(1-Olx,1-Oly,k,bi,bj), locABT,
369       O            af, myThid )       O            af, myThid )
370    #endif
371          ELSE          ELSE
372            STOP 'GAD_CALC_RHS: Bad advectionScheme (Y)'            STOP 'GAD_CALC_RHS: Bad advectionScheme (Y)'
373          ENDIF          ENDIF
# Line 475  cph with limiters in forward, but withou Line 479  cph with limiters in forward, but withou
479       I         deltaTLev(k),rTrans,wFld,TracAB(1-Olx,1-Oly,1,bi,bj),       I         deltaTLev(k),rTrans,wFld,TracAB(1-Olx,1-Oly,1,bi,bj),
480       O         af, myThid )       O         af, myThid )
481            ENDIF            ENDIF
482    #ifndef ALLOW_AUTODIFF_TAMC
483          ELSEIF (vertAdvecScheme.EQ.ENUM_OS7MP ) THEN          ELSEIF (vertAdvecScheme.EQ.ENUM_OS7MP ) THEN
484             CALL GAD_OS7MP_ADV_R( bi,bj,k,             CALL GAD_OS7MP_ADV_R( bi,bj,k,
485       I         deltaTLev(k),rTrans,wFld,TracAB(1-Olx,1-Oly,1,bi,bj),       I         deltaTLev(k),rTrans,wFld,TracAB(1-Olx,1-Oly,1,bi,bj),
486       O         af, myThid )       O         af, myThid )
487    #endif
488          ELSE          ELSE
489            STOP 'GAD_CALC_RHS: Bad vertAdvecScheme (R)'            STOP 'GAD_CALC_RHS: Bad vertAdvecScheme (R)'
490          ENDIF          ENDIF

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55

  ViewVC Help
Powered by ViewVC 1.1.22