diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index e14e2f10..f7362904 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -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) \ No newline at end of file +# FetchContent_MakeAvailable(micm) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5cdfe905..96e5ed7a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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} +) diff --git a/src/component_factory.F90 b/src/component_factory.F90 index 7bffba77..52f4d51d 100644 --- a/src/component_factory.F90 +++ b/src/component_factory.F90 @@ -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 @@ -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