- Timestamp:
- 2020-09-29T12:41:06+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r12377_ticket2386
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEADext/AGRIF5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 8 9 9 # SETTE 10 ^/utils/CI/sette@ HEADsette10 ^/utils/CI/sette@13507 sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/src/OCE/ASM/asminc.F90
r12511 r13540 95 95 !! * Substitutions 96 96 # include "do_loop_substitute.h90" 97 # include "domzgr_substitute.h90" 97 98 !!---------------------------------------------------------------------- 98 99 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 359 360 360 361 IF ( ln_trainc ) THEN 361 CALL iom_get( inum, jpdom_auto glo, 'bckint', t_bkginc, 1 )362 CALL iom_get( inum, jpdom_auto glo, 'bckins', s_bkginc, 1 )362 CALL iom_get( inum, jpdom_auto, 'bckint', t_bkginc, 1 ) 363 CALL iom_get( inum, jpdom_auto, 'bckins', s_bkginc, 1 ) 363 364 ! Apply the masks 364 365 t_bkginc(:,:,:) = t_bkginc(:,:,:) * tmask(:,:,:) … … 371 372 372 373 IF ( ln_dyninc ) THEN 373 CALL iom_get( inum, jpdom_auto glo, 'bckinu', u_bkginc, 1 )374 CALL iom_get( inum, jpdom_auto glo, 'bckinv', v_bkginc, 1 )374 CALL iom_get( inum, jpdom_auto, 'bckinu', u_bkginc, 1 ) 375 CALL iom_get( inum, jpdom_auto, 'bckinv', v_bkginc, 1 ) 375 376 ! Apply the masks 376 377 u_bkginc(:,:,:) = u_bkginc(:,:,:) * umask(:,:,:) … … 383 384 384 385 IF ( ln_sshinc ) THEN 385 CALL iom_get( inum, jpdom_auto glo, 'bckineta', ssh_bkginc, 1 )386 CALL iom_get( inum, jpdom_auto, 'bckineta', ssh_bkginc, 1 ) 386 387 ! Apply the masks 387 388 ssh_bkginc(:,:) = ssh_bkginc(:,:) * tmask(:,:,1) … … 392 393 393 394 IF ( ln_seaiceinc ) THEN 394 CALL iom_get( inum, jpdom_auto glo, 'bckinseaice', seaice_bkginc, 1 )395 CALL iom_get( inum, jpdom_auto, 'bckinseaice', seaice_bkginc, 1 ) 395 396 ! Apply the masks 396 397 seaice_bkginc(:,:) = seaice_bkginc(:,:) * tmask(:,:,1) … … 413 414 DO jk = 1, jpkm1 ! zhdiv = e1e1 * div 414 415 zhdiv(:,:) = 0._wp 415 DO_2D _00_00416 DO_2D( 0, 0, 0, 0 ) 416 417 zhdiv(ji,jj) = ( e2u(ji ,jj) * e3u(ji ,jj,jk,Kmm) * u_bkginc(ji ,jj,jk) & 417 418 & - e2u(ji-1,jj) * e3u(ji-1,jj,jk,Kmm) * u_bkginc(ji-1,jj,jk) & 418 419 & + e1v(ji,jj ) * e3v(ji,jj ,jk,Kmm) * v_bkginc(ji,jj ,jk) & 419 & - e1v(ji,jj-1) * e3v(ji,jj-1,jk,Kmm) * v_bkginc(ji,jj-1,jk) ) / e3t(ji,jj,jk,Kmm) 420 & - e1v(ji,jj-1) * e3v(ji,jj-1,jk,Kmm) * v_bkginc(ji,jj-1,jk) ) & 421 & / e3t(ji,jj,jk,Kmm) 420 422 END_2D 421 CALL lbc_lnk( 'asminc', zhdiv, 'T', 1. ) ! lateral boundary cond. (no sign change)423 CALL lbc_lnk( 'asminc', zhdiv, 'T', 1.0_wp ) ! lateral boundary cond. (no sign change) 422 424 ! 423 DO_2D _00_00425 DO_2D( 0, 0, 0, 0 ) 424 426 u_bkginc(ji,jj,jk) = u_bkginc(ji,jj,jk) & 425 427 & + 0.2_wp * ( zhdiv(ji+1,jj) - zhdiv(ji ,jj) ) * r1_e1u(ji,jj) * umask(ji,jj,jk) … … 465 467 ! 466 468 IF ( ln_trainc ) THEN 467 CALL iom_get( inum, jpdom_auto glo, 'tn', t_bkg )468 CALL iom_get( inum, jpdom_auto glo, 'sn', s_bkg )469 CALL iom_get( inum, jpdom_auto, 'tn', t_bkg ) 470 CALL iom_get( inum, jpdom_auto, 'sn', s_bkg ) 469 471 t_bkg(:,:,:) = t_bkg(:,:,:) * tmask(:,:,:) 470 472 s_bkg(:,:,:) = s_bkg(:,:,:) * tmask(:,:,:) … … 472 474 ! 473 475 IF ( ln_dyninc ) THEN 474 CALL iom_get( inum, jpdom_auto glo, 'un', u_bkg)475 CALL iom_get( inum, jpdom_auto glo, 'vn', v_bkg)476 CALL iom_get( inum, jpdom_auto, 'un', u_bkg, cd_type = 'U', psgn = 1._wp ) 477 CALL iom_get( inum, jpdom_auto, 'vn', v_bkg, cd_type = 'V', psgn = 1._wp ) 476 478 u_bkg(:,:,:) = u_bkg(:,:,:) * umask(:,:,:) 477 479 v_bkg(:,:,:) = v_bkg(:,:,:) * vmask(:,:,:) … … 479 481 ! 480 482 IF ( ln_sshinc ) THEN 481 CALL iom_get( inum, jpdom_auto glo, 'sshn', ssh_bkg )483 CALL iom_get( inum, jpdom_auto, 'sshn', ssh_bkg ) 482 484 ssh_bkg(:,:) = ssh_bkg(:,:) * tmask(:,:,1) 483 485 ENDIF … … 758 760 ! 759 761 ssh(:,:,Kbb) = ssh(:,:,Kmm) ! Update before fields 762 #if ! defined key_qco 760 763 e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm) 764 #endif 761 765 !!gm why not e3u(:,:,:,Kbb), e3v(:,:,:,Kbb), gdept(:,:,:,Kbb) ???? 762 766 ! … … 896 900 IF ( kt == nitdin_r ) THEN 897 901 ! 898 l_1st_euler = 0! Force Euler forward step902 l_1st_euler = .TRUE. ! Force Euler forward step 899 903 ! 900 904 ! Sea-ice : SI3 case … … 970 974 ! ! set to bottom of a level 971 975 ! DO jk = jpk-1, 2, -1 972 ! IF ((mld > gdepw(ji,jj,jk )) .and. (mld < gdepw(ji,jj,jk+1))) THEN973 ! mld=gdepw(ji,jj,jk+1 )976 ! IF ((mld > gdepw(ji,jj,jk,Kmm)) .and. (mld < gdepw(ji,jj,jk+1,Kmm))) THEN 977 ! mld=gdepw(ji,jj,jk+1,Kmm) 974 978 ! jkmax=jk 975 979 ! ENDIF
Note: See TracChangeset
for help on using the changeset viewer.