Changeset 10296 for branches/UKMO/dev_r5518_GO6_package_FOAMv14_bgcupdates2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2018-11-12T13:15:24+01:00 (5 years ago)

Author:

dford

Message:

Merge in revisions 8447:10159 of dev_r5518_GO6_package.

File:

• branches/UKMO/dev_r5518_GO6_package_FOAMv14_bgcupdates2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14_bgcupdates2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -61 +61 @@
    USE asminc          ! assimilation increments     
    USE asmbkg          ! writing out state trajectory
+   USE asmbgc          ! biogeochemical assimilation increments
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
    USE diadct          ! sections transports           (dia_dct_init routine)
@@ -160 +161 @@
                 IF( ln_dyninc ) CALL dyn_asm_inc( nit000 - 1 )    ! Dynamics
                 IF( ln_sshinc ) CALL ssh_asm_inc( nit000 - 1 )    ! SSH
+                IF( lk_bgcinc ) CALL bgc_asm_inc( nit000 - 1 )    ! BGC
              ENDIF
           ENDIF
@@ -192 +194 @@
       IF( lk_diaobs   )   CALL dia_obs_wri
       !
+      IF( ( lk_asminc ).AND.( ln_balwri ) ) CALL asm_bgc_bal_wri( nitend )  ! Output balancing increments
+      !
       IF( ln_icebergs )   CALL icb_end( nitend )
 
@@ -208 +212 @@
          CALL Agrif_ParentGrid_To_ChildGrid()
          IF( lk_diaobs ) CALL dia_obs_wri
-         IF( nn_timing == 1 )   CALL timing_finalize
+         IF( nn_timing > 0 )   CALL timing_finalize
          CALL Agrif_ChildGrid_To_ParentGrid()
       ENDIF
 #endif
-      IF( nn_timing == 1 )   CALL timing_finalize
+      IF( nn_timing > 0 )   CALL timing_finalize
       !
       CALL nemo_closefile
@@ -405 +409 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_init
+      IF( nn_timing > 0 )  CALL timing_init
       !
       !                                      ! General initialization