- Timestamp:
- 2015-07-20T19:43:15+02:00 (9 years ago)
- Location:
- branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
r5541 r5619 921 921 pn2(ji,jj,jk) = grav * ( zaw * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) & 922 922 & - zbw * ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) ) ) & 923 & / fse3w(ji,jj,jk) * tmask(ji,jj,jk)923 & / fse3w(ji,jj,jk) * wmask(ji,jj,jk) 924 924 END DO 925 925 END DO … … 1242 1242 ! 1243 1243 rau0 = 1026._wp !: volumic mass of reference [kg/m3] 1244 rcp = 39 91.86795711963_wp !: heat capacity [J/K]1244 rcp = 3974._wp !: heat capacity [J/K] 1245 1245 ! 1246 1246 IF(lwp) THEN ! Control print -
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90
r5102 r5619 102 102 REAL(wp) :: zta, zsa ! local scalars 103 103 REAL(wp), POINTER, DIMENSION(:,:,:,:) :: zts_dta 104 REAL(wp), POINTER, DIMENSION(:,:,:,:) :: zts_dtadmp 104 105 !!---------------------------------------------------------------------- 105 106 ! 106 107 IF( nn_timing == 1 ) CALL timing_start( 'tra_dmp') 107 108 ! 108 CALL wrk_alloc( jpi, jpj, jpk, jpts, zts_dta ) 109 ! 109 CALL wrk_alloc( jpi, jpj, jpk, jpts, zts_dta, zts_dtadmp ) 110 110 ! !== input T-S data at kt ==! 111 CALL dta_tsd( kt, zts_dta ) ! read and interpolates T-S data at kt 111 CALL dta_tsd( kt, zts_dta, zts_dtadmp ) ! read and interpolates T-S data at kt 112 zts_dta=zts_dtadmp 112 113 ! 113 114 SELECT CASE ( nn_zdmp ) !== type of damping ==! … … 175 176 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 176 177 ! 177 CALL wrk_dealloc( jpi, jpj, jpk, jpts, zts_dta )178 CALL wrk_dealloc( jpi, jpj, jpk, jpts, zts_dta, zts_dtadmp ) 178 179 ! 179 180 IF( nn_timing == 1 ) CALL timing_stop( 'tra_dmp') -
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r5431 r5619 22 22 USE sbcrnf ! River runoff 23 23 USE sbcisf ! Ice shelf 24 USE sbc_iscpl ! Ice sheet coupling 24 25 USE traqsr ! solar radiation penetration 25 26 USE trd_oce ! trends: ocean variables … … 117 118 INTEGER :: ji, jj, jk, jn ! dummy loop indices 118 119 INTEGER :: ikt, ikb 119 INTEGER :: nk_isf120 120 REAL(wp) :: zfact, z1_e3t, zdep 121 REAL(wp) :: zalpha, zhk 122 REAL(wp) :: zt_frz, zpress 121 REAL(wp) :: zt_frz, zpress 123 122 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdt, ztrds 124 123 !!---------------------------------------------------------------------- … … 220 219 ! 221 220 IF( nn_isf > 0 ) THEN 222 zfact = 0.5 e0221 zfact = 0.5_wp 223 222 DO jj = 2, jpj 224 223 DO ji = fs_2, fs_jpim1 … … 233 232 ! compute tfreez for the temperature correction (we add water at freezing temperature) 234 233 ! zpress = grav*rau0*fsdept(ji,jj,jk)*1.e-04 235 zt_frz = -1.9 !eos_fzp( tsn(ji,jj,jk,jp_sal), zpress )234 zt_frz = -1.9_wp !eos_fzp( tsn(ji,jj,jk,jp_sal), zpress ) 236 235 ! compute trend 237 236 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) & … … 246 245 ! compute tfreez for the temperature correction (we add water at freezing temperature) 247 246 ! zpress = grav*rau0*fsdept(ji,jj,ikb)*1.e-04 248 zt_frz = -1.9 !eos_fzp( tsn(ji,jj,ikb,jp_sal), zpress )247 zt_frz = -1.9_wp !eos_fzp( tsn(ji,jj,ikb,jp_sal), zpress ) 249 248 ! compute trend 250 249 tsa(ji,jj,ikb,jp_tem) = tsa(ji,jj,ikb,jp_tem) & … … 288 287 ENDIF 289 288 290 IF( l_trdtra ) THEN ! send trends for further diagnostics 289 !---------------------------------------- 290 ! Ice Sheet coupling imbalance correction to have conservation 291 !---------------------------------------- 292 ! 293 IF( ln_iscpl .AND. ln_hfb) THEN ! input of heat and salt due to river runoff 294 DO jk = 1,jpk 295 DO jj = 2, jpj 296 DO ji = fs_2, fs_jpim1 297 zdep = 1._wp / fse3t_n(ji,jj,jk) 298 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) - htsc_iscpl(ji,jj,jk,jp_tem) & 299 & * zdep 300 tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal) - htsc_iscpl(ji,jj,jk,jp_sal) & 301 & * zdep 302 END DO 303 END DO 304 END DO 305 ENDIF 306 307 IF( l_trdtra ) THEN ! save the horizontal diffusive trends for further diagnostics 291 308 ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:) 292 309 ztrds(:,:,:) = tsa(:,:,:,jp_sal) - ztrds(:,:,:)
Note: See TracChangeset
for help on using the changeset viewer.