Changeset 12081 for NEMO/branches/2019/dev_ASINTER-01-05_merged/src

Timestamp:

2019-12-06T11:52:54+01:00 (4 years ago)

Author:

laurent

Message:

Minor synchronization with "dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk"

File:

• NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcblk_phy.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcblk_phy.F90

@@ -533 +533 @@
             CALL BULK_FORMULA( pzu, pTs(ji,jj), pqs(ji,jj), pTa(ji,jj), pqa(ji,jj), &
                &              zCd, zCh, zCe,                                        &
-               &              pwnd(ji,jj), pUb(ji,jj), pslp(ji,jj), &
+               &              pwnd(ji,jj), pUb(ji,jj), pslp(ji,jj),                 &
                &              pTau(ji,jj), zQsen, zQlat )
 
@@ -568 +568 @@
       REAL(wp), DIMENSION(jpi,jpj), INTENT(out) :: pQlat !  [W/m^2]
       !!
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(out), OPTIONAL :: pEvap  ! Evaporation [kg/m^2/s]
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(out), OPTIONAL :: prhoa  ! Air density at z=pzu [kg/m^3]
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(out), OPTIONAL :: pEvap ! Evaporation [kg/m^2/s]
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(out), OPTIONAL :: prhoa ! Air density at z=pzu [kg/m^3]
       !!
       REAL(wp) :: ztaa, zgamma, zrho, zUrho, zevap
       INTEGER  :: ji, jj, jq     ! dummy loop indices
       !!----------------------------------------------------------------------------------
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-   
-               !! Need ztaa, absolute temperature at pzu (formula to estimate rho_air needs absolute temperature, not the potential temperature "pTa")
-               ztaa = pTa(ji,jj) ! first guess...
-               DO jq = 1, 4
-                  zgamma = gamma_moist( 0.5*(ztaa+pTs(ji,jj)) , pqa(ji,jj) )
-                  ztaa = pTa(ji,jj) - zgamma*pzu   ! Absolute temp. is slightly colder...
-               END DO
-               zrho = rho_air(ztaa, pqa(ji,jj), pslp(ji,jj))
-               zrho = rho_air(ztaa, pqa(ji,jj), pslp(ji,jj)-zrho*grav*pzu) ! taking into account that we are pzu m above the sea level where SLP is given!
-   
-               zUrho = pUb(ji,jj)*MAX(zrho, 1._wp)     ! rho*U10
-   
-               pTau(ji,jj) = zUrho * pCd(ji,jj) * pwnd(ji,jj) ! Wind stress module
-   
-               zevap        = zUrho * pCe(ji,jj) * (pqa(ji,jj) - pqs(ji,jj))
-               pQsen(ji,jj) = zUrho * pCh(ji,jj) * (pTa(ji,jj) - pTs(ji,jj)) * cp_air(pqa(ji,jj))
-               pQlat(ji,jj) = L_vap(pTs(ji,jj)) * zevap
-   
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+
+            !! Need ztaa, absolute temperature at pzu (formula to estimate rho_air needs absolute temperature, not the potential temperature "pTa")
+            ztaa = pTa(ji,jj) ! first guess...
+            DO jq = 1, 4
+               zgamma = gamma_moist( 0.5*(ztaa+pTs(ji,jj)) , pqa(ji,jj) )
+               ztaa = pTa(ji,jj) - zgamma*pzu   ! Absolute temp. is slightly colder...
+            END DO
+            zrho = rho_air(ztaa, pqa(ji,jj), pslp(ji,jj))
+            zrho = rho_air(ztaa, pqa(ji,jj), pslp(ji,jj)-zrho*grav*pzu) ! taking into account that we are pzu m above the sea level where SLP is given!
+
+            zUrho = pUb(ji,jj)*MAX(zrho, 1._wp)     ! rho*U10
+
+            pTau(ji,jj) = zUrho * pCd(ji,jj) * pwnd(ji,jj) ! Wind stress module
+
+            zevap        = zUrho * pCe(ji,jj) * (pqa(ji,jj) - pqs(ji,jj))
+            pQsen(ji,jj) = zUrho * pCh(ji,jj) * (pTa(ji,jj) - pTs(ji,jj)) * cp_air(pqa(ji,jj))
+            pQlat(ji,jj) = L_vap(pTs(ji,jj)) * zevap
+
             IF( PRESENT(pEvap) ) pEvap(ji,jj) = - zevap
             IF( PRESENT(prhoa) ) prhoa(ji,jj) = zrho
-   
-            END DO
-         END DO
+
+         END DO
+      END DO
    END SUBROUTINE BULK_FORMULA_VCTR
 
@@ -630 +630 @@
       !!----------------------------------------------------------------------------------
 
-         !! Need ztaa, absolute temperature at pzu (formula to estimate rho_air needs absolute temperature, not the potential temperature "pTa")
-         ztaa = pTa ! first guess...
-         DO jq = 1, 4
-            zgamma = gamma_moist( 0.5*(ztaa+pTs) , pqa )
-            ztaa = pTa - zgamma*pzu   ! Absolute temp. is slightly colder...
-         END DO
-         zrho = rho_air(ztaa, pqa, pslp)
-         zrho = rho_air(ztaa, pqa, pslp-zrho*grav*pzu) ! taking into account that we are pzu m above the sea level where SLP is given!
-   
-         zUrho = pUb*MAX(zrho, 1._wp)     ! rho*U10
-   
-         pTau = zUrho * pCd * pwnd ! Wind stress module
-   
-         zevap = zUrho * pCe * (pqa - pqs)
-         pQsen = zUrho * pCh * (pTa - pTs) * cp_air(pqa)
-         pQlat = L_vap(pTs) * zevap
-   
-         IF( PRESENT(pEvap) ) pEvap = - zevap
-         IF( PRESENT(prhoa) ) prhoa = zrho
+      !! Need ztaa, absolute temperature at pzu (formula to estimate rho_air needs absolute temperature, not the potential temperature "pTa")
+      ztaa = pTa ! first guess...
+      DO jq = 1, 4
+         zgamma = gamma_moist( 0.5*(ztaa+pTs) , pqa )
+         ztaa = pTa - zgamma*pzu   ! Absolute temp. is slightly colder...
+      END DO
+      zrho = rho_air(ztaa, pqa, pslp)
+      zrho = rho_air(ztaa, pqa, pslp-zrho*grav*pzu) ! taking into account that we are pzu m above the sea level where SLP is given!
+
+      zUrho = pUb*MAX(zrho, 1._wp)     ! rho*U10
+
+      pTau = zUrho * pCd * pwnd ! Wind stress module
+
+      zevap = zUrho * pCe * (pqa - pqs)
+      pQsen = zUrho * pCh * (pTa - pTs) * cp_air(pqa)
+      pQlat = L_vap(pTs) * zevap
+
+      IF( PRESENT(pEvap) ) pEvap = - zevap
+      IF( PRESENT(prhoa) ) prhoa = zrho
 
    END SUBROUTINE BULK_FORMULA_SCLR