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/tunable_parameters.in clubb_release/input/tunable_parameters/tunable_parameters.in
107,108c107
< bv_efold = 5.0 ! Control parameter for inverse e-folding of cloud fraction in the mixed Brunt Vaisala frequency [-]
< wpxp_Ri_exp = .5 ! Exponent determining the influence of the Richardson number on invrs_tau_wpxp [-]
---
> bv_efold = 5.0 ! Control parameter for inverse e-folding of cloud fraction in the mixed Brunt Vaisala frequency
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
229d228
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 0.
163a163
>
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
142d141
< wpxp_Ri_exp_minmax = 0., 0.
163a163
>
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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
143d142
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 0.
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/input_misc/tuner/error_four_cases.in clubb_release/input_misc/tuner/error_four_cases.in
167d166
< wpxp_Ri_exp_minmax = 0., 0.
188a188
>
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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 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
160d159
< wpxp_Ri_exp_minmax = 0., 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
142d141
< wpxp_Ri_exp_minmax = 0., 0.
163a163
>
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
162,163c162
< iRichardson_num_min, iRichardson_num_max, iwpxp_Ri_exp, &
< ia3_coef_min, ia_const, iCx_min, iCx_max, ibv_efold
---
> iRichardson_num_min, iRichardson_num_max, ia3_coef_min, ia_const, iCx_min, iCx_max, ibv_efold
297,298c296
< iRichardson_num_min, iRichardson_num_max, iwpxp_Ri_exp, &
< ia3_coef_min, ia_const, iCx_min, iCx_max, ibv_efold
---
> iRichardson_num_min, iRichardson_num_max, ia3_coef_min, ia_const, iCx_min, iCx_max, ibv_efold
2399,2400c2397,2398
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
2437,2438c2435
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
2466,2467c2463,2464
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
4286,4287c4283,4284
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
4316,4317c4313
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
4342,4343c4338,4339
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
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
1312,1313c1312
< ibv_efold, &
< iwpxp_Ri_exp
---
> ibv_efold
1424,1425c1423
< altitude_threshold, &
< wpxp_Ri_exp
---
> altitude_threshold
1511d1508
< wpxp_Ri_exp = clubb_params(iwpxp_Ri_exp)
1926c1923
< else ! l_smooth_min_max
---
> else
1935c1932
< * min( max( Ri_zm(i,k)**wpxp_Ri_exp, zero), 12.0_core_rknd ))
---
> * min( max( sqrt( Ri_zm(i,k) ), zero), 12.0_core_rknd ) )
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 = 101 ! Total tunable parameters
---
> nparams = 100 ! Total tunable parameters
145,146c145
< ibv_efold = 100,&
< iwpxp_Ri_exp = 101
---
> ibv_efold = 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
114,115c114
< "a_const ", "bv_efold ", &
< "wpxp_Ri_exp "/)
---
> "a_const ", "bv_efold "/)
148c147
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> a3_coef_min, a_const, bv_efold )
174,175c173
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
356,357d353
< wpxp_Ri_exp = .5_core_rknd ! Exponent determining the influence of
< ! the Richardson number on invrs_tau_wpxp
472,473c468
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
520,521c515,516
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, & ! intent(out)
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold ) ! intent(out)
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, & ! intent(out)
> a_const, bv_efold ) ! intent(out)
946,947c941,942
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
987,988c982
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
1023,1024c1017
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
1065,1066c1058,1059
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, & ! intent(in)
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, & ! intent(in)
---
> Cx_min, Cx_max, Richardson_num_min, & ! intent(in)
> Richardson_num_max, a3_coef_min, a_const, bv_efold, & ! intent(in)
1207,1208c1200
< ibv_efold, &
< iwpxp_Ri_exp
---
> ibv_efold
1257,1258c1249,1250
< Cx_max_minmax, Richardson_num_min_minmax, Richardson_num_max_minmax, &
< wpxp_Ri_exp_minmax, a3_coef_min_minmax, a_const_minmax, bv_efold_minmax
---
> Cx_max_minmax, Richardson_num_min_minmax, Richardson_num_max_minmax, a3_coef_min_minmax, &
> a_const_minmax, bv_efold_minmax
1284c1276
< a_const_minmax, bv_efold_minmax, wpxp_Ri_exp_minmax
---
> a_const_minmax, bv_efold_minmax
1395d1386
< params_minmax(:,iwpxp_Ri_exp) = wpxp_Ri_exp_minmax
1562,1563c1553,1554
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, params )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, params )
1678,1679c1669
< ibv_efold, &
< iwpxp_Ri_exp
---
> ibv_efold
1705,1706c1695
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
1811d1799
< params(iwpxp_Ri_exp) = wpxp_Ri_exp
1842,1843c1830,1831
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
1959d1946
< iwpxp_Ri_exp, &
1989,1990c1976
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
2105d2090
< wpxp_Ri_exp = params(iwpxp_Ri_exp)
2134,2135c2119,2120
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
2168,2169c2153
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
2273d2256
< wpxp_Ri_exp = init_value
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_standalone.F90 clubb_release/src/clubb_standalone.F90
71,72c71
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
102,103c101,102
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
129,130c128,129
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_thread_test.F90 clubb_release/src/clubb_thread_test.F90
78,80c78,79
< C_invrs_tau_wpxp_Ri, C_invrs_tau_wpxp_N2_thresh, Cx_min, Cx_max, &
< Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> C_invrs_tau_wpxp_Ri, C_invrs_tau_wpxp_N2_thresh, &
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
122,123c121,122
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
158,159c157,158
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/error.F90 clubb_release/src/error.F90
264,265c264
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, wpxp_Ri_exp, &
< a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
360,361c359,360
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
417,418c416,417
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
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
576,577c576
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
612,613c611,612
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
639,640c638,639
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
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
365,366c365
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
528,529c527,528
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
555,556c554,555
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/jacobian.F90 clubb_release/src/jacobian.F90
148,149c148
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold
---
> Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, a3_coef_min, a_const, bv_efold
183,184c182,183
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold )
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold )
229,230c228,229
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &
257,258c256,257
< Cx_min, Cx_max, Richardson_num_min, Richardson_num_max, &
< wpxp_Ri_exp, a3_coef_min, a_const, bv_efold, &
---
> Cx_min, Cx_max, Richardson_num_min, &
> Richardson_num_max, a3_coef_min, a_const, bv_efold, &