Changeset 15264 for NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcfwb.F90

Timestamp:

2021-09-16T12:42:20+02:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/releases/r4.0/r4.0-HEAD@15236 (ticket #2487)}

Location:

NEMO/branches/2020/ticket2487

Files:

• . (modified) (1 prop)
• src/OCE/SBC/sbcfwb.F90 (modified) (7 diffs)

NEMO/branches/2020/ticket2487

@@ -1 @@
-^/utils/build/arch@12130      arch
-^/utils/build/makenemo@12191  makenemo
-^/utils/build/mk@11662        mk
-^/utils/tools_r4.0-HEAD@12672 tools
-^/vendors/AGRIF/dev@10586     ext/AGRIF
-^/vendors/FCM@10134           ext/FCM
-^/vendors/IOIPSL@9655         ext/IOIPSL
+^/utils/build/arch@12130        arch
+^/utils/build/makenemo@12191    makenemo
+^/utils/build/mk@11662          mk
+^/utils/tools_r4.0-HEAD@14974   tools
+^/vendors/AGRIF/stable@14105    ext/AGRIF
+^/vendors/FCM@10134             ext/FCM
+^/vendors/IOIPSL@9655           ext/IOIPSL
 
 # SETTE mapping (inactive)

@@ -1 @@
-^/utils/build/arch@12130      arch
-^/utils/build/makenemo@12191  makenemo
-^/utils/build/mk@11662        mk
-^/utils/tools_r4.0-HEAD@12672 tools
-^/vendors/AGRIF/dev@10586     ext/AGRIF
-^/vendors/FCM@10134           ext/FCM
-^/vendors/IOIPSL@9655         ext/IOIPSL
+^/utils/build/arch@12130        arch
+^/utils/build/makenemo@12191    makenemo
+^/utils/build/mk@11662          mk
+^/utils/tools_r4.0-HEAD@14974   tools
+^/vendors/AGRIF/stable@14105    ext/AGRIF
+^/vendors/FCM@10134             ext/FCM
+^/vendors/IOIPSL@9655           ext/IOIPSL
 
 # SETTE mapping (inactive)

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

@@ -24 +24 @@
    !
    USE in_out_manager ! I/O manager
+   USE iom            ! IOM
    USE lib_mpp        ! distribued memory computing library
    USE timing         ! Timing
@@ -101 +102 @@
          snwice_mass_b(:,:) = 0.e0               ! no sea-ice model is being used : no snow+ice mass
          snwice_mass  (:,:) = 0.e0
+         snwice_fmass (:,:) = 0.e0
 #endif
          !
@@ -116 +118 @@
             emp(:,:) = emp(:,:) - z_fwfprv(1)        * tmask(:,:,1)
             qns(:,:) = qns(:,:) + zcoef * sst_m(:,:) * tmask(:,:,1) ! account for change to the heat budget due to fw correction
+            ! outputs
+            IF( iom_use('hflx_fwb_cea') )  CALL iom_put( 'hflx_fwb_cea', zcoef * sst_m(:,:) * tmask(:,:,1) )
+            IF( iom_use('vflx_fwb_cea') )  CALL iom_put( 'vflx_fwb_cea', z_fwfprv(1)        * tmask(:,:,1) )
          ENDIF
          !
@@ -122 +127 @@
          IF( kt == nit000 ) THEN                      ! initialisation
             !                                         ! Read the corrective factor on precipitations (fwfold)
-            CALL ctl_opn( inum, 'EMPave_old.dat', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
-            READ ( inum, "(24X,I8,2ES24.16)" ) iyear, a_fwb_b, a_fwb
-            CLOSE( inum )
+            IF ( ln_rstart .AND. iom_varid( numror, 'a_fwb_b', ldstop = .FALSE. ) > 0     &
+               &           .AND. iom_varid( numror, 'a_fwb',   ldstop = .FALSE. ) > 0 ) THEN
+               IF(lwp) WRITE(numout,*) 'sbc_fwb : reading FW-budget adjustment from restart file'
+               CALL iom_get( numror, 'a_fwb_b', a_fwb_b, ldxios = lrxios )
+               CALL iom_get( numror, 'a_fwb',   a_fwb,   ldxios = lrxios )
+            ELSE
+               CALL ctl_opn( inum, 'EMPave_old.dat', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
+               READ ( inum, "(24X,I8,2ES24.16)" ) iyear, a_fwb_b, a_fwb
+               CLOSE( inum )
+            END IF
             fwfold = a_fwb                            ! current year freshwater budget correction
             !                                         ! estimate from the previous year budget
@@ -131 +143 @@
             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
+            !
+            IF( lwxios ) THEN                         ! Activate output of restart variables
+               CALL iom_set_rstw_var_active( 'a_fwb_b' )
+               CALL iom_set_rstw_var_active( 'a_fwb'   )
+            END IF
          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
@@ -144 +161 @@
             emp(:,:) = emp(:,:) + fwfold             * tmask(:,:,1)
             qns(:,:) = qns(:,:) - zcoef * sst_m(:,:) * tmask(:,:,1) ! account for change to the heat budget due to fw correction
-         ENDIF
+            ! outputs
+            IF( iom_use('hflx_fwb_cea') )  CALL iom_put( 'hflx_fwb_cea', -zcoef * sst_m(:,:) * tmask(:,:,1) )
+            IF( iom_use('vflx_fwb_cea') )  CALL iom_put( 'vflx_fwb_cea', -fwfold             * tmask(:,:,1) )
+         ENDIF
+         ! Output restart information
+         IF( lrst_oce ) THEN
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'sbc_fwb : writing FW-budget adjustment to ocean restart file at it = ', kt
+            IF(lwp) WRITE(numout,*) '~~~~'
+            IF( lwxios ) CALL iom_swap( cwxios_context )
+            CALL iom_rstput( kt, nitrst, numrow, 'a_fwb_b', a_fwb_b, ldxios = lwxios )
+            CALL iom_rstput( kt, nitrst, numrow, 'a_fwb',   a_fwb,   ldxios = lwxios )
+            IF( lwxios ) CALL iom_swap( cxios_context  )
+         END IF
          !
          IF( kt == nitend .AND. lwm ) THEN            ! save fwfold value in a file (only one required)
@@ -188 +218 @@
             qns(:,:) = qns(:,:) - zerp_cor(:,:) * rcp * sst_m(:,:)  ! account for change to the heat budget due to fw correction
             erp(:,:) = erp(:,:) + zerp_cor(:,:)
+            ! outputs
+            IF( iom_use('hflx_fwb_cea') )  CALL iom_put( 'hflx_fwb_cea', -zerp_cor(:,:) * rcp * sst_m(:,:) )
+            IF( iom_use('vflx_fwb_cea') )  CALL iom_put( 'vflx_fwb_cea', -zerp_cor(:,:) )
             !
             IF( nprint == 1 .AND. lwp ) THEN                   ! control print

@@ -1 @@
-^/utils/build/arch@12130      arch
-^/utils/build/makenemo@12191  makenemo
-^/utils/build/mk@11662        mk
-^/utils/tools_r4.0-HEAD@12672 tools
-^/vendors/AGRIF/dev@10586     ext/AGRIF
-^/vendors/FCM@10134           ext/FCM
-^/vendors/IOIPSL@9655         ext/IOIPSL
+^/utils/build/arch@12130        arch
+^/utils/build/makenemo@12191    makenemo
+^/utils/build/mk@11662          mk
+^/utils/tools_r4.0-HEAD@14974   tools
+^/vendors/AGRIF/stable@14105    ext/AGRIF
+^/vendors/FCM@10134             ext/FCM
+^/vendors/IOIPSL@9655           ext/IOIPSL
 
 # SETTE mapping (inactive)