Changeset 3905 for trunk/NEMOGCM/NEMO/TOP_SRC
- Timestamp:
- 2013-05-24T15:40:39+02:00 (11 years ago)
- Location:
- trunk/NEMOGCM/NEMO/TOP_SRC
- Files:
-
- 4 edited
-
PISCES/P4Z/p4zsed.F90 (modified) (1 diff)
-
oce_trc.F90 (modified) (1 diff)
-
trc.F90 (modified) (2 diffs)
-
trcsub.F90 (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90
r3904 r3905 105 105 DO ji = 1, jpi 106 106 zdep = rfact2 / fse3t(ji,jj,1) 107 ! zwflux = ( emps(ji,jj) - emp(ji,jj) ) & 108 ! & * tsn(ji,jj,1,jp_sal) / ( tsn(ji,jj,1,jp_sal) - 6.0 ) / 1000. 109 zwflux = 0. 110 zfminus = MIN( 0., -zwflux ) * trn(ji,jj,1,jpfer) * zdep 111 zfplus = MAX( 0., -zwflux ) * 10E-9 * zdep 107 zwflux = fmmflx(ji,jj) / 1000._wp 108 zfminus = MIN( 0._wp, -zwflux ) * trn(ji,jj,1,jpfer) * zdep 109 zfplus = MAX( 0._wp, -zwflux ) * icefeinput * zdep 112 110 zironice(ji,jj) = zfplus + zfminus 113 111 END DO -
trunk/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
r3680 r3905 99 99 USE sbc_oce , ONLY : emp => emp !: freshwater budget: volume flux [Kg/m2/s] 100 100 USE sbc_oce , ONLY : emp_b => emp_b !: freshwater budget: volume flux [Kg/m2/s] 101 USE sbc_oce , ONLY : sfx => sfx !: downward salt flux [PSU/m2/s]101 USE sbc_oce , ONLY : fmmflx => fmmflx !: freshwater budget: volume flux [Kg/m2/s] 102 102 USE sbc_oce , ONLY : rnf => rnf !: river runoff [Kg/m2/s] 103 103 USE sbc_oce , ONLY : ln_dm2dc => ln_dm2dc !: Daily mean to Diurnal Cycle short wave (qsr) -
trunk/NEMOGCM/NEMO/TOP_SRC/trc.F90
r3882 r3905 141 141 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fr_i_tm !: average ice fraction [m/s] 142 142 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_tm !: freshwater budget: volume flux [Kg/m2/s] 143 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sfx_tm !: downward salt flux [PSU/m2/s]143 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fmmflx_tm !: freshwater budget: freezing/melting [Kg/m2/s] 144 144 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_b_hold !: hold emp from the beginning of each sub-stepping[m] 145 145 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: qsr_tm !: solar radiation average [m] … … 181 181 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: hdivb_temp, rotb_temp 182 182 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: hmld_temp, qsr_temp, fr_i_temp,wndm_temp 183 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_temp, sfx_temp, emp_b_temp183 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_temp, fmmflx_temp, emp_b_temp 184 184 ! 185 185 #if defined key_trabbl -
trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.F90
r3680 r3905 124 124 fr_i_tm (:,:) = fr_i_tm (:,:) + fr_i (:,:) 125 125 emp_tm (:,:) = emp_tm (:,:) + emp (:,:) 126 sfx_tm (:,:) = sfx_tm (:,:) + sfx(:,:)126 fmmflx_tm(:,:) = fmmflx_tm(:,:) + fmmflx(:,:) 127 127 qsr_tm (:,:) = qsr_tm (:,:) + qsr (:,:) 128 128 wndm_tm (:,:) = wndm_tm (:,:) + wndm (:,:) … … 212 212 emp_temp (:,:) = emp (:,:) 213 213 emp_b_temp (:,:) = emp_b (:,:) 214 sfx_temp (:,:) = sfx(:,:)214 fmmflx_temp(:,:) = fmmflx(:,:) 215 215 qsr_temp (:,:) = qsr (:,:) 216 216 wndm_temp (:,:) = wndm (:,:) … … 316 316 fr_i_tm (:,:) = fr_i_tm (:,:) + fr_i (:,:) 317 317 emp_tm (:,:) = emp_tm (:,:) + emp (:,:) 318 sfx_tm (:,:) = sfx_tm (:,:) + sfx(:,:)318 fmmflx_tm(:,:) = fmmflx_tm (:,:) + fmmflx(:,:) 319 319 qsr_tm (:,:) = qsr_tm (:,:) + qsr (:,:) 320 320 wndm_tm (:,:) = wndm_tm (:,:) + wndm (:,:) … … 335 335 qsr (:,:) = qsr_tm (:,:) * r1_ndttrc 336 336 emp (:,:) = emp_tm (:,:) * r1_ndttrc 337 sfx (:,:) = sfx_tm(:,:) * r1_ndttrc337 fmmflx(:,:) = fmmflx_tm (:,:) * r1_ndttrc 338 338 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrc 339 339 # if defined key_trabbl … … 351 351 qsr (:,:) = qsr_tm (:,:) * r1_ndttrcp1 352 352 emp (:,:) = emp_tm (:,:) * r1_ndttrcp1 353 sfx (:,:) = sfx_tm(:,:) * r1_ndttrcp1353 fmmflx(:,:) = fmmflx_tm (:,:) * r1_ndttrcp1 354 354 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrcp1 355 355 # if defined key_trabbl … … 501 501 CALL lbc_lnk( emp (:,:) , 'T', 1. ) 502 502 CALL lbc_lnk( emp_b (:,:) , 'T', 1. ) 503 CALL lbc_lnk( sfx(:,:) , 'T', 1. )503 CALL lbc_lnk( fmmflx(:,:) , 'T', 1. ) 504 504 CALL lbc_lnk( qsr (:,:) , 'T', 1. ) 505 505 CALL lbc_lnk( wndm (:,:) , 'T', 1. ) … … 601 601 fr_i_tm(:,:) = 0._wp 602 602 emp_tm (:,:) = 0._wp 603 sfx_tm(:,:) = 0._wp603 fmmflx_tm(:,:) = 0._wp 604 604 qsr_tm (:,:) = 0._wp 605 605 wndm_tm(:,:) = 0._wp … … 708 708 fr_i (:,:) = fr_i_temp (:,:) 709 709 emp (:,:) = emp_temp (:,:) 710 sfx (:,:) = sfx_temp(:,:)710 fmmflx(:,:) = fmmflx_temp(:,:) 711 711 emp_b (:,:) = emp_b_temp (:,:) 712 712 qsr (:,:) = qsr_temp (:,:) … … 827 827 fr_i_tm (:,:) = fr_i (:,:) 828 828 emp_tm (:,:) = emp (:,:) 829 sfx_tm (:,:) = sfx(:,:)829 fmmflx_tm (:,:) = fmmflx(:,:) 830 830 qsr_tm (:,:) = qsr (:,:) 831 831 wndm_tm (:,:) = wndm (:,:) … … 1056 1056 & rnf_temp(jpi,jpj) , h_rnf_temp(jpi,jpj) , & 1057 1057 & tsn_temp(jpi,jpj,jpk,2) , emp_b_temp(jpi,jpj), & 1058 & emp_temp(jpi,jpj) , sfx_temp(jpi,jpj) ,&1058 & emp_temp(jpi,jpj) , fmmflx_temp(jpi,jpj), & 1059 1059 & hmld_temp(jpi,jpj) , qsr_temp(jpi,jpj) , & 1060 1060 & fr_i_temp(jpi,jpj) , fr_i_tm(jpi,jpj) , & … … 1104 1104 & sshv_n_tm(jpi,jpj) , sshv_b_hold(jpi,jpj), & 1105 1105 & tsn_tm(jpi,jpj,jpk,2) , & 1106 & emp_tm(jpi,jpj) , sfx_tm(jpi,jpj) ,&1106 & emp_tm(jpi,jpj) , fmmflx_tm(jpi,jpj) , & 1107 1107 & emp_b_hold(jpi,jpj) , & 1108 1108 & hmld_tm(jpi,jpj) , qsr_tm(jpi,jpj) , &
Note: See TracChangeset
for help on using the changeset viewer.
