Changeset 13082 for NEMO/branches/2020/ticket2377/src/OCE/SBC/sbcfwb.F90

Timestamp:

2020-06-10T09:38:08+02:00 (4 years ago)

Author:

smueller

Message:

Removal of variable fwfold from module sbcfwb (ticket #2377)

File:

• NEMO/branches/2020/ticket2377/src/OCE/SBC/sbcfwb.F90 (modified) (6 diffs)

NEMO/branches/2020/ticket2377/src/OCE/SBC/sbcfwb.F90

@@ -37 +37 @@
    REAL(wp) ::   a_fwb     ! annual domain averaged freshwater budget from the
                            ! previous year
-   REAL(wp) ::   fwfold    ! fwfold to be suppressed
    REAL(wp) ::   area      ! global mean ocean surface (interior domain)
 
@@ -112 +111 @@
          ENDIF
          !
-      CASE ( 2 )                             !==  fwf budget adjusted from the previous year  ==!
+      CASE ( 2 )                             !==  fw adjustment based on fw budget at the end of the previous year  ==!
          !
          IF( kt == nit000 ) THEN                      ! initialisation
-            !                                         ! Read the corrective factor on precipitations (fwfold)
+            !                                         ! read the fw adjustment (a_fwb)
             IF ( ln_rstart .AND. iom_varid( numror, 'a_fwb',   ldstop = .FALSE. ) > 0 ) THEN
                IF(lwp) WRITE(numout,*) 'sbc_fwb : reading FW-budget adjustment from restart file'
@@ -124 +123 @@
                CLOSE( inum )
             END IF
-            fwfold = a_fwb                            ! current year freshwater budget correction
-            !                                         ! estimate from the previous year budget
+            !
             IF(lwp)WRITE(numout,*)
-            IF(lwp)WRITE(numout,*)'sbc_fwb : year = ',iyear  , ' freshwater budget correction = ', fwfold
+            IF(lwp)WRITE(numout,*)'sbc_fwb : year = ',iyear  , ' freshwater budget correction = ', a_fwb
             IF(lwp)WRITE(numout,*)'          year = ',iyear-1, ' freshwater budget read       = ', a_fwb
             !
@@ -134 +132 @@
             END IF
          ENDIF   
-         !                                         ! Update fwfold if new year start
+         !                                         ! Update a_fwb if new year start
          ikty = 365 * 86400 / rn_Dt                  !!bug  use of 365 days leap year or 360d year !!!!!!!
          IF( MOD( kt, ikty ) == 0 ) THEN
@@ -142 +140 @@
             a_fwb   = a_fwb * 1.e+3 / ( area * rday * 365. )     ! convert in Kg/m3/s = mm/s
 !!gm        !                                                      !!bug 365d year 
-            fwfold =  a_fwb                           ! current year freshwater budget correction
-            !                                         ! estimate from the previous year budget
          ENDIF
          ! 
          IF( MOD( kt-1, kn_fsbc ) == 0 ) THEN         ! correct the freshwater fluxes
-            zcoef = fwfold * rcp
-            emp(:,:) = emp(:,:) + fwfold             * tmask(:,:,1)
+            zcoef = a_fwb * rcp
+            emp(:,:) = emp(:,:) + a_fwb              * tmask(:,:,1)
             qns(:,:) = qns(:,:) - zcoef * sst_m(:,:) * tmask(:,:,1) ! account for change to the heat budget due to fw correction
          ENDIF
@@ -161 +157 @@
          END IF
          !
-         IF( kt == nitend .AND. lwm ) THEN            ! save fwfold value in a file (only one required)
+         IF( kt == nitend .AND. lwm ) THEN            ! save a_fwb value in a file (only one required)
             CALL ctl_opn( inum, 'EMPave.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea )
             WRITE( inum, "(24X,I8,2ES24.16)" ) nyear, a_fwb