Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2018-10-29T15:20:26+01:00 (5 years ago)

Author:

kingr

Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (9 diffs)

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

@@ -85 +85 @@
    USE stopar
    USE stopts
-   USE diatmb          ! Top,middle,bottom output
-   USE dia25h          ! 25h mean output
-   USE diaopfoam       ! FOAM operational output
-   USE diurnal_bulk    ! diurnal bulk SST 
 
    IMPLICIT NONE
@@ -165 +161 @@
           ENDIF
 
-#if defined key_agrif
-          CALL Agrif_Regrid()
-#endif
-
          DO WHILE ( istp <= nitend .AND. nstop == 0 )
 #if defined key_agrif
-            CALL stp                         ! AGRIF: time stepping
+            CALL Agrif_Step( stp )           ! AGRIF: time stepping
 #else
             CALL stp( istp )                 ! standard time stepping
@@ -195 +187 @@
       !
 #if defined key_agrif
-      IF( .NOT. Agrif_Root() ) THEN
-         CALL Agrif_ParentGrid_To_ChildGrid()
-         IF( lk_diaobs ) CALL dia_obs_wri
-         IF( nn_timing == 1 )   CALL timing_finalize
-         CALL Agrif_ChildGrid_To_ParentGrid()
-      ENDIF
+      CALL Agrif_ParentGrid_To_ChildGrid()
+      IF( lk_diaobs ) CALL dia_obs_wri
+      IF( nn_timing == 1 )   CALL timing_finalize
+      CALL Agrif_ChildGrid_To_ParentGrid()
 #endif
       IF( nn_timing == 1 )   CALL timing_finalize
@@ -344 +334 @@
          jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   ! second dim.
 #endif
-      ENDIF         
+      ENDIF
          jpk = jpkdta                                             ! third dim
-#if defined key_agrif
-         ! simple trick to use same vertical grid as parent
-         ! but different number of levels: 
-         ! Save maximum number of levels in jpkdta, then define all vertical grids
-         ! with this number.
-         ! Suppress once vertical online interpolation is ok
-         IF(.NOT.Agrif_Root()) jpkdta = Agrif_Parent(jpkdta)
-#endif
          jpim1 = jpi-1                                            ! inner domain indices
          jpjm1 = jpj-1                                            !   "           "
@@ -407 +389 @@
                             CALL  istate_init   ! ocean initial state (Dynamics and tracers)
 
-      CALL diurnal_sst_bulk_init                ! diurnal sst
-      IF ( ln_diurnal ) CALL diurnal_sst_coolskin_init   ! cool skin  
-
       IF( lk_tide       )   CALL    tide_init( nit000 )    ! Initialisation of the tidal harmonics
 
@@ -480 +459 @@
 
       !                                     ! Assimilation increments
-      IF( lk_asminc ) THEN 
-#if defined key_shelf 
-         CALL  zdf_mxl_tref()     ! Initialization of hmld_tref
-#endif 
-         CALL asm_inc_init     ! Initialize assimilation increments 
-      ENDIF
-
+      IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler
-                            CALL dia_tmb_init  ! TMB outputs
-                            CALL dia_25h_init  ! 25h mean  outputs
-                            CALL dia_diaopfoam_init  ! FOAM operational output
       !
    END SUBROUTINE nemo_init
@@ -646 +616 @@
       USE ldftra_oce, ONLY: ldftra_oce_alloc
       USE trc_oce   , ONLY: trc_oce_alloc
-      USE diainsitutem, ONLY: insitu_tem_alloc
 #if defined key_diadct 
       USE diadct    , ONLY: diadct_alloc 
@@ -663 +632 @@
       ierr = ierr + ldftra_oce_alloc()          ! ocean lateral  physics : tracers
       ierr = ierr + zdf_oce_alloc   ()          ! ocean vertical physics
-      ierr = ierr + insitu_tem_alloc()
       !
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
@@ -742 +710 @@
       INTEGER :: ifac, jl, inu
       INTEGER, PARAMETER :: ntest = 14
-      INTEGER, DIMENSION(ntest) :: ilfax
-      !
-      ! ilfax contains the set of allowed factors.
-      ilfax(:) = (/(2**jl,jl=ntest,1,-1)/)
-      !!----------------------------------------------------------------------
-      ! ilfax contains the set of allowed factors.
-      ilfax(:) = (/(2**jl,jl=ntest,1,-1)/)
+      INTEGER :: ilfax(ntest)
+      !
+      ! lfax contains the set of allowed factors.
+      data (ilfax(jl),jl=1,ntest) / 16384, 8192, 4096, 2048, 1024, 512, 256,  &
+         &                            128,   64,   32,   16,    8,   4,   2  /
+      !!----------------------------------------------------------------------
 
       ! Clear the error flag and initialise output vars