Changeset 439
- Timestamp:
- 2006-04-11T15:52:28+02:00 (18 years ago)
- Location:
- trunk/NEMO
- Files:
-
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/C1D_SRC/step1d.F90
r321 r439 32 32 USE ocfzpt ! surface ocean freezing point (oc_fz_pt routine) 33 33 34 USE trcstp ! passive tracer time-stepping (trc_stp routine) 34 35 35 36 USE dynzdf_imp ! vertical diffusion: implicit (dyn_zdf routine) … … 202 203 203 204 205 #if defined key_passivetrc 206 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 207 ! Passive Tracer Model 208 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 209 ! N.B. ua, va, ta, sa arrays are used as workspace in this section 210 !----------------------------------------------------------------------- 211 212 CALL trc_stp( kstp, indic ) ! time-stepping 213 214 #endif 204 215 205 216 -
trunk/NEMO/OFF_SRC/DOM/domrea.F90
r382 r439 93 93 REAL(wp) :: zdate0, zdt 94 94 REAL(wp), DIMENSION(jpidta,jpjdta) :: & 95 zta ! dummy array for bathymetry95 zta, zlamt, zphit ! dummy array for bathymetry 96 96 REAL(wp) , DIMENSION(jpidta,jpjdta,jpk) :: & 97 97 zt3a ! dummy array for bathymetry … … 112 112 113 113 llog = .FALSE. 114 zlamt(:,:) = 0.e0 115 zphit(:,:) = 0.e0 114 116 115 117 CALL ymds2ju( 0, 1, 1, 0.e0, zdate0 ) ! calendar initialization … … 127 129 128 130 IF(lwp) WRITE(numout,*) ' one file in "mesh_mask.nc" ' 129 CALL restini( clnam0, jpidta , jpjdta , glamt, gphit, & ! create 'mesh_mask.nc' file131 CALL restini( clnam0, jpidta , jpjdta , zlamt, zphit, & ! create 'mesh_mask.nc' file 130 132 & jpk , gdept , trim(clnam0) , & ! in unit inum0 131 133 & itime , zdate0, zdt , inum0, domain_id=nidom ) … … 140 142 141 143 IF(lwp) WRITE(numout,*) ' two files in "mesh.nc" and "mask.nc" ' 142 CALL restini( clnam1, jpidta , jpjdta , glamt, gphit, & ! create 'mesh.nc' file144 CALL restini( clnam1, jpidta , jpjdta , zlamt, zphit, & ! create 'mesh.nc' file 143 145 & jpk , gdept , trim(clnam1) , & ! in unit inum1 144 146 & itime , zdate0, zdt , inum1, domain_id=nidom ) 145 CALL restini( clnam2, jpidta , jpjdta , glamt, gphit, & ! create 'mask.nc' file147 CALL restini( clnam2, jpidta , jpjdta , zlamt, zphit, & ! create 'mask.nc' file 146 148 & jpk , gdept , trim(clnam2) , & ! in unit inum2 147 149 & itime , zdate0, zdt , inum2, domain_id=nidom ) … … 156 158 157 159 IF(lwp) WRITE(numout,*) ' three files in "mesh_hgr.nc" , mesh_zgr.nc" and "mask.nc" ' 158 CALL restini( clnam3, jpidta , jpjdta , glamt, gphit, & ! create 'mesh_hgr.nc' file160 CALL restini( clnam3, jpidta , jpjdta , zlamt, zphit, & ! create 'mesh_hgr.nc' file 159 161 & jpk , gdept , trim(clnam3) , & ! in unit inum3 160 162 & itime , zdate0, zdt , inum3, domain_id=nidom ) 161 CALL restini( clnam4, jpidta , jpjdta , glamt, gphit, & ! create 'mesh_zgr.nc' file163 CALL restini( clnam4, jpidta , jpjdta , zlamt, zphit, & ! create 'mesh_zgr.nc' file 162 164 & jpk , gdept , trim(clnam4) , & ! in unit inum4 163 165 & itime , zdate0, zdt , inum4, domain_id=nidom ) 164 CALL restini( clnam2, jpidta , jpjdta , glamt, gphit, & ! create 'mask.nc' file166 CALL restini( clnam2, jpidta , jpjdta , zlamt, zphit, & ! create 'mask.nc' file 165 167 & jpk , gdept , trim(clnam2) , & ! in unit inum2 166 168 & itime , zdate0, zdt , inum2, domain_id=nidom ) … … 201 203 END DO 202 204 END DO 205 206 #if defined key_cfg_1d 207 IF(lwp) WRITE(numout,*) '********** 1D configuration : set umask and vmask equal tmask ********' 208 IF(lwp) WRITE(numout,*) '********** ********' 209 ! set umask and vmask equal tmask in 1D configuration 210 umask(:,:,:) = tmask(:,:,:) 211 vmask(:,:,:) = tmask(:,:,:) 212 #endif 203 213 204 214 #if defined key_off_degrad -
trunk/NEMO/TOP_SRC/TRP/trcbbl.F90
r433 r439 5 5 !! layer scheme 6 6 !!============================================================================== 7 #if defined key_passivetrc && ( defined key_trcbbl_dif || defined key_trcbbl_adv ) 7 #if defined key_passivetrc && ( defined key_trcbbl_dif || defined key_trcbbl_adv ) && ! defined key_cfg_1d 8 8 !!---------------------------------------------------------------------- 9 9 !! 'key_trcbbl_dif' or diffusive bottom boundary layer -
trunk/NEMO/TOP_SRC/TRP/trcstp.F90
r433 r439 12 12 USE trc ! ocean passive tracers variables 13 13 USE trctrp ! passive tracers transport 14 USE trctrp1d ! passive tracers transport 1D configuration15 14 USE trcsms ! passive tracers sources and sinks 16 15 USE prtctl_trc ! Print control for debbuging … … 18 17 USE trcdit 19 18 USE trcrst 20 USE ini1d21 19 22 20 IMPLICIT NONE … … 70 68 71 69 ! transport of passive tracers 72 IF( lk_cfg_1d ) THEN 73 CALL trc_trp_1d( kt ) 74 ELSE 75 CALL trc_trp( kt ) 76 ENDIF 77 70 CALL trc_trp( kt ) 78 71 79 72 IF(ln_ctl) THEN ! print mean trends (used for debugging) -
trunk/NEMO/TOP_SRC/TRP/trctrp.F90
r433 r439 128 128 ! 129 129 130 IF( lk_zps ) CALL zps_hde_trc( kt, trb, gtru, gtrv ) ! Partial steps: now horizontal gradient 130 IF( lk_zps .AND. .NOT. lk_trccfg_1d ) & 131 & CALL zps_hde_trc( kt, trb, gtru, gtrv ) ! Partial steps: now horizontal gradient 131 132 ! ! of passive tracers at the bottom ocean level 132 133 -
trunk/NEMO/TOP_SRC/TRP/trctrp_ctl.F90
r349 r439 125 125 IF(lwp) WRITE(numout,*) ' cross-land advection only with 2nd order advection scheme' 126 126 nstop = nstop + 1 127 ENDIF 128 129 IF( lk_trccfg_1d ) THEN 130 ln_trcadv_cen2 = .FALSE. ; ln_trcadv_tvd = .FALSE. ; ln_trcadv_muscl = .FALSE. 131 ln_trcadv_muscl2 = .FALSE. ; ln_trcadv_smolar = .FALSE. 132 IF(lwp) WRITE(numout,*) ' ******* 1D configuration : No advection on passive tracers *******' 133 IF(lwp) WRITE(numout,*) ' ******* *******' 127 134 ENDIF 128 135 … … 236 243 ENDIF 237 244 238 IF( .NOT. ln_trcldf_diff ) THEN245 IF( .NOT. ln_trcldf_diff .OR. lk_trccfg_1d ) THEN 239 246 l_trcldf_lap = .FALSE. ; l_trcldf_bilap = .FALSE. ; l_trcldf_bilapg = .FALSE. 240 247 l_trcldf_iso = .FALSE. ; l_trcldf_iso_zps = .FALSE. 241 248 l_trczdf_iso = .FALSE. ; l_trczdf_iso_vo = .FALSE. 242 IF(lwp ) WRITE(numout,*) ' No lateral physics on passive tracers' 249 IF(lwp ) WRITE(numout,*) '************* No lateral physics on passive tracers *****************' 250 IF(lwp ) WRITE(numout,*) '************* *****************' 243 251 ELSE 244 252 ! ... Space variation of eddy coefficients -
trunk/NEMO/TOP_SRC/trc.F90
r433 r439 198 198 #endif 199 199 200 !! 1D configuration 201 !! -------------------------------------------------- 202 #if defined key_cfg_1d 203 LOGICAL, PARAMETER :: lk_trccfg_1d = .TRUE. !: 1D pass. tracer configuration flag 204 #else 205 LOGICAL, PARAMETER :: lk_trccfg_1d = .FALSE. !: 1D pass. tracer configuration flag 206 #endif 207 208 200 209 #else 201 210 !!======================================================================
Note: See TracChangeset
for help on using the changeset viewer.