Changeset 2251


Ignore:
Timestamp:
05/26/14 12:41:58 (8 years ago)
Author:
aclsce
Message:

Modifed IPSLCM6 NEMO sources to fit with NEMO revision 4624

Location:
CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/limistate.F90

    r2230 r2251  
    504504      READ  ( numnam_ice_cfg, namiceini, IOSTAT = ios, ERR = 902 ) 
    505505902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp ) 
    506       WRITE ( numoni, namiceini ) 
     506      IF(lwm) WRITE ( numoni, namiceini ) 
    507507 
    508508      ! Define the initial parameters 
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/sbccpl.F90

    r2194 r2251  
    247247      READ  ( numnam_cfg, namsbc_cpl, IOSTAT = ios, ERR = 902 ) 
    248248902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_cpl in configuration namelist', lwp ) 
    249       WRITE ( numond, namsbc_cpl ) 
     249      IF(lwm) WRITE ( numond, namsbc_cpl ) 
    250250 
    251251      IF(lwp) THEN                        ! control print 
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/sbcmod.F90

    r2221 r2251  
    6363   !!---------------------------------------------------------------------- 
    6464   !! NEMO/OPA 4.0 , NEMO-consortium (2011)  
    65    !! $Id: sbcmod.F90 4230 2013-11-18 11:57:11Z cetlod $ 
     65   !! $Id: sbcmod.F90 4624 2014-04-28 12:09:03Z acc $ 
    6666   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    6767   !!---------------------------------------------------------------------- 
     
    101101      READ  ( numnam_cfg, namsbc, IOSTAT = ios, ERR = 902 ) 
    102102902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc in configuration namelist', lwp ) 
    103       WRITE ( numond, namsbc ) 
     103      IF(lwm) WRITE ( numond, namsbc ) 
    104104 
    105105      !                          ! overwrite namelist parameter using CPP key information 
     
    153153      IF(lwp) WRITE(numout,*) '              Fluxes distributed linearly over ice categories ln_iceflx_linear = ', ln_iceflx_linear 
    154154#endif 
     155      ! 
     156#if defined key_top && ! defined key_offline 
     157      ltrcdm2dc = (ln_dm2dc .AND. ln_blk_core .AND. nn_ice==2) 
     158      IF( ltrcdm2dc )THEN 
     159         IF(lwp)THEN 
     160            WRITE(numout,*)"analytical diurnal cycle, core bulk formulation and LIM2 use: " 
     161            WRITE(numout,*)"Diurnal cycle on physics but not in passive tracers" 
     162         ENDIF 
     163      ENDIF 
     164#else  
     165      ltrcdm2dc =  .FALSE. 
     166#endif 
     167 
    155168      ! 
    156169      !                              ! allocate sbc arrays 
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/trc_oce.F90

    r2189 r2251  
    6767   !!---------------------------------------------------------------------- 
    6868   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    69    !! $Id: trc_oce.F90 3770 2013-02-04 10:51:28Z cetlod $  
     69   !! $Id: trc_oce.F90 4623 2014-04-22 15:21:41Z acc $  
    7070   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    7171   !!---------------------------------------------------------------------- 
     
    178178      zrgb(1,61) = 10.000   ;   zrgb(2,61) = 0.47804   ;   zrgb(3,61) = 0.27178   ;   zrgb(4,61) = 0.56870 
    179179      ! 
     180      ! 
    180181      prgb(:,:) = zrgb(2:4,:) 
    181182      ! 
     
    270271      !!---------------------------------------------------------------------- 
    271272      ! 
    272       ! It is not necessary to compute anything bellow the following depth 
     273      ! It is not necessary to compute anything below the following depth 
    273274      zhext = prldex * ( LOG(10._wp) * zprec + LOG(pqsr_frc) ) 
    274275      ! 
     
    276277      pjl = jpkm1 
    277278      DO jk = jpkm1, 1, -1 
    278          zem = MAXVAL( fsdepw(:,:,jk+1) * tmask(:,:,jk) ) 
    279          IF( zem >= zhext )   pjl = jk                       ! last T-level reached by Qsr 
     279         IF(SUM(tmask(:,:,jk)) > 0 ) THEN 
     280            zem = MAXVAL( fsdepw(:,:,jk+1) * tmask(:,:,jk) ) 
     281            IF( zem >= zhext )   pjl = jk                       ! last T-level reached by Qsr 
     282         ELSE 
     283            pjl = jk                                            ! or regional sea-bed depth  
     284         ENDIF 
    280285      END DO 
    281286      ! 
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/zdftke.F90

    r2189 r2251  
    707707      READ  ( numnam_cfg, namzdf_tke, IOSTAT = ios, ERR = 902 ) 
    708708902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tke in configuration namelist', lwp ) 
    709       WRITE ( numond, namzdf_tke ) 
     709      IF(lwm) WRITE ( numond, namzdf_tke ) 
    710710      ! 
    711711      ri_cri   = 2._wp    / ( 2._wp + rn_ediss / rn_ediff )   ! resulting critical Richardson number 
Note: See TracChangeset for help on using the changeset viewer.