Changeset 5209 for branches/2015
- Timestamp:
- 2015-04-13T15:30:33+02:00 (9 years ago)
- Location:
- branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r5131 r5209 53 53 LOGICAL :: ln_dynrnf !: read runoff data in file (T) or set to zero (F) 54 54 55 INTEGER , PARAMETER :: jpfld = 2 1! maximum number of fields to read55 INTEGER , PARAMETER :: jpfld = 22 ! maximum number of fields to read 56 56 INTEGER , SAVE :: jf_tem ! index of temperature 57 57 INTEGER , SAVE :: jf_sal ! index of salinity … … 63 63 INTEGER , SAVE :: jf_emp ! index of water flux 64 64 INTEGER , SAVE :: jf_qsr ! index of solar radiation 65 INTEGER , SAVE :: jf_qsm ! index of daily mean solar radiation in case of dirunal cycle 65 66 INTEGER , SAVE :: jf_wnd ! index of wind speed 66 67 INTEGER , SAVE :: jf_ice ! index of sea ice cover … … 264 265 fr_i(:,:) = sf_dyn(jf_ice)%fnow(:,:,1) * tmask(:,:,1) ! Sea-ice fraction 265 266 qsr (:,:) = sf_dyn(jf_qsr)%fnow(:,:,1) * tmask(:,:,1) ! solar radiation 266 IF ( ln_dynrnf ) & 267 IF( ln_dm2dc ) THEN ! diurnal cycle 268 qsr_mean(:,:) = sf_dyn(jf_qsm)%fnow(:,:,1) * tmask(:,:,1) ! daily mean solar radiation 269 ELSE 270 qsr_mean(:,:) = qsr(:,:) ! solar radiation 271 ENDIF 272 IF( ln_dynrnf ) & 267 273 rnf (:,:) = sf_dyn(jf_rnf)%fnow(:,:,1) * tmask(:,:,1) ! river runoffs 268 274 … … 338 344 CHARACTER(len=100) :: cn_dir ! Root directory for location of core files 339 345 TYPE(FLD_N), DIMENSION(jpfld) :: slf_d ! array of namelist informations on the fields to read 340 TYPE(FLD_N) :: sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_ wnd, sn_rnf ! informations about the fields to be read346 TYPE(FLD_N) :: sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_qsm, sn_wnd, sn_rnf ! informations about the fields to be read 341 347 TYPE(FLD_N) :: sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl ! " " 342 348 TYPE(FLD_N) :: sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_fmf ! " " … … 344 350 ! 345 351 NAMELIST/namdta_dyn/cn_dir, ln_dynwzv, ln_dynbbl, ln_degrad, ln_dynrnf, & 346 & sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_ wnd, sn_rnf, &352 & sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_qsm, sn_wnd, sn_rnf, & 347 353 & sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl, & 348 354 & sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_fmf … … 388 394 389 395 ! 390 IF 396 IF( ln_dynrnf ) THEN 391 397 jf_rnf = jfld + 1 ; jfld = jf_rnf 392 398 slf_d(jf_rnf) = sn_rnf 393 399 ELSE 394 400 rnf (:,:) = 0._wp 401 ENDIF 402 403 IF( ln_dm2dc ) THEN 404 jf_qsm = jfld + 1 ; jfld = jf_qsm 405 slf_d(jf_qsm) = sn_qsm 395 406 ENDIF 396 407 -
branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/TOP_SRC/trcini.F90
r5206 r5209 70 70 71 71 CALL top_alloc() ! allocate TOP arrays 72 73 IF( lk_offline ) ln_dm2dc = .FALSE.74 72 75 73 IF( nn_cla == 1 ) &
Note: See TracChangeset
for help on using the changeset viewer.