Changeset 11436


Ignore:
Timestamp:
2019-08-14T16:16:20+02:00 (15 months ago)
Author:
timgraham
Message:

Get rid of modification to sbc_cpl_init and sbc_cpl_alloc so that number of models is no longer hard coded in the latter. This must be leftover from CICE

Location:
NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/SBC/sbccpl.F90

    r11270 r11436  
    219219      ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 
    220220#endif 
    221       !ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
    222       ! Hardwire only two models as nn_cplmodel has not been read in 
    223       ! from the namelist yet. 
    224       ALLOCATE( xcplmask(jpi,jpj,0:2) , STAT=ierr(3) )    
     221      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
    225222      ! 
    226223      IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(4) )  
     
    336333 
    337334      !                                   ! allocate sbccpl arrays 
    338       !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
     335      IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    339336      
    340337      ! ================================ ! 
  • NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/SBC/sbcmod.F90

    r11105 r11436  
    291291      !                             !* OASIS initialization 
    292292      ! 
    293       IF( lk_oasis ) THEN 
    294          IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )  
    295          CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step 
    296                                        !                      (2) the use of nn_fsbc 
    297       ENDIF 
     293      IF( lk_oasis )   CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step 
     294      !                                              !                      (2) the use of nn_fsbc 
    298295      !     nn_fsbc initialization if OPA-SAS coupling via OASIS 
    299296      !     SAS time-step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly 
Note: See TracChangeset for help on using the changeset viewer.