Changeset 14124 for NEMO

Timestamp:

2020-12-07T20:40:20+01:00 (3 years ago)

Author:

smueller

Message:

Adjustments to restore compatibility with the restart I/O functionality (ticket #2377)

File:

• NEMO/branches/2020/r14118_ticket2377/src/OCE/SBC/sbcfwb.F90 (modified) (3 diffs)

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

@@ -131 +131 @@
             IF ( ln_rstart .AND. iom_varid( numror, 'a_fwb',   ldstop = .FALSE. ) > 0 ) THEN        !    as read from restart file
                IF(lwp) WRITE(numout,*) 'sbc_fwb : reading FW-budget adjustment from restart file'
-               CALL iom_get( numror, 'a_fwb',   a_fwb,   ldxios = lrxios )
+               CALL iom_get( numror, 'a_fwb',   a_fwb )
             ELSE                                                                                    !    as specified in namelist
                a_fwb = rn_fwb0
@@ -139 +139 @@
             IF(lwp)WRITE(numout,*)'sbc_fwb : initial freshwater-budget adjustment = ', a_fwb, 'kg/m2/s'
             !
-            IF( lwxios ) THEN                         ! Activate output of restart variables
-               CALL iom_set_rstw_var_active( 'a_fwb'   )
-            END IF
          ENDIF   
          !                                         ! Update a_fwb if new year start
@@ -163 +160 @@
             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',   a_fwb,   ldxios = lwxios )
-            IF( lwxios ) CALL iom_swap( cxios_context  )
+            CALL iom_rstput( kt, nitrst, numrow, 'a_fwb',   a_fwb )
          END IF
          !