Changeset 14072 for NEMO/trunk/src/OCE/nemogcm.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/nemogcm.F90 (modified) (15 diffs)

NEMO/trunk/src/OCE/nemogcm.F90

@@ -29 +29 @@
    !!            3.3.1! 2011-01  (A. R. Porter, STFC Daresbury) dynamical allocation
    !!             -   ! 2011-11  (C. Harris) decomposition changes for running with CICE
-   !!            3.6  ! 2012-05  (C. Calone, J. Simeon, G. Madec, C. Ethe) Add grid coarsening 
+   !!            3.6  ! 2012-05  (C. Calone, J. Simeon, G. Madec, C. Ethe) Add grid coarsening
    !!             -   ! 2014-12  (G. Madec) remove KPP scheme and cross-land advection (cla)
    !!            4.0  ! 2016-10  (G. Madec, S. Flavoni)  domain configuration / user defined interface
@@ -74 +74 @@
    USE lib_mpp        ! distributed memory computing
    USE mppini         ! shared/distributed memory setting (mpp_init routine)
-   USE lbcnfd  , ONLY : isendto, nsndto  ! Setup of north fold exchanges 
+   USE lbcnfd  , ONLY : isendto, nsndto  ! Setup of north fold exchanges
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
    USE halo_mng       ! Halo manager
@@ -184 +184 @@
             CALL stp_MLF      ( istp )
 #  else
-            CALL stp        ( istp ) 
+            CALL stp        ( istp )
 #  endif
             istp = istp + 1
@@ -195 +195 @@
          !
          DO WHILE( istp <= nitend .AND. nstop == 0 )
-            CALL stp_diurnal( istp )   ! time step only the diurnal SST 
+            CALL stp_diurnal( istp )   ! time step only the diurnal SST
             istp = istp + 1
          END DO
@@ -308 +308 @@
 #ifdef key_agrif
       ELSE
-                  numnul = Agrif_Parent(numnul)   
+                  numnul = Agrif_Parent(numnul)
 #endif
       ENDIF
@@ -373 +373 @@
 903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namcfg in reference namelist' )
       READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 )
-904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namcfg in configuration namelist' )   
+904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namcfg in configuration namelist' )
       !
       IF( ln_read_cfg ) THEN            ! Read sizes in domain configuration file
@@ -396 +396 @@
 #if defined key_agrif
       Kbb_a = Nbb   ;   Kmm_a = Nnn   ;   Krhs_a = Nrhs   ! agrif_oce module copies of time level indices
-#endif 
+#endif
       !                             !-------------------------------!
       !                             !  NEMO general initialization  !
@@ -416 +416 @@
 #endif
                            CALL     dom_init( Nbb, Nnn, Naa )   ! Domain
-      IF( ln_crs       )   CALL     crs_init(      Nnn      )   ! coarsened grid: domain initialization 
+      IF( ln_crs       )   CALL     crs_init(      Nnn      )   ! coarsened grid: domain initialization
       IF( sn_cfctl%l_prtctl )   &
          &                 CALL prt_ctl_init        ! Print control
-      
+
                            CALL diurnal_sst_bulk_init       ! diurnal sst
-      IF( ln_diurnal   )   CALL diurnal_sst_coolskin_init   ! cool skin   
-      !                            
+      IF( ln_diurnal   )   CALL diurnal_sst_coolskin_init   ! cool skin
+      !
       IF( ln_diurnal_only ) THEN                    ! diurnal only: a subset of the initialisation routines
          CALL  istate_init( Nbb, Nnn, Naa )         ! ocean initial state (Dynamics and tracers)
@@ -430 +430 @@
             CALL dia_obs_init( Nnn )                ! Initialize observational data
             CALL dia_obs( nit000 - 1, Nnn )         ! Observation operator for restart
-         ENDIF     
+         ENDIF
          IF( lk_asminc )   CALL asm_inc_init( Nbb, Nnn, Nrhs )   ! Assimilation increments
          !
@@ -439 +439 @@
                            CALL  istate_init( Nbb, Nnn, Naa )    ! ocean initial state (Dynamics and tracers)
 
-      !                                      ! external forcing 
+      !                                      ! external forcing
                            CALL    tide_init                     ! tidal harmonics
                            CALL     sbc_init( Nbb, Nnn, Naa )    ! surface boundary conditions (including sea-ice)
@@ -446 +446 @@
       !                                      ! Ocean physics
                            CALL zdf_phy_init( Nnn )    ! Vertical physics
-                                     
+
       !                                         ! Lateral physics
                            CALL ldf_tra_init      ! Lateral ocean tracer physics
@@ -482 +482 @@
                            CALL sto_par_init    ! Stochastic parametrization
       IF( ln_sto_eos   )   CALL sto_pts_init    ! RRandom T/S fluctuations
-     
+
       !                                      ! Diagnostics
                            CALL     flo_init( Nnn )    ! drifting Floats
@@ -526 +526 @@
          WRITE(numout,*) '                              sn_cfctl%l_prttrc  = ', sn_cfctl%l_prttrc
          WRITE(numout,*) '                              sn_cfctl%l_oasout  = ', sn_cfctl%l_oasout
-         WRITE(numout,*) '                              sn_cfctl%procmin   = ', sn_cfctl%procmin  
-         WRITE(numout,*) '                              sn_cfctl%procmax   = ', sn_cfctl%procmax  
-         WRITE(numout,*) '                              sn_cfctl%procincr  = ', sn_cfctl%procincr 
-         WRITE(numout,*) '                              sn_cfctl%ptimincr  = ', sn_cfctl%ptimincr 
+         WRITE(numout,*) '                              sn_cfctl%procmin   = ', sn_cfctl%procmin
+         WRITE(numout,*) '                              sn_cfctl%procmax   = ', sn_cfctl%procmax
+         WRITE(numout,*) '                              sn_cfctl%procincr  = ', sn_cfctl%procincr
+         WRITE(numout,*) '                              sn_cfctl%ptimincr  = ', sn_cfctl%ptimincr
          WRITE(numout,*) '      timing by routine               ln_timing  = ', ln_timing
          WRITE(numout,*) '      CFL diagnostics                 ln_diacfl  = ', ln_diacfl
@@ -599 +599 @@
       !!----------------------------------------------------------------------
       !
-      ierr =        oce_alloc    ()    ! ocean 
+      ierr =        oce_alloc    ()    ! ocean
       ierr = ierr + dia_wri_alloc()
       ierr = ierr + dom_oce_alloc()    ! ocean domain
@@ -611 +611 @@
    END SUBROUTINE nemo_alloc
 
-   
+
    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto )
       !!----------------------------------------------------------------------