Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion components/eamxx/cime_config/namelist_defaults_eamxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ be lost if SCREAM_HACK_XML is not enabled.
<!-- ZM deep convection -->
<zm inherit="atm_proc_base">
<apply_detr_tend type="logical" doc="ZM flag for cld liq/ice detrainment tend" >true</apply_detr_tend>
<use_fortran_bridge type="logical" doc="ZM flag to call fortran ZM" >false</use_fortran_bridge>
<trig_dcape type="logical" doc="ZM flag to enable DCAPE trigger" >true</trig_dcape>
<trig_ull type="logical" doc="ZM flag to enable ULL mode" >true</trig_ull>
<clos_dyn_adj type="logical" doc="ZM flag to enable dynamic closure adjustment" >false</clos_dyn_adj>
Expand Down
39 changes: 1 addition & 38 deletions components/eamxx/src/physics/zm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,37 +1,3 @@
set(PATH_TO_LEGACY_ZM ${SCREAM_BASE_DIR}/../eam/src/physics/cam/zm/)

set(ZM_F90_SRCS
# ----------------------------------------------------------------------------
# EAMxx side C++ bridge methods
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge/zm_eamxx_bridge.cpp
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge/zm_eamxx_bridge_main.F90
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge/zm_eamxx_bridge_params.F90
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge/zm_eamxx_bridge_methods.F90
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge/zm_eamxx_bridge_physconst.F90
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge/zm_eamxx_bridge_wv_saturation.F90
# ----------------------------------------------------------------------------
# Fortran ZM code
${PATH_TO_LEGACY_ZM}/zm_conv.F90
${PATH_TO_LEGACY_ZM}/zm_conv_cape.F90
${PATH_TO_LEGACY_ZM}/zm_conv_util.F90
${PATH_TO_LEGACY_ZM}/zm_conv_types.F90
${PATH_TO_LEGACY_ZM}/zm_aero_type.F90
${PATH_TO_LEGACY_ZM}/zm_microphysics_state.F90
${PATH_TO_LEGACY_ZM}/zm_conv_mcsp.F90
${PATH_TO_LEGACY_ZM}/zm_transport.F90
# ----------------------------------------------------------------------------
# shared fotran modules
${SCREAM_BASE_DIR}/../../share/util/shr_sys_mod.F90
${SCREAM_BASE_DIR}/../../share/util/shr_kind_mod.F90
${SCREAM_BASE_DIR}/../../share/util/shr_assert_mod.F90.in
# ----------------------------------------------------------------------------
# misc other fotran modules
${SCREAM_BASE_DIR}/../eam/src/physics/cam/wv_sat_methods.F90
${SCREAM_BASE_DIR}/../eam/src/utils/cam_abortutils.F90
${SCREAM_BASE_DIR}/../eam/src/control/cam_logfile.F90
# ----------------------------------------------------------------------------
)

set(ZM_SRCS
# ----------------------------------------------------------------------------
# C++/EAMxx atomsphere process for ZM
Expand Down Expand Up @@ -65,7 +31,7 @@ if (NOT EAMXX_ENABLE_GPU OR Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE OR Kokkos
) # ZM ETI SRCS
endif()

add_library(zm ${ZM_F90_SRCS} ${ZM_SRCS})
add_library(zm ${ZM_SRCS})
Comment thread
jgfouca marked this conversation as resolved.

set_target_properties(zm PROPERTIES
Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/modules
Expand All @@ -75,10 +41,7 @@ target_compile_definitions(zm PUBLIC EAMXX_HAS_ZM)

target_include_directories(zm PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/fortran_bridge
${CMAKE_CURRENT_BINARY_DIR}/modules
${PATH_TO_LEGACY_ZM}
${PATH_TO_LEGACY_ZM}/..
)
target_link_libraries(zm eamxx_physics_share scream_share csm_share)

Expand Down
466 changes: 189 additions & 277 deletions components/eamxx/src/physics/zm/eamxx_zm_process_interface.cpp

Large diffs are not rendered by default.

134 changes: 0 additions & 134 deletions components/eamxx/src/physics/zm/fortran_bridge/zm_eamxx_bridge.cpp

This file was deleted.

31 changes: 0 additions & 31 deletions components/eamxx/src/physics/zm/fortran_bridge/zm_eamxx_bridge.hpp

This file was deleted.

Loading
Loading