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 13258 for NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES – NEMO

Ignore:
Timestamp:
2020-07-07T12:23:18+02:00 (4 years ago)
Author:
rblod
Message:

#2129 : merge branch CMEMS with trunk r13327

Location:
NEMO/branches/2020/dev_r12973_AGRIF_CMEMS
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS

    • Property svn:externals

      •  

        old new  
        22^/utils/build/makenemo@HEAD   makenemo 
        33^/utils/build/mk@HEAD         mk 
        4 ^/utils/tools_dev_r12970_AGRIF_CMEMS            tools 
         4^/utils/tools/@HEAD           tools 
        55^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P2Z/p2zbio.F90

    r12377 r13258  
    5858   !! * Substitutions 
    5959#  include "do_loop_substitute.h90" 
     60#  include "domzgr_substitute.h90" 
    6061   !!---------------------------------------------------------------------- 
    6162   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
    … …  
    338339      ! 
    339340      IF( lk_iomput ) THEN 
    340          CALL lbc_lnk( 'p2zbio', zw2d(:,:,:),'T', 1. ) 
    341          CALL lbc_lnk_multi( 'p2zbio', zw3d(:,:,:,1),'T', 1., zw3d(:,:,:,2),'T', 1., zw3d(:,:,:,3),'T', 1. ) 
     341         CALL lbc_lnk( 'p2zbio', zw2d(:,:,:),'T', 1.0_wp ) 
     342         CALL lbc_lnk_multi( 'p2zbio', zw3d(:,:,:,1),'T', 1.0_wp, zw3d(:,:,:,2),'T', 1.0_wp, zw3d(:,:,:,3),'T', 1.0_wp ) 
    342343         ! Save diagnostics 
    343344         CALL iom_put( "TNO3PHY", zw2d(:,:,1) ) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P2Z/p2zexp.F90

    r12489 r13258  
    3939   !! * Substitutions 
    4040#  include "do_loop_substitute.h90" 
     41#  include "domzgr_substitute.h90" 
    4142   !!---------------------------------------------------------------------- 
    4243   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
    … …  
    106107      END_2D 
    107108 
    108       CALL lbc_lnk( 'p2zexp', sedpocn, 'T', 1. ) 
     109      CALL lbc_lnk( 'p2zexp', sedpocn, 'T', 1.0_wp ) 
    109110  
    110111      ! Oa & Ek: diagnostics depending on jpdia2d !          left as example 
    … …  
    209210         END IF 
    210211      END_2D 
    211       CALL lbc_lnk( 'p2zexp', cmask , 'T', 1. )      ! lateral boundary conditions on cmask   (sign unchanged) 
     212      CALL lbc_lnk( 'p2zexp', cmask , 'T', 1.0_wp )      ! lateral boundary conditions on cmask   (sign unchanged) 
    212213      areacot = glob_sum( 'p2zexp', e1e2t(:,:) * cmask(:,:) ) 
    213214      ! 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P2Z/p2zopt.F90

    r12377 r13258  
    4040   !! * Substitutions 
    4141#  include "do_loop_substitute.h90" 
     42#  include "domzgr_substitute.h90" 
    4243   !!---------------------------------------------------------------------- 
    4344   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P2Z/p2zsed.F90

    r12377 r13258  
    3333   !! * Substitutions 
    3434#  include "do_loop_substitute.h90" 
     35#  include "domzgr_substitute.h90" 
    3536   !!---------------------------------------------------------------------- 
    3637   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zbc.F90

    r12377 r13258  
    4848   !! * Substitutions 
    4949#  include "do_loop_substitute.h90" 
     50#  include "domzgr_substitute.h90" 
    5051   !!---------------------------------------------------------------------- 
    5152   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
    … …  
    310311         END_3D 
    311312         ! 
    312          CALL lbc_lnk( 'p4zbc', zcmask , 'T', 1. )      ! lateral boundary conditions on cmask   (sign unchanged) 
     313         CALL lbc_lnk( 'p4zbc', zcmask , 'T', 1.0_wp )      ! lateral boundary conditions on cmask   (sign unchanged) 
    313314         ! 
    314315         DO_3D_11_11( 1, jpk ) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zbio.F90

    r12377 r13258  
    4040   !! * Substitutions 
    4141#  include "do_loop_substitute.h90" 
     42#  include "domzgr_substitute.h90" 
    4243   !!---------------------------------------------------------------------- 
    4344   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zche.F90

    r12377 r13258  
    132132   !! * Substitutions 
    133133#  include "do_loop_substitute.h90" 
     134#  include "domzgr_substitute.h90" 
    134135   !!---------------------------------------------------------------------- 
    135136   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zfechem.F90

    r12377 r13258  
    3333   !! * Substitutions 
    3434#  include "do_loop_substitute.h90" 
     35#  include "domzgr_substitute.h90" 
    3536   !!---------------------------------------------------------------------- 
    3637   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zflx.F90

    r12377 r13258  
    5454   !! * Substitutions 
    5555#  include "do_loop_substitute.h90" 
     56#  include "domzgr_substitute.h90" 
    5657   !!---------------------------------------------------------------------- 
    5758   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zopt.F90

    r12377 r13258  
    4444   !! * Substitutions 
    4545#  include "do_loop_substitute.h90" 
     46#  include "domzgr_substitute.h90" 
    4647   !!---------------------------------------------------------------------- 
    4748   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
    … …  
    401402      ! 
    402403      CALL trc_oce_rgb( xkrgb )                  ! tabulated attenuation coefficients 
    403       nksrp = trc_oce_ext_lev( r_si2, 0.33e2 )     ! max level of light extinction (Blue Chl=0.01) 
     404      nksrp = trc_oce_ext_lev( r_si2, 0.33e2_wp )     ! max level of light extinction (Blue Chl=0.01) 
    404405      ! 
    405406      IF(lwp) WRITE(numout,*) '        level of light extinction = ', nksrp, ' ref depth = ', gdepw_1d(nksrp+1), ' m' 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zpoc.F90

    r12377 r13258  
    3939   !! * Substitutions 
    4040#  include "do_loop_substitute.h90" 
     41#  include "domzgr_substitute.h90" 
    4142   !!---------------------------------------------------------------------- 
    4243   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zprod.F90

    r12377 r13258  
    4848   !! * Substitutions 
    4949#  include "do_loop_substitute.h90" 
     50#  include "domzgr_substitute.h90" 
    5051   !!---------------------------------------------------------------------- 
    5152   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zrem.F90

    r12377 r13258  
    4444   !! * Substitutions 
    4545#  include "do_loop_substitute.h90" 
     46#  include "domzgr_substitute.h90" 
    4647   !!---------------------------------------------------------------------- 
    4748   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zsed.F90

    r12377 r13258  
    3939   !! * Substitutions 
    4040#  include "do_loop_substitute.h90" 
     41#  include "domzgr_substitute.h90" 
    4142   !!---------------------------------------------------------------------- 
    4243   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zsink.F90

    r12377 r13258  
    4040   !! * Substitutions 
    4141#  include "do_loop_substitute.h90" 
     42#  include "domzgr_substitute.h90" 
    4243   !!---------------------------------------------------------------------- 
    4344   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p4zsms.F90

    r13058 r13258  
    4141   !! * Substitutions 
    4242#  include "do_loop_substitute.h90" 
     43#  include "domzgr_substitute.h90" 
    4344   !!---------------------------------------------------------------------- 
    4445   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/P4Z/p5zprod.F90

    r12377 r13258  
    5252   !! * Substitutions 
    5353#  include "do_loop_substitute.h90" 
     54#  include "domzgr_substitute.h90" 
    5455   !!---------------------------------------------------------------------- 
    5556   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/SED/oce_sed.F90

    r12489 r13258  
    1313   USE dom_oce , ONLY :   glamt     =>   glamt          !: longitude of t-point (degre) 
    1414   USE dom_oce , ONLY :   gphit     =>   gphit          !: latitude  of t-point (degre) 
     15!!st  
     16#if ! defined key_qco 
    1517   USE dom_oce , ONLY :   e3t       =>   e3t            !: latitude  of t-point (degre) 
     18#endif 
    1619   USE dom_oce , ONLY :   e3t_1d    =>   e3t_1d         !: reference depth of t-points (m) 
    1720   USE dom_oce , ONLY :   gdepw_0   =>   gdepw_0        !: reference depth of t-points (m) 
    … …  
    5356 
    5457END MODULE oce_sed 
    55  
    56  

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/SED/seddta.F90

    r12489 r13258  
    2424   !! * Substitutions 
    2525#  include "do_loop_substitute.h90" 
     26#  include "domzgr_substitute.h90" 
    2627   !! $Id$ 
    2728CONTAINS 
    … …  
    164165      CALL pack_arr ( jpoce,  rainrm_dta(1:jpoce,jscal), trc_data(1:jpi,1:jpj,14), iarroce(1:jpoce) ) 
    165166      rainrm_dta(1:jpoce,jscal) = rainrm_dta(1:jpoce,jscal) * 1e-4 
    166       ! vector temperature [°C] and salinity  
     167      ! vector temperature [�C] and salinity  
    167168      CALL pack_arr ( jpoce,  temp(1:jpoce), trc_data(1:jpi,1:jpj,15), iarroce(1:jpoce) ) 
    168169      CALL pack_arr ( jpoce,  salt(1:jpoce), trc_data(1:jpi,1:jpj,16), iarroce(1:jpoce) ) 

  • NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/TOP/PISCES/trcwri_pisces.F90

    r12377 r13258  
    2121   !! * Substitutions 
    2222#  include "do_loop_substitute.h90" 
     23#  include "domzgr_substitute.h90" 
    2324   !!---------------------------------------------------------------------- 
    2425   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
Note: See TracChangeset for help on using the changeset viewer.