- Timestamp:
- 2020-10-22T20:49:56+02:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11842_SI3-10_EAP
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/OCE/LDF/ldftra.F90 (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11842_SI3-10_EAP
- Property svn:externals
-
old new 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 1 ^/utils/build/arch@12130 arch 2 ^/utils/build/makenemo@12191 makenemo 3 ^/utils/build/mk@11662 mk 4 ^/utils/tools_r4.0-HEAD@12672 tools 5 ^/vendors/AGRIF/dev@10586 ext/AGRIF 6 ^/vendors/FCM@10134 ext/FCM 7 ^/vendors/IOIPSL@9655 ext/IOIPSL 8 9 # SETTE mapping (inactive) 10 #^/utils/CI/sette@12135 sette
-
- Property svn:externals
-
NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/LDF/ldftra.F90
r11536 r13662 152 152 ! ================================= 153 153 ! 154 REWIND( numnam_ref ) ! Namelist namtra_ldf in reference namelist : Lateral physics on tracers154 REWIND( numnam_ref ) 155 155 READ ( numnam_ref, namtra_ldf, IOSTAT = ios, ERR = 901) 156 156 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtra_ldf in reference namelist' ) 157 REWIND( numnam_cfg ) ! Namelist namtra_ldf in configuration namelist : Lateral physics on tracers 157 158 REWIND( numnam_cfg ) 158 159 READ ( numnam_cfg, namtra_ldf, IOSTAT = ios, ERR = 902 ) 159 160 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namtra_ldf in configuration namelist' ) … … 510 511 ENDIF 511 512 ! 512 REWIND( numnam_ref ) ! Namelist namtra_eiv in reference namelist : eddy induced velocity param.513 REWIND( numnam_ref ) 513 514 READ ( numnam_ref, namtra_eiv, IOSTAT = ios, ERR = 901) 514 515 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtra_eiv in reference namelist' ) 515 516 ! 516 REWIND( numnam_cfg ) ! Namelist namtra_eiv in configuration namelist : eddy induced velocity param.517 REWIND( numnam_cfg ) 517 518 READ ( numnam_cfg, namtra_eiv, IOSTAT = ios, ERR = 902 ) 518 519 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namtra_eiv in configuration namelist' ) … … 662 663 ! eddies using the isopycnal slopes calculated in ldfslp.F : 663 664 ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w)) 664 ze3w = e3w_n(ji,jj,jk) * tmask(ji,jj,jk)665 ze3w = e3w_n(ji,jj,jk) * wmask(ji,jj,jk) 665 666 zah(ji,jj) = zah(ji,jj) + zn2 * wslp2(ji,jj,jk) * ze3w 666 667 zhw(ji,jj) = zhw(ji,jj) + ze3w … … 680 681 ! eddies using the isopycnal slopes calculated in ldfslp.F : 681 682 ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w)) 682 ze3w = e3w_n(ji,jj,jk) * tmask(ji,jj,jk)683 ze3w = e3w_n(ji,jj,jk) * wmask(ji,jj,jk) 683 684 zah(ji,jj) = zah(ji,jj) + zn2 * ( wslpi(ji,jj,jk) * wslpi(ji,jj,jk) & 684 685 & + wslpj(ji,jj,jk) * wslpj(ji,jj,jk) ) * ze3w … … 770 771 DO ji = 1, fs_jpim1 ! vector opt. 771 772 zpsi_uw(ji,jj,jk) = - r1_4 * e2u(ji,jj) * ( wslpi(ji,jj,jk ) + wslpi(ji+1,jj,jk) ) & 772 & * ( aeiu (ji,jj,jk-1) + aeiu (ji ,jj,jk) ) * umask(ji,jj,jk)773 & * ( aeiu (ji,jj,jk-1) + aeiu (ji ,jj,jk) ) * wumask(ji,jj,jk) 773 774 zpsi_vw(ji,jj,jk) = - r1_4 * e1v(ji,jj) * ( wslpj(ji,jj,jk ) + wslpj(ji,jj+1,jk) ) & 774 & * ( aeiv (ji,jj,jk-1) + aeiv (ji,jj ,jk) ) * vmask(ji,jj,jk)775 & * ( aeiv (ji,jj,jk-1) + aeiv (ji,jj ,jk) ) * wvmask(ji,jj,jk) 775 776 END DO 776 777 END DO … … 851 852 CALL iom_put( "woce_eiv", zw3d ) 852 853 ! 854 IF( iom_use('weiv_masstr') ) THEN ! vertical mass transport & its square value 855 zw2d(:,:) = rau0 * e1e2t(:,:) 856 DO jk = 1, jpk 857 zw3d(:,:,jk) = zw3d(:,:,jk) * zw2d(:,:) 858 END DO 859 CALL iom_put( "weiv_masstr" , zw3d ) 860 ENDIF 861 ! 862 IF( iom_use('ueiv_masstr') ) THEN 863 zw3d(:,:,:) = 0.e0 864 DO jk = 1, jpkm1 865 zw3d(:,:,jk) = rau0 * ( psi_uw(:,:,jk+1) - psi_uw(:,:,jk) ) 866 END DO 867 CALL iom_put( "ueiv_masstr", zw3d ) ! mass transport in i-direction 868 ENDIF 853 869 ! 854 870 zztmp = 0.5_wp * rau0 * rcp … … 870 886 CALL iom_put( "ueiv_heattr3d", zztmp * zw3d ) ! heat transport in i-direction 871 887 ENDIF 888 ! 889 IF( iom_use('veiv_masstr') ) THEN 890 zw3d(:,:,:) = 0.e0 891 DO jk = 1, jpkm1 892 zw3d(:,:,jk) = rau0 * ( psi_vw(:,:,jk+1) - psi_vw(:,:,jk) ) 893 END DO 894 CALL iom_put( "veiv_masstr", zw3d ) ! mass transport in i-direction 895 ENDIF 896 ! 872 897 zw2d(:,:) = 0._wp 873 898 zw3d(:,:,:) = 0._wp … … 885 910 CALL iom_put( "veiv_heattr", zztmp * zw3d ) ! heat transport in j-direction 886 911 ! 887 IF( ln_diaptr ) CALL dia_ptr_hst( jp_tem, 'eiv', 0.5 * zw3d )912 IF( ln_diaptr ) CALL dia_ptr_hst( jp_tem, 'eiv', 0.5 * zw3d ) 888 913 ! 889 914 zztmp = 0.5_wp * 0.5
Note: See TracChangeset
for help on using the changeset viewer.
