Changeset 1322 for palm/trunk/SOURCE/advec_ws.f90
- Timestamp:
- Mar 20, 2014 4:38:49 PM (10 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/advec_ws.f90 (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/advec_ws.f90
r1321 r1322 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! REAL constants defined as wp-kind 23 23 ! 24 24 ! Former revisions: … … 195 195 ! 196 196 !-- Set the appropriate factors for scalar and momentum advection. 197 adv_sca_5 = 1. /60.198 adv_sca_3 = 1. /12.199 adv_sca_1 = 1. /2.200 adv_mom_5 = 1. /120.201 adv_mom_3 = 1. /24.202 adv_mom_1 = 1. /4.197 adv_sca_5 = 1.0_wp / 60.0_wp 198 adv_sca_3 = 1.0_wp / 12.0_wp 199 adv_sca_1 = 1.0_wp / 2.0_wp 200 adv_mom_5 = 1.0_wp / 120.0_wp 201 adv_mom_3 = 1.0_wp / 24.0_wp 202 adv_mom_1 = 1.0_wp / 4.0_wp 203 203 ! 204 204 !-- Arrays needed for statical evaluation of fluxes. … … 1174 1174 + ( flux_r(k) * & 1175 1175 ( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 1176 / ( u_comp(k) - gu + 1.0E-20 1176 / ( u_comp(k) - gu + 1.0E-20_wp ) & 1177 1177 + diss_r(k) * & 1178 1178 ABS( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 1179 / ( ABS( u_comp(k) - gu ) + 1.0E-20 ) )&1179 / ( ABS( u_comp(k) - gu ) + 1.0E-20_wp ) ) & 1180 1180 * weight_substep(intermediate_timestep_count) 1181 1181 ! … … 1278 1278 + ( flux_r(k) * & 1279 1279 ( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 1280 / ( u_comp(k) - gu + 1.0E-20 1280 / ( u_comp(k) - gu + 1.0E-20_wp ) & 1281 1281 + diss_r(k) * & 1282 1282 ABS( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 1283 / ( ABS( u_comp(k) - gu ) + 1.0E-20 ) )&1283 / ( ABS( u_comp(k) - gu ) + 1.0E-20_wp ) ) & 1284 1284 * weight_substep(intermediate_timestep_count) 1285 1285 ! … … 1631 1631 + ( flux_n(k) & 1632 1632 * ( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 1633 / ( v_comp(k) - gv + 1.0E-20 )&1633 / ( v_comp(k) - gv + 1.0E-20_wp ) & 1634 1634 + diss_n(k) & 1635 1635 * ABS( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 1636 / ( ABS( v_comp(k) - gv ) +1.0E-20 ) )&1636 / ( ABS( v_comp(k) - gv ) +1.0E-20_wp ) ) & 1637 1637 * weight_substep(intermediate_timestep_count) 1638 1638 ! … … 1740 1740 + ( flux_n(k) & 1741 1741 * ( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 1742 / ( v_comp(k) - gv + 1.0E-20 )&1742 / ( v_comp(k) - gv + 1.0E-20_wp ) & 1743 1743 + diss_n(k) & 1744 1744 * ABS( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 1745 / ( ABS( v_comp(k) - gv ) +1.0E-20 ) )&1745 / ( ABS( v_comp(k) - gv ) +1.0E-20_wp ) ) & 1746 1746 * weight_substep(intermediate_timestep_count) 1747 1747 ! … … 3312 3312 + ( flux_r(k) * & 3313 3313 ( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 3314 / ( u_comp(k) - gu + 1.0E-20 )&3314 / ( u_comp(k) - gu + 1.0E-20_wp ) & 3315 3315 + diss_r(k) * & 3316 3316 ABS( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 3317 / ( ABS( u_comp(k) - gu ) + 1.0E-20 ) )&3317 / ( ABS( u_comp(k) - gu ) + 1.0E-20_wp ) ) & 3318 3318 * weight_substep(intermediate_timestep_count) 3319 3319 ! … … 3418 3418 + ( flux_r(k) * & 3419 3419 ( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 3420 / ( u_comp(k) - gu + 1.0E-20 3420 / ( u_comp(k) - gu + 1.0E-20_wp ) & 3421 3421 + diss_r(k) * & 3422 3422 ABS( u_comp(k) - 2.0 * hom(k,1,1,0) ) & 3423 / ( ABS( u_comp(k) - gu ) + 1.0E-20 ) )&3423 / ( ABS( u_comp(k) - gu ) + 1.0E-20_wp ) ) & 3424 3424 * weight_substep(intermediate_timestep_count) 3425 3425 ! … … 3749 3749 ! + ( flux_r * & 3750 3750 ! ( u_comp - 2.0 * hom(k,1,1,0) ) & 3751 ! / ( u_comp - gu + 1.0E-20 3751 ! / ( u_comp - gu + 1.0E-20_wp ) & 3752 3752 ! + diss_r * & 3753 3753 ! ABS( u_comp - 2.0 * hom(k,1,1,0) ) & 3754 ! / ( ABS( u_comp - gu ) + 1.0E-20 ) )&3754 ! / ( ABS( u_comp - gu ) + 1.0E-20_wp ) ) & 3755 3755 ! * weight_substep(intermediate_timestep_count) 3756 3756 ! … … 4108 4108 + ( flux_n(k) & 4109 4109 * ( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 4110 / ( v_comp(k) - gv + 1.0E-20 )&4110 / ( v_comp(k) - gv + 1.0E-20_wp ) & 4111 4111 + diss_n(k) & 4112 4112 * ABS( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 4113 / ( ABS( v_comp(k) - gv ) +1.0E-20 ) )&4113 / ( ABS( v_comp(k) - gv ) +1.0E-20_wp ) ) & 4114 4114 * weight_substep(intermediate_timestep_count) 4115 4115 ! … … 4221 4221 + ( flux_n(k) & 4222 4222 * ( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 4223 / ( v_comp(k) - gv + 1.0E-20 )&4223 / ( v_comp(k) - gv + 1.0E-20_wp ) & 4224 4224 + diss_n(k) & 4225 4225 * ABS( v_comp(k) - 2.0 * hom(k,1,2,0) ) & 4226 / ( ABS( v_comp(k) - gv ) +1.0E-20 ) )&4226 / ( ABS( v_comp(k) - gv ) +1.0E-20_wp ) ) & 4227 4227 * weight_substep(intermediate_timestep_count) 4228 4228 ! … … 4554 4554 ! + ( flux_n & 4555 4555 ! * ( v_comp - 2.0 * hom(k,1,2,0) ) & 4556 ! / ( v_comp - gv + 1.0E-20 )&4556 ! / ( v_comp - gv + 1.0E-20_wp ) & 4557 4557 ! + diss_n & 4558 4558 ! * ABS( v_comp - 2.0 * hom(k,1,2,0) ) & 4559 ! / ( ABS( v_comp - gv ) +1.0E-20 ) )&4559 ! / ( ABS( v_comp - gv ) +1.0E-20_wp ) ) & 4560 4560 ! * weight_substep(intermediate_timestep_count) 4561 4561 !
Note: See TracChangeset
for help on using the changeset viewer.
