Changeset 2148 for branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC
- Timestamp:
- 2010-10-04T15:53:42+02:00 (14 years ago)
- Location:
- branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC
- Files:
-
- 13 edited
-
PISCES/p4zmort.F90 (modified) (1 diff)
-
PISCES/p4zrem.F90 (modified) (1 diff)
-
PISCES/p4zsink.F90 (modified) (1 diff)
-
TRP/trcadv.F90 (modified) (1 diff)
-
TRP/trcdmp.F90 (modified) (1 diff)
-
TRP/trcldf.F90 (modified) (1 diff)
-
TRP/trcnxt.F90 (modified) (3 diffs)
-
TRP/trcrad.F90 (modified) (1 diff)
-
TRP/trcsbc.F90 (modified) (4 diffs)
-
TRP/trczdf.F90 (modified) (1 diff)
-
TRP/trdmld_trc.F90 (modified) (7 diffs)
-
TRP/trdmod_trc.F90 (modified) (1 diff)
-
oce_trc.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/PISCES/p4zmort.F90
r2104 r2148 235 235 !! 236 236 !! ** Method : Read the nampismort namelist and check the parameters 237 !! called at the first timestep (nittrc000)237 !! called at the first timestep 238 238 !! 239 239 !! ** input : Namelist nampismort -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/PISCES/p4zrem.F90
r2104 r2148 408 408 !! 409 409 !! ** Method : Read the nampisrem namelist and check the parameters 410 !! called at the first timestep (nittrc000)410 !! called at the first timestep 411 411 !! 412 412 !! ** input : Namelist nampisrem -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/PISCES/p4zsink.F90
r2104 r2148 321 321 !! 322 322 !! ** Method : Read the nampiskrs namelist and check the parameters 323 !! called at the first timestep (nittrc000)323 !! called at the first timestep 324 324 !! 325 325 !! ** input : Namelist nampiskrs -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trcadv.F90
r2082 r2148 65 65 !!---------------------------------------------------------------------- 66 66 67 IF( kt == nit trc000 ) CALL trc_adv_ctl ! initialisation & control of options67 IF( kt == nit000 ) CALL trc_adv_ctl ! initialisation & control of options 68 68 69 IF( neuler == 0 .AND. kt == nit trc000 ) THEN ! at nit00069 IF( neuler == 0 .AND. kt == nit000 ) THEN ! at nit000 70 70 r2dt(:) = rdttra(:) * FLOAT(nn_dttrc) ! = rdtra (restarting with Euler time stepping) 71 ELSEIF( kt <= nit trc000 + nn_dttrc ) THEN ! at nit000 or nit000+171 ELSEIF( kt <= nit000 + nn_dttrc ) THEN ! at nit000 or nit000+1 72 72 r2dt(:) = 2. * rdttra(:) * FLOAT(nn_dttrc) ! = 2 rdttra (leapfrog) 73 73 ENDIF -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trcdmp.F90
r2030 r2148 82 82 ! 0. Initialization (first time-step only) 83 83 ! -------------- 84 IF( kt == nit trc000 ) CALL trc_dmp_init84 IF( kt == nit000 ) CALL trc_dmp_init 85 85 86 86 IF( l_trdtrc ) ALLOCATE( ztrtrd(jpi,jpj,jpk) ) ! temporary save of trends -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trcldf.F90
r2082 r2148 62 62 !!---------------------------------------------------------------------- 63 63 64 IF( kt == nit trc000 ) CALL ldf_ctl ! initialisation & control of options64 IF( kt == nit000 ) CALL ldf_ctl ! initialisation & control of options 65 65 66 66 IF( l_trdtrc ) THEN -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trcnxt.F90
r2082 r2148 86 86 !!---------------------------------------------------------------------- 87 87 88 IF( kt == nit trc000 .AND. lwp ) THEN88 IF( kt == nit000 .AND. lwp ) THEN 89 89 WRITE(numout,*) 90 90 WRITE(numout,*) 'trc_nxt : time stepping on passive tracers' … … 109 109 110 110 ! set time step size (Euler/Leapfrog) 111 IF( neuler == 0 .AND. kt == nit trc000) THEN ; r2dt(:) = rdttra(:) * FLOAT( nn_dttrc ) ! at nit000 (Euler)112 ELSEIF( kt <= nit trc000 + 1 ) THEN ; r2dt(:) = 2.* rdttra(:) * FLOAT( nn_dttrc ) ! at nit000 or nit000+1 (Leapfrog)111 IF( neuler == 0 .AND. kt == nit000) THEN ; r2dt(:) = rdttra(:) * FLOAT( nn_dttrc ) ! at nit000 (Euler) 112 ELSEIF( kt <= nit000 + 1 ) THEN ; r2dt(:) = 2.* rdttra(:) * FLOAT( nn_dttrc ) ! at nit000 or nit000+1 (Leapfrog) 113 113 ENDIF 114 114 … … 120 120 121 121 ! Leap-Frog + Asselin filter time stepping 122 IF( lk_vvl ) THEN ; CALL tra_nxt_vvl( kt, nittrc000, trb, trn, tra, jptra ) ! variable volume level (vvl)123 ELSE ; CALL tra_nxt_fix( kt, nittrc000,trb, trn, tra, jptra ) ! fixed volume level122 IF( lk_vvl ) THEN ; CALL tra_nxt_vvl( kt, 'TRC', trb, trn, tra, jptra ) ! variable volume level (vvl) 123 ELSE ; CALL tra_nxt_fix( kt, trb, trn, tra, jptra ) ! fixed volume level 124 124 ENDIF 125 125 -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trcrad.F90
r2030 r2148 54 54 !!---------------------------------------------------------------------- 55 55 56 IF( kt == nit trc000 ) THEN56 IF( kt == nit000 ) THEN 57 57 IF(lwp) WRITE(numout,*) 58 58 IF(lwp) WRITE(numout,*) 'trc_rad : Correct artificial negative concentrations ' -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trcsbc.F90
r2052 r2148 65 65 !! * Local declarations 66 66 INTEGER :: ji, jj, jn ! dummy loop indices 67 REAL(wp) :: z tra, zsrau, zse3t ! temporary scalars67 REAL(wp) :: zsrau, zse3t ! temporary scalars 68 68 REAL(wp), DIMENSION(jpi,jpj) :: zemps ! surface freshwater flux 69 69 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ztrtrd … … 71 71 !!---------------------------------------------------------------------- 72 72 73 IF( kt == nit trc000 ) THEN73 IF( kt == nit000 ) THEN 74 74 IF(lwp) WRITE(numout,*) 75 75 IF(lwp) WRITE(numout,*) 'trc_sbc : Passive tracers surface boundary condition' … … 82 82 #if ! defined key_offline 83 83 ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff 84 IF( lk_vvl ) THEN ; zemps(:,:) = emps(:,:) - emp(:,:) ! volume variable 85 ELSE ; zemps(:,:) = emps(:,:) - rnf(:,:) ! linear free surface 84 IF( lk_vvl ) THEN ! volume variable 85 zemps(:,:) = emps(:,:) - emp(:,:) 86 !!ch zemps(:,:) = 0. 87 ELSE ! linear free surface 88 IF( ln_rnf ) THEN ; zemps(:,:) = emps(:,:) - rnf(:,:) ! E-P-R 89 ELSE ; zemps(:,:) = emps(:,:) 90 ENDIF 86 91 ENDIF 87 92 #else … … 91 96 ENDIF 92 97 #endif 98 93 99 ! 0. initialization 94 100 zsrau = 1. / rau0 95 #if defined key_zco96 zse3t = 1. / e3t_0(1)97 #endif98 99 101 DO jn = 1, jptra 100 102 ! 101 103 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) ! save trends 102 104 ! ! add the trend to the general tracer trend 103 105 DO jj = 2, jpj 104 106 DO ji = fs_2, fs_jpim1 ! vector opt. 105 #if ! defined key_zco106 107 zse3t = 1. / fse3t(ji,jj,1) 107 #endif 108 ! add the trend to the general tracer trend 109 ztra = zemps(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t 110 tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + ztra 108 tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + zemps(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t 111 109 END DO 112 110 END DO -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trczdf.F90
r2082 r2148 61 61 !!--------------------------------------------------------------------- 62 62 63 IF( kt == nit trc000 ) CALL zdf_ctl ! initialisation & control of options63 IF( kt == nit000 ) CALL zdf_ctl ! initialisation & control of options 64 64 65 65 #if ! defined key_pisces 66 IF( neuler == 0 .AND. kt == nit trc000 ) THEN ! at nit00066 IF( neuler == 0 .AND. kt == nit000 ) THEN ! at nit000 67 67 r2dt(:) = rdttra(:) * FLOAT(nn_dttrc) ! = rdtra (restarting with Euler time stepping) 68 ELSEIF( kt <= nit trc000 + nn_dttrc ) THEN ! at nit000 or nit000+168 ELSEIF( kt <= nit000 + nn_dttrc ) THEN ! at nit000 or nit000+1 69 69 r2dt(:) = 2. * rdttra(:) * FLOAT(nn_dttrc) ! = 2 rdttra (leapfrog) 70 70 ENDIF -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trdmld_trc.F90
r2052 r2148 361 361 !!---------------------------------------------------------------------- 362 362 363 IF( llwarn ) THEN ! warnings 364 IF( ( nittrc000 /= nit000 ) & 365 .OR.( nn_dttrc /= 1 ) ) THEN 366 367 WRITE(numout,*) 'Be careful, trends diags never validated' 368 STOP 'Uncomment this line to proceed' 369 ENDIF 370 ENDIF 363 IF( nn_dttrc /= 1 ) CALL ctl_stop( " Be careful, trends diags never validated " ) 371 364 372 365 ! ====================================================================== … … 422 415 ! II.1 Set before values of vertically averages passive tracers 423 416 ! ------------------------------------------------------------- 424 IF( kt > nit trc000 ) THEN417 IF( kt > nit000 ) THEN 425 418 DO jn = 1, jptra 426 419 IF( ln_trdtrc(jn) ) THEN … … 507 500 tmltrd_trc(:,:,:,:) = tmltrd_trc(:,:,:,:) * rn_ucf_trc 508 501 509 itmod = kt - nit trc000 + 1502 itmod = kt - nit000 + 1 510 503 it = kt 511 504 … … 915 908 !!---------------------------------------------------------------------- 916 909 ! ... Warnings 917 IF( llwarn ) THEN 918 IF( ( nittrc000 /= nit000 ) & 919 .OR.( nn_dttrc /= 1 ) ) THEN 920 921 WRITE(numout,*) 'Be careful, trends diags never validated' 922 STOP 'Uncomment this line to proceed' 923 END IF 924 END IF 910 IF( nn_dttrc /= 1 ) CALL ctl_stop( " Be careful, trends diags never validated " ) 925 911 926 912 ! ====================================================================== … … 1038 1024 1039 1025 ! define time axis 1040 itmod = kt - nit trc000 + 11026 itmod = kt - nit000 + 1 1041 1027 it = kt 1042 1028 … … 1318 1304 CALL dia_nam( clhstnam, nn_trd_trc, csuff ) 1319 1305 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & 1320 & 1, jpi, 1, jpj, nit trc000-nn_dttrc, zjulian, rdt, nh_t(jn), nidtrd(jn), domain_id=nidom )1306 & 1, jpi, 1, jpj, nit000, zjulian, rdt, nh_t(jn), nidtrd(jn), domain_id=nidom ) 1321 1307 1322 1308 !-- Define the ML depth variable … … 1331 1317 CALL dia_nam( clhstnam, nn_trd_trc, 'trdbio' ) 1332 1318 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & 1333 & 1, jpi, 1, jpj, nit trc000-nn_dttrc, zjulian, rdt, nh_tb, nidtrdbio, domain_id=nidom )1319 & 1, jpi, 1, jpj, nit000, zjulian, rdt, nh_tb, nidtrdbio, domain_id=nidom ) 1334 1320 #endif 1335 1321 -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/TRP/trdmod_trc.F90
r2030 r2148 50 50 !!---------------------------------------------------------------------- 51 51 52 IF( kt == nit trc000 ) THEN52 IF( kt == nit000 ) THEN 53 53 ! IF(lwp)WRITE(numout,*) 54 54 ! IF(lwp)WRITE(numout,*) 'trd_mod_trc:' -
branches/DEV_r2106_LOCEAN2010/NEMO/TOP_SRC/oce_trc.F90
r2104 r2148 201 201 USE sbc_oce , ONLY : emps => emps !: freshwater budget: concentration/dillution [Kg/m2/s] 202 202 USE sbc_oce , ONLY : rnf => rnf !: river runoff [Kg/m2/s] 203 USE sbc_oce , ONLY : ln_rnf => ln_rnf !: runoffs / runoff mouths 203 204 USE sbc_oce , ONLY : fr_i => fr_i !: ice fraction (between 0 to 1) 204 205 USE traqsr , ONLY : rn_abs => rn_abs !: fraction absorbed in the very near surface
Note: See TracChangeset
for help on using the changeset viewer.
