Ignore:
Timestamp:
2019-05-03T17:13:09+02:00 (2 years ago)
Author:
acc
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Tidy up the diurnal cycle code (DIU) to separate its stand-alone functionality from the cool skin and warm layer calculations. The latter can be called from step; the former needs to be kept out of step so that it can implement its own time-level indices.
The stand-alone functionality will need to be revisited once the new timestepping is finalised. SETTE tested (ORCA2_ICE and SAS).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/SAS/nemogcm.F90

    r10922 r10927  
    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 
     
    5153 
    5254   CHARACTER(lc) ::   cform_aaa="( /, 'AAAAAAAA', / ) "     ! flag for output listing 
     55 
     56#if defined key_mpp_mpi 
     57   INCLUDE 'mpif.h' 
     58#endif 
    5359 
    5460   !!---------------------------------------------------------------------- 
     
    128134         ! 
    129135         DO WHILE( istp <= nitend .AND. nstop == 0 ) 
     136#if defined key_mpp_mpi 
     137            ncom_stp = istp 
     138            IF ( istp == ( nit000 + 1 ) ) elapsed_time = MPI_Wtime() 
     139            IF ( istp ==         nitend ) elapsed_time = MPI_Wtime() - elapsed_time 
     140#endif 
    130141            CALL stp        ( istp )  
    131142            istp = istp + 1 
     
    169180#endif 
    170181      ! 
     182      IF(lwm) THEN 
     183         IF( nstop == 0 ) THEN   ;   STOP 0 
     184         ELSE                    ;   STOP 999 
     185         ENDIF 
     186      ENDIF 
     187      ! 
    171188   END SUBROUTINE nemo_gcm 
    172189 
     
    180197      INTEGER  ::   ji                 ! dummy loop indices 
    181198      INTEGER  ::   ios, ilocal_comm   ! local integers 
    182       CHARACTER(len=120), DIMENSION(30) ::   cltxt, cltxt2, clnam 
     199      CHARACTER(len=120), DIMENSION(60) ::   cltxt, cltxt2, clnam 
    183200      CHARACTER(len=80)                 ::   clname 
    184201      !! 
Note: See TracChangeset for help on using the changeset viewer.