Changeset 15777

Timestamp:

2022-04-08T15:51:16+02:00 (2 years ago)

Author:

frrh

Message:

Apply chnages to ensure GC5 using ORCA1 restarts reproducibly
This set of changes may well be trommed back as we work out
what is essential what what isn't, but for now, this is what WORKS!

Location:

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

Files:

• DOM/domvvl.F90 (modified) (1 diff)
• DOM/iscplrst.F90 (modified) (1 diff)
• DYN/dynnxt.F90 (modified) (1 diff)
• SBC/sbcice_cice.F90 (modified) (1 diff)
• step.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_fixrest/src/OCE/DOM/domvvl.F90

@@ -135 +135 @@
       !                    !== Set of all other vertical scale factors  ==!  (now and before)
       !                                ! Horizontal interpolation of e3t
+
+      ! Ensure all e3t_b and e3t_n halos are up to date!
+      call lbc_lnk('dom_vvl_init', e3t_b, 'T', 1.0_wp)
+      call lbc_lnk('dom_vvl_init', e3t_n, 'T', 1.0_wp) 
+
       CALL dom_vvl_interpol( e3t_b(:,:,:), e3u_b(:,:,:), 'U' )    ! from T to U
       CALL dom_vvl_interpol( e3t_n(:,:,:), e3u_n(:,:,:), 'U' )

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_fixrest/src/OCE/DOM/iscplrst.F90

@@ -199 +199 @@
          END DO
          !
+
+         call lbc_lnk("iscpl_rst_interpol", e3t_n, 'T', 1.0_wp)
+
          CALL dom_vvl_interpol( e3t_n(:,:,:), e3u_n(:,:,:), 'U' )
          CALL dom_vvl_interpol( e3t_n(:,:,:), e3v_n(:,:,:), 'V' )

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_fixrest/src/OCE/DYN/dynnxt.F90

@@ -248 +248 @@
             IF( ln_dynadv_vec ) THEN      ! Asselin filter applied on velocity
                ! Before filtered scale factor at (u/v)-points
+               call lbc_lnk("dynnxt", e3t_b, 'T', 1.0_wp)
+
                CALL dom_vvl_interpol( e3t_b(:,:,:), e3u_b(:,:,:), 'U' )
                CALL dom_vvl_interpol( e3t_b(:,:,:), e3v_b(:,:,:), 'V' )

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

@@ -243 +243 @@
                ! Horizontal scale factor interpolations
                ! --------------------------------------
+
+               call lbc_lnk("cice_sbc_init", e3t_b, 'T', 1.0_wp)
+               call lbc_lnk("cice_sbc_init", e3t_n, 'T', 1.0_wp)
+
                CALL dom_vvl_interpol( e3t_b(:,:,:), e3u_b(:,:,:), 'U' )
                CALL dom_vvl_interpol( e3t_b(:,:,:), e3v_b(:,:,:), 'V' )

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

@@ -93 +93 @@
       !
       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.)
+
       !
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -273 +278 @@
 !!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