Changeset 2402


Ignore:
Timestamp:
2010-11-17T17:14:31+01:00 (10 years ago)
Author:
cetlod
Message:

Update TOP component according to changes related to cross-land advection. see ticket #127

Location:
branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

    r2287 r2402  
    150150      IF( ioptio /= 1 )   CALL ctl_stop( 'Choose ONE advection scheme in namelist namtrc_adv' ) 
    151151 
    152       IF( n_cla == 1 .AND. .NOT. ln_trcadv_cen2 )   & 
    153          &                CALL ctl_stop( 'cross-land advection only with 2nd order advection scheme' ) 
    154  
    155152      !                              ! Set nadv 
    156153      IF( ln_trcadv_cen2   )   nadv =  1 
  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

    r2364 r2402  
    11431143      ENDIF 
    11441144 
    1145       IF( ( lk_trdmld_trc ) .AND. ( n_cla == 1 ) ) THEN 
    1146          WRITE(numout,cform_war) 
    1147          WRITE(numout,*) '                You set n_cla = 1. Note that the Mixed-Layer diagnostics  ' 
    1148          WRITE(numout,*) '                are not exact along the corresponding straits.            ' 
    1149          nwarn = nwarn + 1 
    1150       ENDIF 
    1151  
    1152  
    11531145      ! * Debugging information * 
    11541146      IF( lldebug ) THEN 
  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

    r2317 r2402  
    188188 
    189189#endif 
    190    USE lib_mpp , ONLY :   lk_mpp    =>  lk_mpp       !: Mpp flag 
    191  
    192    USE dom_oce , ONLY :   n_cla     =>   n_cla         !: flag (0/1) for cross land advection  
     190   USE lib_mpp , ONLY :   lk_mpp    =>  lk_mpp        !: Mpp flag 
     191 
     192   USE dom_oce , ONLY :   nn_cla    =>  nn_cla        !: flag (0/1) for cross land advection  
    193193 
    194194   !* surface fluxes * 
  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/trcini.F90

    r2287 r2402  
    9393 
    9494      IF( ln_dm2dc .AND. ( lk_pisces .OR. lk_lobster ) )    & 
    95       &       CALL ctl_stop( ' The diurnal cycle is not compatible with PISCES or LOBSTER  ' ) 
     95         &       CALL ctl_stop( ' The diurnal cycle is not compatible with PISCES or LOBSTER  ' ) 
     96 
     97      IF( nn_cla == 1 )   & 
     98         &       CALL ctl_stop( ' Cross Land Advection not yet implemented with passive tracer ; nn_cla must be 0' ) 
    9699 
    97100      IF( lk_lobster ) THEN   ;   CALL trc_ini_lobster      ! LOBSTER bio-model 
Note: See TracChangeset for help on using the changeset viewer.