Changeset 10689
- Timestamp:
- 2019-02-15T14:55:37+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/fix_ticket2229
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/fix_ticket2229
- Property svn:externals
-
old new 1 ^/utils/build/arch 2 ^/utils/build/makenemo 3 ^/utils/build/mk 4 ^/utils/tools 5 ^/vendors/AGRIF/dev 6 ^/vendors/FCM 7 ^/vendors/IOIPSL 1 ^/utils/build/arch@HEAD arch 2 ^/utils/build/makenemo@HEAD makenemo 3 ^/utils/build/mk@HEAD mk 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev@HEAD ext/AGRIF 6 ^/vendors/FCM@HEAD ext/FCM 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL
-
- Property svn:externals
-
NEMO/branches/2019/fix_ticket2229/README.rst
r10605 r10689 90 90 .. Substitutions / Links 91 91 92 .. |NEMO manual| image:: http ://zenodo.org/badge/DOI/10.5281/zenodo.1464816.svg93 .. |NEMO guide| image:: http ://zenodo.org/badge/DOI/10.5281/zenodo.1475325.svg94 .. |SI3 manual| image:: http ://zenodo.org/badge/DOI/10.5281/zenodo.1471689.svg95 .. |TOP manual| image:: http ://zenodo.org/badge/DOI/10.5281/zenodo.1471700.svg92 .. |NEMO manual| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1464816.svg 93 .. |NEMO guide| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1475325.svg 94 .. |SI3 manual| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1471689.svg 95 .. |TOP manual| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1471700.svg 96 96 97 97 .. |NEMO strategy| replace:: multi-year development strategy -
NEMO/branches/2019/fix_ticket2229/REFERENCES.bib
- Property svn:mime-type set to text/x-bibtex
-
NEMO/branches/2019/fix_ticket2229/cfgs/AGRIF_DEMO/zooms.bib
- Property svn:mime-type set to text/x-bibtex
-
NEMO/branches/2019/fix_ticket2229/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml
r9572 r10689 67 67 68 68 <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." > 69 <field field_ref="vomecrtz25h" name="vomerctz" operation="instant" enabled=".TRUE."/> 70 <field field_ref="woce" name="vovecrtz" operation="instant" enabled=".TRUE."/> 69 <field field_ref="vovecrtz25h" name="vovecrtz" operation="instant" enabled=".TRUE."/> 71 70 <field field_ref="avt25h" name="votkeavt" operation="instant" enabled=".TRUE."/> 72 71 <field field_ref="avm25h" name="votkeavm" operation="instant" enabled=".TRUE."/> -
NEMO/branches/2019/fix_ticket2229/cfgs/SHARED/field_def_nemo-oce.xml
r10364 r10689 975 975 976 976 <field_group id="25h_grid_W" grid_ref="grid_W_3D" operation="instant"> 977 <field id="vo mecrtz25h" name="k current 25h mean" unit="m/s" />977 <field id="vovecrtz25h" name="k current 25h mean" unit="m/s" /> 978 978 <field id="avt25h" name="vertical diffusivity25h mean" unit="m2/s" /> 979 979 <field id="avm25h" name="vertical viscosity 25h mean" unit="m2/s" /> -
NEMO/branches/2019/fix_ticket2229/doc/rst/source/configurations.bib
- Property svn:mime-type set to text/x-bibtex
-
NEMO/branches/2019/fix_ticket2229/src/OCE/BDY/bdydta.F90
r10529 r10689 371 371 END DO ! jbdy 372 372 373 IF ( ln_apr_obc ) THEN 374 DO jbdy = 1, nb_bdy 375 IF (cn_tra(jbdy) /= 'runoff')THEN 376 igrd = 1 ! meridional velocity 377 DO ib = 1, idx_bdy(jbdy)%nblenrim(igrd) 378 ii = idx_bdy(jbdy)%nbi(ib,igrd) 379 ij = idx_bdy(jbdy)%nbj(ib,igrd) 380 dta_bdy(jbdy)%ssh(ib) = dta_bdy(jbdy)%ssh(ib) + ssh_ib(ii,ij) 381 END DO 382 ENDIF 383 END DO 384 ENDIF 385 373 386 IF ( ln_tide ) THEN 374 387 IF (ln_dynspg_ts) THEN ! Fill temporary arrays with slow-varying bdy data … … 389 402 ENDIF 390 403 391 IF ( ln_apr_obc ) THEN392 DO jbdy = 1, nb_bdy393 IF (cn_tra(jbdy) /= 'runoff')THEN394 igrd = 1 ! meridional velocity395 DO ib = 1, idx_bdy(jbdy)%nblenrim(igrd)396 ii = idx_bdy(jbdy)%nbi(ib,igrd)397 ij = idx_bdy(jbdy)%nbj(ib,igrd)398 dta_bdy(jbdy)%ssh(ib) = dta_bdy(jbdy)%ssh(ib) + ssh_ib(ii,ij)399 END DO400 ENDIF401 END DO402 ENDIF403 404 ! 404 405 IF( ln_timing ) CALL timing_stop('bdy_dta') -
NEMO/branches/2019/fix_ticket2229/src/OCE/BDY/bdyini.F90
r10537 r10689 941 941 ii = idx_bdy(ib_bdy)%nbi(icount,igrd) 942 942 ij = idx_bdy(ib_bdy)%nbj(icount,igrd) 943 if((com_east .ne. 1) .and. (ii == nlci) .and. (nbondi .le. 0)) then943 if((com_east .ne. 1) .and. (ii == (nlci-1)) .and. (nbondi .le. 0)) then 944 944 com_east = 1 945 945 elseif((com_west .ne. 1) .and. (ii == 2) .and. (nbondi .ge. 0) .and. (nbondi .ne. 2)) then … … 948 948 if((com_south .ne. 1) .and. (ij == 2) .and. (nbondj .ge. 0) .and. (nbondj .ne. 2)) then 949 949 com_south = 1 950 elseif((com_north .ne. 1) .and. (ij == nlcj) .and. (nbondj .le. 0)) then950 elseif((com_north .ne. 1) .and. (ij == (nlcj-1)) .and. (nbondj .le. 0)) then 951 951 com_north = 1 952 952 endif … … 960 960 & nbrdta(ib,igrd,ib_bdy) == ir ) THEN 961 961 ii = nbidta(ib,igrd,ib_bdy)- iw_b(1)+2 962 if((com_west_b .ne. 1) .and. (ii == (nlcit(nowe+1) ))) then962 if((com_west_b .ne. 1) .and. (ii == (nlcit(nowe+1)-1))) then 963 963 ij = nbjdta(ib,igrd,ib_bdy) - is_b(1)+2 964 964 if((ij == 2) .and. (nbondj == 0 .or. nbondj == 1)) then … … 989 989 & nbrdta(ib,igrd,ib_bdy) == ir ) THEN 990 990 ii = nbidta(ib,igrd,ib_bdy)- iw_b(1)+2 991 if((com_west_b .ne. 1) .and. (ii == (nlcit(nowe+1) ))) then991 if((com_west_b .ne. 1) .and. (ii == (nlcit(nowe+1)-1))) then 992 992 ij = nbjdta(ib,igrd,ib_bdy) - is_b(1)+2 993 993 if((ij == 2) .and. (nbondj == 0 .or. nbondj == 1)) then … … 1030 1030 & nbrdta(ib,igrd,ib_bdy) == ir ) THEN 1031 1031 ij = nbjdta(ib,igrd,ib_bdy)- is_b(3)+2 1032 if((com_south_b .ne. 1) .and. (ij == (nlcjt(noso+1) ))) then1032 if((com_south_b .ne. 1) .and. (ij == (nlcjt(noso+1)-1))) then 1033 1033 com_south_b = 1 1034 1034 endif … … 1052 1052 & nbrdta(ib,igrd,ib_bdy) == ir ) THEN 1053 1053 ij = nbjdta(ib,igrd,ib_bdy)- is_b(3)+2 1054 if((com_south_b .ne. 1) .and. (ij == (nlcjt(noso+1) ))) then1054 if((com_south_b .ne. 1) .and. (ij == (nlcjt(noso+1)-1))) then 1055 1055 com_south_b = 1 1056 1056 endif -
NEMO/branches/2019/fix_ticket2229/src/OCE/DIA/dia25h.F90
r10499 r10689 100 100 un_25h (:,:,:) = ub (:,:,:) 101 101 vn_25h (:,:,:) = vb (:,:,:) 102 wn_25h (:,:,:) = wn (:,:,:)103 102 avt_25h (:,:,:) = avt (:,:,:) 104 103 avm_25h (:,:,:) = avm (:,:,:) … … 148 147 ! local variable for debugging 149 148 ll_print = ll_print .AND. lwp 149 150 ! wn_25h could not be initialised in dia_25h_init, so we do it here instead 151 IF( kt == nn_it000 ) THEN 152 wn_25h(:,:,:) = wn(:,:,:) 153 ENDIF 150 154 151 155 ! Sum of 25 hourly instantaneous values to give a 25h mean from 24hours every day … … 223 227 CALL iom_put("vomecrty25h", zw3d ) ! j-current 224 228 zw3d(:,:,:) = wn_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:)) 225 CALL iom_put("vo mecrtz25h", zw3d ) ! k-current229 CALL iom_put("vovecrtz25h", zw3d ) ! k-current 226 230 ! Write vertical physics 227 231 zw3d(:,:,:) = avt_25h(:,:,:)*wmask(:,:,:) + zmdi*(1.0-tmask(:,:,:)) -
NEMO/branches/2019/fix_ticket2229/src/OCE/LBC/mpp_bdy_generic.h90
r10542 r10689 140 140 CASE ( -1 ) 141 141 CALL mppsend( 2, zt3we(1,1,1,1,1,1), imigr, noea, ml_req1 ) 142 CALL mpprecv( 1, zt3ew(1,1,1,1,1,2), imigr, noea )143 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err)144 142 CASE ( 0 ) 145 143 CALL mppsend( 1, zt3ew(1,1,1,1,1,1), imigr, nowe, ml_req1 ) 146 144 CALL mppsend( 2, zt3we(1,1,1,1,1,1), imigr, noea, ml_req2 ) 145 CASE ( 1 ) 146 CALL mppsend( 1, zt3ew(1,1,1,1,1,1), imigr, nowe, ml_req1 ) 147 END SELECT 148 ! 149 SELECT CASE ( nbondi_bdy_b(IBD_IN(jf)) ) 150 CASE ( -1 ) 151 CALL mpprecv( 1, zt3ew(1,1,1,1,1,2), imigr, noea ) 152 CASE ( 0 ) 147 153 CALL mpprecv( 1, zt3ew(1,1,1,1,1,2), imigr, noea ) 148 154 CALL mpprecv( 2, zt3we(1,1,1,1,1,2), imigr, nowe ) 155 CASE ( 1 ) 156 CALL mpprecv( 2, zt3we(1,1,1,1,1,2), imigr, nowe ) 157 END SELECT 158 ! 159 SELECT CASE ( nbondi_bdy(IBD_IN(jf)) ) 160 CASE ( -1 ) 161 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err) 162 CASE ( 0 ) 149 163 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err) 150 164 IF(l_isend) CALL mpi_wait(ml_req2, ml_stat, ml_err) 151 165 CASE ( 1 ) 152 CALL mppsend( 1, zt3ew(1,1,1,1,1,1), imigr, nowe, ml_req1 )153 CALL mpprecv( 2, zt3we(1,1,1,1,1,2), imigr, nowe )154 166 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err) 155 167 END SELECT … … 230 242 CASE ( -1 ) 231 243 CALL mppsend( 4, zt3sn(1,1,1,1,1,1), imigr, nono, ml_req1 ) 232 CALL mpprecv( 3, zt3ns(1,1,1,1,1,2), imigr, nono )233 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err)234 244 CASE ( 0 ) 235 245 CALL mppsend( 3, zt3ns(1,1,1,1,1,1), imigr, noso, ml_req1 ) 236 246 CALL mppsend( 4, zt3sn(1,1,1,1,1,1), imigr, nono, ml_req2 ) 247 CASE ( 1 ) 248 CALL mppsend( 3, zt3ns(1,1,1,1,1,1), imigr, noso, ml_req1 ) 249 END SELECT 250 ! 251 SELECT CASE ( nbondj_bdy_b(IBD_IN(jf)) ) 252 CASE ( -1 ) 253 CALL mpprecv( 3, zt3ns(1,1,1,1,1,2), imigr, nono ) 254 CASE ( 0 ) 237 255 CALL mpprecv( 3, zt3ns(1,1,1,1,1,2), imigr, nono ) 238 256 CALL mpprecv( 4, zt3sn(1,1,1,1,1,2), imigr, noso ) 257 CASE ( 1 ) 258 CALL mpprecv( 4, zt3sn(1,1,1,1,1,2), imigr, noso ) 259 END SELECT 260 ! 261 SELECT CASE ( nbondj_bdy(IBD_IN(jf)) ) 262 CASE ( -1 ) 263 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err) 264 CASE ( 0 ) 239 265 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err) 240 266 IF(l_isend) CALL mpi_wait(ml_req2, ml_stat, ml_err) 241 267 CASE ( 1 ) 242 CALL mppsend( 3, zt3ns(1,1,1,1,1,1), imigr, noso, ml_req1 )243 CALL mpprecv( 4, zt3sn(1,1,1,1,1,2), imigr, noso )244 268 IF(l_isend) CALL mpi_wait(ml_req1, ml_stat, ml_err) 245 269 END SELECT -
NEMO/branches/2019/fix_ticket2229/src/OCE/LBC/mpp_loc_generic.h90
r10425 r10689 17 17 # define MPI_OPERATION mpi_maxloc 18 18 # define LOC_OPERATION MAXLOC 19 # define ERRVAL -HUGE 19 20 # endif 20 21 # if defined OPERATION_MINLOC 21 22 # define MPI_OPERATION mpi_minloc 22 23 # define LOC_OPERATION MINLOC 24 # define ERRVAL HUGE 23 25 # endif 24 26 … … 42 44 ! 43 45 idim = SIZE(kindex) 44 ALLOCATE ( ilocs(idim) )45 46 ! 46 ilocs = LOC_OPERATION( ARRAY_IN(:,:,:) , mask= MASK_IN(:,:,:) == 1._wp ) 47 zmin = ARRAY_IN(ilocs(1),ilocs(2),ilocs(3)) 48 ! 49 kindex(1) = ilocs(1) + nimpp - 1 47 IF ( ALL(MASK_IN(:,:,:) /= 1._wp) ) THEN 48 ! special case for land processors 49 zmin = ERRVAL(zmin) 50 index0 = 0 51 ELSE 52 ALLOCATE ( ilocs(idim) ) 53 ! 54 ilocs = LOC_OPERATION( ARRAY_IN(:,:,:) , mask= MASK_IN(:,:,:) == 1._wp ) 55 zmin = ARRAY_IN(ilocs(1),ilocs(2),ilocs(3)) 56 ! 57 kindex(1) = mig( ilocs(1) ) 50 58 # if defined DIM_2d || defined DIM_3d /* avoid warning when kindex has 1 element */ 51 kindex(2) = ilocs(2) + njmpp - 159 kindex(2) = mjg( ilocs(2) ) 52 60 # endif 53 61 # if defined DIM_3d /* avoid warning when kindex has 2 elements */ 54 kindex(3) = ilocs(3)62 kindex(3) = ilocs(3) 55 63 # endif 56 !57 DEALLOCATE (ilocs)58 !59 index0 = kindex(1)-1 ! 1d index starting at 064 ! 65 DEALLOCATE (ilocs) 66 ! 67 index0 = kindex(1)-1 ! 1d index starting at 0 60 68 # if defined DIM_2d || defined DIM_3d /* avoid warning when kindex has 1 element */ 61 index0 = index0 + jpiglo * (kindex(2)-1)69 index0 = index0 + jpiglo * (kindex(2)-1) 62 70 # endif 63 71 # if defined DIM_3d /* avoid warning when kindex has 2 elements */ 64 index0 = index0 + jpiglo * jpjglo * (kindex(3)-1)72 index0 = index0 + jpiglo * jpjglo * (kindex(3)-1) 65 73 # endif 74 END IF 66 75 zain(1,:) = zmin 67 76 zain(2,:) = REAL(index0, wp) -
NEMO/branches/2019/fix_ticket2229/tests/WAD/MY_DOCS/references.bib
- Property svn:mime-type set to text/x-bibtex
-
NEMO/branches/2019/fix_ticket2229/tests/test_cases.bib
- Property svn:mime-type set to text/x-bibtex
Note: See TracChangeset
for help on using the changeset viewer.