Changeset 10323 for NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP
- Timestamp:
- 2018-11-16T16:13:30+01:00 (6 years ago)
- Location:
- NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP
- Files:
-
- 13 edited
-
trcadv.F90 (modified) (1 diff)
-
trcbbl.F90 (modified) (1 diff)
-
trcdmp.F90 (modified) (2 diffs)
-
trcldf.F90 (modified) (1 diff)
-
trcnxt.F90 (modified) (4 diffs)
-
trcrad.F90 (modified) (1 diff)
-
trcsbc.F90 (modified) (1 diff)
-
trctrp.F90 (modified) (1 diff)
-
trczdf.F90 (modified) (1 diff)
-
trdmxl_trc.F90 (modified) (1 diff)
-
trdmxl_trc_rst.F90 (modified) (1 diff)
-
trdtrc.F90 (modified) (2 diffs)
-
trdtrc_oce.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcadv.F90
r9950 r10323 64 64 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 65 65 !! $Id$ 66 !! Software governed by the CeCILL licen ce (./LICENSE)66 !! Software governed by the CeCILL license (see ./LICENSE) 67 67 !!---------------------------------------------------------------------- 68 68 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcbbl.F90
r9950 r10323 32 32 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 33 33 !! $Id$ 34 !! Software governed by the CeCILL licen ce (./LICENSE)34 !! Software governed by the CeCILL license (see ./LICENSE) 35 35 !!---------------------------------------------------------------------- 36 36 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcdmp.F90
r9950 r10323 46 46 # include "vectopt_loop_substitute.h90" 47 47 !!---------------------------------------------------------------------- 48 !! NEMO/TOP 3.3, NEMO Consortium (2018)48 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 49 49 !! $Id$ 50 !! Software governed by the CeCILL licen ce (./LICENSE)50 !! Software governed by the CeCILL license (see ./LICENSE) 51 51 !!---------------------------------------------------------------------- 52 52 CONTAINS … … 251 251 ! ------------------- 252 252 253 IF( cn_cfg == "orca" ) THEN253 IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA") THEN 254 254 ! 255 255 SELECT CASE ( nn_cfg ) -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcldf.F90
r9950 r10323 45 45 # include "vectopt_loop_substitute.h90" 46 46 !!---------------------------------------------------------------------- 47 !! NEMO/TOP 3.7, NEMO Consortium (2018)47 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 48 48 !! $Id$ 49 !! Software governed by the CeCILL licen ce (./LICENSE)49 !! Software governed by the CeCILL license (see ./LICENSE) 50 50 !!---------------------------------------------------------------------- 51 51 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcnxt.F90
r9950 r10323 48 48 49 49 !!---------------------------------------------------------------------- 50 !! NEMO/TOP 3.3, NEMO Consortium (2018)50 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 51 51 !! $Id$ 52 !! Software governed by the CeCILL licen ce (./LICENSE)52 !! Software governed by the CeCILL license (see ./LICENSE) 53 53 !!---------------------------------------------------------------------- 54 54 CONTAINS … … 103 103 IF( l_trdtrc ) THEN ! trends: store now fields before the Asselin filter application 104 104 ALLOCATE( ztrdt(jpi,jpj,jpk,jptra) ) 105 ztrdt(:,:,:,:) = trn(:,:,:,:) 105 ztrdt(:,:,:,:) = 0._wp 106 IF( ln_traldf_iso ) THEN ! diagnose the "pure" Kz diffusive trend 107 DO jn = 1, jptra 108 CALL trd_tra( kt, 'TRC', jn, jptra_zdfp, ztrdt(:,:,:,jn) ) 109 ENDDO 110 ENDIF 111 112 ! total trend for the non-time-filtered variables. 113 zfact = 1.0 / rdttrc 114 ! G Nurser 23 Mar 2017. Recalculate trend as Delta(e3t*T)/e3tn; e3tn cancel from tsn terms 115 IF( ln_linssh ) THEN ! linear sea surface height only 116 DO jn = 1, jptra 117 DO jk = 1, jpkm1 118 ztrdt(:,:,jk,jn) = ( tra(:,:,jk,jn)*e3t_a(:,:,jk) / e3t_n(:,:,jk) - trn(:,:,jk,jn)) * zfact 119 END DO 120 END DO 121 ELSE 122 DO jn = 1, jptra 123 DO jk = 1, jpkm1 124 ztrdt(:,:,jk,jn) = ( tra(:,:,jk,jn) - trn(:,:,jk,jn) ) * zfact 125 END DO 126 END DO 127 ENDIF 128 ! 129 DO jn = 1, jptra 130 CALL trd_tra( kt, 'TRC', jn, jptra_tot, ztrdt(:,:,:,jn) ) 131 ENDDO 132 ! 133 IF( ln_linssh ) THEN ! linear sea surface height only 134 ! Store now fields before applying the Asselin filter 135 ! in order to calculate Asselin filter trend later. 136 ztrdt(:,:,:,:) = trn(:,:,:,:) 137 ENDIF 138 106 139 ENDIF 107 140 ! ! Leap-Frog + Asselin filter time stepping … … 113 146 END DO 114 147 END DO 148 IF (l_trdtrc .AND. .NOT. ln_linssh ) THEN ! Zero Asselin filter contribution must be explicitly written out since for vvl 149 ! ! Asselin filter is output by tra_nxt_vvl that is not called on this time step 150 ztrdt(:,:,:,:) = 0._wp 151 DO jn = 1, jptra 152 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt(:,:,:,jn) ) 153 ENDDO 154 END IF 155 ! 115 156 ELSE 116 157 IF( .NOT. l_offline ) THEN ! Leap-Frog + Asselin filter time stepping … … 126 167 ENDIF 127 168 ! 128 IF( l_trdtrc ) THEN ! trends: send Asselin filter trends to trdtra manager for further diagnostics169 IF( l_trdtrc .AND. ln_linssh ) THEN ! trend of the Asselin filter (tb filtered - tb)/dt ) 129 170 DO jn = 1, jptra 130 171 DO jk = 1, jpkm1 131 172 zfact = 1._wp / r2dttrc 132 173 ztrdt(:,:,jk,jn) = ( trb(:,:,jk,jn) - ztrdt(:,:,jk,jn) ) * zfact 133 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt )134 END DO174 END DO 175 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt(:,:,:,jn) ) 135 176 END DO 136 DEALLOCATE( ztrdt )137 177 END IF 178 IF( l_trdtrc ) DEALLOCATE( ztrdt ) 138 179 ! 139 180 IF(ln_ctl) THEN ! print mean trends (used for debugging) -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcrad.F90
r9950 r10323 29 29 30 30 !!---------------------------------------------------------------------- 31 !! NEMO/TOP 3.3, NEMO Consortium (2018)31 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 32 32 !! $Id$ 33 !! Software governed by the CeCILL licen ce (./LICENSE)33 !! Software governed by the CeCILL license (see ./LICENSE) 34 34 !!---------------------------------------------------------------------- 35 35 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trcsbc.F90
r9950 r10323 31 31 # include "vectopt_loop_substitute.h90" 32 32 !!---------------------------------------------------------------------- 33 !! NEMO/TOP 3.3, NEMO Consortium (2018)33 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 34 34 !! $Id$ 35 !! Software governed by the CeCILL licen ce (./LICENSE)35 !! Software governed by the CeCILL license (see ./LICENSE) 36 36 !!---------------------------------------------------------------------- 37 37 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trctrp.F90
r9950 r10323 37 37 38 38 !!---------------------------------------------------------------------- 39 !! NEMO/TOP 3.3, NEMO Consortium (2018)39 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 40 40 !! $Id$ 41 !! Software governed by the CeCILL licen ce (./LICENSE)41 !! Software governed by the CeCILL license (see ./LICENSE) 42 42 !!---------------------------------------------------------------------- 43 43 -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trczdf.F90
r9950 r10323 30 30 31 31 !!---------------------------------------------------------------------- 32 !! NEMO/TOP 3.7, NEMO Consortium (2018)32 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 33 33 !! $Id$ 34 !! Software governed by the CeCILL licen ce (./LICENSE)34 !! Software governed by the CeCILL license (see ./LICENSE) 35 35 !!---------------------------------------------------------------------- 36 36 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trdmxl_trc.F90
r9950 r10323 51 51 52 52 !!---------------------------------------------------------------------- 53 !! NEMO/TOP 3.3, NEMO Consortium (2018)53 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 54 54 !! $Id$ 55 !! Software governed by the CeCILL licen ce (./LICENSE)55 !! Software governed by the CeCILL license (see ./LICENSE) 56 56 !!---------------------------------------------------------------------- 57 57 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trdmxl_trc_rst.F90
r9950 r10323 23 23 24 24 !!--------------------------------------------------------------------------------- 25 !! NEMO/TOP 3.3, NEMO Consortium (2018)25 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 26 26 !! $Id$ 27 !! Software governed by the CeCILL licen ce (./LICENSE)27 !! Software governed by the CeCILL license (see ./LICENSE) 28 28 !!--------------------------------------------------------------------------------- 29 29 CONTAINS -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trdtrc.F90
r9950 r10323 25 25 26 26 !!---------------------------------------------------------------------- 27 !! NEMO/TOP 3.3, NEMO Consortium (2018)27 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 28 28 !! $Id$ 29 !! Software governed by the CeCILL licen ce (./LICENSE)29 !! Software governed by the CeCILL license (see ./LICENSE) 30 30 !!---------------------------------------------------------------------- 31 31 … … 81 81 ! 82 82 SELECT CASE( ktrd ) 83 CASE( jptra_xad ) ; WRITE (cltra,'("XAD_",4a)') 84 CASE( jptra_yad ) ; WRITE (cltra,'("YAD_",4a)') 85 CASE( jptra_zad ) ; WRITE (cltra,'("ZAD_",4a)') 86 CASE( jptra_ldf ) ; WRITE (cltra,'("LDF_",4a)') 87 CASE( jptra_bbl ) ; WRITE (cltra,'("BBL_",4a)') 88 CASE( jptra_nsr ) ; WRITE (cltra,'("FOR_",4a)') 89 CASE( jptra_zdf ) ; WRITE (cltra,'("ZDF_",4a)') 90 CASE( jptra_dmp ) ; WRITE (cltra,'("DMP_",4a)') 91 CASE( jptra_sms ) ; WRITE (cltra,'("SMS_",4a)') 92 CASE( jptra_atf ) ; WRITE (cltra,'("ATF_",4a)') 93 CASE( jptra_radb ) ; WRITE (cltra,'("RDB_",4a)') 94 CASE( jptra_radn ) ; WRITE (cltra,'("RDN_",4a)') 83 CASE( jptra_xad ) ; WRITE (cltra,'("XAD_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 84 CASE( jptra_yad ) ; WRITE (cltra,'("YAD_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 85 CASE( jptra_zad ) ; WRITE (cltra,'("ZAD_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 86 CASE( jptra_ldf ) ; WRITE (cltra,'("LDF_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 87 CASE( jptra_bbl ) ; WRITE (cltra,'("BBL_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 88 CASE( jptra_nsr ) ; WRITE (cltra,'("FOR_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 89 CASE( jptra_zdf ) ; WRITE (cltra,'("ZDF_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 90 CASE( jptra_zdfp ) ; WRITE (cltra,'("ZDP_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 91 CASE( jptra_dmp ) ; WRITE (cltra,'("DMP_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 92 CASE( jptra_sms ) ; WRITE (cltra,'("SMS_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 93 CASE( jptra_tot ) ; WRITE (cltra,'("TOT_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 94 CASE( jptra_atf ) ; WRITE (cltra,'("ATF_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 95 CASE( jptra_radb ) ; WRITE (cltra,'("RDB_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 96 CASE( jptra_radn ) ; WRITE (cltra,'("RDN_",4a)') ; cltra = TRIM(cltra)//TRIM(ctrcnm(kjn)) ; CALL iom_put( cltra, ptrtrd(:,:,:) ) 95 97 END SELECT 96 cltra = TRIM(cltra)//TRIM(ctrcnm(kjn))97 CALL iom_put( cltra, ptrtrd(:,:,:) )98 98 ! 99 99 END IF -
NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/TRP/trdtrc_oce.F90
r9950 r10323 107 107 108 108 !!---------------------------------------------------------------------- 109 !! NEMO/TOP 3.3, NEMO Consortium (2018)109 !! NEMO/TOP 4.0 , NEMO Consortium (2018) 110 110 !! $Id$ 111 !! Software governed by the CeCILL licen ce (./LICENSE)111 !! Software governed by the CeCILL license (see ./LICENSE) 112 112 !!---------------------------------------------------------------------- 113 113 CONTAINS
Note: See TracChangeset
for help on using the changeset viewer.
