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 5207 – NEMO

Changeset 5207


Ignore:
Timestamp:
2015-04-13T13:00:27+02:00 (9 years ago)
Author:
cetlod
Message:

dev_r5204_CNRS_PISCES_dcy:minor bugs corrections

Location:
branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90

    r5206 r5207  
    340340         CALL tab_1d_2d_2( nbpb, qsr_ice(:,:,1), npb, qsr_ice_1d(1:nbpb)  , jpi, jpj ) 
    341341         CALL tab_1d_2d_2( nbpb, qns_ice(:,:,1), npb, qns_ice_1d(1:nbpb)  , jpi, jpj ) 
    342          IF( l_trcdm2dc ) & 
     342         IF( l_trcdm2dc ) THEN 
    343343            CALL tab_1d_2d_2( nbpb, fstric_mean        , npb, fstbif_mean_1d (1:nbpb), jpi, jpj ) 
    344344            CALL tab_1d_2d_2( nbpb, qsr_ice_mean(:,:,1), npb, qsr_ice_mean_1d(1:nbpb), jpi, jpj ) 

  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90

    r5206 r5207  
    1818   USE ice_2 
    1919   USE limistate_2 
    20    USE sbc_oce, ONLY : lk_cpl 
     20   USE sbc_oce, ONLY : lk_cpl, l_trcdm2dc 
    2121   USE in_out_manager 
    2222   USE lib_mpp          ! MPP library 
    … …  
    273273       END DO 
    274274 
    275        IF( l_topdcy )THEN 
     275       IF( l_trcdm2dc )THEN 
    276276          ! 
    277277          DO ji = kideb , kiut 

  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90

    r5206 r5207  
    220220 
    221221      !   daily mean qsr when diurnal cycle is applied on physics - for BGC models 
    222       IF( l_trcdm2dc ) qsr_mean(:,:) =  pfrld(:,:) * qsr_mean(:,:) +  ftr_ice_mean(:,:) 
     222      IF( l_trcdm2dc ) THEN 
     223         DO jj = 1, jpj 
     224            DO ji = 1, jpi 
     225               zfcm1 = pfrld(ji,jj) * qsr_mean(ji,jj) 
     226               DO jl = 1, jpl 
     227                  zfcm1 = zfcm1 + ftr_ice_mean(ji,jj,jl) 
     228               END DO 
     229               qsr_mean(ji,jj) = zfcm1                                       
     230            ENDDO 
     231         ENDDO 
     232      ENDIF 
    223233 
    224234      !------------------------------------------------! 

  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

    r5206 r5207  
    680680         !          
    681681         IF( l_trcdm2dc )  THEN 
    682             CALL tab_1d_2d( nbpb, qns_ice_mean(:,:,jl), npb, qns_ice_mean_1d(1:nbpb) , jpi, jpj) 
     682            CALL tab_1d_2d( nbpb, qsr_ice_mean(:,:,jl), npb, qsr_ice_mean_1d(1:nbpb) , jpi, jpj) 
    683683            CALL tab_1d_2d( nbpb, ftr_ice_mean(:,:,jl), npb, ftr_ice_mean_1d(1:nbpb) , jpi, jpj ) 
    684684         ENDIF 

  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90

    r5206 r5207  
    2424   USE wrk_nemo       ! work arrays 
    2525   USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)   
    26    USE sbc_oce, ONLY : lk_cpl 
     26   USE sbc_oce, ONLY : lk_cpl, l_trcdm2dc 
    2727 
    2828   IMPLICIT NONE 
    … …  
    294294      IF( l_trcdm2dc ) THEN 
    295295         DO ji = kideb , kiut 
    296              ftr_ice_mean_1d(ji) =  ftr_ice_mean_1d(ji) &  
    297                  &                + a_i_1d(ji) * zftrice_mean(ji) & 
    298                  &                             * EXP( - rn_kappa_i * ( MAX ( 0._wp , h_i_1d(ji) ) ) ) & 
    299                                                * EXP( - zraext_s   * ( MAX ( 0._wp , h_s_1d(ji) ) ) ) 
     296             ftr_ice_mean_1d(ji) =  ftr_ice_mean_1d(ji)               &  
     297                 &                + a_i_1d(ji) * zftrice_mean(ji)     & 
     298                 &                             * EXP( - rn_kappa_i * ( MAX ( 0._wp , ht_i_1d(ji) ) ) ) & 
     299                 &                             * EXP( - zraext_s   * ( MAX ( 0._wp , ht_s_1d(ji) ) ) ) 
    300300         END DO 
    301301      ENDIF 

  • branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

    r5206 r5207  
    195195               &                      fr1_i0     , fr2_i0     , cp_ice_msh , jpl  ) 
    196196 
    197             IF( ltrcdm2dc_ice )   CALL blk_ice_meanqsr( zalb_ice, qsr_ice_mean, jpl ) 
     197            IF( l_trcdm2dc )   CALL blk_ice_meanqsr( zalb_ice, qsr_ice_mean, jpl ) 
    198198 
    199199         CASE( jp_cpl )            ! Coupled formulation : atmosphere-ice stress only (fluxes provided after ice dynamics) 
Note: See TracChangeset for help on using the changeset viewer.