Skip to content

Commit

Permalink
new clubb tag and bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@bstephens82
bstephens82 committed Nov 6, 2023
1 parent 0d2c3e3 commit b219c2d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 133 deletions.
2 changes: 1 addition & 1 deletion Externals_CAM.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ required = True
local_path = src/physics/clubb
protocol = svn
repo_url = https://github.com/bstephens82/clubb_src/tags/
tag = bstephens82.clubb_src.a811ebf
tag = bstephens82.clubb_src.9647175
required = True

[silhs]
Expand Down
133 changes: 1 addition & 132 deletions src/physics/cam/clubb_intr.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2023,15 +2023,7 @@ subroutine clubb_ini_cam(pbuf2d)
l_host_applies_sfc_fluxes, & ! In
saturation_equation, & ! In
l_input_fields, & ! In
clubb_config_flags%iiPDF_type, & ! In
clubb_config_flags%ipdf_call_placement, & ! In
clubb_config_flags%l_predict_upwp_vpwp, & ! In
clubb_config_flags%l_min_xp2_from_corr_wx, & ! In
clubb_config_flags%l_prescribed_avg_deltaz, & ! In
clubb_config_flags%l_damp_wp2_using_em, & ! In
clubb_config_flags%l_stability_correct_tau_zm, & ! In
clubb_config_flags%l_enable_relaxed_clipping, & ! In
clubb_config_flags%l_diag_Lscale_from_tau, & ! In
clubb_config_flags, & ! In
err_code ) ! Out

if ( err_code == clubb_fatal_error ) then
Expand Down Expand Up @@ -4955,46 +4947,6 @@ subroutine stats_init_clubb( l_stats_in, stats_tsamp_in, stats_tout_in, &


use clubb_api_module, only: &
ztscr01, &
ztscr02, &
ztscr03, &
ztscr04, &
ztscr05, &
ztscr06, &
ztscr07, &
ztscr08, &
ztscr09, &
ztscr10, &
ztscr11, &
ztscr12, &
ztscr13, &
ztscr14, &
ztscr15, &
ztscr16, &
ztscr17, &
ztscr18, &
ztscr19, &
ztscr20, &
ztscr21

use clubb_api_module, only: &
zmscr01, &
zmscr02, &
zmscr03, &
zmscr04, &
zmscr05, &
zmscr06, &
zmscr07, &
zmscr08, &
zmscr09, &
zmscr10, &
zmscr11, &
zmscr12, &
zmscr13, &
zmscr14, &
zmscr15, &
zmscr16, &
zmscr17, &
l_stats, &
l_output_rad_files, &
stats_tsamp, &
Expand Down Expand Up @@ -5169,53 +5121,6 @@ subroutine stats_init_clubb( l_stats_in, stats_tsamp_in, stats_tout_in, &
allocate( stats_zt%file%grid_avg_var( stats_zt%num_output_fields ) )
allocate( stats_zt%file%z( stats_zt%kk ) )

first_call = (.not. allocated(ztscr01))

! Allocate scratch space
if (first_call) allocate( ztscr01(stats_zt%kk) )
if (first_call) allocate( ztscr02(stats_zt%kk) )
if (first_call) allocate( ztscr03(stats_zt%kk) )
if (first_call) allocate( ztscr04(stats_zt%kk) )
if (first_call) allocate( ztscr05(stats_zt%kk) )
if (first_call) allocate( ztscr06(stats_zt%kk) )
if (first_call) allocate( ztscr07(stats_zt%kk) )
if (first_call) allocate( ztscr08(stats_zt%kk) )
if (first_call) allocate( ztscr09(stats_zt%kk) )
if (first_call) allocate( ztscr10(stats_zt%kk) )
if (first_call) allocate( ztscr11(stats_zt%kk) )
if (first_call) allocate( ztscr12(stats_zt%kk) )
if (first_call) allocate( ztscr13(stats_zt%kk) )
if (first_call) allocate( ztscr14(stats_zt%kk) )
if (first_call) allocate( ztscr15(stats_zt%kk) )
if (first_call) allocate( ztscr16(stats_zt%kk) )
if (first_call) allocate( ztscr17(stats_zt%kk) )
if (first_call) allocate( ztscr18(stats_zt%kk) )
if (first_call) allocate( ztscr19(stats_zt%kk) )
if (first_call) allocate( ztscr20(stats_zt%kk) )
if (first_call) allocate( ztscr21(stats_zt%kk) )

ztscr01 = 0.0_r8
ztscr02 = 0.0_r8
ztscr03 = 0.0_r8
ztscr04 = 0.0_r8
ztscr05 = 0.0_r8
ztscr06 = 0.0_r8
ztscr07 = 0.0_r8
ztscr08 = 0.0_r8
ztscr09 = 0.0_r8
ztscr10 = 0.0_r8
ztscr11 = 0.0_r8
ztscr12 = 0.0_r8
ztscr13 = 0.0_r8
ztscr14 = 0.0_r8
ztscr15 = 0.0_r8
ztscr16 = 0.0_r8
ztscr17 = 0.0_r8
ztscr18 = 0.0_r8
ztscr19 = 0.0_r8
ztscr20 = 0.0_r8
ztscr21 = 0.0_r8

! Default initialization for array indices for zt
if (first_call) then
call stats_init_zt_api( clubb_vars_zt, l_error, &
Expand Down Expand Up @@ -5256,42 +5161,6 @@ subroutine stats_init_clubb( l_stats_in, stats_tsamp_in, stats_tout_in, &

! Allocate scratch space

if (first_call) allocate( zmscr01(stats_zm%kk) )
if (first_call) allocate( zmscr02(stats_zm%kk) )
if (first_call) allocate( zmscr03(stats_zm%kk) )
if (first_call) allocate( zmscr04(stats_zm%kk) )
if (first_call) allocate( zmscr05(stats_zm%kk) )
if (first_call) allocate( zmscr06(stats_zm%kk) )
if (first_call) allocate( zmscr07(stats_zm%kk) )
if (first_call) allocate( zmscr08(stats_zm%kk) )
if (first_call) allocate( zmscr09(stats_zm%kk) )
if (first_call) allocate( zmscr10(stats_zm%kk) )
if (first_call) allocate( zmscr11(stats_zm%kk) )
if (first_call) allocate( zmscr12(stats_zm%kk) )
if (first_call) allocate( zmscr13(stats_zm%kk) )
if (first_call) allocate( zmscr14(stats_zm%kk) )
if (first_call) allocate( zmscr15(stats_zm%kk) )
if (first_call) allocate( zmscr16(stats_zm%kk) )
if (first_call) allocate( zmscr17(stats_zm%kk) )

zmscr01 = 0.0_r8
zmscr02 = 0.0_r8
zmscr03 = 0.0_r8
zmscr04 = 0.0_r8
zmscr05 = 0.0_r8
zmscr06 = 0.0_r8
zmscr07 = 0.0_r8
zmscr08 = 0.0_r8
zmscr09 = 0.0_r8
zmscr10 = 0.0_r8
zmscr11 = 0.0_r8
zmscr12 = 0.0_r8
zmscr13 = 0.0_r8
zmscr14 = 0.0_r8
zmscr15 = 0.0_r8
zmscr16 = 0.0_r8
zmscr17 = 0.0_r8

if (first_call) then
call stats_init_zm_api( clubb_vars_zm, l_error, &
stats_zm )
Expand Down

0 comments on commit b219c2d

Please sign in to comment.