New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10394 – NEMO

Changeset 10394


Ignore:
Timestamp:
2018-12-14T15:34:18+01:00 (5 years ago)
Author:
jcastill
Message:

Merged r6232_hadgem3_cplseq@7460 branch

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r10392 r10394  
    191191      ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 
    192192#endif 
    193       ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
     193!      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
     194      ! Hardwire three models as nn_cplmodel has not been read in from the namelist yet.    
     195      ALLOCATE( xcplmask(jpi,jpj,0:3) , STAT=ierr(3) ) 
    194196      ! 
    195197      sbc_cpl_alloc = MAXVAL( ierr ) 
    … …  
    277279 
    278280      !                                   ! allocate sbccpl arrays 
    279       IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
     281      !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    280282      
    281283      ! ================================ ! 

  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r8058 r10394  
    284284      CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 
    285285      ! 
     286      ! In coupled mode get extra fields from CICE for passing back to atmosphere    
     287      IF ( ksbc == jp_purecpl ) CALL cice_sbc_hadgam(nit000)    
     288      !     
    286289      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
    287290      ! 
    … …  
    708711      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_hadgam') 
    709712      ! 
    710       IF( kt == nit000 )  THEN 
    711          IF(lwp) WRITE(numout,*)'cice_sbc_hadgam' 
    712          IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    713       ENDIF 
    714  
    715713      !                                         ! =========================== ! 
    716714      !                                         !   Prepare Coupling fields   ! 

  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r8058 r10394  
    266266      ENDIF 
    267267      ! 
    268       IF( lk_oasis )   CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step 
    269       !                                                     !                                            (2) the use of nn_fsbc 
    270  
     268      IF( lk_oasis ) THEN    
     269         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )             
     270         CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step    
     271                                      ! (2) the use of nn_fsbc    
     272      ENDIF    
    271273!     nn_fsbc initialization if OPA-SAS coupling via OASIS 
    272274!     sas model time step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly 

  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r9181 r10394  
    6868   USE icbini          ! handle bergs, initialisation 
    6969   USE icbstp          ! handle bergs, calving, themodynamics and transport 
     70   USE sbccpl 
    7071   USE cpl_oasis3      ! OASIS3 coupling 
    7172   USE c1d             ! 1D configuration 
    … …  
    173174            CALL stp                         ! AGRIF: time stepping 
    174175#else 
    175             CALL stp( istp )                 ! standard time stepping 
     176            IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos    
     177            CALL stp( istp )    
     178            ! We don't couple on the final timestep because    
     179            ! our restart file has already been written    
     180            ! and contains all the necessary data for a    
     181            ! restart. sbc_cpl_snd could be called here    
     182            ! but it would require    
     183            ! a) A test to ensure it was not performed    
     184            !    on the very last time-step    
     185            ! b) the presence of another call to    
     186            !    sbc_cpl_snd call prior to the main DO loop    
     187            ! This solution produces identical results    
     188            ! with fewer lines of code.   
    176189#endif 
    177190            istp = istp + 1 

  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/step.F90

    r10392 r10394  
    410410      ! Coupled mode 
    411411      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    412       IF( lk_oasis         )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
     412      !IF( lk_oasis         )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
    413413      ! 
    414414#if defined key_iomput 
Note: See TracChangeset for help on using the changeset viewer.