Skip to content
Draft
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4102bdb
Merge pull request #638 from dustinswales/swales_sync_main
mkavulich Feb 4, 2025
b140da3
Update src/CMakeLists.txt: use modern cmake features to install Fortr…
climbfuji Mar 12, 2025
463d5ad
Add missing 'include(GNUInstallDirs)' in src/CMakeLists.txt
climbfuji Mar 19, 2025
11359cb
Update src/CMakeLists.txt: use modern cmake features to install Fortr…
grantfirl Apr 16, 2025
c8fd894
Merge branch 'develop' of https://github.com/ncar/ccpp-framework into…
climbfuji Jul 24, 2025
cd2c99b
Merge branch 'develop' of https://github.com/ncar/ccpp-framework into…
climbfuji Aug 21, 2025
3256121
Update main from develop 2025/07/24 --> 2025/08/21 (#668)
mkavulich Aug 28, 2025
addae26
Create test to illustrate GNU failure
Sep 26, 2025
324c1d9
Merge commit 'addae26f14e127d525c040262d908acf99d70639' into HEAD
Sep 26, 2025
5771816
add parent ddt to group calling list
peverwhee Jan 13, 2026
e595616
find variable working for parent/children, but need to sort of const …
peverwhee Feb 12, 2026
3bd7057
back out ddt library addition to run env
peverwhee Feb 19, 2026
781269a
framework generates but constituents passing individually with wrong …
peverwhee Feb 19, 2026
71a1221
commit latest
peverwhee Feb 24, 2026
f4a05b9
non-constituent ddts being passed through to suite cap
peverwhee Feb 24, 2026
413acab
cleanup
peverwhee Feb 24, 2026
8fc24dd
Initial commit
Mar 5, 2026
1eb706f
Merge branch 'develop' of https://github.com/NCAR/ccpp-framework into…
Mar 16, 2026
dae14d2
Use full DDT reference in Scheme call_list
Mar 16, 2026
b88d5d2
Merge branch 'bug/unalloc_var_to_Group' of https://github.com/dustins…
Mar 16, 2026
42c2898
Some more changes
dustinswales Mar 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/capgen_test/source_dir2/temp_set.F90
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MODULE temp_set
!! \htmlinclude arg_table_temp_set_run.html
!!
SUBROUTINE temp_set_run(ncol, lev, timestep, temp_level, temp_diag, temp, ps, &
to_promote, promote_pcnst, slev_lbound, soil_levs, var_array, errmsg, errflg)
to_promote, promote_pcnst, slev_lbound, soil_levs, var_array, cld_frac, errmsg, errflg)
!----------------------------------------------------------------
IMPLICIT NONE
!----------------------------------------------------------------
Expand All @@ -36,6 +36,7 @@ SUBROUTINE temp_set_run(ncol, lev, timestep, temp_level, temp_diag, temp, ps, &
real(kind_phys), intent(out) :: promote_pcnst(:)
character(len=512), intent(out) :: errmsg
integer, intent(out) :: errflg
real(kind_phys), intent(in), optional :: cld_frac(:,:)
!----------------------------------------------------------------
integer :: ilev

Expand Down
9 changes: 9 additions & 0 deletions test/capgen_test/temp_set.meta
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@
type = real
kind = kind_phys
intent = inout
[ cld_frac ]
standard_name = cloud_fraction
long_name = cloud fraction
type = real
kind = kind_phys
units = Pa
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
intent = in
optional = True
[ errmsg ]
standard_name = ccpp_error_message
long_name = Error message for error handling in CCPP
Expand Down
12 changes: 8 additions & 4 deletions test/capgen_test/test_capgen_host_integration.F90
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ program test
character(len=cs), target :: test_parts1(2) = (/ 'physics1 ', &
'physics2 ' /)
character(len=cs), target :: test_parts2(1) = (/ 'data_prep ' /)
character(len=cm), target :: test_invars1(10) = (/ &
character(len=cm), target :: test_invars1(12) = (/ &
'potential_temperature ', &
'potential_temperature_at_interface ', &
'coefficients_for_interpolation ', &
Expand All @@ -16,7 +16,9 @@ program test
'soil_levels ', &
'temperature_at_diagnostic_levels ', &
'time_step_for_physics ', &
'array_variable_for_testing ' /)
'array_variable_for_testing ', &
'cloud_fraction ', &
'do_cloud_fraction_adjustment '/)
character(len=cm), target :: test_outvars1(10) = (/ &
'potential_temperature ', &
'potential_temperature_at_interface ', &
Expand All @@ -28,7 +30,7 @@ program test
'ccpp_error_code ', &
'ccpp_error_message ', &
'array_variable_for_testing ' /)
character(len=cm), target :: test_reqvars1(12) = (/ &
character(len=cm), target :: test_reqvars1(14) = (/ &
'potential_temperature ', &
'potential_temperature_at_interface ', &
'coefficients_for_interpolation ', &
Expand All @@ -40,7 +42,9 @@ program test
'temperature_at_diagnostic_levels ', &
'ccpp_error_code ', &
'ccpp_error_message ', &
'array_variable_for_testing ' /)
'array_variable_for_testing ', &
'cloud_fraction ', &
'do_cloud_fraction_adjustment '/)

character(len=cm), target :: test_invars2(3) = (/ &
'model_times ', &
Expand Down
3 changes: 2 additions & 1 deletion test/capgen_test/test_host_data.F90
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module test_host_data
real(kind_phys), dimension(:,:), allocatable :: &
u, & ! zonal wind (m/s)
v, & ! meridional wind (m/s)
pmid ! midpoint pressure (Pa)
pmid, & ! midpoint pressure (Pa)
cld_frac ! cloud fraction (1)
real(kind_phys), dimension(:,:,:),allocatable :: &
q ! constituent mixing ratio (kg/kg moist or dry air depending on type)
end type physics_state
Expand Down
8 changes: 8 additions & 0 deletions test/capgen_test/test_host_data.meta
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
kind = kind_phys
units = Pa
dimensions = (horizontal_dimension, vertical_layer_dimension)
[ cld_frac ]
standard_name = cloud_fraction
long_name = cloud fraction
type = real
kind = kind_phys
units = Pa
dimensions = (horizontal_dimension, vertical_layer_dimension)
active = (do_cloud_fraction_adjustment)
[ soil_levs ]
standard_name = soil_levels
long_name = soil levels
Expand Down
3 changes: 2 additions & 1 deletion test/capgen_test/test_host_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ module test_host_mod
integer, parameter :: num_time_steps = 2
real(kind_phys), parameter :: tolerance = 1.0e-13_kind_phys
real(kind_phys) :: tint_save(ncols, pverP)

logical, parameter :: cfrac_adj = .false.

public :: init_data
public :: compare_data
public :: check_model_times
Expand Down
6 changes: 6 additions & 0 deletions test/capgen_test/test_host_mod.meta
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,9 @@
units = none
dimensions = (horizontal_dimension,2,4,6)
type = real | kind = kind_phys
[ cfrac_adj ]
standard_name = do_cloud_fraction_adjustment
long_name = control for cloud fraction adjustment
units = none
dimensions = ()
type = logical
Loading