Changeset 899 for trunk/NEMO
- Timestamp:
- 2008-04-22T18:15:19+02:00 (16 years ago)
- Location:
- trunk/NEMO
- Files:
-
- 1 deleted
- 13 edited
- 5 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/C1D_SRC/c1d.F90
r891 r899 4 4 !! Ocean state : 1D initialization 5 5 !!===================================================================== 6 #if defined key_c fg_1d6 #if defined key_c1d 7 7 !!---------------------------------------------------------------------- 8 !! 'key_cf g_1d' 1D Configuration8 !! 'key_cf1d' 1D Configuration 9 9 !!---------------------------------------------------------------------- 10 10 !! init_1d : initial mask … … 19 19 20 20 !! * Share Module variables 21 LOGICAL, PUBLIC, PARAMETER :: lk_c fg_1d = .TRUE. !: 1D flag21 LOGICAL, PUBLIC, PARAMETER :: lk_c1d = .TRUE. !: 1D flag 22 22 23 23 !! * Routine accessibility … … 60 60 !! Default key NO 1D Config 61 61 !!---------------------------------------------------------------------- 62 LOGICAL , PUBLIC, PARAMETER :: lk_c fg_1d = .FALSE. !: internal damping flag62 LOGICAL , PUBLIC, PARAMETER :: lk_c1d = .FALSE. !: internal damping flag 63 63 CONTAINS 64 64 SUBROUTINE init_1d ! Empty routine -
trunk/NEMO/C1D_SRC/diawri_c1d.F90
r891 r899 4 4 !! Ocean diagnostics : write ocean output files 5 5 !!===================================================================== 6 #if defined key_c fg_1d7 !!---------------------------------------------------------------------- 8 !! 'key_c fg_1d' 1D Configuration6 #if defined key_c1d 7 !!---------------------------------------------------------------------- 8 !! 'key_c1d' 1D Configuration 9 9 !!---------------------------------------------------------------------- 10 10 !!---------------------------------------------------------------------- -
trunk/NEMO/C1D_SRC/dyncor_c1d.F90
r891 r899 4 4 !! Ocean state : 1D initialization 5 5 !!===================================================================== 6 #if defined key_c fg_1d6 #if defined key_c1d 7 7 !!---------------------------------------------------------------------- 8 !! 'key_c fg_1d' 1D Configuration8 !! 'key_c1d' 1D Configuration 9 9 !!---------------------------------------------------------------------- 10 10 !!---------------------------------------------------------------------- -
trunk/NEMO/C1D_SRC/dynnxt_c1d.F90
r891 r899 4 4 !! Ocean dynamics: time stepping in 1D configuration 5 5 !!====================================================================== 6 #if defined key_c fg_1d6 #if defined key_c1d 7 7 !!---------------------------------------------------------------------- 8 !! 'key_c fg_1d' 1D Configuration8 !! 'key_c1d' 1D Configuration 9 9 !!---------------------------------------------------------------------- 10 10 !!---------------------------------------------------------------------- -
trunk/NEMO/OFF_SRC/par_ORCA_R2.h90
r719 r899 45 45 jpnisl = 400 !: maximum number of points per island 46 46 47 #elif defined key_c fg_1d47 #elif defined key_c1d 48 48 ! global domain size !!! * global domain * 49 49 jpiglo = 3 , & !: 1st dimension of global domain --> i -
trunk/NEMO/OPA_SRC/DOM/domzgr.F90
r719 r899 569 569 ! ================ 570 570 571 IF( .NOT. lk_c fg_1d ) THEN571 IF( .NOT. lk_c1d ) THEN 572 572 573 573 ! Suppress isolated ocean grid points -
trunk/NEMO/OPA_SRC/ZDF/zdfkpp.F90
r896 r899 130 130 evmean 131 131 132 #if defined key_c fg_1d132 #if defined key_c1d 133 133 REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) :: & 134 134 rig , & ! gradient Richardson number … … 352 352 zsh2 = 0.5 * 0.5 * ( zdku2 + zdkv2 ) * ze3sqr 353 353 zri = MAX( rn2(ji,jj,jk), 0. ) / ( zsh2 + epsln ) 354 #if defined key_c fg_1d354 #if defined key_c1d 355 355 ! save the gradient richardson number 356 356 rig(ji,jj,jk) = zri * tmask(ji,jj,jk) … … 515 515 zucube = zustar(ji,jj) * zustar(ji,jj) * zustar(ji,jj) 516 516 zmoa(ji) = zucube / ( vonk * ( zbuofdep + epsln ) ) 517 #if defined key_c fg_1d517 #if defined key_c1d 518 518 ! store the surface buoyancy forcing 519 519 zstabl = 0.5 + SIGN( 0.5, zbuofdep ) … … 744 744 ! Save the Richardson number 745 745 zria (ji) = zrib 746 #if defined key_c fg_1d746 #if defined key_c1d 747 747 ! store buoyancy length scale 748 748 buof(ji,jj,jk) = zbuofdep * tmask(ji,jj,jk) -
trunk/NEMO/OPA_SRC/ZDF/zdftke.F90
r888 r899 68 68 & ri_c = 2._wp / 9._wp !: critic Richardson number 69 69 70 # if defined key_c fg_1d70 # if defined key_c1d 71 71 ! ! 1D cfg only 72 72 REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) :: e_dis, e_mix, & ! dissipation and mixing turbulent lengh scales … … 270 270 END SELECT 271 271 272 # if defined key_c fg_1d272 # if defined key_c1d 273 273 ! save mixing and dissipation turbulent length scales 274 274 e_dis(:,:,:) = zmxld(:,:,:) … … 368 368 ! local Richardson number 369 369 zri = MAX( rn2(ji,jj,jk), 0. ) / ( zsh2 + 1.e-20 ) 370 # if defined key_c fg_1d370 # if defined key_c1d 371 371 ! save masked local Richardson number in zmxlm array 372 372 e_ric(ji,jj,jk) = zri * tmask(ji,jj,jk) … … 400 400 END SELECT 401 401 402 # if defined key_c fg_1d402 # if defined key_c1d 403 403 ! save masked Prandlt number 404 404 e_pdl(:,:,2:jpkm1) = zmxld(:,:,2:jpkm1) -
trunk/NEMO/OPA_SRC/istate.F90
r888 r899 127 127 CALL eos( tb, sb, rhd, rhop ) ! before potential and in situ densities 128 128 129 IF( ln_zps .AND. .NOT. lk_c fg_1d ) &129 IF( ln_zps .AND. .NOT. lk_c1d ) & 130 130 & CALL zps_hde( nit000, tb, sb, rhd, & ! Partial steps: before Horizontal DErivative 131 131 & gtu, gsu, gru, & ! of t, s, rd at the bottom ocean level -
trunk/NEMO/OPA_SRC/opa.F90
r888 r899 124 124 IF( lk_mpp ) CALL mpp_max(nstop) 125 125 126 IF( lk_c fg_1d ) THEN126 IF( lk_c1d ) THEN 127 127 istp = nit000 128 128 DO WHILE ( istp <= nitend .AND. nstop == 0 ) … … 269 269 IF( ln_ctl ) CALL prt_ctl_init ! Print control 270 270 271 IF( lk_c fg_1d )CALL fcorio_1d ! redefine Coriolis at T-point271 IF( lk_c1d ) CALL fcorio_1d ! redefine Coriolis at T-point 272 272 273 273 IF( lk_obc ) CALL obc_init ! Open boundaries … … 310 310 IF(lwp) WRITE(numout,cform_aaa) ! Flag AAAAAAA 311 311 312 IF( lk_c fg_1d ) THEN312 IF( lk_c1d ) THEN 313 313 CALL init_1d 314 314 ENDIF -
trunk/NEMO/OPA_SRC/par_ORCA_R2.h90
r719 r899 63 63 jpnisl = 400 !: maximum number of points per island 64 64 65 #elif defined key_c fg_1d65 #elif defined key_c1d 66 66 ! global domain size !!! * global domain * 67 67 INTEGER & -
trunk/NEMO/OPA_SRC/par_oce.F90
r789 r899 28 28 INTEGER, PUBLIC, PARAMETER :: & !: 29 29 jpni = 1, & !: number of processors following i 30 jpnj = 1, & !: number of processors following j31 jpnij = 1!: nb of local domain = nb of processors30 jpnj = 2, & !: number of processors following j 31 jpnij = 2 !: nb of local domain = nb of processors 32 32 ! ! ( <= jpni x jpnj ) 33 33 #else -
trunk/NEMO/OPA_SRC/restart.F90
r888 r899 290 290 CALL eos( tb, sb, rhd, rhop ) ! before potential and in situ densities 291 291 ENDIF 292 IF( ln_zps .AND. .NOT. lk_c fg_1d ) THEN292 IF( ln_zps .AND. .NOT. lk_c1d ) THEN 293 293 IF( iom_varid( numror, 'gtu', ldstop = .FALSE. ) > 0 ) THEN 294 294 CALL iom_get( numror, jpdom_autoglo, 'gtu' , gtu ) -
trunk/NEMO/TOP_SRC/SMS/p4zsed.F
r728 r899 296 296 DO jj=1,jpj 297 297 DO ji=1,jpi 298 #if ! defined key_c fg_1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 )298 #if ! defined key_c1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 299 299 zfact=nitrpot(ji,jj,jk)*denitot/nitrpottot 300 300 #else -
trunk/NEMO/TOP_SRC/TRP/trcbbl.F90
r719 r899 5 5 !! layer scheme 6 6 !!============================================================================== 7 #if defined key_passivetrc && ( defined key_trcbbl_dif || defined key_trcbbl_adv ) && ! defined key_c fg_1d7 #if defined key_passivetrc && ( defined key_trcbbl_dif || defined key_trcbbl_adv ) && ! defined key_c1d 8 8 !!---------------------------------------------------------------------- 9 9 !! 'key_trcbbl_dif' or diffusive bottom boundary layer -
trunk/NEMO/TOP_SRC/trc.F90
r719 r899 194 194 !! 1D configuration 195 195 !! -------------------------------------------------- 196 #if defined key_cf g_1d196 #if defined key_cf1d 197 197 LOGICAL, PARAMETER :: lk_trccfg_1d = .TRUE. !: 1D pass. tracer configuration flag 198 198 #else -
trunk/NEMO/TOP_SRC/trcrst.F90
r794 r899 110 110 111 111 #if defined key_trc_pisces 112 # if ! defined key_c fg_1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 )112 # if ! defined key_c1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 113 113 REAL(wp) :: ztrasum 114 114 # endif … … 218 218 #if defined key_trc_pisces 219 219 220 #if ! defined key_c fg_1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 )220 #if ! defined key_c1d && ( defined key_orca_r4 || defined key_orca_r2 || defined key_orca_r05 || defined key_orca_r025 ) 221 221 222 222 ztrasum = 0.
Note: See TracChangeset
for help on using the changeset viewer.