Changeset 12205 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90

Timestamp:

2019-12-12T11:52:50+01:00 (4 years ago)

Author:

acc

Message:

2019/dev_r11943_MERGE_2019: Merge in dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis. SETTE tested

File:

• NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/step.F90

@@ -107 +107 @@
                              
       IF( kstp == nit000 ) THEN                       ! initialize IOM context (must be done after nemo_init for AGRIF+XIOS+OASIS)
-                             CALL iom_init(      cxios_context          )  ! for model grid (including passible AGRIF zoom)
+                             CALL iom_init( cxios_context, ld_closedef=.FALSE. )   ! for model grid (including passible AGRIF zoom)
+         IF( lk_diamlr   )   CALL dia_mlr_iom_init    ! with additional setup for multiple-linear-regression analysis
+                             CALL iom_init_closedef
          IF( ln_crs      )   CALL iom_init( TRIM(cxios_context)//"_crs" )  ! for coarse grid
       ENDIF
@@ -117 +119 @@
       ! Update external forcing (tides, open boundaries, ice shelf interaction and surface boundary condition (including sea-ice)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      IF( ln_tide    )   CALL sbc_tide( kstp )                        ! update tide potential
+      IF( ln_tide    )   CALL tide_update( kstp )                     ! update tide potential
       IF( ln_apr_dyn )   CALL sbc_apr ( kstp )                        ! atmospheric pressure (NB: call before bdy_dta which needs ssh_ib) 
       IF( ln_bdy     )   CALL bdy_dta ( kstp, Nnn, kt_offset = +1 )   ! update dynamic & tracer data at open boundaries
@@ -211 +213 @@
       ! diagnostics and outputs
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      IF( ln_floats  )   CALL flo_stp ( kstp, Nbb, Nnn )        ! drifting Floats
-      IF( ln_diacfl  )   CALL dia_cfl ( kstp,      Nnn )        ! Courant number diagnostics
-                         CALL dia_hth ( kstp,      Nnn )        ! Thermocline depth (20 degres isotherm depth)
-      IF( ln_diadct  )   CALL dia_dct ( kstp,      Nnn )        ! Transports
-                         CALL dia_ar5 ( kstp,      Nnn )        ! ar5 diag
-                         CALL dia_ptr ( kstp,      Nnn )        ! Poleward adv/ldf TRansports diagnostics
-      IF( ln_diaharm )   CALL dia_harm( kstp,      Nnn )        ! Tidal harmonic analysis
-                         CALL dia_wri ( kstp,      Nnn )        ! ocean model: outputs
-      !
-      IF( ln_crs     )   CALL crs_fld ( kstp,      Nnn )   ! ocean model: online field coarsening & output
+      IF( ln_floats  )   CALL flo_stp   ( kstp, Nbb, Nnn )      ! drifting Floats
+      IF( ln_diacfl  )   CALL dia_cfl   ( kstp,      Nnn )      ! Courant number diagnostics
+                         CALL dia_hth   ( kstp,      Nnn )      ! Thermocline depth (20 degres isotherm depth)
+      IF( ln_diadct  )   CALL dia_dct   ( kstp,      Nnn )      ! Transports
+                         CALL dia_ar5   ( kstp,      Nnn )      ! ar5 diag
+                         CALL dia_ptr   ( kstp,      Nnn )      ! Poleward adv/ldf TRansports diagnostics
+                         CALL dia_wri   ( kstp,      Nnn )      ! ocean model: outputs
+      IF( ln_crs     )   CALL crs_fld   ( kstp,      Nnn )      ! ocean model: online field coarsening & output
+      IF( lk_diadetide ) CALL dia_detide( kstp )                ! Weights computation for daily detiding of model diagnostics
+      IF( lk_diamlr  )   CALL dia_mlr                           ! Update time used in multiple-linear-regression analysis
       
 #if defined key_top