New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5209 for branches/2015/dev_r5204_CNRS_PISCES_dcy – NEMO

Ignore:
Timestamp:
2015-04-13T15:30:33+02:00 (9 years ago)
Author:
cetlod
Message:

dev_r5204_CNRS_PISCES_dcy:updates for offline

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  
    5353   LOGICAL            ::   ln_dynrnf    !: read runoff data in file (T) or set to zero (F) 
    5454 
    55    INTEGER  , PARAMETER ::   jpfld = 21     ! maximum number of fields to read 
     55   INTEGER  , PARAMETER ::   jpfld = 22     ! 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 
    6566   INTEGER  , SAVE      ::   jf_wnd         ! index of wind speed 
    6667   INTEGER  , SAVE      ::   jf_ice         ! index of sea ice cover 
     
    264265      fr_i(:,:)        = sf_dyn(jf_ice)%fnow(:,:,1) * tmask(:,:,1)    ! Sea-ice fraction 
    265266      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 ) & 
    267273      rnf (:,:)        = sf_dyn(jf_rnf)%fnow(:,:,1) * tmask(:,:,1)    ! river runoffs  
    268274 
     
    338344      CHARACTER(len=100)            ::  cn_dir   !   Root directory for location of core files 
    339345      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 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 
    341347      TYPE(FLD_N) :: sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl          !   "                                 " 
    342348      TYPE(FLD_N) :: sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_fmf  !   "                                 " 
     
    344350      ! 
    345351      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,  & 
    347353         &                sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl,          & 
    348354         &                sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_fmf 
     
    388394 
    389395      ! 
    390       IF ( ln_dynrnf ) THEN 
     396      IF( ln_dynrnf ) THEN 
    391397                jf_rnf = jfld + 1  ;  jfld  = jf_rnf 
    392398         slf_d(jf_rnf) = sn_rnf 
    393399      ELSE 
    394400         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 
    395406      ENDIF 
    396407 
  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/TOP_SRC/trcini.F90

    r5206 r5209  
    7070 
    7171      CALL top_alloc()              ! allocate TOP arrays 
    72  
    73       IF( lk_offline )  ln_dm2dc = .FALSE. 
    7472 
    7573      IF( nn_cla == 1 )   & 
Note: See TracChangeset for help on using the changeset viewer.