Changeset 7134


Ignore:
Timestamp:
2016-10-27T13:30:10+02:00 (4 years ago)
Author:
jcastill
Message:

Version as in UKMO/dev_r5107_hadgem3_cplseq@5646

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

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r5936_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r7131 r7134  
    188188      ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 
    189189#endif 
    190       ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
     190      !ALLOCATE( xcplmask(jpi,jpj,nn_cplmodel) , STAT=ierr(3) )  
     191      ! Hardwire only two models as nn_cplmodel has not been read in  
     192      ! from the namelist yet.  
     193      ALLOCATE( xcplmask(jpi,jpj,2) , STAT=ierr(3) )  
    191194      ! 
    192195      sbc_cpl_alloc = MAXVAL( ierr ) 
     
    274277 
    275278      !                                   ! allocate sbccpl arrays 
    276       IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
     279      !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    277280      
    278281      ! ================================ ! 
  • branches/UKMO/r5936_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r7131 r7134  
    288288      CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 
    289289      ! 
     290      ! In coupled mode get extra fields from CICE for passing back to atmosphere  
     291      IF ( ksbc == jp_purecpl ) CALL cice_sbc_hadgam(nit000)  
     292      !   
    290293      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
    291294      ! 
     
    710713      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_hadgam') 
    711714      ! 
    712       IF( kt == nit000 )  THEN 
    713          IF(lwp) WRITE(numout,*)'cice_sbc_hadgam' 
    714          IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    715       ENDIF 
    716  
    717715      !                                         ! =========================== ! 
    718716      !                                         !   Prepare Coupling fields   ! 
  • branches/UKMO/r5936_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r7131 r7134  
    258258      ENDIF 
    259259      ! 
    260       IF( lk_oasis )   CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step 
    261       !                                             !                                            (2) the use of nn_fsbc 
    262  
     260      IF( lk_oasis ) THEN  
     261         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )           
     262         CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step  
     263                                      !                                            (2) the use of nn_fsbc  
     264      ENDIF  
    263265!     nn_fsbc initialization if OPA-SAS coupling via OASIS 
    264266!     sas model time step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly 
  • branches/UKMO/r5936_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r7131 r7134  
    7070   USE icbini          ! handle bergs, initialisation 
    7171   USE icbstp          ! handle bergs, calving, themodynamics and transport 
     72   USE sbccpl 
    7273   USE cpl_oasis3      ! OASIS3 coupling 
    7374   USE c1d             ! 1D configuration 
     
    171172            CALL stp                         ! AGRIF: time stepping 
    172173#else 
    173             CALL stp( istp )                 ! standard time stepping 
     174         IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos  
     175         CALL stp( istp )  
     176         ! We don't couple on the final timestep because  
     177         ! our restart file has already been written  
     178         ! and contains all the necessary data for a  
     179         ! restart. sbc_cpl_snd could be called here  
     180         ! but it would require  
     181         ! a) A test to ensure it was not performed  
     182         !    on the very last time-step  
     183         ! b) the presence of another call to  
     184         !    sbc_cpl_snd call prior to the main DO loop  
     185         ! This solution produces identical results  
     186         ! with fewer lines of code.   
    174187#endif 
    175188            istp = istp + 1 
  • branches/UKMO/r5936_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/step.F90

    r7131 r7134  
    341341      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    342342!!gm why lk_oasis and not lk_cpl ???? 
    343       IF( lk_oasis   )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
     343      !IF( lk_oasis   )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
    344344      ! 
    345345#if defined key_iomput 
Note: See TracChangeset for help on using the changeset viewer.