Changeset 4990 for trunk/NEMOGCM/NEMO/TOP_SRC/TRP
- Timestamp:
- 2014-12-15T17:42:49+01:00 (9 years ago)
- Location:
- trunk/NEMOGCM/NEMO/TOP_SRC/TRP
- Files:
-
- 4 deleted
- 8 edited
- 4 copied
-
trcbbl.F90 (modified) (2 diffs)
-
trcdmp.F90 (modified) (3 diffs)
-
trcldf.F90 (modified) (4 diffs)
-
trcnxt.F90 (modified) (2 diffs)
-
trcrad.F90 (modified) (3 diffs)
-
trcsbc.F90 (modified) (2 diffs)
-
trctrp.F90 (modified) (1 diff)
-
trczdf.F90 (modified) (2 diffs)
-
trdmld_trc.F90 (deleted)
-
trdmld_trc_rst.F90 (deleted)
-
trdmod_trc.F90 (deleted)
-
trdmod_trc_oce.F90 (deleted)
-
trdmxl_trc.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90)
-
trdmxl_trc_rst.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90)
-
trdtrc.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90)
-
trdtrc_oce.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90
r4513 r4990 25 25 USE trabbl ! 26 26 USE prtctl_trc ! Print control for debbuging 27 USE trd mod_oce27 USE trd_oce 28 28 USE trdtra 29 29 … … 93 93 DO jn = 1, jptra 94 94 ztrtrd(:,:,:,jn) = tra(:,:,:,jn) - ztrtrd(:,:,:,jn) 95 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_bbl, ztrtrd(:,:,:,jn) )95 CALL trd_tra( kt, 'TRC', jn, jptra_bbl, ztrtrd(:,:,:,jn) ) 96 96 END DO 97 97 CALL wrk_dealloc( jpi, jpj, jpk, jptra, ztrtrd ) ! temporary save of trends -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90
r4359 r4990 23 23 USE prtctl_trc ! Print control for debbuging 24 24 USE trdtra 25 USE trd mod_oce25 USE trd_oce 26 26 27 27 IMPLICIT NONE … … 75 75 !! ** Action : - update the tracer trends tra with the newtonian 76 76 !! damping trends. 77 !! - save the trends ('key_trdm ld_trc')77 !! - save the trends ('key_trdmxl_trc') 78 78 !!---------------------------------------------------------------------- 79 79 !! … … 151 151 IF( l_trdtrc ) THEN 152 152 ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 153 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_dmp, ztrtrd )153 CALL trd_tra( kt, 'TRC', jn, jptra_dmp, ztrtrd ) 154 154 END IF 155 155 ! ! =========== -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
r3294 r4990 25 25 USE traldf_iso_grif ! lateral mixing (tra_ldf_iso_grif routine) 26 26 USE traldf_lap ! lateral mixing (tra_ldf_lap routine) 27 USE trd mod_oce27 USE trd_oce 28 28 USE trdtra 29 29 USE prtctl_trc ! Print control … … 73 73 74 74 SELECT CASE ( nldf ) ! compute lateral mixing trend and add it to the general trend 75 CASE ( 0 ) ; CALL tra_ldf_lap ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra) ! iso-level laplacian75 CASE ( 0 ) ; CALL tra_ldf_lap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra ) ! iso-level laplacian 76 76 CASE ( 1 ) ! rotated laplacian 77 77 IF( ln_traldf_grif ) THEN 78 78 CALL tra_ldf_iso_grif( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 ) 79 79 ELSE 80 CALL tra_ldf_iso ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )80 CALL tra_ldf_iso ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, rn_ahtb_0 ) 81 81 ENDIF 82 CASE ( 2 ) ; CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra ) ! iso-level bilaplacian82 CASE ( 2 ) ; CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra ) ! iso-level bilaplacian 83 83 CASE ( 3 ) ; CALL tra_ldf_bilapg( kt, nittrc000, 'TRC', trb, tra, jptra ) ! s-coord. horizontal bilaplacian 84 84 ! 85 85 CASE ( -1 ) ! esopa: test all possibility with control print 86 CALL tra_ldf_lap ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra )86 CALL tra_ldf_lap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra ) 87 87 WRITE(charout, FMT="('ldf0 ')") ; CALL prt_ctl_trc_info(charout) 88 88 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) … … 90 90 CALL tra_ldf_iso_grif( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 ) 91 91 ELSE 92 CALL tra_ldf_iso ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )92 CALL tra_ldf_iso ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, rn_ahtb_0 ) 93 93 ENDIF 94 94 WRITE(charout, FMT="('ldf1 ')") ; CALL prt_ctl_trc_info(charout) 95 95 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 96 CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra )96 CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra ) 97 97 WRITE(charout, FMT="('ldf2 ')") ; CALL prt_ctl_trc_info(charout) 98 98 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) … … 105 105 DO jn = 1, jptra 106 106 ztrtrd(:,:,:,jn) = tra(:,:,:,jn) - ztrtrd(:,:,:,jn) 107 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_ldf, ztrtrd(:,:,:,jn) )107 CALL trd_tra( kt, 'TRC', jn, jptra_ldf, ztrtrd(:,:,:,jn) ) 108 108 END DO 109 109 CALL wrk_dealloc( jpi, jpj, jpk, jptra, ztrtrd ) -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90
r4611 r4990 30 30 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 31 31 USE prtctl_trc ! Print control for debbuging 32 USE trd mod_oce32 USE trd_oce 33 33 USE trdtra 34 34 USE tranxt … … 148 148 zfact = 1.e0 / r2dt(jk) 149 149 ztrdt(:,:,jk,jn) = ( trb(:,:,jk,jn) - ztrdt(:,:,jk,jn) ) * zfact 150 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_atf, ztrdt )150 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt ) 151 151 END DO 152 152 END DO -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90
r3680 r4990 15 15 USE oce_trc ! ocean dynamics and tracers variables 16 16 USE trc ! ocean passive tracers variables 17 USE trd mod_oce17 USE trd_oce 18 18 USE trdtra 19 19 USE prtctl_trc ! Print control for debbuging … … 156 156 ztrtrdb(:,:,:) = ( ptrb(:,:,:,jn) - ztrtrdb(:,:,:) ) * zs2rdt 157 157 ztrtrdn(:,:,:) = ( ptrn(:,:,:,jn) - ztrtrdn(:,:,:) ) * zs2rdt 158 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_radb, ztrtrdb ) ! Asselin-like trend handling159 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_radn, ztrtrdn ) ! standard trend handling158 CALL trd_tra( kt, 'TRC', jn, jptra_radb, ztrtrdb ) ! Asselin-like trend handling 159 CALL trd_tra( kt, 'TRC', jn, jptra_radn, ztrtrdn ) ! standard trend handling 160 160 ! 161 161 ENDIF … … 187 187 ztrtrdb(:,:,:) = ( ptrb(:,:,:,jn) - ztrtrdb(:,:,:) ) * zs2rdt 188 188 ztrtrdn(:,:,:) = ( ptrn(:,:,:,jn) - ztrtrdn(:,:,:) ) * zs2rdt 189 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_radb, ztrtrdb ) ! Asselin-like trend handling190 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_radn, ztrtrdn ) ! standard trend handling189 CALL trd_tra( kt, 'TRC', jn, jptra_radb, ztrtrdb ) ! Asselin-like trend handling 190 CALL trd_tra( kt, 'TRC', jn, jptra_radn, ztrtrdn ) ! standard trend handling 191 191 ! 192 192 ENDIF -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
r3719 r4990 19 19 USE trc ! ocean passive tracers variables 20 20 USE prtctl_trc ! Print control for debbuging 21 USE trd mod_oce21 USE trd_oce 22 22 USE trdtra 23 23 … … 104 104 IF( l_trdtrc ) THEN 105 105 ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 106 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_nsr, ztrtrd )106 CALL trd_tra( kt, 'TRC', jn, jptra_nsr, ztrtrd ) 107 107 END IF 108 108 ! ! =========== -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90
r4148 r4990 82 82 IF( .NOT. Agrif_Root()) CALL Agrif_Update_Trc( kstp ) ! Update tracer at AGRIF zoom boundaries : children only 83 83 #endif 84 IF( ln_zps ) CALL zps_hde( kstp, jptra, trn, gtru, gtrv) ! Partial steps: now horizontal gradient of passive84 IF( ln_zps ) CALL zps_hde( kstp, jptra, trn, pgtu=gtru, pgtv=gtrv, sgtu=gtrui, sgtv=gtrvi ) ! Partial steps: now horizontal gradient of passive 85 85 ! tracers at the bottom ocean level 86 86 ! -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
r3680 r4990 19 19 USE trazdf_exp ! vertical diffusion: explicit (tra_zdf_exp routine) 20 20 USE trazdf_imp ! vertical diffusion: implicit (tra_zdf_imp routine) 21 USE trd mod_oce21 USE trd_oce 22 22 USE trdtra 23 23 USE prtctl_trc ! Print control … … 106 106 ztrtrd(:,:,jk,jn) = ( ( tra(:,:,jk,jn) - trb(:,:,jk,jn) ) / r2dt(jk) ) - ztrtrd(:,:,jk,jn) 107 107 END DO 108 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_zdf, ztrtrd(:,:,:,jn) )108 CALL trd_tra( kt, 'TRC', jn, jptra_zdf, ztrtrd(:,:,:,jn) ) 109 109 END DO 110 110 CALL wrk_dealloc( jpi, jpj, jpk, jptra, ztrtrd )
Note: See TracChangeset
for help on using the changeset viewer.
