Changeset 15790

Timestamp:

2022-04-22T13:41:23+02:00 (2 years ago)

Author:

frrh

Message:

Further fixes for bit comp restartability. Homing in on river
runoff as the culprit.

Location:

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_fixrest/src/OCE

Files:

• SBC/sbcrnf.F90 (modified) (3 diffs)
• step.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_fixrest/src/OCE/SBC/sbcrnf.F90

@@ -26 +26 @@
    USE iom            ! I/O module
    USE lib_mpp        ! MPP library
+   USE lbclnk
 
    IMPLICIT NONE
@@ -151 +152 @@
       ENDIF
       !
+
+      ! Make sure rnf is up to date!
+      call lbc_lnk('rnf_div', rnf, 'T', 1.0)
+
       !                                                ! ---------------------------------------- !
       IF( kt == nit000 ) THEN                          !   set the forcing field at nit000 - 1    !
@@ -156 +161 @@
          IF( ln_rstart .AND.    &                               !* Restart: read in restart file
             & iom_varid( numror, 'rnf_b', ldstop = .FALSE. ) > 0 ) THEN
-            IF(lwp) WRITE(numout,*) '          nit000-1 runoff forcing fields red in the restart file', lrxios
+            IF(lwp) WRITE(numout,*) '          nit000-1 runoff forcing fields read in the restart file', lrxios
             CALL iom_get( numror, jpdom_autoglo, 'rnf_b', rnf_b, ldxios = lrxios )     ! before runoff
             CALL iom_get( numror, jpdom_autoglo, 'rnf_hc_b', rnf_tsc_b(:,:,jp_tem), ldxios = lrxios )   ! before heat content of runoff

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_fixrest/src/OCE/step.F90

@@ -94 +94 @@
       IF( ln_timing )   CALL timing_start('stp')
 
-      CALL lbc_lnk_multi('step',e3u_b,'U',1., e3v_b,'V',1.)
-      CALL lbc_lnk_multi('step',e3u_n,'U',1., e3v_n,'V',1.)
-      CALL lbc_lnk_multi('step',e3t_b,'T',1., e3t_n,'T',1.)
-
       !
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -278 +274 @@
 !!jc: That would be better, but see comment above
 !!
-      CALL lbc_lnk_multi('step',ub,'U',-1., vb,'V',-1.,tsb(:,:,:,jp_tem),'T',1.,  tsb(:,:,:,jp_sal),'T',1.)
-      CALL lbc_lnk_multi('step',ub,'U',-1., vb,'V',-1.)
-
-      CALL lbc_lnk('step', sshb,'T',1.)
-      CALL lbc_lnk_multi('step',un,'U',-1., vn,'V',-1.,tsn(:,:,:,jp_tem),'T',1., tsn(:,:,:,jp_sal),'T',1., rhop,'T',1.)
-      CALL lbc_lnk_multi('step',un,'U',-1., vn,'V',-1.)
-      CALL lbc_lnk('step', sshn,'T',1.)
-
       IF( lrst_oce   )   CALL rst_write    ( kstp )   ! write output ocean restart file
       IF( ln_sto_eos )   CALL sto_rst_write( kstp )   ! write restart file for stochastic parameters