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

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

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

revision 1.1 by jmc, Mon Oct 7 16:17:09 2002 UTC revision 1.2 by jmc, Tue Dec 10 03:00:59 2002 UTC
# Line 50  CEOP Line 50  CEOP
50  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
51    
52  #ifdef NONLIN_FRSURF  #ifdef NONLIN_FRSURF
53         IF (useRealFreshWaterFlux .AND. nonlinFreeSurf.GT.0) THEN  c      IF (useRealFreshWaterFlux .AND. nonlinFreeSurf.GT.0) THEN
54           IF ( (nonlinFreeSurf.GT.0 .OR. buoyancyRelation.EQ.'OCEANICP')
55         &      .AND. useRealFreshWaterFlux ) THEN
56    
57  C-- Called at the beginning of the time step :  C-- Called at the beginning of the time step :
58  C-  keep present time EmPmR to compute later (S/R EXTERNAL_FORCING_SURF)  C-  keep present time EmPmR to compute later (S/R EXTERNAL_FORCING_SURF)
# Line 63  C   tracers and momentum flux associated Line 65  C   tracers and momentum flux associated
65            ENDDO            ENDDO
66           ENDDO           ENDDO
67    
68          ELSEIF( myTime .EQ. 0. _d 0 ) THEN          ELSE
69            DO j=1-Oly,sNy+Oly            DO j=1-Oly,sNy+Oly
70             DO i=1-Olx,sNx+Olx             DO i=1-Olx,sNx+Olx
71              PmEpR(i,j,bi,bj) = 0. _d 0              PmEpR(i,j,bi,bj) = 0. _d 0
72             ENDDO             ENDDO
73            ENDDO            ENDDO
74    
75          ELSE            IF( myTime .NE. 0. _d 0 .AND. nonlinFreeSurf.GE.0 ) THEN
76  C     needs previous time-step value of E-P-R, that has not been loaded  C     needs previous time-step value of E-P-R, that has not been loaded
77  C     and was not in pickup-file ; try to use etaN & etaH instead.  C     and was not in pickup-file ; try to use etaN & etaH instead.
78            DO j=1,sNy            DO j=1,sNy
# Line 79  C     and was not in pickup-file ; try t Line 81  C     and was not in pickup-file ; try t
81       &        hDivFlow(i,j,bi,bj)*recip_rA(i,j,bi,bj)       &        hDivFlow(i,j,bi,bj)*recip_rA(i,j,bi,bj)
82       &      + (etaN(i,j,bi,bj)-etaH(i,j,bi,bj))       &      + (etaN(i,j,bi,bj)-etaH(i,j,bi,bj))
83       &       /(implicDiv2Dflow*deltaTfreesurf)       &       /(implicDiv2Dflow*deltaTfreesurf)
84                PmEpR(i,j,bi,bj) = PmEpR(i,j,bi,bj)/convertEmP2rUnit
85             ENDDO             ENDDO
86            ENDDO            ENDDO
87              ENDIF
88          ENDIF          ENDIF
89    
90         ENDIF         ENDIF
# Line 150  C- end bi,bj loop. Line 154  C- end bi,bj loop.
154        ENDDO        ENDDO
155    
156        IF (implicDiv2Dflow .NE. 1. _d 0 .OR. useOBCS )        IF (implicDiv2Dflow .NE. 1. _d 0 .OR. useOBCS )
157       &    _EXCH_XY_R8(etaH, myThid )       &    _EXCH_XY_RL(etaH, myThid )
158    
159  #endif /* EXACT_CONSERV */  #endif /* EXACT_CONSERV */
160    
161    #ifdef NONLIN_FRSURF
162          IF ( buoyancyRelation.EQ.'OCEANICP'
163         &     .AND. useRealFreshWaterFlux
164         &     .AND. myTime.EQ.startTime ) THEN
165              _EXCH_XY_RS(PmEpR, myThid )
166          ENDIF
167    #endif /* NONLIN_FRSURF */
168    
169        RETURN        RETURN
170        END        END
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
  ViewVC Help
Powered by ViewVC 1.1.22