From 9e9f5d1b641470154a989d5cfcd6fbd01bf2f026 Mon Sep 17 00:00:00 2001 From: Jiwon Gim Date: Mon, 24 Feb 2025 11:40:14 -0700 Subject: [PATCH] update musica tag --- test/docker/Dockerfile.musica | 4 ++-- test/docker/Dockerfile.musica.no_install | 2 +- test/musica/CMakeLists.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/docker/Dockerfile.musica b/test/docker/Dockerfile.musica index 69168104..8c1dfdcc 100644 --- a/test/docker/Dockerfile.musica +++ b/test/docker/Dockerfile.musica @@ -5,7 +5,7 @@ FROM ubuntu:22.04 -ARG MUSICA_GIT_TAG=fix_bugs +ARG MUSICA_GIT_TAG=cc39bb00d2220fc81c85b22d3ceea4a39bd2bacf ARG CAM_SIMA_CHEMISTRY_DATA_TAG=ea3539f1d7b71162e8a78d900ecbe265ba870e3d ARG USE_INSTALLED_MUSICA_LIB=ON ARG BUILD_TYPE=Debug @@ -99,7 +99,7 @@ RUN cd atmospheric_physics/test \ -D CMAKE_CXX_COMPILER=mpicxx \ && cmake --build ./build -# # Move the MUSICA configuration to the build root to make the data available for testing +# Move the MUSICA configuration to the build root to make the data available for testing RUN mv /home/test_user/cam-sima-chemistry-data/mechanisms /home/test_user/atmospheric_physics/test/build/musica_configurations WORKDIR /home/test_user/atmospheric_physics/test/build diff --git a/test/docker/Dockerfile.musica.no_install b/test/docker/Dockerfile.musica.no_install index 95bb5b2a..6abec992 100644 --- a/test/docker/Dockerfile.musica.no_install +++ b/test/docker/Dockerfile.musica.no_install @@ -8,7 +8,7 @@ FROM ubuntu:22.04 -ARG MUSICA_GIT_TAG=fix_bugs +ARG MUSICA_GIT_TAG=cc39bb00d2220fc81c85b22d3ceea4a39bd2bacf ARG CAM_SIMA_CHEMISTRY_DATA_TAG=ea3539f1d7b71162e8a78d900ecbe265ba870e3d ARG USE_INSTALLED_MUSICA_LIB=OFF ARG BUILD_TYPE=Debug diff --git a/test/musica/CMakeLists.txt b/test/musica/CMakeLists.txt index 6f640050..d6aed931 100644 --- a/test/musica/CMakeLists.txt +++ b/test/musica/CMakeLists.txt @@ -16,7 +16,6 @@ if(NOT $ENV{USE_INSTALLED_MUSICA_LIB}) # Set by docker FetchContent_MakeAvailable(musica) elseif($ENV{USE_INSTALLED_MUSICA_LIB}) - # Add flags for gfortran if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-none") endif()