Changeset 2251 for CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO
- Timestamp:
- 05/26/14 12:41:58 (10 years ago)
- Location:
- CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/limistate.F90
r2230 r2251 504 504 READ ( numnam_ice_cfg, namiceini, IOSTAT = ios, ERR = 902 ) 505 505 902 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp ) 506 WRITE ( numoni, namiceini )506 IF(lwm) WRITE ( numoni, namiceini ) 507 507 508 508 ! Define the initial parameters -
CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/sbccpl.F90
r2194 r2251 247 247 READ ( numnam_cfg, namsbc_cpl, IOSTAT = ios, ERR = 902 ) 248 248 902 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 ) 250 250 251 251 IF(lwp) THEN ! control print -
CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/sbcmod.F90
r2221 r2251 63 63 !!---------------------------------------------------------------------- 64 64 !! NEMO/OPA 4.0 , NEMO-consortium (2011) 65 !! $Id: sbcmod.F90 4 230 2013-11-18 11:57:11Z cetlod$65 !! $Id: sbcmod.F90 4624 2014-04-28 12:09:03Z acc $ 66 66 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 67 67 !!---------------------------------------------------------------------- … … 101 101 READ ( numnam_cfg, namsbc, IOSTAT = ios, ERR = 902 ) 102 102 902 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc in configuration namelist', lwp ) 103 WRITE ( numond, namsbc )103 IF(lwm) WRITE ( numond, namsbc ) 104 104 105 105 ! ! overwrite namelist parameter using CPP key information … … 153 153 IF(lwp) WRITE(numout,*) ' Fluxes distributed linearly over ice categories ln_iceflx_linear = ', ln_iceflx_linear 154 154 #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 155 168 ! 156 169 ! ! allocate sbc arrays -
CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/trc_oce.F90
r2189 r2251 67 67 !!---------------------------------------------------------------------- 68 68 !! 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 $ 70 70 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 71 71 !!---------------------------------------------------------------------- … … 178 178 zrgb(1,61) = 10.000 ; zrgb(2,61) = 0.47804 ; zrgb(3,61) = 0.27178 ; zrgb(4,61) = 0.56870 179 179 ! 180 ! 180 181 prgb(:,:) = zrgb(2:4,:) 181 182 ! … … 270 271 !!---------------------------------------------------------------------- 271 272 ! 272 ! It is not necessary to compute anything bel low the following depth273 ! It is not necessary to compute anything below the following depth 273 274 zhext = prldex * ( LOG(10._wp) * zprec + LOG(pqsr_frc) ) 274 275 ! … … 276 277 pjl = jpkm1 277 278 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 280 285 END DO 281 286 ! -
CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/zdftke.F90
r2189 r2251 707 707 READ ( numnam_cfg, namzdf_tke, IOSTAT = ios, ERR = 902 ) 708 708 902 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 ) 710 710 ! 711 711 ri_cri = 2._wp / ( 2._wp + rn_ediss / rn_ediff ) ! resulting critical Richardson number
Note: See TracChangeset
for help on using the changeset viewer.