Changeset 5210


Ignore:
Timestamp:
2015-04-13T15:44:27+02:00 (6 years ago)
Author:
cetlod
Message:

dev_r5204_CNRS_PISCES_dcy:minor corrections for offline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

    r5209 r5210  
    5353   LOGICAL            ::   ln_dynrnf    !: read runoff data in file (T) or set to zero (F) 
    5454 
    55    INTEGER  , PARAMETER ::   jpfld = 22     ! maximum number of fields to read 
     55   INTEGER  , PARAMETER ::   jpfld = 21     ! maximum number of fields to read 
    5656   INTEGER  , SAVE      ::   jf_tem         ! index of temperature 
    5757   INTEGER  , SAVE      ::   jf_sal         ! index of salinity 
     
    6363   INTEGER  , SAVE      ::   jf_emp         ! index of water flux 
    6464   INTEGER  , SAVE      ::   jf_qsr         ! index of solar radiation 
    65    INTEGER  , SAVE      ::   jf_qsm        ! index of daily mean solar radiation in case of dirunal cycle 
    6665   INTEGER  , SAVE      ::   jf_wnd         ! index of wind speed 
    6766   INTEGER  , SAVE      ::   jf_ice         ! index of sea ice cover 
     
    265264      fr_i(:,:)        = sf_dyn(jf_ice)%fnow(:,:,1) * tmask(:,:,1)    ! Sea-ice fraction 
    266265      qsr (:,:)        = sf_dyn(jf_qsr)%fnow(:,:,1) * tmask(:,:,1)    ! solar radiation 
    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  
     266      IF( ln_dm2dc )   qsr_mean(:,:) = qsr(:,:)                         ! daily mean solar radiation 
    272267      IF( ln_dynrnf ) & 
    273268      rnf (:,:)        = sf_dyn(jf_rnf)%fnow(:,:,1) * tmask(:,:,1)    ! river runoffs  
     
    344339      CHARACTER(len=100)            ::  cn_dir   !   Root directory for location of core files 
    345340      TYPE(FLD_N), DIMENSION(jpfld) ::  slf_d    ! array of namelist informations on the fields to read 
    346       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      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 read 
    347342      TYPE(FLD_N) :: sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl          !   "                                 " 
    348343      TYPE(FLD_N) :: sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_fmf  !   "                                 " 
     
    350345      ! 
    351346      NAMELIST/namdta_dyn/cn_dir, ln_dynwzv, ln_dynbbl, ln_degrad, ln_dynrnf,    & 
    352          &                sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_qsm, sn_wnd, sn_rnf,  & 
     347         &                sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_wnd, sn_rnf,  & 
    353348         &                sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl,          & 
    354349         &                sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_fmf 
     
    399394      ELSE 
    400395         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 
    406396      ENDIF 
    407397 
Note: See TracChangeset for help on using the changeset viewer.