Changeset 6736 for branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2016-06-24T09:50:27+02:00 (8 years ago)

Author:

jamesharle

Message:

FASTNEt code modifications

File:

• branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (15 diffs)

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -46 +46 @@
    USE mppini          ! shared/distributed memory setting (mpp_init routine)
    USE domain          ! domain initialization             (dom_init routine)
-#if defined key_nemocice_decomp
-   USE ice_domain_size, only: nx_global, ny_global
-#endif
-   USE tideini         ! tidal components initialization   (tide_ini routine)
    USE obcini          ! open boundary cond. initialization (obc_ini routine)
    USE bdyini          ! open boundary cond. initialization (bdy_init routine)
    USE bdydta          ! open boundary cond. initialization (bdy_dta_init routine)
-   USE bdytides        ! open boundary cond. initialization (bdytide_init routine)
+   USE bdytides        ! open boundary cond. initialization (tide_init routine)
    USE istate          ! initial state setting          (istate_init routine)
    USE ldfdyn          ! lateral viscosity setting      (ldfdyn_init routine)
@@ -60 +56 @@
    USE phycst          ! physical constant                  (par_cst routine)
    USE trdmod          ! momentum/tracers trends       (trd_mod_init routine)
-   USE asminc          ! assimilation increments     
    USE asmbkg          ! writing out state trajectory
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
@@ -67 +62 @@
    USE lib_fortran     ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
    USE step            ! NEMO time-stepping                 (stp     routine)
-   USE icbini          ! handle bergs, initialisation
-   USE icbstp          ! handle bergs, calving, themodynamics and transport
 #if defined key_oasis3
    USE cpl_oasis3      ! OASIS3 coupling
@@ -81 +74 @@
    USE lib_mpp         ! distributed memory computing
 #if defined key_iomput
-   USE xios
-#endif
-   USE sbctide, ONLY: lk_tide
+   USE mod_ioclient
+#endif
+   USE tamtrj          ! Output trajectory, needed for TAM
 
    IMPLICIT NONE
@@ -126 +119 @@
       !                            !-----------------------!
 #if defined key_agrif
-      CALL Agrif_Declare_Var_dom   ! AGRIF: set the meshes for DOM
-      CALL Agrif_Declare_Var       !  "      "   "   "      "  DYN/TRA 
+      CALL Agrif_Declare_Var       ! AGRIF: set the meshes
 # if defined key_top
-      CALL Agrif_Declare_Var_top   !  "      "   "   "      "  TOP
-# endif
-# if defined key_lim2
-      CALL Agrif_Declare_Var_lim2  !  "      "   "   "      "  LIM
+      CALL Agrif_Declare_Var_Top   ! AGRIF: set the meshes
 # endif
 #endif
@@ -171 +160 @@
 #endif
 
-      IF( lk_diaobs   )   CALL dia_obs_wri
-      !
-      IF( ln_icebergs )   CALL icb_end( nitend )
+      IF( lk_diaobs ) CALL dia_obs_wri
 
       !                            !------------------------!
@@ -194 +181 @@
       !
       CALL nemo_closefile
-#if defined key_iomput
-      CALL xios_finalize                ! end mpp communications with xios
-# if defined key_oasis3 || defined key_oasis4
+#if defined key_oasis3 || defined key_oasis4
       CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
-# endif
 #else
-# if defined key_oasis3 || defined key_oasis4
-      CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
-# else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications
-# endif
 #endif
       !
@@ -238 +218 @@
       IF( Agrif_Root() ) THEN
 # if defined key_oasis3 || defined key_oasis4
-         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
-         CALL xios_initialize( "oceanx",local_comm=ilocal_comm )
-# else
-         CALL  xios_initialize( "nemo",return_comm=ilocal_comm )
+         CALL cpl_prism_init( ilocal_comm )                 ! nemo local communicator given by oasis
 # endif
+         CALL  init_ioclient( ilocal_comm )                 ! exchange io_server nemo local communicator with the io_server
       ENDIF
       narea = mynode( cltxt, numnam, nstop, ilocal_comm )   ! Nodes selection
@@ -276 +254 @@
       ! than variables
       IF( Agrif_Root() ) THEN
+         jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   ! first  dim.
 #if defined key_nemocice_decomp
-         jpi = ( nx_global+2-2*jpreci + (jpni-1) ) / jpni + 2*jpreci ! first  dim.
-         jpj = ( ny_global+2-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj ! second dim. 
+         jpj = ( jpjglo+1-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj ! second dim.
 #else
-         jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   ! first  dim.
          jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   ! second dim.
 #endif
@@ -335 +312 @@
       IF( ln_ctl        )   CALL prt_ctl_init   ! Print control
 
+                            CALL     sbc_init   ! Forcings : surface module
       IF( lk_obc        )   CALL     obc_init   ! Open boundaries
-
-                            CALL  istate_init   ! ocean initial state (Dynamics and tracers)
-
-      IF( lk_tide       )   CALL tide_init( nit000 )    ! Initialisation of the tidal harmonics
-
       IF( lk_bdy        )   CALL     bdy_init       ! Open boundaries initialisation
       IF( lk_bdy        )   CALL     bdy_dta_init   ! Open boundaries initialisation of external data arrays
-      IF( lk_bdy        )   CALL     bdytide_init   ! Open boundaries initialisation of tidal harmonic forcing
-
+      IF( lk_bdy        )   CALL     tide_init      ! Open boundaries initialisation of tidal harmonic forcing
+
+                            CALL flush(numout)
                             CALL dyn_nept_init  ! simplified form of Neptune effect
+                            CALL flush(numout)
+
+                            CALL  istate_init   ! ocean initial state (Dynamics and tracers)
 
       !                                     ! Ocean physics
-                            CALL     sbc_init   ! Forcings : surface module
+ 
       !                                         ! Vertical physics
                             CALL     zdf_init      ! namelist read
@@ -383 +360 @@
       !                                     ! Misc. options
       IF( nn_cla == 1   )   CALL cla_init       ! Cross Land Advection
-                            CALL icb_init( rdt, nit000)   ! initialise icebergs instance
-      
+
 #if defined key_top
       !                                     ! Passive tracers
@@ -391 +367 @@
       !                                     ! Diagnostics
       IF( lk_floats     )   CALL     flo_init   ! drifting Floats
+                            CALL     iom_init   ! iom_put initialization
       IF( lk_diaar5     )   CALL dia_ar5_init   ! ar5 diag
                             CALL dia_ptr_init   ! Poleward TRansports initialization
@@ -403 +380 @@
       IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler
+                            CALL tam_trj_init ! Trajectory handling
       !
    END SUBROUTINE nemo_init
@@ -539 +517 @@
       USE ldftra_oce, ONLY: ldftra_oce_alloc
       USE trc_oce   , ONLY: trc_oce_alloc
-#if defined key_diadct 
-      USE diadct    , ONLY: diadct_alloc 
-#endif 
       !
       INTEGER :: ierr
@@ -555 +530 @@
       ierr = ierr + lib_mpp_alloc   (numout)    ! mpp exchanges
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
-      !
-#if defined key_diadct 
-      ierr = ierr + diadct_alloc    ()          ! 
-#endif 
       !
       IF( lk_mpp    )   CALL mpp_sum( ierr )