Console Output
+ diff --exclude=.git --exclude=version_clubb_core.txt --exclude=version_silhs.txt -r clubb clubb_release
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters/configurable_model_flags.in clubb_release/input/tunable_parameters/configurable_model_flags.in
45d44
< l_use_wp3_lim_with_smth_Heaviside = .false.,
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_clubb_core_module.F90 clubb_release/src/CLUBB_core/advance_clubb_core_module.F90
1988d1987
< clubb_config_flags%l_use_wp3_lim_with_smth_Heaviside, & ! intent(in)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_wp2_wp3_module.F90 clubb_release/src/CLUBB_core/advance_wp2_wp3_module.F90
79d78
< l_use_wp3_lim_with_smth_Heaviside, & ! intent(in)
295,296c294
< l_use_tke_in_wp2_wp3_K_dfsn, & ! Use TKE in eddy diffusion for wp2 and wp3
< l_use_wp3_lim_with_smth_Heaviside ! Flag to activate mods on wp3 limiters for conv test
---
> l_use_tke_in_wp2_wp3_K_dfsn ! Use TKE in eddy diffusion for wp2 and wp3
872d869
< l_use_wp3_lim_with_smth_Heaviside, & ! intent(in)
1018d1014
< l_use_wp3_lim_with_smth_Heaviside, &
1186,1187c1182
< l_use_tke_in_wp2_wp3_K_dfsn, & ! Use TKE in eddy diffusion for wp2 and wp3
< l_use_wp3_lim_with_smth_Heaviside ! Flag to activate mods on wp3 limiters for conv test
---
> l_use_tke_in_wp2_wp3_K_dfsn ! Use TKE in eddy diffusion for wp2 and wp3
1605d1599
< l_use_wp3_lim_with_smth_Heaviside, & ! intent(in)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/clip_explicit.F90 clubb_release/src/CLUBB_core/clip_explicit.F90
965d964
< l_use_wp3_lim_with_smth_Heaviside, & ! intent(in)
1045,1050d1043
< ! Flag to activate modifications on wp3 limiters for convergence test
< ! (use smooth Heaviside 'Preskin' function in the calculation of
< ! clip_skewness for wp3)
< logical, intent(in):: &
< l_use_wp3_lim_with_smth_Heaviside
<
1070,1073c1063,1065
< call clip_skewness_core( nz, ngrdcol, gr, sfc_elevation, & ! intent(in)
< Skw_max_mag, wp2_zt, & ! intent(in)
< l_use_wp3_lim_with_smth_Heaviside, & ! intent(in)
< wp3 ) ! intent(inout)
---
> call clip_skewness_core( nz, ngrdcol, gr, sfc_elevation, & ! intent(in)
> Skw_max_mag, wp2_zt, & ! intent(in)
> wp3 ) ! intent(inout)
1088d1079
< l_use_wp3_lim_with_smth_Heaviside, &
1097,1099d1087
< use advance_helper_module, only: &
< smooth_heaviside_peskin
<
1118,1122d1105
< ! Flag to activate modifications on wp3 limiters for convergence test
< ! (use smooth Heaviside 'Preskin' function in the calculation of clip_skewness for wp3)
< logical, intent(in):: &
< l_use_wp3_lim_with_smth_Heaviside
<
1137,1140d1119
< real( kind = core_rknd ), dimension(ngrdcol,nz) :: &
< zagl_thresh, & ! temporatory array
< H_zagl ! Heaviside function for clippings of wp3_lim_sqd
<
1163,1165c1142
< if (l_use_wp3_lim_with_smth_Heaviside) then
<
< !implement a smoothed Heaviside function to avoid discontinuities
---
> do k = 1, nz
1167,1169c1144,1152
< zagl_thresh(i,:) = ( gr%zt(i,:) - sfc_elevation(i) ) / 100.0_core_rknd
< zagl_thresh(i,:) = zagl_thresh(i,:) - 1.0_core_rknd
< H_zagl(i,:) = smooth_heaviside_peskin(zagl_thresh(i,:), 0.6_core_rknd)
---
> if ( gr%zt(i,k) - sfc_elevation(i) <= 100.0_core_rknd ) then ! Clip for 100 m. AGL.
> !wp3_upper_lim(k) = 0.2_core_rknd * sqrt_2 * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
> !wp3_lower_lim(k) = -0.2_core_rknd * sqrt_2 * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
> wp3_lim_sqd(i,k) = 0.0021_core_rknd * Skw_max_mag**2 * wp2_zt_cubed(i,k)
> else ! Clip skewness consistently with a.
> !wp3_upper_lim(k) = 4.5_core_rknd * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
> !wp3_lower_lim(k) = -4.5_core_rknd * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
> wp3_lim_sqd(i,k) = Skw_max_mag**2 * wp2_zt_cubed(i,k) ! Skw_max_mag = 4.5_core_rknd^2
> endif
1170a1154
> end do
1172,1198d1155
< do k = 1, nz
< do i = 1, ngrdcol
< wp3_lim_sqd(i,k) = wp2_zt_cubed(i,k) &
< * ( H_zagl(i,k) * Skw_max_mag**2 &
< + (1.0_core_rknd - H_zagl(i,k)) &
< * 0.0021_core_rknd *Skw_max_mag**2 )
< end do
< end do
<
< else ! default method
<
< do k = 1, nz
< do i = 1, ngrdcol
< if ( gr%zt(i,k) - sfc_elevation(i) <= 100.0_core_rknd ) then ! Clip for 100 m. AGL.
< !wp3_upper_lim(k) = 0.2_core_rknd * sqrt_2 * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
< !wp3_lower_lim(k) = -0.2_core_rknd * sqrt_2 * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
< wp3_lim_sqd(i,k) = 0.0021_core_rknd * Skw_max_mag**2 * wp2_zt_cubed(i,k)
< else ! Clip skewness consistently with a.
< !wp3_upper_lim(k) = 4.5_core_rknd * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
< !wp3_lower_lim(k) = -4.5_core_rknd * wp2_zt(k)**(3.0_core_rknd/2.0_core_rknd)
< wp3_lim_sqd(i,k) = Skw_max_mag**2 * wp2_zt_cubed(i,k) ! Skw_max_mag = 4.5_core_rknd^2
< endif
< end do
< end do
<
< end if
<
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/clubb_api_module.F90 clubb_release/src/CLUBB_core/clubb_api_module.F90
4530d4529
< l_use_wp3_lim_with_smth_Heaviside, & ! Out
4658d4656
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
4720d4717
< l_use_wp3_lim_with_smth_Heaviside, & ! Out
4783d4779
< l_use_wp3_lim_with_smth_Heaviside, & ! In
4913d4908
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
4979d4973
< l_use_wp3_lim_with_smth_Heaviside, & ! In
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/model_flags.F90 clubb_release/src/CLUBB_core/model_flags.F90
267d266
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
400d398
< l_use_wp3_lim_with_smth_Heaviside, &
532d529
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
603d599
< l_use_wp3_lim_with_smth_Heaviside = .false.
665d660
< l_use_wp3_lim_with_smth_Heaviside, &
798d792
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
867d860
< clubb_config_flags%l_use_wp3_lim_with_smth_Heaviside = l_use_wp3_lim_with_smth_Heaviside
951d943
< write(iunit,*) "l_use_wp3_lim_with_smth_Heaviside = ", clubb_config_flags%l_use_wp3_lim_with_smth_Heaviside
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_driver.F90 clubb_release/src/clubb_driver.F90
846d845
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
907c906
< l_use_tke_in_wp2_wp3_K_dfsn, l_use_wp3_lim_with_smth_Heaviside, l_smooth_Heaviside_tau_wpxp, &
---
> l_use_tke_in_wp2_wp3_K_dfsn, l_smooth_Heaviside_tau_wpxp, &
1070d1068
< l_use_wp3_lim_with_smth_Heaviside, & ! Intent(out)
1472d1469
< l_use_wp3_lim_with_smth_Heaviside, & ! Intent(in)
2285,2288c2282,2283
< call clip_skewness_core( gr%nz, 1, gr, sfc_elevation(:), &
< params(iSkw_max_mag), wp2_zt(1,:), &
< clubb_config_flags%l_use_wp3_lim_with_smth_Heaviside, &
< wp3(1,:) )
---
> call clip_skewness_core( gr%nz, 1, gr, sfc_elevation(:), params(iSkw_max_mag), &
> wp2_zt(1,:), wp3(1,:) )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_tuner.F90 clubb_release/src/clubb_tuner.F90
663d662
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
691c690
< l_use_tke_in_wp2_wp3_K_dfsn, l_use_wp3_lim_with_smth_Heaviside, l_smooth_Heaviside_tau_wpxp
---
> l_use_tke_in_wp2_wp3_K_dfsn, l_smooth_Heaviside_tau_wpxp
743d741
< l_use_wp3_lim_with_smth_Heaviside, & ! Intent(out)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/G_unit_test_types/pdf_parameter_tests.F90 clubb_release/src/G_unit_test_types/pdf_parameter_tests.F90
540d539
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
689d687
< l_use_wp3_lim_with_smth_Heaviside, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/G_unit_test_types/spurious_source_test.F90 clubb_release/src/G_unit_test_types/spurious_source_test.F90
480d479
< l_use_wp3_lim_with_smth_Heaviside, & ! Flag to activate mods on wp3 limiters for conv test
605d603
< l_use_wp3_lim_with_smth_Heaviside, &
![[Jenkins]](/jenkins/static/57c8a776/images/svgs/logo.svg){kind=logo}
