Skip to content

Commit

Permalink
update musica tag
Browse files Browse the repository at this point in the history
  • Loading branch information
boulderdaze committed Feb 24, 2025
1 parent 25a6b6e commit 9e9f5d1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/docker/Dockerfile.musica
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/docker/Dockerfile.musica.no_install
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test/musica/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 9e9f5d1

Please sign in to comment.