Changeset 15512 for NEMO/branches/2021
- Timestamp:
- 2021-11-15T18:22:03+01:00 (3 years ago)
- Location:
- NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/IOM/iom.F90
r14239 r15512 57 57 LOGICAL, PUBLIC, PARAMETER :: lk_iomput = .FALSE. !: iom_put flag 58 58 #endif 59 LOGICAL, PUBLIC :: l_iom = .TRUE. !: RK3 iom flag prevent writing at stage 1&2 59 60 PUBLIC iom_init, iom_init_closedef, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var 60 61 PUBLIC iom_chkatt, iom_getatt, iom_putatt, iom_getszuld, iom_rstput, iom_delay_rst, iom_put -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/LDF/ldftra.F90
r14201 r15512 68 68 LOGICAL , PUBLIC :: ln_ldfeiv !: eddy induced velocity flag 69 69 LOGICAL , PUBLIC :: ln_ldfeiv_dia !: diagnose & output eiv streamfunction and velocity (IOM) 70 LOGICAL , PUBLIC :: l_ldfeiv_dia !: RK3: modified w.r.t. kstg diagnose & output eiv streamfunction and velocity flag 71 70 72 ! != Coefficients =! 71 73 INTEGER , PUBLIC :: nn_aei_ijk_t !: choice of time/space variation of the eiv coeff. … … 768 770 ! 769 771 ! ! diagnose the eddy induced velocity and associated heat transport 770 IF( l n_ldfeiv_dia .AND. cdtype == 'TRA' ) CALL ldf_eiv_dia( zpsi_uw, zpsi_vw, Kmm )772 IF( l_ldfeiv_dia .AND. cdtype == 'TRA' ) CALL ldf_eiv_dia( zpsi_uw, zpsi_vw, Kmm ) 771 773 ! 772 774 END SUBROUTINE ldf_eiv_trp … … 867 869 CALL iom_put( "veiv_heattr3d", zztmp * zw3d ) ! heat transport in j-direction 868 870 ! 869 IF( iom_use( 'sophteiv' ) ) CALL dia_ptr_hst( jp_tem, 'eiv', 0.5 * zw3d )871 IF( iom_use( 'sophteiv' ) .AND. l_diaptr ) CALL dia_ptr_hst( jp_tem, 'eiv', 0.5 * zw3d ) 870 872 ! 871 873 zztmp = 0.5_wp * 0.5 … … 891 893 CALL iom_put( "veiv_salttr3d", zztmp * zw3d ) ! salt transport in j-direction 892 894 ! 893 IF( iom_use( 'sopsteiv' ) ) CALL dia_ptr_hst( jp_sal, 'eiv', 0.5 * zw3d )895 IF( iom_use( 'sopsteiv' ) .AND. l_diaptr ) CALL dia_ptr_hst( jp_sal, 'eiv', 0.5 * zw3d ) 894 896 ! 895 897 ! -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traadv.F90
r15193 r15512 173 173 ! 174 174 ! TEMP: [tiling] This change not necessary if using XIOS (subdomain support) 175 IF( ntile == 0 .OR. ntile == nijtile ) THEN ! Do only on the last tile 176 CALL iom_put( "uocetr_eff", zuu ) ! output effective transport 177 CALL iom_put( "vocetr_eff", zvv ) 178 CALL iom_put( "wocetr_eff", zww ) 175 IF( l_iom ) 176 IF( ntile == 0 .OR. ntile == nijtile ) THEN ! Do only on the last tile 177 CALL iom_put( "uocetr_eff", zuu ) ! output effective transport 178 CALL iom_put( "vocetr_eff", zvv ) 179 CALL iom_put( "wocetr_eff", zww ) 180 ENDIF 179 181 ENDIF 180 182 ! 181 183 !!gm ??? 182 184 ! TEMP: [tiling] This change not necessary if using XIOS (subdomain support) 183 CALL dia_ptr( kt, Kmm, zvv(A2D(nn_hls),:) ) ! diagnose the effective MSF185 IF( l_diaptr ) CALL dia_ptr( kt, Kmm, zvv(A2D(nn_hls),:) ) ! diagnose the effective MSF 184 186 !!gm ??? 185 187 ! -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traadv_fct.F90
r14298 r15512 106 106 l_ptr = .FALSE. 107 107 ll_zAimp = .FALSE. 108 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype =='TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.109 IF( cdtype == 'TRA' .AND. ( iom_use( 'sophtadv' ) .OR. iom_use( 'sophtadv' ) ) )l_ptr = .TRUE.110 IF( cdtype == 'TRA' .AND. ( iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") .OR. &111 &iom_use("uadv_salttr") .OR. iom_use("vadv_salttr") ) ) l_hst = .TRUE.108 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype =='TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 109 IF( l_diaptr .AND. cdtype == 'TRA' .AND. ( iom_use( 'sophtadv' ) .OR. iom_use( 'sophtadv' ) ) ) l_ptr = .TRUE. 110 IF( l_iom .AND. cdtype == 'TRA' .AND. ( iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") .OR. & 111 & iom_use("uadv_salttr") .OR. iom_use("vadv_salttr") ) ) l_hst = .TRUE. 112 112 ! 113 113 ENDIF -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traadv_mus.F90
r14072 r15512 122 122 l_hst = .FALSE. 123 123 l_ptr = .FALSE. 124 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) )l_trd = .TRUE.125 IF( cdtype == 'TRA' .AND. ( iom_use( 'sophtadv' ) .OR. iom_use( 'sophtadv' ) ) )l_ptr = .TRUE.126 IF( 127 & iom_use("uadv_salttr") .OR. iom_use("vadv_salttr") ) )l_hst = .TRUE.124 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 125 IF( l_diaptr .AND. cdtype == 'TRA' .AND. ( iom_use( 'sophtadv' ) .OR. iom_use( 'sophtadv' ) ) ) l_ptr = .TRUE. 126 IF( l_iom .AND. cdtype == 'TRA' .AND. ( iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") .OR. & 127 & iom_use("uadv_salttr") .OR. iom_use("vadv_salttr") ) ) l_hst = .TRUE. 128 128 ENDIF 129 129 ! -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traldf_iso.F90
r14072 r15512 156 156 l_hst = .FALSE. 157 157 l_ptr = .FALSE. 158 IF( cdtype == 'TRA' .AND. ( iom_use( 'sophtldf' ) .OR. iom_use( 'sopstldf' ) ) )l_ptr = .TRUE.159 IF( cdtype == 'TRA' .AND. ( iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") .OR. &160 & iom_use("uadv_salttr") .OR. iom_use("vadv_salttr") ) ) l_hst = .TRUE.158 IF( l_diaptr .AND. cdtype == 'TRA' .AND. ( iom_use( 'sophtldf' ) .OR. iom_use( 'sopstldf' ) ) ) l_ptr = .TRUE. 159 IF( l_iom .AND. cdtype == 'TRA' .AND. ( iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") .OR. & 160 & iom_use("uadv_salttr") .OR. iom_use("vadv_salttr") ) ) l_hst = .TRUE. 161 161 ENDIF 162 162 !
Note: See TracChangeset
for help on using the changeset viewer.