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 13831 for NEMO – NEMO

Changeset 13831 for NEMO


Ignore:
Timestamp:
2020-11-19T14:17:24+01:00 (3 years ago)
Author:
hadcv
Message:

#2365: Merge trunk changes up to [13747]

Location:
NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/cfgs/C1D_PAPA/EXPREF/namelist_cfg

    r13741 r13831  
    428428/ 
    429429!----------------------------------------------------------------------- 
    430 !----------------------------------------------------------------------- 
    431 / 
    432 !----------------------------------------------------------------------- 
    433430&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    434431!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg

    r13741 r13831  
    388388/ 
    389389!----------------------------------------------------------------------- 
    390 !----------------------------------------------------------------------- 
    391 / 
    392 !----------------------------------------------------------------------- 
    393390&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    394391!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg

    r13741 r13831  
    384384/ 
    385385!----------------------------------------------------------------------- 
    386 !----------------------------------------------------------------------- 
    387 / 
    388 !----------------------------------------------------------------------- 
    389386&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    390387!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/cfgs/SHARED/namelist_ref

    r13741 r13831  
    12711271!!gm   ln_trdmld_instant = .false.         !  flag to diagnose trends of instantantaneous or mean ML T/S 
    12721272!!gm 
    1273 / 
    12741273!----------------------------------------------------------------------- 
    12751274&namhsb        !  Heat and salt budgets                                 (default: OFF) 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/cfgs/WED025/EXPREF/namelist_cfg

    r13741 r13831  
    583583/ 
    584584!----------------------------------------------------------------------- 
    585 !----------------------------------------------------------------------- 
    586 / 
    587 !----------------------------------------------------------------------- 
    588585&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    589586!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/ICE/icestp.F90

    r13741 r13831  
    212212      ! --- Ocean time step --- ! 
    213213      !-------------------------! 
    214       IF( ln_icedyn )                   CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )   ! -- update surface ocean stresses 
     214      CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )         ! -- update surface ocean stresses 
    215215!!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!! 
    216216      ! 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/ICE/icetab.F90

    r10069 r13831  
    4040      INTEGER , DIMENSION(ndim1d)     , INTENT(in   ) ::   tab_ind  ! input index 
    4141      REAL(wp), DIMENSION(jpi,jpj,jpl), INTENT(in   ) ::   tab2d    ! input 2D field 
    42       REAL(wp), DIMENSION(ndim1d,jpl) , INTENT(  out) ::   tab1d    ! output 1D field 
     42      REAL(wp), DIMENSION(ndim1d,jpl) , INTENT(inout) ::   tab1d    ! output 1D field 
    4343      ! 
    4444      INTEGER ::   jl, jn, jid, jjd 
    … …  
    6161      INTEGER , DIMENSION(ndim1d) , INTENT(in   ) ::   tab_ind  ! input index 
    6262      REAL(wp), DIMENSION(jpi,jpj), INTENT(in   ) ::   tab2d    ! input 2D field 
    63       REAL(wp), DIMENSION(ndim1d) , INTENT(  out) ::   tab1d    ! output 1D field 
     63      REAL(wp), DIMENSION(ndim1d) , INTENT(inout) ::   tab1d    ! output 1D field 
    6464      ! 
    6565      INTEGER ::   jn , jid, jjd 
    … …  
    8080      INTEGER , DIMENSION(ndim1d)     , INTENT(in   ) ::   tab_ind   ! input index 
    8181      REAL(wp), DIMENSION(ndim1d,jpl) , INTENT(in   ) ::   tab1d     ! input 1D field 
    82       REAL(wp), DIMENSION(jpi,jpj,jpl), INTENT(  out) ::   tab2d     ! output 2D field 
     82      REAL(wp), DIMENSION(jpi,jpj,jpl), INTENT(inout) ::   tab2d     ! output 2D field 
    8383      ! 
    8484      INTEGER ::   jl, jn, jid, jjd 
    … …  
    101101      INTEGER , DIMENSION(ndim1d) , INTENT(in   ) ::   tab_ind   ! input index 
    102102      REAL(wp), DIMENSION(ndim1d) , INTENT(in   ) ::   tab1d     ! input 1D field 
    103       REAL(wp), DIMENSION(jpi,jpj), INTENT(  out) ::   tab2d     ! output 2D field 
     103      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) ::   tab2d     ! output 2D field 
    104104      ! 
    105105      INTEGER ::   jn , jid, jjd 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/DIU/diu_coolskin.F90

    r13295 r13831  
    9595      !!---------------------------------------------------------------------- 
    9696      ! 
    97       IF( .NOT. ln_blk )   CALL ctl_stop("diu_coolskin.f90: diurnal flux processing only implemented for bulk forcing") 
     97      IF( .NOT. (ln_blk .OR. ln_abl) )   CALL ctl_stop("diu_coolskin.f90: diurnal flux processing only implemented for bulk forcing") 
    9898      ! 
    9999      DO_2D( 1, 1, 1, 1 ) 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/IOM/iom.F90

    r13741 r13831  
    19141914      IF( iom_use(cdname) ) THEN 
    19151915#if defined key_iomput 
    1916          IF( SIZE(pfield2d, dim=1) == jpi .AND. SIZE(pfield2d, dim=2) == jpj ) THEN 
    1917             CALL xios_send_field( cdname, pfield2d(Nis0:Nie0, Njs0:Nje0) )       ! this extraction will create a copy of pfield2d 
    1918          ELSE 
    1919             CALL xios_send_field( cdname, pfield2d ) 
    1920          ENDIF 
     1916         CALL xios_send_field( cdname, pfield2d ) 
    19211917#else 
    19221918         WRITE(numout,*) pfield2d   ! iom_use(cdname) = .F. -> useless test to avoid compilation warnings 
    … …  
    19301926      IF( iom_use(cdname) ) THEN 
    19311927#if defined key_iomput 
    1932          IF( SIZE(pfield2d, dim=1) == jpi .AND. SIZE(pfield2d, dim=2) == jpj ) THEN 
    1933             CALL xios_send_field( cdname, pfield2d(Nis0:Nie0, Njs0:Nje0) )       ! this extraction will create a copy of pfield2d 
    1934          ELSE 
    1935             CALL xios_send_field( cdname, pfield2d ) 
    1936          ENDIF 
     1928         CALL xios_send_field( cdname, pfield2d ) 
    19371929#else 
    19381930         WRITE(numout,*) pfield2d   ! iom_use(cdname) = .F. -> useless test to avoid compilation warnings 
    … …  
    19461938      IF( iom_use(cdname) ) THEN 
    19471939#if defined key_iomput 
    1948          IF( SIZE(pfield3d, dim=1) == jpi .AND. SIZE(pfield3d, dim=2) == jpj ) THEN 
    1949             CALL xios_send_field( cdname, pfield3d(Nis0:Nie0, Njs0:Nje0,:) )     ! this extraction will create a copy of pfield3d 
    1950          ELSE 
    1951             CALL xios_send_field( cdname, pfield3d ) 
    1952          ENDIF 
     1940         CALL xios_send_field( cdname, pfield3d ) 
    19531941#else 
    19541942         WRITE(numout,*) pfield3d   ! iom_use(cdname) = .F. -> useless test to avoid compilation warnings 
    … …  
    19621950      IF( iom_use(cdname) ) THEN 
    19631951#if defined key_iomput 
    1964          IF( SIZE(pfield3d, dim=1) == jpi .AND. SIZE(pfield3d, dim=2) == jpj ) THEN 
    1965             CALL xios_send_field( cdname, pfield3d(Nis0:Nie0, Njs0:Nje0,:) )     ! this extraction will create a copy of pfield3d 
    1966          ELSE 
    1967             CALL xios_send_field( cdname, pfield3d ) 
    1968          ENDIF 
     1952         CALL xios_send_field( cdname, pfield3d ) 
    19691953#else 
    19701954         WRITE(numout,*) pfield3d   ! iom_use(cdname) = .F. -> useless test to avoid compilation warnings 
    … …  
    19781962      IF( iom_use(cdname) ) THEN 
    19791963#if defined key_iomput 
    1980          IF( SIZE(pfield4d, dim=1) == jpi .AND. SIZE(pfield4d, dim=2) == jpj ) THEN 
    1981             CALL xios_send_field( cdname, pfield4d(Nis0:Nie0, Njs0:Nje0,:,:) )   ! this extraction will create a copy of pfield4d 
    1982          ELSE 
    1983             CALL xios_send_field (cdname, pfield4d ) 
    1984          ENDIF 
     1964         CALL xios_send_field (cdname, pfield4d ) 
    19851965#else 
    19861966         WRITE(numout,*) pfield4d   ! iom_use(cdname) = .F. -> useless test to avoid compilation warnings 
    … …  
    19941974      IF( iom_use(cdname) ) THEN 
    19951975#if defined key_iomput 
    1996          IF( SIZE(pfield4d, dim=1) == jpi .AND. SIZE(pfield4d, dim=2) == jpj ) THEN 
    1997             CALL xios_send_field( cdname, pfield4d(Nis0:Nie0, Njs0:Nje0,:,:) )   ! this extraction will create a copy of pfield4d 
    1998          ELSE 
    1999             CALL xios_send_field (cdname, pfield4d ) 
    2000          ENDIF 
     1976         CALL xios_send_field (cdname, pfield4d ) 
    20011977#else 
    20021978         WRITE(numout,*) pfield4d   ! iom_use(cdname) = .F. -> useless test to avoid compilation warnings 
    … …  
    22042180      ! 
    22052181      CALL iom_set_domain_attr("grid_"//cdgrd, ni_glo=Ni0glo,nj_glo=Nj0glo,ibegin=mig0(Nis0)-1,jbegin=mjg0(Njs0)-1,ni=Ni_0,nj=Nj_0) 
    2206       CALL iom_set_domain_attr("grid_"//cdgrd, data_dim=2, data_ibegin = 0, data_ni = Ni_0, data_jbegin = 0, data_nj = Nj_0) 
     2182      CALL iom_set_domain_attr("grid_"//cdgrd, data_dim=2, data_ibegin = -nn_hls, data_ni = jpi, data_jbegin = -nn_hls, data_nj = jpj) 
    22072183!don't define lon and lat for restart reading context.  
    22082184      IF ( .NOT.ldrxios ) & 
    … …  
    23032279      CALL dom_ngb( 180.0_wp, 90.0_wp, ix, iy, 'T' ) !  i-line that passes near the North Pole : Reference latitude (used in plots) 
    23042280      CALL iom_set_domain_attr("gznl", ni_glo=Ni0glo, nj_glo=Nj0glo, ibegin=mig0(Nis0)-1, jbegin=mjg0(Njs0)-1, ni=Ni_0, nj=Nj_0) 
    2305       CALL iom_set_domain_attr("gznl", data_dim=2, data_ibegin = 0, data_ni = Ni_0, data_jbegin = 0, data_nj = Nj_0) 
     2281      CALL iom_set_domain_attr("gznl", data_dim=2, data_ibegin = -nn_hls, data_ni = jpi, data_jbegin = -nn_hls, data_nj = jpj) 
    23062282      CALL iom_set_domain_attr("gznl", lonvalue = real(zlon, dp),   & 
    23072283         &                             latvalue = real(RESHAPE(plat(Nis0:Nie0, Njs0:Nje0),(/ Ni_0*Nj_0 /)),dp))   
    2308       CALL iom_set_zoom_domain_attr("ptr", ibegin=ix-1, jbegin=0, ni=1, nj=Nj_0) 
     2284      CALL iom_set_zoom_domain_attr("ptr", ibegin=ix-1, jbegin=0, ni=1, nj=Nj0glo) 
    23092285      ! 
    23102286      CALL iom_update_file_name('ptr') 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/SBC/sbcmod.F90

    r13553 r13831  
    229229      CASE DEFAULT                     !- not supported 
    230230      END SELECT 
    231       IF( ln_diurnal .AND. .NOT. ln_blk )   CALL ctl_stop( "sbc_init: diurnal flux processing only implemented for bulk forcing" ) 
     231      IF( ln_diurnal .AND. .NOT. (ln_blk.OR.ln_abl) )   CALL ctl_stop( "sbc_init: diurnal flux processing only implemented for bulk forcing" ) 
    232232      ! 
    233233      !                       !**  allocate and set required variables 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/tests/ISOMIP+/EXPREF/namelist_cfg

    r13742 r13831  
    477477/ 
    478478!----------------------------------------------------------------------- 
    479 !----------------------------------------------------------------------- 
    480 / 
    481 !----------------------------------------------------------------------- 
    482479&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    483480!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/tests/ISOMIP/EXPREF/namelist_cfg

    r13742 r13831  
    437437/ 
    438438!----------------------------------------------------------------------- 
    439 !----------------------------------------------------------------------- 
    440 / 
    441 !----------------------------------------------------------------------- 
    442439&namhsb        !  Heat and salt budgets                                 (default: OFF) 
    443440!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.