Changeset 10055 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90

Timestamp:

2018-08-20T15:17:09+02:00 (6 years ago)

Author:

dford

Message:

Merge in branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc and address conflicts.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90

@@ -49 +49 @@
 #if defined key_lim3
    USE ice
+#endif
+#if defined key_top
+   USE asmbgc, ONLY: asm_bgc_bkg_wri
 #endif
    USE timing
@@ -125 +128 @@
             IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
             !
+#if defined key_top
+            CALL asm_bgc_bkg_wri( kt, inum )
+            !
+#endif
             CALL iom_close( inum )
          ENDIF