Skip to content

Commit

Permalink
Merge branch 'iulian787/data_ocean_model' (PR E3SM-Project#6249)
Browse files Browse the repository at this point in the history
Add support for the MOAB coupler in data-ocean.

This allows running F-cases that have ocean as the only data model and use MPAS-Seaice with the moab coupler.

On the component data side, instance a new imoab application whose degrees of freedom are aligned with the regular
domain decomposition from the data model. More changes were needed on the coupler side, because previous coupled cases did not have samegrid_ao flag true.
Also, changes in the intel compiler or bios on chrysalis uncovered other needs about initialization of
mpi_reduce variables. (mpi_reduce is needed for comparisons between mct and moab fields,
in debug/verification mode)

Also add MOAB libs to perlmutter.

[BFB]
  • Loading branch information
rljacob authored Mar 29, 2024
2 parents cf6e523 + ee7e670 commit 6b9ecaa
Show file tree
Hide file tree
Showing 16 changed files with 1,057 additions and 508 deletions.
6 changes: 6 additions & 0 deletions cime_config/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@
<environment_variables compiler="amdclang" mpilib="mpich">
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/adios2/2.9.1/cray-mpich-8.1.25/aocc-4.0.0; else echo "$ADIOS2_ROOT"; fi}</env>
</environment_variables>
<environment_variables compiler="intel">
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel; else echo "$MOAB_ROOT"; fi}</env>
</environment_variables>
<environment_variables compiler="gnu">
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
</environment_variables>
<resource_limits>
<resource name="RLIMIT_STACK">-1</resource>
</resource_limits>
Expand Down
5 changes: 5 additions & 0 deletions components/cmake/build_model.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,11 @@ macro(build_model COMP_CLASS COMP_NAME)
target_link_libraries(${TARGET_NAME} ${ITEM})
endforeach()

if (USE_MOAB)
target_link_libraries(${TARGET_NAME} ${MOAB_LIBRARIES})
target_include_directories(${TARGET_NAME} PRIVATE ${MOAB_INCLUDE_DIRS})
endif()

# Make sure we link blas/lapack
if (NOT DEFINED ENV{SKIP_BLAS})
target_link_libraries(${TARGET_NAME} BLAS::BLAS LAPACK::LAPACK)
Expand Down
Loading

0 comments on commit 6b9ecaa

Please sign in to comment.