Skip to content

Commit

Permalink
code clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
boulderdaze committed Feb 20, 2025
1 parent 2269446 commit 0ea6fca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
5 changes: 2 additions & 3 deletions cime_config/buildlib
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,11 @@ def _build_cam():
paths.append(os.path.join(atm_root, "src", "dynamics", "tests",
"initial_conditions"))

# TODO(jiwon); this path is not found
# If using the CMEPS/NUOPC coupler, then add additional path:
if case.get_value("COMP_INTERFACE") == "nuopc":
paths.append(os.path.join(__CIMEROOT, "src", "drivers",
"nuopc", "nuopc_cap_share"))
# End if
# End with

# Write Filepath text file
with open(filepath_src, "w", encoding='utf-8') as filepath:
Expand All @@ -156,7 +155,7 @@ def _build_cam():
if dycore == "mpas":
_setup_mpas(case)

# If the physics suite is MUSICA, build the MUSICA library and configuration
# If the physics suite is MUSICA, build the MUSICA library and get configuration
if phys_suites == "musica":
_build_musica_library(case)
_download_musica_configuration(caseroot)
Expand Down
9 changes: 4 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# parts of CAM require x86 architecture (gptl, which relies on the rdtsc x86 assembly instruction)
# esmf is am image you are expected to have built. Read the README file for instructions
# FROM --platform=linux/amd64 esmf:latest
FROM esmf:latest
FROM --platform=linux/amd64 esmf:latest

###################################################
## Install necessary packages
Expand Down Expand Up @@ -87,6 +86,6 @@ RUN chmod +x /home/cam_sima_user/CAM-SIMA/docker/ftp_download.sh
RUN /home/cam_sima_user/CAM-SIMA/docker/ftp_download.sh

# add the snapshot file
# RUN echo "ncdata='/home/cam_sima_user/run_heldsuarez_cam6_nt2_bigg_try005.cam.h5.0001-01-01-00000.nc'" >> user_nl_cam
# RUN sed -i '5191s/^/\/\//g' /home/cam_sima_user/CAM-SIMA/cime/CIME/non_py/src/timing/gptl.c
# RUN ./case.build
RUN echo "ncdata='/home/cam_sima_user/run_heldsuarez_cam6_nt2_bigg_try005.cam.h5.0001-01-01-00000.nc'" >> user_nl_cam

RUN ./case.build

0 comments on commit 0ea6fca

Please sign in to comment.