Skip to content

Commit

Permalink
Use assumed-size arrays in CCPP, Fortran/metadata consistency fixes i…
Browse files Browse the repository at this point in the history
…n CCPP (#284)

This PR removes one entry from the ccpp_prebuild_config.py that is no longer required, and updates the submodule pointer for ccpp-physics for the changes described in NCAR/ccpp-physics#611.

Also included:

* workaround to propagate REPRO/Bitforbit mode correctly to CCPP - will be cleaned up in @DusanJovic-NOAA's next PR
* tiny bugfix for aux3d arrays (active attribute in CCPP metadata was wrong), no impact on any of the tests, this is just a debugging feature

Co-authored-by: Dustin Swales <dustin.swales@noaa.gov>
  • Loading branch information
climbfuji and dustinswales authored Apr 30, 2021
1 parent 0fb68de commit ce81602
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
7 changes: 7 additions & 0 deletions ccpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/physics)
# Generate Compiler flags for C/CXX/Fortran - set to match NEMSfv3gfs flags
# for DEBUG, REPRO and PROD mode for all three compilers

# DH* 20210429 - quick workaround to get REPRO mode propagated
# correctly to CCPP - will be cleaned up in Dusan's next PR
if(REPRO)
set(CMAKE_BUILD_TYPE Bitforbit CACHE STRING "Choose the type of build." FORCE)
endif()
# *DH 20210429

# Set basic compiler optimization levels, depending on build type
if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
ADD_DEFINITIONS(-DDEBUG)
Expand Down
7 changes: 0 additions & 7 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,13 +294,6 @@
# *DH 2020-06-01
],
},
'mp_fer_hires' : {
'mp_fer_hires_init' : [
'fraction_of_ice_water_cloud',
'fraction_of_rain_water_cloud',
'rime_factor',
],
},
'rrtmgp_sw_rte' : {
'rrtmgp_sw_rte_run' : [
'components_of_surface_downward_shortwave_fluxes',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -7462,7 +7462,7 @@
dimensions = (horizontal_loop_extent,vertical_dimension,number_of_3d_auxiliary_arrays)
type = real
kind = kind_phys
active = (number_of_2d_auxiliary_arrays > 0)
active = (number_of_3d_auxiliary_arrays > 0)

########################################################################
[ccpp-table-properties]
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 126 files

0 comments on commit ce81602

Please sign in to comment.