Changeset 756 for branches

Timestamp:

2007-12-07T15:32:45+01:00 (16 years ago)

Author:

ctlod

Message:

make modifications closer to the initial GYRE forcing, see ticket:#36

File:

• branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcana.F90 (modified) (5 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcana.F90

@@ -166 +166 @@
       zcos_sais2 = COS( (ztime - ztimemax2) / (ztimemax2 - ztimemin2) * rpi )
 
-      ztrp= - 40.          ! retroaction term on heat fluxes (W/m2/K)
+      ztrp= - 40.e0        ! retroaction term on heat fluxes (W/m2/K)
       zconv = 3.16e-5      ! convertion factor: 1 m/yr => 3.16e-5 mm/s
       DO jj = 1, jpj
@@ -192 +192 @@
       emps(:,:) = emp(:,:)
 
-      ! compute the emp flux such as its integration on the whole domain and at each time be zero
-      zsumemp = 0.e0
-      zsurf = 0.e0
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            zsumemp = zsumemp + emp(ji,jj) * tmask(ji,jj,1) * tmask_i(ji,jj)
-            zsurf   = zsurf   +              tmask(ji,jj,1) * tmask_i(ji,jj)
+      ! Compute the emp flux such as its integration on the whole domain at each time is zero
+      IF( nbench /= 1 .AND. nbit_cmp /= 1 ) THEN
+         zsumemp = 0.e0   ;   zsurf = 0.e0
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zsumemp = zsumemp + emp(ji,jj) * tmask(ji,jj,1) * tmask_i(ji,jj)
+               zsurf   = zsurf   +              tmask(ji,jj,1) * tmask_i(ji,jj)
+            END DO
          END DO
-      END DO
-
-      IF( lk_mpp )   CALL mpp_sum( zsumemp  )       ! sum over the global domain
-      IF( lk_mpp )   CALL mpp_sum( zsurf    )       ! sum over the global domain
-
-      IF( nbench /= 0 ) THEN
-         ! Benchmark GYRE configuration (to allow the bit to bit comparison between Mpp/Mono case)
-         zsumemp = 0.e0
-      ELSE
+
+         IF( lk_mpp )   CALL mpp_sum( zsumemp  )       ! sum over the global domain
+         IF( lk_mpp )   CALL mpp_sum( zsurf    )       ! sum over the global domain
+
          ! Default GYRE configuration
          zsumemp = zsumemp / zsurf
+      ELSE
+         ! Benchmark GYRE configuration (to allow the bit to bit comparison between Mpp/Mono case)
+         zsumemp = 0.e0   ;    zsurf = 0.e0
       ENDIF
 
@@ -227 +226 @@
       zday0   =   ndate0 - zyear0 * 10000 - zmonth0 * 100
       !Calculates nday_year, day since january 1st
-      zday_year0 = zday0
+      zday_year0 = (zmonth0-1)*30.+zday0
+
       !accumulates days of previous months of this year
-
-      DO js = 1, zmonth0
-         IF( nleapy > 1 ) THEN
-            zday_year0 = zday_year0 + nleapy
-         ELSE
-            IF( MOD(zyear0, 4 ) == 0 ) THEN
-               zday_year0 = zday_year0 + nbiss(js)
-            ELSE
-               zday_year0 = zday_year0 + nobis(js)
-            ENDIF
-         ENDIF
-      END DO
-
       ! day (in hours) since january the 1st
       ztime = FLOAT( kt ) * rdt / (rmmss * rhhmm)  &  ! incrementation in hour
-         &     - (nyear - 1) * rjjhh * raajj       &  !  - nber of hours the precedent years
-         &     + zday_year0 / 24                      ! nber of hours initial date
-      ! day 21th counted since the 1st January
-      zdaymax = 21                                    ! 21th day of the month
-      DO js = 1, 5                                    ! count each day  until end May
-         IF( nleapy > 1 ) THEN
-            zdaymax = zdaymax + nleapy
-         ELSE
-            IF( MOD(zyear0, 4 ) == 0 ) THEN
-                zdaymax = zdaymax + nbiss(js)
-            ELSE
-                zdaymax = zdaymax + nobis(js)
-            ENDIF
-         ENDIF
-      END DO
-      ztimemax = zdaymax * 24                      ! 21th june     in hours
+         &     - (nyear - 1) * rjjhh * raajj          !  - nber of hours the precedent years
+      ztimemax = ((5.*30.)+21.)* 24.               ! 21th june     in hours
       ztimemin = ztimemax + rjjhh * raajj / 2      ! 21th december in hours
       !                                            ! NB: rjjhh * raajj / 4 = 1 seasonal cycle in hours
@@ -281 +254 @@
       ! ---------------------------------- !
       IF( kt == nit000 .AND. lwp ) THEN 
-         WRITE(numout,*)' sbc_gyre : analytical surface fluxes for GYRE configuration'               
-         WRITE(numout,*)' ~~~~~~~~ ' 
+         WRITE(numout,*)
+         WRITE(numout,*)'sbc_gyre : analytical surface fluxes for GYRE configuration'               
+         WRITE(numout,*)'~~~~~~~~ ' 
          WRITE(numout,*)'           nyear      = ', nyear
          WRITE(numout,*)'           nmonth     = ', nmonth
@@ -317 +291 @@
          WRITE(numout,*)'           zday0      = ', zday0
          WRITE(numout,*)'           zday_year0 = ',zday_year0
-         WRITE(numout,*)'           nobis(2)', nobis(2)
-         WRITE(numout,*)'           nobis(5)', nobis(5)
-         WRITE(numout,*)'           nobis(6)', nobis(6)
-         WRITE(numout,*)'           nobis(1)', nobis(1)
-         WRITE(numout,*)'           nobis(zmonth0 -1)', nobis(zmonth0 - 1)
          WRITE(numout,*)'           raajj  = ', raajj
       ENDIF