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 15015 for NEMO/branches/2021/ticket2680_C1D_PAPA/src/ICE/iceistate.F90 – NEMO

Ignore:
Timestamp:
2021-06-17T19:17:25+02:00 (3 years ago)
Author:
gsamson
Message:

merge trunk into branch (#2680)

Location:
NEMO/branches/2021/ticket2680_C1D_PAPA
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/ticket2680_C1D_PAPA

    • Property svn:externals

      •  

        old new  
        99 
        1010# SETTE 
        11 ^/utils/CI/sette@14244        sette 
         11^/utils/CI/sette@HEAD        sette 
         12 

  • NEMO/branches/2021/ticket2680_C1D_PAPA/src/ICE/iceistate.F90

    r14143 r15015  
    308308            ! select ice covered grid points 
    309309            npti = 0 ; nptidx(:) = 0 
    310             DO_2D( 1, 1, 1, 1 ) 
     310            DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
    311311               IF ( zht_i_ini(ji,jj) > 0._wp ) THEN 
    312312                  npti         = npti  + 1 
    … …  
    363363            CALL ice_var_salprof ! for sz_i 
    364364            DO jl = 1, jpl 
    365                DO_2D( 1, 1, 1, 1 ) 
     365               DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
    366366                  v_i (ji,jj,jl) = h_i(ji,jj,jl) * a_i(ji,jj,jl) 
    367367                  v_s (ji,jj,jl) = h_s(ji,jj,jl) * a_i(ji,jj,jl) 
    … …  
    371371            ! 
    372372            DO jl = 1, jpl 
    373                DO_3D( 1, 1, 1, 1, 1, nlay_s ) 
     373               DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, nlay_s ) 
    374374                  t_s(ji,jj,jk,jl) = zts_3d(ji,jj,jl) 
    375375                  e_s(ji,jj,jk,jl) = zswitch(ji,jj) * v_s(ji,jj,jl) * r1_nlay_s * & 
    … …  
    379379            ! 
    380380            DO jl = 1, jpl 
    381                DO_3D( 1, 1, 1, 1, 1, nlay_i ) 
     381               DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, nlay_i ) 
    382382                  t_i (ji,jj,jk,jl) = zti_3d(ji,jj,jl)  
    383383                  ztmelts          = - rTmlt * sz_i(ji,jj,jk,jl) + rt0 ! melting temperature in K 
Note: See TracChangeset for help on using the changeset viewer.