/[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.56 by dimitri, Tue Feb 16 21:25:22 2010 UTC revision 1.57 by dimitri, Mon Apr 26 20:37:02 2010 UTC
# Line 288  C--   Forcing term Line 288  C--   Forcing term
288  #endif /* ALLOW_FIZHI */  #endif /* ALLOW_FIZHI */
289    
290  #ifdef ALLOW_ADDFLUID  #ifdef ALLOW_ADDFLUID
291        IF ( selectAddFluid.NE.0 .AND. temp_EvPrRn.NE.UNSET_RL ) THEN        IF ( selectAddFluid.NE.0 .AND. temp_addMass.NE.UNSET_RL ) THEN
 C-    for now, use same fluid properties as for E-P-R  
292         IF ( ( selectAddFluid.GE.1 .AND. nonlinFreeSurf.GT.0 )         IF ( ( selectAddFluid.GE.1 .AND. nonlinFreeSurf.GT.0 )
293       &      .OR. convertFW2Salt.EQ.-1. _d 0 ) THEN       &      .OR. convertFW2Salt.EQ.-1. _d 0 ) THEN
294           DO j=1,sNy           DO j=1,sNy
295            DO i=1,sNx            DO i=1,sNx
296              gT(i,j,kLev,bi,bj) = gT(i,j,kLev,bi,bj)              gT(i,j,kLev,bi,bj) = gT(i,j,kLev,bi,bj)
297       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit
298       &          *( temp_EvPrRn - theta(i,j,kLev,bi,bj) )       &          *( temp_addMass - theta(i,j,kLev,bi,bj) )
299       &          *recip_rA(i,j,bi,bj)       &          *recip_rA(i,j,bi,bj)
300       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)
301  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)
# Line 307  C    &          *recip_deepFac2C(kLev)*r Line 306  C    &          *recip_deepFac2C(kLev)*r
306            DO i=1,sNx            DO i=1,sNx
307              gT(i,j,kLev,bi,bj) = gT(i,j,kLev,bi,bj)              gT(i,j,kLev,bi,bj) = gT(i,j,kLev,bi,bj)
308       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit
309       &          *( temp_EvPrRn - tRef(kLev) )       &          *( temp_addMass - tRef(kLev) )
310       &          *recip_rA(i,j,bi,bj)       &          *recip_rA(i,j,bi,bj)
311       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)
312  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)
# Line 473  C--   Forcing term Line 472  C--   Forcing term
472  #endif /* ALLOW_FIZHI */  #endif /* ALLOW_FIZHI */
473    
474  #ifdef ALLOW_ADDFLUID  #ifdef ALLOW_ADDFLUID
475        IF ( selectAddFluid.NE.0 .AND. salt_EvPrRn.NE.UNSET_RL ) THEN        IF ( selectAddFluid.NE.0 .AND. salt_addMass.NE.UNSET_RL ) THEN
 C-    for now, use same fluid properties as for E-P-R  
476         IF ( ( selectAddFluid.GE.1 .AND. nonlinFreeSurf.GT.0 )         IF ( ( selectAddFluid.GE.1 .AND. nonlinFreeSurf.GT.0 )
477       &      .OR. convertFW2Salt.EQ.-1. _d 0 ) THEN       &      .OR. convertFW2Salt.EQ.-1. _d 0 ) THEN
478           DO j=1,sNy           DO j=1,sNy
479            DO i=1,sNx            DO i=1,sNx
480              gS(i,j,kLev,bi,bj) = gS(i,j,kLev,bi,bj)              gS(i,j,kLev,bi,bj) = gS(i,j,kLev,bi,bj)
481       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit
482       &          *( salt_EvPrRn - salt(i,j,kLev,bi,bj) )       &          *( salt_addMass - salt(i,j,kLev,bi,bj) )
483       &          *recip_rA(i,j,bi,bj)       &          *recip_rA(i,j,bi,bj)
484       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)
485  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)
# Line 492  C    &          *recip_deepFac2C(kLev)*r Line 490  C    &          *recip_deepFac2C(kLev)*r
490            DO i=1,sNx            DO i=1,sNx
491              gS(i,j,kLev,bi,bj) = gS(i,j,kLev,bi,bj)              gS(i,j,kLev,bi,bj) = gS(i,j,kLev,bi,bj)
492       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit       &        + addMass(i,j,kLev,bi,bj)*mass2rUnit
493       &          *( salt_EvPrRn - sRef(kLev) )       &          *( salt_addMass - sRef(kLev) )
494       &          *recip_rA(i,j,bi,bj)       &          *recip_rA(i,j,bi,bj)
495       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)       &          *recip_drF(kLev)*_recip_hFacC(i,j,kLev,bi,bj)
496  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)  C    &          *recip_deepFac2C(kLev)*recip_rhoFacC(kLev)
Legend:
Removed from v.1.56  
changed lines
  Added in v.1.57
  ViewVC Help
Powered by ViewVC 1.1.22