Changeset 6388
- Timestamp:
- 2016-03-14T19:28:49+01:00 (8 years ago)
- Location:
- branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 3 edited
-
DYN/dynhpg.F90 (modified) (1 diff)
-
SBC/sbcflx_adj.F90 (modified) (8 diffs)
-
SBC/sbcssr.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
r5880 r6388 304 304 zhpi(ji,jj,1) = zcoef1 * ( rhd(ji+1,jj ,1) - rhd(ji,jj,1) ) / e1u(ji,jj) 305 305 zhpj(ji,jj,1) = zcoef1 * ( rhd(ji ,jj+1,1) - rhd(ji,jj,1) ) / e2v(ji,jj) 306 ! ! 22/01/2016 307 ! write(numout,*) 'rhd(',ji+1,',',jj,',1),rhd(',ji,',',jj,'1),rhd(',ji+1,',',jj, & 308 ! & ',1)-rhd(',ji,',',jj,',1),zhpi(',ji,',',jj,',1)', & 309 ! & rhd(ji+1,jj,1),rhd(ji,jj,1),rhd(ji+1,jj,1) - rhd(ji,jj,1),zhpi(ji,jj,1) 310 ! write(numout,*) 'rhd(',ji,',',jj+1,',1),rhd(',ji,',',jj,'1),rhd(',ji,',',jj+1, & 311 ! & ',1)-rhd(',ji,',',jj,',1),zhpj(',ji,',',jj,',1)', & 312 ! & rhd(ji,jj+1,1),rhd(ji,jj,1),rhd(ji,jj+1,1)-rhd(ji,jj,1),zhpj(ji,jj,1) 306 313 ! add to the general momentum trend 307 314 ua(ji,jj,1) = ua(ji,jj,1) + zhpi(ji,jj,1) -
branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90
r5895 r6388 31 31 PUBLIC sbc_flx_adj_init ! routine called in sbcmod 32 32 33 !ky!REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: erp !: evaporation damping [kg/m2/s] 34 !ky!REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: qrp !: heat flux damping [w/m2] 33 !ky 11/12/2015 recommented below two lines 34 !!ky 3/12/2015 uncommented below two lines for FA test! 35 !REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: erp !: evaporation damping [kg/m2/s] 36 !REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: qrp !: heat flux damping [w/m2] 35 37 36 38 ! !!* Namelist namsbc_flx_adj * … … 79 81 !!---------------------------------------------------------------------- 80 82 ! 83 !!write(numout,*) '*** In sbcflx_adj ***' 84 81 85 IF( nn_timing == 1 ) CALL timing_start('sbc_flx_adj') 82 86 ! … … 94 98 DO ji = 1, jpi 95 99 zqrp = sf_qrp(1)%fnow(ji,jj,1) 100 !ky 11/12/2015 commented out 1 line below 101 !!ky 3/12/2015 1 line below for FA test! 102 !qrp(ji,jj) = sf_qrp(1)%fnow(ji,jj,1) 96 103 qns(ji,jj) = qns(ji,jj) + zqrp 97 104 END DO 98 105 END DO 99 !ky! CALL iom_put( "qrp", qrp ) ! heat flux damping 106 !ky 11/12/2015 recommented out below 1 line below 107 !!ky 3/12/2015 uncommented below 1 line below for FA test! 108 !CALL iom_put( "qrp", qrp ) ! heat flux damping 100 109 ENDIF 101 110 ! … … 103 112 !CDIR COLLAPSE 104 113 DO jj = 1, jpj 114 !!write(numout,*) 'sf_qrp(1)%fnow(30,',jj,',1)=',sf_qrp(1)%fnow(30,jj,1), & 115 !! & 'sf_erp(1)%fnow(30,',jj,',1)=',sf_erp(1)%fnow(30,jj,1), & 116 !! & 'sst_m(30,',jj,')=',sst_m(30,jj),'sss_m(30,',jj,')=',sss_m(30,jj) 105 117 DO ji = 1, jpi 106 118 zerp = ( 1. - 2.*rnfmsk(ji,jj) ) & ! No damping in vicinity of river mouths 107 119 & * sf_erp(1)%fnow(ji,jj,1) 120 !ky 11/12/2015 recommented out 1 line below 121 !!ky 3/12/2015 1 line below for FA test! 122 !erp(ji,jj) = sf_erp(1)%fnow(ji,jj,1) 108 123 sfx(ji,jj) = sfx(ji,jj) + zerp ! salt flux 109 124 END DO 110 125 END DO 111 !ky!CALL iom_put( "erp", erp ) ! freshwater flux damping 126 !ky 11/12/2015 recommented out below one line 127 !!ky 3/12/2015 uncommented below one line for FA test! 128 !CALL iom_put( "erp", erp ) ! freshwater flux damping 112 129 ! 113 130 ELSEIF( nn_flxadjfw == 2 ) THEN !* Salinity damping term (volume flux (emp) and associated heat flux (qns) … … 119 136 & * sf_erp(1)%fnow(ji,jj,1) 120 137 IF( ln_sssr_bnd ) zerp = SIGN( 1., zerp ) * MIN( zerp_bnd, ABS(zerp) ) 138 !ky 11/12/2015 recommented out 1 line below 139 !!ky 3/12/2015 1 line below for FA test! 140 !erp(ji,jj) = sf_erp(1)%fnow(ji,jj,1) 121 141 emp(ji,jj) = emp (ji,jj) + zerp 122 142 qns(ji,jj) = qns(ji,jj) - zerp * rcp * sst_m(ji,jj) 123 143 END DO 124 144 END DO 125 !ky!CALL iom_put( "erp", erp ) ! freshwater flux damping 145 !ky 11/12/2015 recommented out below 1 line 146 !!ky 3/12/2015 uncommented below 1 line for FA test! 147 !CALL iom_put( "erp", erp ) ! freshwater flux damping 126 148 ENDIF 127 149 ! … … 158 180 ! 159 181 182 !!write(numout,*) '*** in sbcflx_adj_init ***' 183 160 184 REWIND( numnam_ref ) ! Namelist namsbc_flx_adj in reference namelist : 161 185 READ ( numnam_ref, namsbc_flx_adj, IOSTAT = ios, ERR = 901) … … 180 204 ! 181 205 ! !* Allocate erp and qrp array 182 !ky!ALLOCATE( qrp(jpi,jpj), erp(jpi,jpj), STAT=ierror ) 183 !ky!IF( ierror > 0 ) CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' ) 206 !ky 11/12/2015 recommented out below two lines 207 !!ky 3/12/2015 uncommented below two lines for FA test! 208 !ALLOCATE( qrp(jpi,jpj), erp(jpi,jpj), STAT=ierror ) 209 !IF( ierror > 0 ) CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' ) 184 210 ! 185 211 IF( nn_flxadjht == 1 ) THEN !* set sf_qrp structure & allocate arrays … … 212 238 ! 213 239 !ky!! !* Initialize qrp and erp if no restoring 214 !ky!IF( nn_sstr /= 1 ) qrp(:,:) = 0._wp 215 !ky!IF( nn_sssr /= 1 .OR. nn_sssr /= 2 ) erp(:,:) = 0._wp 240 !ky 11/12/2015 commented out below two lines 241 !!ky 3/12/2015 below two lines for FA test! 242 !IF( nn_flxadjht /= 1 ) qrp(:,:) = 0._wp 243 !IF( nn_flxadjfw /= 1 .OR. nn_flxadjfw /= 2 ) erp(:,:) = 0._wp 244 !!ky!!IF( nn_sstr /= 1 ) qrp(:,:) = 0._wp 245 !!ky!!IF( nn_sssr /= 1 .OR. nn_sssr /= 2 ) erp(:,:) = 0._wp 216 246 ! 217 247 END SUBROUTINE sbc_flx_adj_init -
branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90
r5880 r6388 115 115 erp(ji,jj) = zerp / MAX( sss_m(ji,jj), 1.e-20 ) ! converted into an equivalent volume flux (diagnostic only) 116 116 END DO 117 !!write(numout,*) 'erp(30,',jj,')=',erp(30,jj), & 118 !! & 'sf_sss(1)%fnow(30,',jj,',1)=',sf_sss(1)%fnow(30,jj,1), & 119 !! & 'sss_m(30,',jj,')=',sss_m(30,jj),'sst_m(30,',jj,')=',sst_m(30,jj), & 120 !! & 'rnfmsk(30,',jj,')=',rnfmsk(30,jj) 117 121 END DO 118 122 CALL iom_put( "erp", erp ) ! freshwater flux damping
Note: See TracChangeset
for help on using the changeset viewer.
