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/doc/WRF_HOC/module_bl_newhoc.F clubb_release/doc/WRF_HOC/module_bl_newhoc.F
111a112,114
> REAL, PARAMETER:: C2_in = 1.300000 ! Low Skewness in C2 Skewness Function.
> REAL, PARAMETER:: C2b_in = 1.300000 ! High Skewness in C2 Skewness Function.
> REAL, PARAMETER:: C2c_in = 5.000000 ! Degree of Slope of C2 Skewness Function.
507c510
< C4_in, C5_in, &
---
> C2_in, C2b_in, C2c_in, C4_in, C5_in, &
1165c1168
< C4_in, C5_in, &
---
> C2_in, C2b_in, C2c_in, C4_in, C5_in, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/ens_tune/error_combined_001.in clubb_release/ens_tune/error_combined_001.in
51a52,54
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/experimental/diag_var.F.up2vp2_sqd3ptdiff.20080326 clubb_release/experimental/diag_var.F.up2vp2_sqd3ptdiff.20080326
44c44
< . only: C2rt, C2thl, C2rtthl, c_K2, nu2, nu9,
---
> . only: C2, C2b, C2c, C2rt, C2thl, C2rtthl, c_K2, nu2, nu9,
152,153c152,153
< ! C2rt_1d(1:gr%nz)
< ! . = C2b + (C2-C2b) *exp( -0.5 * (Skwm(1:gr%nz)/C2c)**2 )
---
> C2rt_1d(1:gr%nz)
> . = C2b + (C2-C2b) *exp( -0.5 * (Skwm(1:gr%nz)/C2c)**2 )
155,156c155,156
< ! C2thl_1d = C2rt_1d
< ! C2rtthl_1d = C2rt_1d
---
> C2thl_1d = C2rt_1d
> C2rtthl_1d = C2rt_1d
158c158
< ! C2sclr_1d = C2rt_1d
---
> C2sclr_1d = C2rt_1d
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
12a13
> l_single_C2_Skw = .false.,
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters/tunable_parameters.in clubb_release/input/tunable_parameters/tunable_parameters.in
4a5
> ! C2, C2b, & C2c are not used unless l_single_C2_Skw is true.
12a14,16
> C2 = 1.300000 ! Low Skewness in C2 Skewness Function. Units [-]
> C2b = 1.300000 ! High Skewness in C2 Skewness Function. Units [-]
> C2c = 5.000000 ! Degree of Slope of C2 Skewness Function. Units [-]
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_compatible_r8029/configurable_model_flags.in clubb_release/input/tunable_parameters_compatible_r8029/configurable_model_flags.in
8a9
> l_single_C2_Skw = .false.,
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_compatible_r8029/tunable_parameters.in clubb_release/input/tunable_parameters_compatible_r8029/tunable_parameters.in
4a5
> ! C2, C2b, & C2c are not used unless l_single_C2_Skw is true.
12a14,16
> C2 = 1.300000 ! Low Skewness in C2 Skewness Function. Units [-]
> C2b = 1.300000 ! High Skewness in C2 Skewness Function. Units [-]
> C2c = 5.000000 ! Degree of Slope of C2 Skewness Function. Units [-]
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_e3sm/configurable_model_flags.in clubb_release/input/tunable_parameters_e3sm/configurable_model_flags.in
12a13
> l_single_C2_Skw = .false.,
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_e3sm/tunable_parameters.in clubb_release/input/tunable_parameters_e3sm/tunable_parameters.in
4a5
> ! C2, C2b, & C2c are not used unless l_single_C2_Skw is true.
12a14,16
> C2 = 1.300000 ! Low Skewness in C2 Skewness Function. Units [-]
> C2b = 1.300000 ! High Skewness in C2 Skewness Function. Units [-]
> C2c = 5.000000 ! Degree of Slope of C2 Skewness Function. Units [-]
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_Lscale/configurable_model_flags.in clubb_release/input/tunable_parameters_Lscale/configurable_model_flags.in
12a13
> l_single_C2_Skw = .false.,
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input/tunable_parameters_Lscale/tunable_parameters.in clubb_release/input/tunable_parameters_Lscale/tunable_parameters.in
4a5
> ! C2, C2b, & C2c are not used unless l_single_C2_Skw is true.
12a14,16
> C2 = 1.300000 ! Low Skewness in C2 Skewness Function. Units [-]
> C2b = 1.300000 ! High Skewness in C2 Skewness Function. Units [-]
> C2c = 5.000000 ! Degree of Slope of C2 Skewness Function. Units [-]
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_all.in clubb_release/input_misc/tuner/error_all.in
127a128,130
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_arm_97.in clubb_release/input_misc/tuner/error_arm_97.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_arm.in clubb_release/input_misc/tuner/error_arm.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_atex.in clubb_release/input_misc/tuner/error_atex.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_bomex.in clubb_release/input_misc/tuner/error_bomex.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_dycoms2_rf01.in clubb_release/input_misc/tuner/error_dycoms2_rf01.in
42a43,45
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_dycoms2_rf02_do.in clubb_release/input_misc/tuner/error_dycoms2_rf02_do.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_dycoms2_rf02_ds.in clubb_release/input_misc/tuner/error_dycoms2_rf02_ds.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_dycoms2_rf02_nd.in clubb_release/input_misc/tuner/error_dycoms2_rf02_nd.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_fire.in clubb_release/input_misc/tuner/error_fire.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_gabls2.in clubb_release/input_misc/tuner/error_gabls2.in
42a43,45
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_gabls3_night.in clubb_release/input_misc/tuner/error_gabls3_night.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_lba.in clubb_release/input_misc/tuner/error_lba.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_nov11_altocu.in clubb_release/input_misc/tuner/error_nov11_altocu.in
41a42,44
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_rico.in clubb_release/input_misc/tuner/error_rico.in
43a44,46
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_ticket_756.in clubb_release/input_misc/tuner/error_ticket_756.in
60a61,64
> C2 = 0.
> C2b = 0.
> C2c = 0.
> C4 = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_wangara.in clubb_release/input_misc/tuner/error_wangara.in
42a43,45
> C2 = 0.
> C2b = 0.
> C2c = 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/run_scripts/run_tuner.bash clubb_release/run_scripts/run_tuner.bash
256a257
> exit
290,296d290
<
< # Copy the contents of the error_*.in file to the tuner log so they will be saved
< TUNER_LOG=`ls -t ../input/tuning_run_results_* | head -n 1`
< echo "" >> $TUNER_LOG
< echo "********************************" >> $TUNER_LOG
< echo "contents of " $ERROR_IN >> $TUNER_LOG
< cat $ERROR_IN >> $TUNER_LOG
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
1527a1528
> clubb_config_flags%l_single_C2_Skw, & ! intent(in)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_xp2_xpyp_module.F90 clubb_release/src/CLUBB_core/advance_xp2_xpyp_module.F90
64a65
> l_single_C2_Skw, & ! In
119a121,123
> C2, &
> C2b, &
> C2c, &
277a282
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, & rtpthlp
394,395c399
< ! Use 3 different values of C2 for rtp2, thlp2, rtpthlp.
< if ( l_C2_cloud_frac ) then
---
> if ( l_single_C2_Skw ) then
397,414c401,402
< do k = 1, gr%nz, 1
< if ( cloud_frac(k) >= cloud_frac_min ) then
< C2rt_1d(k) = C2rt * max( min_cloud_frac_mult, cloud_frac(k) )
< C2thl_1d(k) = C2thl * max( min_cloud_frac_mult, cloud_frac(k) )
< C2rtthl_1d(k) = C2rtthl &
< * max( min_cloud_frac_mult, cloud_frac(k) )
< else ! cloud_frac(k) < cloud_frac_min
< C2rt_1d(k) = C2rt
< C2thl_1d(k) = C2thl
< C2rtthl_1d(k) = C2rtthl
< endif ! cloud_frac(k) >= cloud_frac_min
< enddo ! k = 1, gr%nz, 1
<
< else
<
< C2rt_1d = C2rt
< C2thl_1d = C2thl
< C2rtthl_1d = C2rtthl
---
> ! Use a single value of C2 for all equations.
> C2rt_1d = C2b + ( C2 - C2b ) * exp( -one_half * ( Skw_zm / C2c )**2 )
416c404,439
< endif ! l_C2_cloud_frac
---
> if ( l_C2_cloud_frac ) then
> do k = 1, gr%nz, 1
> if ( cloud_frac(k) >= cloud_frac_min ) then
> C2rt_1d(k) &
> = C2rt_1d(k) * max( min_cloud_frac_mult, cloud_frac(k) )
> endif ! cloud_frac(k) >= cloud_frac_min
> enddo ! k = 1, gr%nz, 1
> endif ! l_C2_cloud_frac
>
> C2thl_1d = C2rt_1d
> C2rtthl_1d = C2rt_1d
> C2sclr_1d = C2rt_1d
>
> else ! .not. l_single_C2_Skw
>
> ! Use 3 different values of C2 for rtp2, thlp2, rtpthlp.
> if ( l_C2_cloud_frac ) then
>
> do k = 1, gr%nz, 1
> if ( cloud_frac(k) >= cloud_frac_min ) then
> C2rt_1d(k) = C2rt * max( min_cloud_frac_mult, cloud_frac(k) )
> C2thl_1d(k) = C2thl * max( min_cloud_frac_mult, cloud_frac(k) )
> C2rtthl_1d(k) = C2rtthl &
> * max( min_cloud_frac_mult, cloud_frac(k) )
> else ! cloud_frac(k) < cloud_frac_min
> C2rt_1d(k) = C2rt
> C2thl_1d(k) = C2thl
> C2rtthl_1d(k) = C2rtthl
> endif ! cloud_frac(k) >= cloud_frac_min
> enddo ! k = 1, gr%nz, 1
>
> else
>
> C2rt_1d = C2rt
> C2thl_1d = C2thl
> C2rtthl_1d = C2rtthl
418c441
< C2sclr_1d = C2rt ! Use rt value for now
---
> endif ! l_C2_cloud_frac
419a443
> C2sclr_1d = C2rt ! Use rt value for now
420a445
> endif ! l_single_C2_Skw
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
141c141
< iC1, iC1b, iC1c, &
---
> iC1, iC1b, iC1c, iC2, iC2b, iC2c, &
252c252
< iC1, iC1b, iC1c, &
---
> iC1, iC1b, iC1c, iC2, iC2b, iC2c, &
2397c2397,2398
< l_standard_term_ta &
---
> l_standard_term_ta, &
> l_single_C2_Skw &
2420c2421
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
2423a2425
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
2433c2435,2436
< l_standard_term_ta & ! Intent(in)
---
> l_standard_term_ta, & ! Intent(in)
> l_single_C2_Skw & ! Intent(in)
3168a3172
> l_single_C2_Skw, & ! Out
3284a3289,3290
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
3331a3338
> l_single_C2_Skw, & ! Out
3383a3391
> l_single_C2_Skw, & ! In
3501a3510,3511
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
3552a3563
> l_single_C2_Skw, & ! In
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/mixing_length.F90 clubb_release/src/CLUBB_core/mixing_length.F90
808a809,813
> use constants_clubb, only: &
> zero, &
> one, &
> T_freeze_K
>
813a819,825
> ! Parameters
> logical, parameter :: &
> l_include_ice = .false. ! Include ice in calculation of rsat_par
>
> real( kind = core_rknd ), parameter :: &
> T_all_ice = 233.15_core_rknd ! Temperature at which only ice is included in calculation [K]
>
824c836,839
< sat_mixrat_liq_res
---
> sat_ice_ratio, & ! Ratio of interpolation between sat_mixrat_liq and sat_mixrat_ice.
> ! sat_ice_ratio=1 ---> rsatl_par = sat_mixrat_ice
> sat_mixrat_liq_res, &
> sat_mixrat_ice_res
829,831c844,863
< ! Include liquid.
< if ( l_sat_mixrat_lookup ) then
< sat_mixrat_liq_res = sat_mixrat_liq_lookup( p_in_Pa, tl_par )
---
> if ( l_include_ice ) then
> if ( tl_par >= T_freeze_K ) then
> sat_ice_ratio = zero
> else if ( tl_par <= T_all_ice ) then
> sat_ice_ratio = one
> else
> ! Linear interpolation
> sat_ice_ratio = ( T_freeze_K - tl_par ) / ( T_freeze_K - T_all_ice )
> end if
> else
> sat_ice_ratio = zero
> end if ! l_include_ice
>
> if ( sat_ice_ratio < one ) then
> ! Include liquid.
> if ( l_sat_mixrat_lookup ) then
> sat_mixrat_liq_res = sat_mixrat_liq_lookup( p_in_Pa, tl_par )
> else
> sat_mixrat_liq_res = sat_mixrat_liq( p_in_Pa, tl_par )
> end if
833c865
< sat_mixrat_liq_res = sat_mixrat_liq( p_in_Pa, tl_par )
---
> sat_mixrat_liq_res = zero
835,836c867,875
<
< rsatl_par = sat_mixrat_liq_res
---
>
> if ( sat_ice_ratio > zero ) then
> ! Include ice.
> sat_mixrat_ice_res = sat_mixrat_ice( p_in_Pa, tl_par )
> else
> sat_mixrat_ice_res = zero
> end if
>
> rsatl_par = sat_mixrat_liq_res + ( sat_mixrat_ice_res - sat_mixrat_liq_res ) * sat_ice_ratio
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
244a245,246
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
359a362
> l_single_C2_Skw, &
479a483,484
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
529a535
> l_single_C2_Skw = .false.
584a591
> l_single_C2_Skw, &
705a713,714
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
759a769
> clubb_config_flags%l_single_C2_Skw = l_single_C2_Skw
832a843
> write(iunit,*) "l_single_C2_Skw = ", clubb_config_flags%l_single_C2_Skw
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/output_netcdf.F90 clubb_release/src/CLUBB_core/output_netcdf.F90
195a196
> l_single_C2_Skw, &
231c232
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
234a236
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
256a259
> l_single_C2_Skw, & ! intent(in)
567a571
> l_single_C2_Skw, &
638c642
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
641a646
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
813c818
< allocate( stat(6) ) ! # of model flags
---
> allocate( stat(7) ) ! # of model flags
819,821c824,828
< stat(4) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_gamma_Skw", lchar( l_gamma_Skw ) )
< stat(5) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_uv_nudge", lchar( l_uv_nudge ) )
< stat(6) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_tke_aniso", lchar( l_tke_aniso ) )
---
> stat(4) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_single_C2_Skw", &
> lchar( l_single_C2_Skw ) )
> stat(5) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_gamma_Skw", lchar( l_gamma_Skw ) )
> stat(6) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_uv_nudge", lchar( l_uv_nudge ) )
> stat(7) = nf90_put_att( ncf%iounit, NF90_GLOBAL, "l_tke_aniso", lchar( l_tke_aniso ) )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/parameter_indices.F90 clubb_release/src/CLUBB_core/parameter_indices.F90
29c29
< nparams = 97 ! Total tunable parameters
---
> nparams = 100 ! Total tunable parameters
43,71c43,74
< iC2rt = 4, &
< iC2thl = 5, &
< iC2rtthl = 6, &
< iC4 = 7, &
< iC_uu_shr = 8, &
< iC_uu_buoy = 9, &
< iC6rt = 10, &
< iC6rtb = 11, &
< iC6rtc = 12, &
< iC6thl = 13, &
< iC6thlb = 14, &
< iC6thlc = 15, &
< iC7 = 16, &
< iC7b = 17, &
< iC7c = 18, &
< iC8 = 19, &
< iC8b = 20, &
< iC10 = 21, &
< iC11 = 22, &
< iC11b = 23, &
< iC11c = 24, &
< iC12 = 25, &
< iC13 = 26, &
< iC14 = 27, &
< iC_wp2_pr_dfsn = 28, &
< iC_wp3_pr_tp = 29, &
< iC_wp3_pr_turb = 30, &
< iC_wp3_pr_dfsn = 31, &
< iC_wp2_splat = 32
---
> iC2 = 4, &
> iC2b = 5, &
> iC2c = 6, &
> iC2rt = 7, &
> iC2thl = 8, &
> iC2rtthl = 9, &
> iC4 = 10, &
> iC_uu_shr = 11, &
> iC_uu_buoy = 12, &
> iC6rt = 13, &
> iC6rtb = 14, &
> iC6rtc = 15, &
> iC6thl = 16, &
> iC6thlb = 17, &
> iC6thlc = 18, &
> iC7 = 19, &
> iC7b = 20, &
> iC7c = 21, &
> iC8 = 22, &
> iC8b = 23, &
> iC10 = 24, &
> iC11 = 25, &
> iC11b = 26, &
> iC11c = 27, &
> iC12 = 28, &
> iC13 = 29, &
> iC14 = 30, &
> iC_wp2_pr_dfsn = 31, &
> iC_wp3_pr_tp = 32, &
> iC_wp3_pr_turb = 33, &
> iC_wp3_pr_dfsn = 34, &
> iC_wp2_splat = 35
74,77c77,80
< iC6rt_Lscale0 = 33, &
< iC6thl_Lscale0 = 34, &
< iC7_Lscale0 = 35, &
< iwpxp_L_thresh = 36
---
> iC6rt_Lscale0 = 36, &
> iC6thl_Lscale0 = 37, &
> iC7_Lscale0 = 38, &
> iwpxp_L_thresh = 39
80,95c83,98
< ic_K = 37, &
< ic_K1 = 38, &
< inu1 = 39, &
< ic_K2 = 40, &
< inu2 = 41, &
< ic_K6 = 42, &
< inu6 = 43, &
< ic_K8 = 44, &
< inu8 = 45, &
< ic_K9 = 46, &
< inu9 = 47, &
< inu10 = 48, &
< ic_K_hm = 49, &
< ic_K_hmb = 50, &
< iK_hm_min_coef = 51, &
< inu_hm = 52
---
> ic_K = 40, &
> ic_K1 = 41, &
> inu1 = 42, &
> ic_K2 = 43, &
> inu2 = 44, &
> ic_K6 = 45, &
> inu6 = 46, &
> ic_K8 = 47, &
> inu8 = 48, &
> ic_K9 = 49, &
> inu9 = 50, &
> inu10 = 51, &
> ic_K_hm = 52, &
> ic_K_hmb = 53, &
> iK_hm_min_coef = 54, &
> inu_hm = 55
98,142c101,145
< islope_coef_spread_DG_means_w = 53, &
< ipdf_component_stdev_factor_w = 54, &
< icoef_spread_DG_means_rt = 55, &
< icoef_spread_DG_means_thl = 56, &
< igamma_coef = 57, &
< igamma_coefb = 58, &
< igamma_coefc = 59, &
< imu = 60, &
< ibeta = 61, &
< ilmin_coef = 62, &
< iomicron = 63, &
< izeta_vrnce_rat = 64, &
< iupsilon_precip_frac_rat = 65, &
< ilambda0_stability_coef = 66, &
< imult_coef = 67, &
< itaumin = 68, &
< itaumax = 69, &
< iLscale_mu_coef = 70, &
< iLscale_pert_coef = 71, &
< ialpha_corr = 72, &
< iSkw_denom_coef = 73, &
< ic_K10 = 74, &
< ic_K10h = 75, &
< ithlp2_rad_coef = 76, &
< ithlp2_rad_cloud_frac_thresh = 77, &
< iup2_sfc_coef = 78, &
< iSkw_max_mag = 79, &
< iC_invrs_tau_bkgnd = 80, &
< iC_invrs_tau_sfc = 81, &
< iC_invrs_tau_shear = 82, &
< iC_invrs_tau_N2 = 83, &
< iC_invrs_tau_N2_wp2 = 84, &
< iC_invrs_tau_N2_xp2 = 85, &
< iC_invrs_tau_N2_wpxp = 86, &
< iC_invrs_tau_N2_clear_wp3 = 87, &
< iC_invrs_tau_wpxp_Ri = 88, &
< iC_invrs_tau_wpxp_N2_thresh = 89, &
< ixp3_coef_base = 90, &
< ixp3_coef_slope = 91, &
< ialtitude_threshold = 92, &
< irtp2_clip_coef = 93, &
< iCx_min = 94, &
< iCx_max = 95, &
< iRichardson_num_min = 96, &
< iRichardson_num_max = 97
---
> islope_coef_spread_DG_means_w = 56, &
> ipdf_component_stdev_factor_w = 57, &
> icoef_spread_DG_means_rt = 58, &
> icoef_spread_DG_means_thl = 59, &
> igamma_coef = 60, &
> igamma_coefb = 61, &
> igamma_coefc = 62, &
> imu = 63, &
> ibeta = 64, &
> ilmin_coef = 65, &
> iomicron = 66, &
> izeta_vrnce_rat = 67, &
> iupsilon_precip_frac_rat = 68, &
> ilambda0_stability_coef = 69, &
> imult_coef = 70, &
> itaumin = 71, &
> itaumax = 72, &
> iLscale_mu_coef = 73, &
> iLscale_pert_coef = 74, &
> ialpha_corr = 75, &
> iSkw_denom_coef = 76, &
> ic_K10 = 77, &
> ic_K10h = 78, &
> ithlp2_rad_coef = 79, &
> ithlp2_rad_cloud_frac_thresh = 80, &
> iup2_sfc_coef = 81, &
> iSkw_max_mag = 82, &
> iC_invrs_tau_bkgnd = 83, &
> iC_invrs_tau_sfc = 84, &
> iC_invrs_tau_shear = 85, &
> iC_invrs_tau_N2 = 86, &
> iC_invrs_tau_N2_wp2 = 87, &
> iC_invrs_tau_N2_xp2 = 88, &
> iC_invrs_tau_N2_wpxp = 89, &
> iC_invrs_tau_N2_clear_wp3 = 90, &
> iC_invrs_tau_wpxp_Ri = 91, &
> iC_invrs_tau_wpxp_N2_thresh = 92, &
> ixp3_coef_base = 93, &
> ixp3_coef_slope = 94, &
> ialtitude_threshold = 95, &
> irtp2_clip_coef = 96, &
> iCx_min = 97, &
> iCx_max = 98, &
> iRichardson_num_min = 99, &
> iRichardson_num_max = 100
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/parameters_tunable.F90 clubb_release/src/CLUBB_core/parameters_tunable.F90
49a50
> C2 = 1.300000_core_rknd, & ! Low Skewness in C2 Skw. Function [-]
52a54,55
> C2b = 1.300000_core_rknd, & ! High Skewness in C2 Skw. Function [-]
> C2c = 5.000000_core_rknd, & ! Degree of Slope of C2 Skw. Function [-]
79c82
< !$omp threadprivate(C1, C1b, C1c, &
---
> !$omp threadprivate(C1, C1b, C1c, C2, C2b, C2c, &
318c321
< C1, C1b, C1c, &
---
> C1, C1b, C1c, C2, C2b, C2c, &
355c358,359
< "C1c ", &
---
> "C1c ", "C2 ", &
> "C2b ", "C2c ", &
619c623
< C1, C1b, C1c, C2rt, C2thl, C2rtthl, & ! intent(out)
---
> C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, & ! intent(out)
1452c1456
< ( C1, C1b, C1c, C2rt, C2thl, C2rtthl, & ! intent(in)
---
> ( C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, & ! intent(in)
1537c1541
< C1, C1b, C1c, &
---
> C1, C1b, C1c, C2, C2b, C2c, &
1573c1577
< ( C1, C1b, C1c, C2rt, C2thl, C2rtthl, & ! intent(in)
---
> ( C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, & ! intent(in)
1630c1634
< ( C1, C1b, C1c, C2rt, C2thl, C2rtthl, &
---
> ( C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, &
1666a1671,1673
> iC2, &
> iC2b, &
> iC2c, &
1771c1778
< C1, C1b, C1c, C2rt, C2thl, C2rtthl, &
---
> C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, &
1798a1806,1808
> params(iC2) = C2
> params(iC2b) = C2b
> params(iC2c) = C2c
1822a1833
>
1827a1839
>
1831a1844
>
1847a1861
>
1851a1866
>
1854a1870
>
1855a1872
>
1856a1874
>
1857a1876
>
1859a1879
>
1862a1883
>
1864a1886
>
1901c1923
< C1, C1b, C1c, C2rt, C2thl, C2rtthl, &
---
> C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, &
1937a1960,1962
> iC2, &
> iC2b, &
> iC2c, &
2045c2070
< C1, C1b, C1c, C2rt, C2thl, C2rtthl, &
---
> C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, &
2069a2095,2097
> C2 = params(iC2)
> C2b = params(iC2b)
> C2c = params(iC2c)
2197c2225
< ( C1, C1b, C1c, C2rt, C2thl, C2rtthl, & ! intent(in)
---
> ( C1, C1b, C1c, C2, C2b, C2c, C2rt, C2thl, C2rtthl, & ! intent(in)
2245a2274,2276
> C2 = init_value
> C2b = init_value
> C2c = init_value
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/stats_clubb_utilities.F90 clubb_release/src/CLUBB_core/stats_clubb_utilities.F90
1613c1613,1614
< l_standard_term_ta &
---
> l_standard_term_ta, &
> l_single_C2_Skw &
1673c1674
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
1676a1678
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
1771a1774
> l_single_C2_Skw, & ! intent(in)
1775a1779
> l_single_C2_Skw, & ! intent(in)
1780a1785
> l_single_C2_Skw, & ! intent(in)
1784a1790
> l_single_C2_Skw, & ! intent(in)
1790a1797
> l_single_C2_Skw, & ! intent(in)
1794a1802
> l_single_C2_Skw, & ! intent(in)
1799a1808
> l_single_C2_Skw, & ! intent(in)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_driver.F90 clubb_release/src/clubb_driver.F90
785a786,787
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
824c826
< l_tke_aniso, l_vert_avg_closure, l_standard_term_ta, &
---
> l_tke_aniso, l_vert_avg_closure, l_single_C2_Skw, l_standard_term_ta, &
976a979
> l_single_C2_Skw, & ! Intent(out)
1344a1348
> l_single_C2_Skw, & ! Intent(in)
1700,1703c1704,1708
< clubb_config_flags%l_standard_term_ta = model_flags_array(8)
< clubb_config_flags%l_tke_aniso = model_flags_array(9)
< clubb_config_flags%l_use_cloud_cover = model_flags_array(10)
< clubb_config_flags%l_rcm_supersat_adj = model_flags_array(11)
---
> clubb_config_flags%l_single_C2_Skw = model_flags_array(8)
> clubb_config_flags%l_standard_term_ta = model_flags_array(9)
> clubb_config_flags%l_tke_aniso = model_flags_array(10)
> clubb_config_flags%l_use_cloud_cover = model_flags_array(11)
> clubb_config_flags%l_rcm_supersat_adj = model_flags_array(12)
2329a2335
> clubb_config_flags%l_single_C2_Skw, & ! In
2502c2508,2509
< clubb_config_flags%l_standard_term_ta &
---
> clubb_config_flags%l_standard_term_ta, &
> clubb_config_flags%l_single_C2_Skw &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_tuner.F90 clubb_release/src/clubb_tuner.F90
520c520
< ndim = 11, & ! Temporarily hardwired for a fixed number of flags
---
> ndim = 12, & ! Temporarily hardwired for a fixed number of flags
651a652,653
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
662c664
< l_tke_aniso, l_vert_avg_closure, l_standard_term_ta, &
---
> l_tke_aniso, l_vert_avg_closure, l_single_C2_Skw, l_standard_term_ta, &
715a718
> l_single_C2_Skw, & ! Intent(out)
731,734c734,738
< model_flags_default(8) = l_standard_term_ta
< model_flags_default(9) = l_tke_aniso
< model_flags_default(10) = l_use_cloud_cover
< model_flags_default(11) = l_rcm_supersat_adj
---
> model_flags_default(8) = l_single_C2_Skw
> model_flags_default(9) = l_standard_term_ta
> model_flags_default(10) = l_tke_aniso
> model_flags_default(11) = l_use_cloud_cover
> model_flags_default(12) = l_rcm_supersat_adj
845,848c849,853
< l_standard_term_ta = model_flags_array(1,8)
< l_tke_aniso = model_flags_array(1,9)
< l_use_cloud_cover = model_flags_array(1,10)
< l_rcm_supersat_adj = model_flags_array(1,11)
---
> l_single_C2_Skw = model_flags_array(1,8)
> l_standard_term_ta = model_flags_array(1,9)
> l_tke_aniso = model_flags_array(1,10)
> l_use_cloud_cover = model_flags_array(1,11)
> l_rcm_supersat_adj = model_flags_array(1,12)
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
512a513,514
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
> ! rtpthlp
559a562
> l_single_C2_Skw, &
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
420a421
> l_single_C2_Skw, & ! Use a single Skewness dependent C2 for rtp2, thlp2, and
468a470
> l_single_C2_Skw, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/latin_hypercube_driver_module.F90 clubb_release/src/SILHS/latin_hypercube_driver_module.F90
39a40
> l_single_C2_Skw, & ! intent(in)
163c164
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
167c168
<
---
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
413c414,415
< l_standard_term_ta )
---
> l_standard_term_ta, &
> l_single_C2_Skw )
427c429,430
< l_standard_term_ta )
---
> l_standard_term_ta, &
> l_single_C2_Skw )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/output_2D_samples_module.F90 clubb_release/src/SILHS/output_2D_samples_module.F90
119c119,120
< l_standard_term_ta )
---
> l_standard_term_ta, &
> l_single_C2_Skw )
148c149
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
151a153
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
172a175
> l_single_C2_Skw, &
191c194,195
< l_standard_term_ta )
---
> l_standard_term_ta, &
> l_single_C2_Skw )
228c232
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
231a236
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
259a265
> l_single_C2_Skw, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/silhs_api_module.F90 clubb_release/src/SILHS/silhs_api_module.F90
143a144
> l_single_C2_Skw, & ! In
232c233
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
236c237
<
---
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
298a300
> l_single_C2_Skw, & ! In
321a324
> l_single_C2_Skw, & ! In
411c414
< l_standard_term_ta ! Use the standard discretization for the turbulent advection terms.
---
> l_standard_term_ta, & ! Use the standard discretization for the turbulent advection terms.
414a418
> l_single_C2_Skw ! Use a single Skewness dependent C2 for rtp2, thlp2, and rtpthlp
430a435
> l_single_C2_Skw, & ! In
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/utilities/sens_matrix/test_analyzeSensMatrix.py clubb_release/utilities/sens_matrix/test_analyzeSensMatrix.py
60,62c60
< defaultBiasesApprox, defaultBiasesApproxLowVals, defaultBiasesApproxHiVals, \
< defaultBiasesApproxPC, defaultBiasesApproxLowValsPC, defaultBiasesApproxHiValsPC, \
< normlzdWeightedDefaultBiasesApproxPC, \
---
> defaultBiasesApprox, defaultBiasesApproxPC, \
122,124c120
< defaultBiasesApprox, defaultBiasesApproxLowVals, defaultBiasesApproxHiVals, \
< defaultBiasesApproxPC, defaultBiasesApproxLowValsPC, defaultBiasesApproxHiValsPC, \
< normlzdWeightedDefaultBiasesApproxPC, \
---
> defaultBiasesApprox, defaultBiasesApproxPC, \
178,180c174
< defaultBiasesApprox, defaultBiasesApproxLowVals, defaultBiasesApproxHiVals, \
< defaultBiasesApproxPC, defaultBiasesApproxLowValsPC, defaultBiasesApproxHiValsPC, \
< normlzdWeightedDefaultBiasesApproxPC, \
---
> defaultBiasesApprox, defaultBiasesApproxPC, \
244,246c238
< defaultBiasesApprox, defaultBiasesApproxLowVals, defaultBiasesApproxHiVals, \
< defaultBiasesApproxPC, defaultBiasesApproxLowValsPC, defaultBiasesApproxHiValsPC, \
< normlzdWeightedDefaultBiasesApproxPC, \
---
> defaultBiasesApprox, defaultBiasesApproxPC, \
![[Jenkins]](/jenkins/static/57c8a776/images/svgs/logo.svg){kind=logo}
