Changeset 13177

Timestamp:

2020-06-29T18:50:21+02:00 (4 years ago)

Author:

smueller

Message:

Replacement of hard-coded constants with model variables and modification of the adjustment-update synchronization in option 2 of the freshwater-budget adjustment mechanism (see ticket #2487)

File:

• NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcfwb.F90 (modified) (1 diff)

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

@@ -125 +125 @@
             IF(lwp)WRITE(numout,*)'          year = ',iyear-1, ' freshwater budget read       = ', a_fwb
             IF(lwp)WRITE(numout,*)'          year = ',iyear-2, ' freshwater budget read       = ', a_fwb_b
-         ENDIF   
-         !                                         ! Update fwfold if new year start
-         ikty = 365 * 86400 / rdt                  !!bug  use of 365 days leap year or 360d year !!!!!!!
-         IF( MOD( kt, ikty ) == 0 ) THEN
+         ELSEIF( ( nday_year == 1 ) .AND. ( nsec_day == NINT( 0.5_wp * rdt ) ) ) THEN   ! Update fwfold at the start of 1 January
             a_fwb_b = a_fwb                           ! mean sea level taking into account the ice+snow
                                                       ! sum over the global domain
             a_fwb   = glob_sum( 'sbcfwb', e1e2t(:,:) * ( sshn(:,:) + snwice_mass(:,:) * r1_rau0 ) )
-            a_fwb   = a_fwb * 1.e+3 / ( area * rday * 365. )     ! convert in Kg/m3/s = mm/s
-!!gm        !                                                      !!bug 365d year 
+            a_fwb   = a_fwb * rau0 / ( area * rday * nyear_len(1) )   ! convert in kg/m3/s
             fwfold =  a_fwb                           ! current year freshwater budget correction
             !                                         ! estimate from the previous year budget