Changeset 9296 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2018-01-31T16:27:16+01:00 (6 years ago)

Author:

dford

Message:

Move most of the BGC assimilation code into its own module, to make it more portable across versions/configurations. Partially apply the new naming conventions for BGC obs.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (3 diffs)

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

@@ -61 +61 @@
    USE asminc          ! assimilation increments     
    USE asmbkg          ! writing out state trajectory
-   USE asmbal          ! writing out biogeochemical assimilation balancing increments
+   USE asmbgc          ! biogeochemical assimilation increments
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
    USE diadct          ! sections transports           (dia_dct_init routine)
@@ -161 +161 @@
                 IF( ln_dyninc ) CALL dyn_asm_inc( nit000 - 1 )    ! Dynamics
                 IF( ln_sshinc ) CALL ssh_asm_inc( nit000 - 1 )    ! SSH
-                IF( ln_logchlinc ) CALL logchl_asm_inc( nit000 - 1 )
-                IF( ln_fco2inc .OR. ln_pco2inc ) CALL pco2_asm_inc( nit000 - 1 )
+                IF( lk_bgcinc ) CALL bgc_asm_inc( nit000 - 1 )    ! BGC
              ENDIF
           ENDIF
@@ -195 +194 @@
       IF( lk_diaobs   )   CALL dia_obs_wri
       !
-      IF( ( lk_asminc ).AND.( ln_balwri ) ) CALL asm_bal_wri( nitend )  ! Output balancing increments
+      IF( ( lk_asminc ).AND.( ln_balwri ) ) CALL asm_bgc_bal_wri( nitend )  ! Output balancing increments
       !
       IF( ln_icebergs )   CALL icb_end( nitend )