Skip to content

Commit

Permalink
disabling micm inclusion for now
Browse files Browse the repository at this point in the history
  • Loading branch information
K20shores committed Jul 18, 2023
1 parent 985daeb commit 4fea1e9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
16 changes: 8 additions & 8 deletions cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ include_directories(${CAMP_INCLUDE_DIR})
################################################################################
# MICM library

include(FetchContent)
# include(FetchContent)

set(ENABLE_FORTRAN_LINK ON)
FetchContent_Declare(micm
GIT_REPOSITORY https://github.com/NCAR/micm.git
GIT_TAG 20c0a19
FIND_PACKAGE_ARGS NAMES micm
)
# set(ENABLE_FORTRAN_LINK ON)
# FetchContent_Declare(micm
# GIT_REPOSITORY https://github.com/NCAR/micm.git
# GIT_TAG 20c0a19
# FIND_PACKAGE_ARGS NAMES micm
# )

FetchContent_MakeAvailable(micm)
# FetchContent_MakeAvailable(micm)
12 changes: 9 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@

add_executable(music_box component_factory.F90
components/camp.F90
components/micm.F90
# components/micm.F90
components/emissions.F90
components/loss.F90
music_box.F90
music_box_core.F90)

target_link_libraries(music_box musica::musicacore musica::micm ${CAMP_LIB} ${SUNDIALS_LIBS}
${GSL_LIBS})
target_link_libraries(music_box
PUBLIC
musica::musicacore
# musica::micm
${CAMP_LIB}
${SUNDIALS_LIBS}
${GSL_LIBS}
)

6 changes: 3 additions & 3 deletions src/component_factory.F90
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module musica_component_factory
function component_builder( config, domain, output ) result( new_obj )

use music_box_camp, only : camp_t
use music_box_micm, only : micm_t
! use music_box_micm, only : micm_t
use musica_assert, only : die_msg
use musica_config, only : config_t
use musica_domain, only : domain_t
Expand All @@ -52,8 +52,8 @@ function component_builder( config, domain, output ) result( new_obj )

if( component_type .eq. 'camp' ) then
new_obj => camp_t( config, domain, output )
else if( component_type .eq. 'micm' ) then
new_obj => micm_t( config, domain, output )
! else if( component_type .eq. 'micm' ) then
! new_obj => micm_t( config, domain, output )
else if( component_type .eq. 'musica-emissions' ) then
new_obj => emissions_t( config, domain, output )
else if( component_type .eq. 'musica-loss' ) then
Expand Down

0 comments on commit 4fea1e9

Please sign in to comment.