Skip to content

Commit a811ebf

Browse files
committed
updating version of clubb
1 parent aa1d359 commit a811ebf

36 files changed

+1798
-1886
lines changed

Skx_module.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ subroutine Skx_func( nz, ngrdcol, xp2, xp3, &
7575
!$acc parallel loop gang vector collapse(2) default(present)
7676
do k = 1, nz
7777
do i = 1, ngrdcol
78-
Skx(i,k) = xp3(i,k) / ( ( xp2(i,k) + Skx_denom_tol ) * sqrt( xp2(i,k) + Skx_denom_tol ) )
78+
Skx(i,k) = xp3(i,k) * sqrt(( xp2(i,k) + Skx_denom_tol )**(-3))
7979
end do
8080
end do
8181
!$acc end parallel loop

adg1_adg2_3d_luhar_pdf.F90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ subroutine ADG1_pdf_driver( nz, ngrdcol, & ! In
147147

148148
integer :: j ! Loop index
149149

150-
!$acc declare create( w_1_n, w_2_n )
150+
!$acc enter data create( w_1_n, w_2_n )
151151

152152
! Calculate the mixture fraction and the PDF component means and variances
153153
! of w.
@@ -204,6 +204,8 @@ subroutine ADG1_pdf_driver( nz, ngrdcol, & ! In
204204
enddo ! i=1, sclr_dim
205205
endif ! l_scalar_calc
206206

207+
!$acc exit data delete( w_1_n, w_2_n )
208+
207209
return
208210

209211
end subroutine ADG1_pdf_driver
@@ -1358,7 +1360,7 @@ subroutine backsolve_Luhar_params( Sk_max, Skx, & ! In
13581360
end subroutine backsolve_Luhar_params
13591361

13601362
!=============================================================================
1361-
pure function max_cubic_root( a_coef, b_coef, c_coef, d_coef ) &
1363+
function max_cubic_root( a_coef, b_coef, c_coef, d_coef ) &
13621364
result( max_root )
13631365

13641366
! Description:

advance_clubb_core_module.F90

Lines changed: 348 additions & 442 deletions
Large diffs are not rendered by default.

advance_helper_module.F90

Lines changed: 90 additions & 140 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)