Changeset 13375 for branches/UKMO/dev_1d_bugfixes_BoB/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

Timestamp:

2020-08-03T18:26:21+02:00 (4 years ago)

Author:

jwhile

Message:

Updates for 1d running

File:

• branches/UKMO/dev_1d_bugfixes_BoB/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) (7 diffs)

branches/UKMO/dev_1d_bugfixes_BoB/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

@@ -10 +10 @@
    !!----------------------------------------------------------------------
    !!   'key_c1d'                                       1D Configuration
-   !!----------------------------------------------------------------------  
+   !!----------------------------------------------------------------------
    !!   stp_c1d        : NEMO system time-stepping in c1d case
    !!----------------------------------------------------------------------
-   USE step_oce        ! time stepping definition modules 
+   USE step_oce        ! time stepping definition modules
 #if defined key_top
    USE trcstp          ! passive tracer time-stepping      (trc_stp routine)
@@ -20 +20 @@
    USE dynnxt_c1d      ! time-stepping                    (dyn_nxt routine)
    USE dyndmp          ! U & V momentum damping           (dyn_dmp routine)
-   USE restart         ! restart 
+   USE restart         ! restart
 
    IMPLICIT NONE
@@ -40 +40 @@
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE stp_c1d  ***
-      !!                      
+      !!
       !! ** Purpose :  - Time stepping of SBC including LIM (dynamic and thermodynamic eqs.)
       !!               - Time stepping of OPA (momentum and active tracer eqs.)
       !!               - Time stepping of TOP (passive tracer eqs.)
-      !! 
-      !! ** Method  : -1- Update forcings and data  
-      !!              -2- Update vertical ocean physics 
-      !!              -3- Compute the t and s trends 
-      !!              -4- Update t and s 
+      !!
+      !! ** Method  : -1- Update forcings and data
+      !!              -2- Update vertical ocean physics
+      !!              -3- Compute the t and s trends
+      !!              -4- Update t and s
       !!              -5- Compute the momentum trends
       !!              -6- Update the horizontal velocity
@@ -76 +76 @@
                          CALL bn2( tsb, rab_b, rn2b ) ! before Brunt-Vaisala frequency
                          CALL bn2( tsn, rab_n, rn2  ) ! now    Brunt-Vaisala frequency
-      !  VERTICAL PHYSICS   
+      !  VERTICAL PHYSICS
                          CALL zdf_bfr( kstp )         ! bottom friction
       !                                               ! Vertical eddy viscosity and diffusivity coefficients
@@ -98 +98 @@
       IF( lk_zdfddm .AND. .NOT. lk_zdfkpp )   &
          &               CALL zdf_ddm( kstp )         ! double diffusive mixing
-         
+
                          CALL zdf_mxl( kstp )         ! mixed layer depth
 
@@ -125 +125 @@
                         tsa(:,:,:,:) = 0._wp       ! set tracer trends to zero
 
+      IF( lk_asminc .AND. ln_asmiau .AND.  ln_trainc )   &
+                        CALL tra_asm_inc( kstp )   ! apply tracer assimilation increment
                         CALL tra_sbc( kstp )       ! surface boundary condition
       IF( ln_traqsr )   CALL tra_qsr( kstp )       ! penetrative solar radiation qsr
@@ -141 +143 @@
                         ua(:,:,:) = 0._wp          ! set dynamics trends to zero
                         va(:,:,:) = 0._wp
+
+      IF( ln_bkgwri )   CALL asm_bkg_wri( kstp )     ! output background fields
 
       IF( ln_dyndmp )   CALL dyn_dmp    ( kstp )   ! internal damping trends- momentum