/[MITgcm]/MITgcm/pkg/exf/exf_mapfields.F
ViewVC logotype

Diff of /MITgcm/pkg/exf/exf_mapfields.F

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

revision 1.28 by dimitri, Tue Apr 23 19:04:33 2013 UTC revision 1.29 by dimitri, Sat Jun 29 19:44:18 2013 UTC
# Line 178  C--   Account for rain-temp Line 178  C--   Account for rain-temp
178               ENDDO               ENDDO
179              ENDDO              ENDDO
180             ENDIF             ENDIF
181    #ifdef ALLOW_RUNOFF
182    C--   Account for energy content of RunOff:
183               DO j = 1, sNy
184                DO i = 1, sNx
185                  Qnet(i,j,bi,bj) = Qnet(i,j,bi,bj)
186         &              - HeatCapacity_Cp
187         &               *( theta(i,j,ks,bi,bj) - temp_EvPrRn )
188         &               *runoff(i,j,bi,bj)*rhoConstFresh
189                ENDDO
190               ENDDO
191    #endif
192  C--   Account for energy content of Evap:  C--   Account for energy content of Evap:
193             DO j = 1, sNy             DO j = 1, sNy
194              DO i = 1, sNx              DO i = 1, sNx
# Line 189  C--   Account for energy content of Evap Line 200  C--   Account for energy content of Evap
200              ENDDO              ENDDO
201             ENDDO             ENDDO
202            ENDIF            ENDIF
203  # ifdef ALLOW_RUNOFF  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
204  C--   Account for energy content of RunOff:  #endif /* ALLOW_ATM_TEMP */
205  #  ifdef ALLOW_RUNOFTEMP  #if defined(ALLOW_RUNOFF) && defined(ALLOW_RUNOFTEMP)
206            DO j = 1, sNy            IF ( runoftempfile .NE. ' ' ) THEN
207             DO i = 1, sNx  C--   Add energy content of RunOff
               Qnet(i,j,bi,bj) = Qnet(i,j,bi,bj)  
      &             - HeatCapacity_Cp  
      &             *( theta(i,j,ks,bi,bj) - runoftemp(i,j,bi,bj) )  
      &             *runoff(i,j,bi,bj)*rhoConstFresh  
            ENDDO  
           ENDDO  
 #  else /* ifndef ALLOW_RUNOFTEMP */  
           IF ( temp_EvPrRn .NE. UNSET_RL ) THEN  
208             DO j = 1, sNy             DO j = 1, sNy
209              DO i = 1, sNx              DO i = 1, sNx
210                 Qnet(i,j,bi,bj) = Qnet(i,j,bi,bj)                 Qnet(i,j,bi,bj) = Qnet(i,j,bi,bj)
211       &              - HeatCapacity_Cp       &              + HeatCapacity_Cp
212       &              *( theta(i,j,ks,bi,bj) - temp_EvPrRn )       &              *( theta(i,j,ks,bi,bj) - runoftemp(i,j,bi,bj) )
213       &              *runoff(i,j,bi,bj)*rhoConstFresh       &              *runoff(i,j,bi,bj)*rhoConstFresh
214              ENDDO              ENDDO
215             ENDDO             ENDDO
216            ENDIF            ENDIF
217  #  endif /* ALLOW_RUNOFTEMP */  #endif
 # endif /* ALLOW_RUNOFF */  
 C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  
 #endif /* ALLOW_ATM_TEMP */  
218    
219  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
220  CADJ STORE ustress(:,:,bi,bj) = comlev1_bibj, key=ikey, byte=isbyte  CADJ STORE ustress(:,:,bi,bj) = comlev1_bibj, key=ikey, byte=isbyte
Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29
  ViewVC Help
Powered by ViewVC 1.1.22