Changeset 3403
- Timestamp:
- 2012-05-28T12:32:12+02:00 (12 years ago)
- Location:
- branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/CONFIG/AMM12/EXP00/namelist
r3309 r3403 137 137 ! =1 use observed ice-cover , 138 138 ! =2 ice-model used ("key_lim3" or "key_lim2) 139 nn_ice_embd = 0 ! =0 levitating ice (no mass exchange, concentration/dilution effect) 140 ! =1 levitating ice with mass and salt exchange but no presure effect 141 ! =2 embedded sea-ice (full salt and mass exchanges and pressure) 139 142 ln_dm2dc = .false. ! daily mean to diurnal cycle on short wave 140 143 ln_rnf = .true. ! runoffs (T => fill namsbc_rnf) -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
r3309 r3403 137 137 ! =1 use observed ice-cover , 138 138 ! =2 ice-model used ("key_lim3" or "key_lim2) 139 nn_ice_embd = 0 ! =0 levitating ice (no mass exchange, concentration/dilution effect) 140 ! =1 levitating ice with mass and salt exchange but no presure effect 141 ! =2 embedded sea-ice (full salt and mass exchanges and pressure) 139 142 ln_dm2dc = .false. ! daily mean to diurnal cycle on short wave 140 143 ln_rnf = .true. ! runoffs (T => fill namsbc_rnf) -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/CONFIG/GYRE/EXP00/namelist
r3306 r3403 137 137 ! =1 use observed ice-cover , 138 138 ! =2 ice-model used ("key_lim3" or "key_lim2) 139 nn_ice_embd = 0 ! =0 levitating ice (no mass exchange, concentration/dilution effect) 140 ! =1 levitating ice with mass and salt exchange but no presure effect 141 ! =2 embedded sea-ice (full salt and mass exchanges and pressure) 139 142 ln_dm2dc = .false. ! daily mean to diurnal cycle on short wave 140 143 ln_rnf = .false. ! runoffs (T => fill namsbc_rnf) -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
r3306 r3403 137 137 ! =1 use observed ice-cover , 138 138 ! =2 ice-model used ("key_lim3" or "key_lim2) 139 nn_ice_embd = 0 ! =0 levitating ice (no mass exchange, concentration/dilution effect) 140 ! =1 levitating ice with mass and salt exchange but no presure effect 141 ! =2 embedded sea-ice (full salt and mass exchanges and pressure) 139 142 ln_dm2dc = .false. ! daily mean to diurnal cycle on short wave 140 143 ln_rnf = .true. ! runoffs (T => fill namsbc_rnf) -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
r3306 r3403 137 137 ! =1 use observed ice-cover , 138 138 ! =2 ice-model used ("key_lim3" or "key_lim2) 139 nn_ice_embd = 0 ! =0 levitating ice (no mass exchange, concentration/dilution effect) 140 ! =1 levitating ice with mass and salt exchange but no presure effect 141 ! =2 embedded sea-ice (full salt and mass exchanges and pressure) 139 142 ln_dm2dc = .false. ! daily mean to diurnal cycle on short wave 140 143 ln_rnf = .true. ! runoffs (T => fill namsbc_rnf) -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
r3294 r3403 63 63 REAL(wp) :: zsrau, zse3t ! temporary scalars 64 64 CHARACTER (len=22) :: charout 65 REAL(wp), POINTER, DIMENSION(:,: ) :: z emps65 REAL(wp), POINTER, DIMENSION(:,: ) :: zsfx 66 66 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrtrd 67 67 !!--------------------------------------------------------------------- … … 70 70 ! 71 71 ! Allocate temporary workspace 72 CALL wrk_alloc( jpi, jpj, z emps)72 CALL wrk_alloc( jpi, jpj, zsfx ) 73 73 IF( l_trdtrc ) CALL wrk_alloc( jpi, jpj, jpk, ztrtrd ) 74 74 … … 80 80 81 81 82 IF( lk_offline ) THEN ! emps in dynamical files contains emps- rnf83 z emps(:,:) = emps(:,:)82 IF( lk_offline ) THEN ! sfx in dynamical files contains sfx - rnf 83 zsfx(:,:) = sfx(:,:) 84 84 ELSE ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff 85 85 IF( lk_vvl ) THEN ! volume variable 86 z emps(:,:) = emps(:,:) - emp(:,:)87 !!ch z emps(:,:) = 0.86 zsfx(:,:) = sfx(:,:) - emp(:,:) 87 !!ch zsfx(:,:) = 0. 88 88 ELSE ! linear free surface 89 IF( ln_rnf ) THEN ; z emps(:,:) = emps(:,:) - rnf(:,:) ! E-P-R90 ELSE ; z emps(:,:) = emps(:,:)89 IF( ln_rnf ) THEN ; zsfx(:,:) = sfx(:,:) - rnf(:,:) ! E-P-R 90 ELSE ; zsfx(:,:) = sfx(:,:) 91 91 ENDIF 92 92 ENDIF … … 102 102 DO ji = fs_2, fs_jpim1 ! vector opt. 103 103 zse3t = 1. / fse3t(ji,jj,1) 104 tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + z emps(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t104 tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + zsfx(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t 105 105 END DO 106 106 END DO … … 117 117 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 118 118 ENDIF 119 CALL wrk_dealloc( jpi, jpj, z emps)119 CALL wrk_dealloc( jpi, jpj, zsfx ) 120 120 IF( l_trdtrc ) CALL wrk_dealloc( jpi, jpj, jpk, ztrtrd ) 121 121 ! -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
r3294 r3403 227 227 USE sbc_oce , ONLY : emp => emp !: freshwater budget: volume flux [Kg/m2/s] 228 228 USE sbc_oce , ONLY : emp_b => emp_b !: freshwater budget: volume flux [Kg/m2/s] 229 USE sbc_oce , ONLY : emps => emps!: freshwater budget: concentration/dillution [Kg/m2/s]229 USE sbc_oce , ONLY : sfx => sfx !: freshwater budget: concentration/dillution [Kg/m2/s] 230 230 USE sbc_oce , ONLY : rnf => rnf !: river runoff [Kg/m2/s] 231 231 USE sbc_oce , ONLY : ln_dm2dc => ln_dm2dc !: Daily mean to Diurnal Cycle short wave (qsr) -
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/TOP_SRC/trcsub.F90
r3294 r3403 121 121 fr_i_tm (:,:) = fr_i_tm (:,:) + fr_i (:,:) 122 122 emp_tm (:,:) = emp_tm (:,:) + emp (:,:) 123 emps_tm (:,:) = emps_tm (:,:) + emps(:,:)123 emps_tm (:,:) = emps_tm (:,:) + sfx (:,:) 124 124 qsr_tm (:,:) = qsr_tm (:,:) + qsr (:,:) 125 125 wndm_tm (:,:) = wndm_tm (:,:) + wndm (:,:) … … 209 209 emp_temp (:,:) = emp (:,:) 210 210 emp_b_temp (:,:) = emp_b (:,:) 211 emps_temp (:,:) = emps(:,:)211 emps_temp (:,:) = sfx (:,:) 212 212 qsr_temp (:,:) = qsr (:,:) 213 213 wndm_temp (:,:) = wndm (:,:) … … 313 313 fr_i_tm (:,:) = fr_i_tm (:,:) + fr_i (:,:) 314 314 emp_tm (:,:) = emp_tm (:,:) + emp (:,:) 315 emps_tm (:,:) = emps_tm (:,:) + emps(:,:)315 emps_tm (:,:) = emps_tm (:,:) + sfx (:,:) 316 316 qsr_tm (:,:) = qsr_tm (:,:) + qsr (:,:) 317 317 wndm_tm (:,:) = wndm_tm (:,:) + wndm (:,:) … … 332 332 qsr (:,:) = qsr_tm (:,:) * r1_ndttrc 333 333 emp (:,:) = emp_tm (:,:) * r1_ndttrc 334 emps(:,:) = emps_tm (:,:) * r1_ndttrc334 sfx (:,:) = emps_tm (:,:) * r1_ndttrc 335 335 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrc 336 336 # if defined key_trabbl … … 348 348 qsr (:,:) = qsr_tm (:,:) * r1_ndttrcp1 349 349 emp (:,:) = emp_tm (:,:) * r1_ndttrcp1 350 emps(:,:) = emps_tm (:,:) * r1_ndttrcp1350 sfx (:,:) = emps_tm (:,:) * r1_ndttrcp1 351 351 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrcp1 352 352 # if defined key_trabbl … … 498 498 CALL lbc_lnk( emp (:,:) , 'T', 1. ) 499 499 CALL lbc_lnk( emp_b (:,:) , 'T', 1. ) 500 CALL lbc_lnk( emps(:,:) , 'T', 1. )500 CALL lbc_lnk( sfx (:,:) , 'T', 1. ) 501 501 CALL lbc_lnk( qsr (:,:) , 'T', 1. ) 502 502 CALL lbc_lnk( wndm (:,:) , 'T', 1. ) … … 705 705 fr_i (:,:) = fr_i_temp (:,:) 706 706 emp (:,:) = emp_temp (:,:) 707 emps(:,:) = emps_temp (:,:)707 sfx (:,:) = emps_temp (:,:) 708 708 emp_b (:,:) = emp_b_temp (:,:) 709 709 qsr (:,:) = qsr_temp (:,:) … … 824 824 fr_i_tm (:,:) = fr_i (:,:) 825 825 emp_tm (:,:) = emp (:,:) 826 emps_tm (:,:) = emps(:,:)826 emps_tm (:,:) = sfx (:,:) 827 827 qsr_tm (:,:) = qsr (:,:) 828 828 wndm_tm (:,:) = wndm (:,:)
Note: See TracChangeset
for help on using the changeset viewer.