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 15127 for NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/C14 – NEMO

Ignore:
Timestamp:
2021-07-16T20:00:12+02:00 (3 years ago)
Author:
cetlod
Message:

dev_PISCO : merge with trunk@15119

Location:
NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO

    • Property svn:externals

      •  

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

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/C14/trcnam_c14.F90

    r12377 r15127  
    6060      ln_trc_cbc(jp_c14) = .false. 
    6161      ln_trc_obc(jp_c14) = .false. 
     62      ln_trc_ais(jp_c14) = .false. 
    6263      ! 
    6364      READ  ( numtrc_ref, namc14_typ, IOSTAT = ios, ERR = 901) 

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/C14/trcsms_c14.F90

    r13970 r15127  
    8181      ! ------------------------------------------------------------------- 
    8282 
    83       DO_2D( 1, 1, 1, 1 ) 
     83      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
    8484         IF( tmask(ji,jj,1) >  0. ) THEN 
    8585            ! 
    … …  
    128128      ! 
    129129      ! Add the surface flux to the trend of jp_c14 
    130       DO_2D( 1, 1, 1, 1 ) 
     130      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
    131131         tr(ji,jj,1,jp_c14,Krhs) = tr(ji,jj,1,jp_c14,Krhs) + qtr_c14(ji,jj) / e3t(ji,jj,1,Kmm)  
    132132      END_2D 
    133133      ! 
    134134      ! Computation of decay effects on jp_c14 
    135       DO_3D( 1, 1, 1, 1, 1, jpk ) 
     135      DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpk ) 
    136136         ! 
    137137         tr(ji,jj,jk,jp_c14,Krhs) = tr(ji,jj,jk,jp_c14,Krhs) - rlam14 * tr(ji,jj,jk,jp_c14,Kbb) * tmask(ji,jj,jk)  

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/TOP/C14/trcwri_c14.F90

    r14239 r15127  
    6060         zz3d(:,:,:) = 0._wp 
    6161         ! 
    62          DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 
     62         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 
    6363            IF( tmask(ji,jj,jk) > 0._wp) THEN 
    6464               z3d (ji,jj,jk) = tr(ji,jj,jk,jp_c14,Kmm) 
    … …  
    7171         z2d(:,:) =0._wp 
    7272         jk = 1 
    73          DO_2D( 1, 1, 1, 1 ) 
     73         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
    7474            ztemp = zres(ji,jj) / c14sbc(ji,jj) 
    7575            IF( ztemp > 0._wp .AND. tmask(ji,jj,jk) > 0._wp ) z2d(ji,jj) = LOG( ztemp ) 
Note: See TracChangeset for help on using the changeset viewer.