Changeset 7781 for branches/UKMO

Timestamp:

2017-03-09T16:06:53+01:00 (7 years ago)

Author:

timgraham

Message:

Move swap of runoff forcing fields to sbc_mod

Location:

branches/UKMO/dev_r5518_GO6_package_fix_rnf/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcmod.F90 (modified) (1 diff)
• sbcrnf.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package_fix_rnf/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -340 +340 @@
          emp_b(:,:) = emp(:,:)
          sfx_b(:,:) = sfx(:,:)
+         IF ( ln_rnf ) THEN  ! Need to be here so that order is correct in coupled mode
+            rnf_b    (:,:  ) = rnf    (:,:  )
+            rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:) 
+         ENDIF
+         !
+      ENDIF
+
       ENDIF
       !                                            ! ---------------------------------------- !

branches/UKMO/dev_r5518_GO6_package_fix_rnf/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -110 +110 @@
       CALL wrk_alloc( jpi,jpj, ztfrz)
 
-      !                                            ! ---------------------------------------- !
-      IF( kt /= nit000 ) THEN                      !          Swap of forcing fields          !
-         !                                         ! ---------------------------------------- !
-         rnf_b    (:,:  ) = rnf    (:,:  )               ! Swap the ocean forcing fields except at nit000
-         rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:)               ! where before fields are set at the end of the routine
-         !
-      ENDIF
-
       !                                            !-------------------!
       !                                            !   Update runoff   !