fixed the musica fortran path

ESCOMP · Jan 30, 2024 · f61ad0d · f61ad0d
1 parent d503eba
commit f61ad0d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
@@ -2,7 +2,7 @@
 local_path = ccpp_framework
 protocol = git
 repo_url = https://github.com/peverwhee/ccpp-framework
-tag = CPF_0.2.050
+tag = CPF_0.2.051
 required = True
 
 [ncar-physics]
@@ -11,7 +11,7 @@ protocol = git
 repo_url = https://github.com/ESCOMP/atmospheric_physics
 # tag = atmos_phys0_01_000
 # TODO(jiwon)
-branch = update_micm_interface
+branch = 73-unit-conversion
 required = True
 
 [externals_description]

diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -98,7 +98,7 @@ def _build_cam():
                  os.path.join(atm_root, "src", "dynamics", "utils"),
                  os.path.join(atm_root, "src", "physics", "utils"),
                  os.path.join(atm_root, "src", "utils"),
-                 os.path.join("/usr/local/musica-0.4.0/fortran_include/")]
+                 os.path.join(os.environ.get("MUSICA_FORTRAN_INCLUDE"))]
         for path in phys_dirs:
             if path not in paths:
                 paths.append(path)

diff --git a/docker/Dockerfile.musica b/docker/Dockerfile.musica
@@ -20,7 +20,7 @@ RUN dnf -y update \
     && dnf clean all
 
 ##################################################
-# Set symlink to the specific python version
+# Set a symlink to the specific python version
 # that supports a deprecated pacakge for cime (distuitls)
 ##################################################
 RUN ln -fs /usr/bin/python3.11 /usr/bin/python3
@@ -56,26 +56,25 @@ RUN curl -LO https://github.com/jacobwilliams/json-fortran/archive/8.2.0.tar.gz
 
 # add a symlink
 RUN ln -s /usr/local/jsonfortran-gnu-8.2.0/lib/libjsonfortran.a /usr/local/lib/libjsonfortran.a
+ENV JSON_FORTRAN_HOME="/usr/local/jsonfortran-gnu-8.2.0"
 
-###################################################
-## Build and install MUSICA
-###################################################
-
-# TODO(jiwon): update after musica & atmospheric_phys PRs are approved
-# RUN git clone https://github.com/NCAR/musica.git
-RUN git clone -b update_for_ccpp_wrapper --depth 1 https://github.com/NCAR/musica.git
-RUN mkdir /musica/build \
-    && cd /musica/build \
-    && export JSON_FORTRAN_HOME="/usr/local/jsonfortran-gnu-8.2.0" \
+##################################################
+# Build and install MUSICA
+##################################################
+RUN git clone --depth 1 --branch v.0.5.0 https://github.com/NCAR/musica.git
+RUN cd musica \
     && cmake \
-            -D MAKE_MUSICA_FORTRAN_INSTALLABLE=ON \
-            -D ENABLE_TESTS=OFF \
-            -D ENABLE_TUVX=OFF \
-            .. \
+        -S . \
+        -B build \
+        -D MAKE_MUSICA_FORTRAN_INSTALLABLE=ON \
+        -D ENABLE_TESTS=OFF \
+        -D ENABLE_TUVX=OFF \
+    && cd build \
     && make install -j 8
 
-# add a symlink
-RUN ln -s /usr/local/musica-0.4.0/lib64/libmusica.a /usr/local/lib/libmusica.a
+# add a symlinks
+RUN ln -s /usr/local/musica-0.5.0/lib64/libmusica.a /usr/local/lib/libmusica.a
+ENV MUSICA_FORTRAN_INCLUDE=/usr/local/musica-0.5.0/fortran-include
 
 ###################################################
 ## Build CAM-SIMA