Ignore:
Timestamp:
2019-11-22T15:29:17+01:00 (22 months ago)
Author:
acc
Message:

Merge in changes from 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. This just creates a fresh copy of this branch to use as the merge base. See ticket #2341

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/nemogcm.F90

    r11536 r11949  
    3232   USE bdyini         ! open boundary cond. setting       (bdy_init routine). mandatory for sea-ice 
    3333   USE bdydta         ! open boundary cond. setting   (bdy_dta_init routine). mandatory for sea-ice 
     34   USE diu_layers     ! diurnal bulk SST and coolskin 
     35   USE step_diu       ! diurnal bulk SST timestepping (called from here if run offline) 
    3436   ! 
    3537   USE lib_mpp        ! distributed memory computing 
     
    5254   CHARACTER(lc) ::   cform_aaa="( /, 'AAAAAAAA', / ) "     ! flag for output listing 
    5355 
     56#if defined key_mpp_mpi 
     57   INCLUDE 'mpif.h' 
     58#endif 
     59 
    5460   !!---------------------------------------------------------------------- 
    5561   !! NEMO/SAS 4.0 , NEMO Consortium (2018) 
     
    8389      !                            !-----------------------! 
    8490#if defined key_agrif 
     91      Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs   ! agrif_oce module copies of time level indices 
    8592      CALL Agrif_Declare_Var_dom   ! AGRIF: set the meshes for DOM 
    8693      CALL Agrif_Declare_Var       !  "      "   "   "      "  DYN/TRA  
     
    109116#if defined key_si3 
    110117      ! Recursive update from highest nested level to lowest: 
     118      Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs   ! agrif_oce module copies of time level indices 
    111119      CALL Agrif_step_child_adj(Agrif_update_ice) 
    112120#endif 
     
    128136         ! 
    129137         DO WHILE( istp <= nitend .AND. nstop == 0 ) 
     138#if defined key_mpp_mpi 
     139            ncom_stp = istp 
     140            IF ( istp == ( nit000 + 1 ) ) elapsed_time = MPI_Wtime() 
     141            IF ( istp ==         nitend ) elapsed_time = MPI_Wtime() - elapsed_time 
     142#endif 
    130143            CALL stp        ( istp )  
    131144            istp = istp + 1 
     
    334347      CALL nemo_alloc() 
    335348 
     349      ! Initialise time level indices 
     350      Nbb = 1; Nnn = 2; Naa = 3; Nrhs = Naa 
     351 
    336352      !                             !-------------------------------! 
    337353      !                             !  NEMO general initialization  ! 
     
    346362                           CALL phy_cst         ! Physical constants 
    347363                           CALL eos_init        ! Equation of seawater 
    348                            CALL dom_init('SAS') ! Domain 
     364                           CALL dom_init( Nbb, Nnn, Naa, 'SAS') ! Domain 
    349365      IF( ln_ctl      )    CALL prt_ctl_init    ! Print control 
    350366       
     
    353369 
    354370      !                                      ! external forcing  
    355                            CALL sbc_init        ! Forcings : surface module  
     371                           CALL sbc_init( Nbb, Nnn, Naa )  ! Forcings : surface module  
    356372 
    357373      ! ==> clem: open boundaries init. is mandatory for sea-ice because ice BDY is not decoupled from   
Note: See TracChangeset for help on using the changeset viewer.