Changeset 4804 for branches/2014/dev_CNRS1_10_TEOS10_Ediag
- Timestamp:
- 2014-10-03T12:47:03+02:00 (10 years ago)
- Location:
- branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO
- Files:
-
- 5 added
- 5 deleted
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r4570 r4804 535 535 !!--------------------------------------------------------------------- 536 536 #if defined key_ldfslp && ! defined key_c1d 537 CALL eos ( pts, rhd, rhop, gdept_0(:,:,:) ) ! Time-filtered in situ density538 CALL bn2 ( pts, rn2 ) ! before Brunt-Vaisala frequency537 CALL eos_rab( pts, rab_n ) ! now local thermal/haline expension ratio at T-points 538 CALL bn2 ( pts, rab_n, rn2 ) ! now Brunt-Vaisala 539 539 IF( ln_zps ) & 540 540 & CALL zps_hde( kt, jpts, pts, gtsu, gtsv, rhd, gru, grv ) ! Partial steps: before Horizontal DErivative -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90
r4619 r4804 87 87 ! Mixed layer trends for active tracers 88 88 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 89 !!gm IF( ln_dyn_m ld ) CALL trd_mld_dyn89 !!gm IF( ln_dyn_mxl ) CALL trd_mxl_dyn 90 90 ! 91 91 END SUBROUTINE trd_dyn -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90
r4619 r4804 19 19 USE zdf_oce ! ocean vertical physics 20 20 USE trd_oce ! trends: ocean variables 21 USE trd mod_trc ! ocean passive mixed layer tracers trends21 USE trdtrc ! ocean passive mixed layer tracers trends 22 22 USE trdglo ! trends: global domain averaged 23 23 USE trdpen ! trends: Potential ENergy … … 73 73 !! call to trd_tra_adv 74 74 !! - 'TRA' case : regroup T & S trends 75 !! - send the trends to trd_tra_mng (trd mod_trc) for further processing75 !! - send the trends to trd_tra_mng (trdtrc) for further processing 76 76 !!---------------------------------------------------------------------- 77 77 INTEGER , INTENT(in) :: kt ! time step … … 157 157 ztrds(:,:,:) = ptrd(:,:,:) * tmask(:,:,:) 158 158 END SELECT 159 ! ! send trend to trd_ mod_trc160 CALL trd_ mod_trc( ztrds, ktra, ktrd, kt )159 ! ! send trend to trd_trc 160 CALL trd_trc( ztrds, ktra, ktrd, kt ) 161 161 ! 162 162 ENDIF -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
r4619 r4804 1310 1310 IF( l_trdtrc ) THEN ! save the non-local tracer flux trends for diagnostic 1311 1311 ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 1312 CALL trd_tra( kt, 'TRC', jn, jptra_ trd_zdf, ztrtrd(:,:,:) )1312 CALL trd_tra( kt, 'TRC', jn, jptra_zdf, ztrtrd(:,:,:) ) 1313 1313 ENDIF 1314 1314 ! -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90
r3680 r4804 18 18 USE par_trc ! TOP parameters 19 19 USE trc ! TOP variables 20 USE trd mod_oce21 USE trd mod_trc20 USE trd_oce 21 USE trdtrc 22 22 USE iom ! I/O library 23 23 … … 302 302 ENDIF 303 303 304 IF( l_trdtrc ) CALL trd_ mod_trc( tra(:,:,:,jpc14), jpc14, jptra_trd_sms, kt ) ! save trends304 IF( l_trdtrc ) CALL trd_trc( tra(:,:,:,jpc14), jpc14, jptra_sms, kt ) ! save trends 305 305 306 306 CALL wrk_dealloc( jpi, jpj, zatmbc14 ) -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
r3680 r4804 18 18 USE par_trc ! TOP parameters 19 19 USE trc ! TOP variables 20 USE trd mod_oce21 USE trd mod_trc20 USE trd_oce 21 USE trdtrc 22 22 USE iom ! I/O library 23 23 … … 201 201 IF( l_trdtrc ) THEN 202 202 DO jn = jp_cfc0, jp_cfc1 203 CALL trd_ mod_trc( tra(:,:,:,jn), jn, jptra_trd_sms, kt ) ! save trends203 CALL trd_trc( tra(:,:,:,jn), jn, jptra_sms, kt ) ! save trends 204 204 END DO 205 205 END IF -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90
r3680 r4804 16 16 USE oce_trc ! Ocean variables 17 17 USE trc ! TOP variables 18 USE trd mod_oce19 USE trd mod_trc18 USE trd_oce 19 USE trdtrc 20 20 21 21 IMPLICIT NONE … … 65 65 DO jn = jp_myt0, jp_myt1 66 66 ztrmyt(:,:,:) = tra(:,:,:,jn) 67 CALL trd_ mod_trc( ztrmyt, jn, jptra_trd_sms, kt ) ! save trends67 CALL trd_trc( ztrmyt, jn, jptra_sms, kt ) ! save trends 68 68 END DO 69 69 CALL wrk_dealloc( jpi, jpj, jpk, ztrmyt ) -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90
r4147 r4804 21 21 USE lbclnk ! 22 22 USE prtctl_trc ! Print control for debbuging 23 USE trd mod_oce24 USE trd mod_trc23 USE trd_oce 24 USE trd_trc 25 25 USE iom 26 26 … … 457 457 IF( l_trdtrc ) THEN 458 458 DO jl = jp_pcs0_trd, jp_pcs1_trd 459 CALL trd_ mod_trc( trbio(:,:,:,jl), jl, kt ) ! handle the trend459 CALL trd_trc( trbio(:,:,:,jl), jl, kt ) ! handle the trend 460 460 END DO 461 461 ENDIF -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90
r3446 r4804 22 22 USE lbclnk 23 23 USE prtctl_trc ! Print control for debbuging 24 USE trd mod_oce25 USE trd mod_trc24 USE trd_oce 25 USE trd_trc 26 26 USE iom 27 27 … … 164 164 ztrbio(:,:,:) = tra(:,:,:,jpno3) - ztrbio(:,:,:) 165 165 jl = jp_pcs0_trd + 16 166 CALL trd_ mod_trc( ztrbio, jl, kt ) ! handle the trend166 CALL trd_trc( ztrbio, jl, kt ) ! handle the trend 167 167 CALL wrk_dealloc( jpi, jpj, jpk, ztrbio ) ! temporary save of trends 168 168 ENDIF -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90
r4147 r4804 128 128 IF( etot(ji,jj,jk) >= zpar100(ji,jj) ) neln(ji,jj) = jk + 1 129 129 ! ! nb. this is to ensure compatibility with 130 ! ! nmld_trc definition in trd_m ld_trc_zint130 ! ! nmld_trc definition in trd_mxl_trc_zint 131 131 END DO 132 132 END DO -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90
r4609 r4804 18 18 USE sms_pisces 19 19 USE lbclnk 20 USE trd mod_oce21 USE trd mod_trc20 USE trd_oce 21 USE trdtrc 22 22 USE iom 23 23 USE prtctl_trc ! Print control for debbuging … … 128 128 ztrbio(:,:,:) = tra(:,:,:,jpdet) - ztrbio(:,:,:) 129 129 jl = jp_pcs0_trd + 7 130 CALL trd_ mod_trc( ztrbio, jl, kt ) ! handle the trend130 CALL trd_trc( ztrbio, jl, kt ) ! handle the trend 131 131 CALL wrk_dealloc( jpi, jpj, jpk, ztrbio ) 132 132 ENDIF -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90
r4147 r4804 20 20 USE p2zsed 21 21 USE p2zexp 22 USE trd mod_oce23 USE trd mod_trc_oce24 USE trd mod_trc25 USE trdm ld_trc22 USE trd_oce 23 USE trdtrc_oce 24 USE trd_trc 25 USE trdmxl_trc 26 26 27 27 IMPLICIT NONE … … 61 61 IF( l_trdtrc ) THEN 62 62 DO jn = jp_pcs0, jp_pcs1 63 CALL trd_ mod_trc( tra(:,:,:,jn), jn, jptra_trd_sms, kt ) ! save trends63 CALL trd_trc( tra(:,:,:,jn), jn, jptra_sms, kt ) ! save trends 64 64 END DO 65 65 END IF 66 66 67 IF( lk_trdm ld_trc ) CALL trd_mld_bio( kt ) ! trends: Mixed-layer67 IF( lk_trdmxl_trc ) CALL trd_mxl_bio( kt ) ! trends: Mixed-layer 68 68 ! 69 69 IF ( kt == nittrc000 ) CALL FLUSH ( numonp ) ! flush output namelist PISCES -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90
r4361 r4804 205 205 IF( etot(ji,jj,jk) * tmask(ji,jj,jk) >= 0.0043 * qsr(ji,jj) ) THEN 206 206 neln(ji,jj) = jk+1 ! Euphotic level : 1rst T-level strictly below Euphotic layer 207 ! ! nb: ensure the compatibility with nmld_trc definition in trd_m ld_trc_zint207 ! ! nb: ensure the compatibility with nmld_trc definition in trd_mxl_trc_zint 208 208 heup(ji,jj) = fsdepw(ji,jj,jk+1) ! Euphotic layer depth 209 209 ENDIF -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90
r4162 r4804 25 25 USE p4zint ! time interpolation 26 26 USE iom ! I/O manager 27 USE trd mod_oce ! Ocean trends variables28 USE trd mod_trc ! TOP trends variables27 USE trd_oce ! Ocean trends variables 28 USE trdtrc ! TOP trends variables 29 29 USE sedmodel ! Sediment model 30 30 USE prtctl_trc ! print control for debugging … … 146 146 jl = jn + jp_pcs0 - 1 147 147 ztrdpis(:,:,:,jn) = ztrdpis(:,:,:,jn) + tra(:,:,:,jl) 148 CALL trd_ mod_trc( ztrdpis(:,:,:,jn), jn, jptra_trd_sms, kt ) ! save trends148 CALL trd_trc( ztrdpis(:,:,:,jn), jn, jptra_sms, kt ) ! save trends 149 149 END DO 150 150 CALL wrk_dealloc( jpi, jpj, jpk, jp_pisces, ztrdpis ) -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90
r4319 r4804 19 19 USE trc ! TOP variables 20 20 USE sms_pisces ! sms trends 21 USE trd mod_trc_oce21 USE trdtrc_oce 22 22 USE iom ! I/O manager 23 23 … … 123 123 #if defined key_pisces_reduced 124 124 125 IF( ( .NOT.lk_iomput .AND. ln_diabio ) .OR. lk_trdm ld_trc ) THEN125 IF( ( .NOT.lk_iomput .AND. ln_diabio ) .OR. lk_trdmxl_trc ) THEN 126 126 ! 127 127 ! Namelist nampisdbi -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90
r4513 r4804 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 -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90
r4359 r4804 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 ! ! =========== -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
r3294 r4804 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 … … 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 ) -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90
r4611 r4804 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 -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90
r3680 r4804 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 -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
r3719 r4804 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 ! ! =========== -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
r3680 r4804 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 ) -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
r4610 r4804 66 66 USE oce , ONLY : rhop => rhop !: potential volumic mass (kg m-3) 67 67 USE oce , ONLY : rhd => rhd !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units) 68 #if defined key_offline 69 USE oce , ONLY : rab_n => rab_n !: local thermal/haline expension ratio at T-points 70 #endif 68 71 USE oce , ONLY : hdivn => hdivn !: horizontal divergence (1/s) 69 72 USE oce , ONLY : rotn => rotn !: relative vorticity [s-1] -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/trcini.F90
r4607 r4804 192 192 USE trcnxt , ONLY: trc_nxt_alloc 193 193 USE trczdf , ONLY: trc_zdf_alloc 194 USE trd mod_trc_oce, ONLY: trd_mod_trc_oce_alloc195 #if defined key_trdm ld_trc196 USE trdm ld_trc , ONLY: trd_mld_trc_alloc194 USE trdtrc_oce , ONLY: trd_trc_oce_alloc 195 #if defined key_trdmxl_trc 196 USE trdmxl_trc , ONLY: trd_mxl_trc_alloc 197 197 #endif 198 198 ! … … 204 204 ierr = ierr + trc_nxt_alloc() 205 205 ierr = ierr + trc_zdf_alloc() 206 ierr = ierr + trd_ mod_trc_oce_alloc()207 #if defined key_trdm ld_trc208 ierr = ierr + trd_m ld_trc_alloc()206 ierr = ierr + trd_trc_oce_alloc() 207 #if defined key_trdmxl_trc 208 ierr = ierr + trd_mxl_trc_alloc() 209 209 #endif 210 210 ! -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/trcnam.F90
r4319 r4804 25 25 USE trcnam_c14b ! C14 SMS namelist 26 26 USE trcnam_my_trc ! MY_TRC SMS namelist 27 USE trd mod_oce28 USE trd mod_trc_oce27 USE trd_oce 28 USE trdtrc_oce 29 29 USE iom ! I/O manager 30 30 … … 119 119 120 120 121 #if defined key_trdm ld_trc || defined key_trdtrc121 #if defined key_trdmxl_trc || defined key_trdtrc 122 122 123 123 REWIND( numnat_ref ) ! Namelist namtrc_trd in reference namelist : Passive tracer trends … … 132 132 IF(lwp) THEN 133 133 WRITE(numout,*) 134 WRITE(numout,*) ' trd_m ld_trc_init : read namelist namtrc_trd '134 WRITE(numout,*) ' trd_mxl_trc_init : read namelist namtrc_trd ' 135 135 WRITE(numout,*) ' ~~~~~~~~~~~~~~~~ ' 136 136 WRITE(numout,*) ' * frequency of trends diagnostics nn_trd_trc = ', nn_trd_trc 137 137 WRITE(numout,*) ' * control surface type nn_ctls_trc = ', nn_ctls_trc 138 WRITE(numout,*) ' * restart for ML diagnostics ln_trdm ld_trc_restart = ', ln_trdmld_trc_restart138 WRITE(numout,*) ' * restart for ML diagnostics ln_trdmxl_trc_restart = ', ln_trdmxl_trc_restart 139 139 WRITE(numout,*) ' * flag to diagnose trends of ' 140 WRITE(numout,*) ' instantantaneous or mean ML T/S ln_trdm ld_trc_instant = ', ln_trdmld_trc_instant140 WRITE(numout,*) ' instantantaneous or mean ML T/S ln_trdmxl_trc_instant = ', ln_trdmxl_trc_instant 141 141 WRITE(numout,*) ' * unit conversion factor rn_ucf_trc = ', rn_ucf_trc 142 142 DO jn = 1, jptra … … 266 266 !!--------------------------------------------------------------------- 267 267 INTEGER :: ierr 268 #if defined key_trdm ld_trc || defined key_trdtrc268 #if defined key_trdmxl_trc || defined key_trdtrc 269 269 NAMELIST/namtrc_trd/ nn_trd_trc, nn_ctls_trc, rn_ucf_trc, & 270 & ln_trdm ld_trc_restart, ln_trdmld_trc_instant, &270 & ln_trdmxl_trc_restart, ln_trdmxl_trc_instant, & 271 271 & cn_trdrst_trc_in, cn_trdrst_trc_out, ln_trdtrc 272 272 #endif -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/trcrst.F90
r4152 r4804 137 137 CALL trc_rst_stat ! statistics 138 138 CALL iom_close( numrtw ) ! close the restart file (only at last time step) 139 #if ! defined key_trdm ld_trc139 #if ! defined key_trdmxl_trc 140 140 lrst_trc = .FALSE. 141 141 #endif -
branches/2014/dev_CNRS1_10_TEOS10_Ediag/NEMOGCM/NEMO/TOP_SRC/trcstp.F90
r4306 r4804 19 19 USE trcwri 20 20 USE trcrst 21 USE trd mod_trc_oce22 USE trdm ld_trc21 USE trdtrc_oce 22 USE trdmxl_trc 23 23 USE iom 24 24 USE in_out_manager … … 59 59 IF( nn_timing == 1 ) CALL timing_start('trc_stp') 60 60 ! 61 IF( kt == nittrc000 .AND. lk_trdm ld_trc ) CALL trd_mld_trc_init ! trends: Mixed-layer61 IF( kt == nittrc000 .AND. lk_trdmxl_trc ) CALL trd_mxl_trc_init ! trends: Mixed-layer 62 62 ! 63 63 IF( lk_vvl ) THEN ! update ocean volume due to ssh temporal evolution … … 100 100 ENDIF 101 101 IF( lrst_trc ) CALL trc_rst_wri ( kt ) ! write tracer restart file 102 IF( lk_trdm ld_trc ) CALL trd_mld_trc ( kt ) ! trends: Mixed-layer102 IF( lk_trdmxl_trc ) CALL trd_mxl_trc ( kt ) ! trends: Mixed-layer 103 103 ! 104 104 IF( nn_dttrc /= 1 ) CALL trc_sub_reset( kt ) ! resetting physical variables when sub-stepping
Note: See TracChangeset
for help on using the changeset viewer.