Revert PR #369 submodule bumps for CIME, EKAT, and SCORPIO

[katsmith133]

This PR reverts the most recent submodule pointer updates introduced in PR #369 for:

• cime
• externals/ekat
• externals/scorpio

This is required before PR #371 to avoid conflict and to keep things clear.

Restored submodule SHAs:

• cime: c64260ed94aff167a59635ed4a9ae5af16824e91 -> bd710a378bbb5ad9efef5d958b63dab221e7b1fe
• externals/ekat: 7156c944701fd19fa5e27ffcb86819f12851ae67 -> 66c4c3561e337da8bfdb9d2304318bf4ae2e97cf
• externals/scorpio: 9df851035a89ba1ca0581ccdbb88fcfc0ec38992 -> a486b499e8113f92c136f020cc0e7a68c664f01a

• Building
  • CMake build does not produce any new warnings from changes in this PR
• Testing
  • Add a comment to the PR titled Testing with the following:
    • Which machines CTest unit tests
      have been run on and indicate that are all passing.
    • The Polaris omega_pr test suite
      has passed, using the Polaris e3sm_submodules/Omega baseline
    • Document machine(s), compiler(s), and the build path(s) used for -p for both the baseline (Polaris e3sm_submodules/Omega) and the PR build
    • Indicate "All tests passed" or document failing tests

[mark-petersen]

Passes cTests on Frontier CPU and GPU. I made sure the submodules were updated locally before the test. I also double checked that the submodules are the same as before the #369 merge:

$ git diff --stat 0c350c757c ede466f274
 components/omega/doc/design/Tendencies.md              |  2 +-
 components/omega/src/ocn/Tendencies.cpp                | 18 +++++++++---------
 components/omega/src/ocn/Tendencies.h                  |  2 +-
 components/omega/test/timeStepping/TimeStepperTest.cpp | 28 ++++++++++++++--------------
 4 files changed, 25 insertions(+), 25 deletions(-)

[katsmith133]

Testing

CTest unit tests:

• Machine: PM-CPU and PM-GPU
• Compiler: gnu and gnugpu
• Build type: Release
• Result: All tests passed on PM-CPU, ran into config error on PM-CPU:

CMake Error at /pscratch/sd/k/katsmith/Omega-PR/externals/cpptrace/cmake/Autoconfig.cmake:72 (message):
Cpptrace auto config: No unwinding back-end seems to be supported, stack tracing will not work. To compile anyway set CPPTRACE_UNWIND_WITH_NOTHING.
Call Stack (most recent call first):
/pscratch/sd/k/katsmith/Omega-PR/externals/cpptrace/CMakeLists.txt:69 (include)

Adding in the flag -DCPPTRACE_UNWIND_WITH_NOTHING=ON fixes this issue and all tests pass on PM-GPU.

I am assuming that when these submodules are updated in PR #371 this will no longer be an issue, but I will test for that and report on that PR.

[mark-petersen]

I also tested on PM GPU and it works with the cmake flag -DCPPTRACE_UNWIND_WITH_NOTHING=ON. That is needed both before and after this PR.

Here are my full test instructions for PM GPU:

salloc --nodes 4 --qos interactive --time 01:00:00 --constraint gpu --tasks-per-node=2 --gpus-per-task 1 --account=m4572_g # or e3sm_g

# perlmutter has nodes with either 40 or 80 gb of high bandwidth memory, and the system defaults to 40. You can ask for 80 gb nodes with the sbatch flag --constraint="gpu&hbm80gb"

export CODEDIR=opr
export CODEPATH=${HOME}/repos/E3SM/${CODEDIR}
export RUNDIR=test_omega_gpu
mkdir ${PSCRATCH}/runs/$RUNDIR
cd !$

rm -rf build
mkdir build
cd build
module load cmake

# compiler options are:
export compiler=gnugpu
#export compiler=nvidiagpu

export PARMETIS_ROOT=/global/cfs/cdirs/e3sm/software/polaris/pm-gpu/spack/dev_polaris_0_9_0_${compiler}_mpich/var/spack/environments/dev_polaris_0_9_0_${compiler}_mpich/.spack-env/view
cmake \
   -DCPPTRACE_UNWIND_WITH_NOTHING=ON \
   -DOMEGA_CIME_COMPILER=${compiler} \
   -DOMEGA_BUILD_TYPE=Release \
   -DOMEGA_CIME_MACHINE=pm-gpu \
   -DOMEGA_PARMETIS_ROOT=${PARMETIS_ROOT}\
   -DOMEGA_BUILD_TEST=ON \
   -Wno-dev \
   -DOMEGA_MPI_ON_DEVICE:BOOL=OFF \
   -S ${CODEPATH}/components/omega -B . 
#   -DCPPTRACE_UNWIND_WITH_NOTHING=ON \ # added 260326 for scorpio doc error
# needed for compiler bug: OMEGA_MPI_ON_DEVICE:BOOL=OFF. See https://github.com/E3SM-Project/Omega/issues/214
./omega_build.sh

# linking:
cd test
ln -isf /global/homes/m/mpeterse/meshes/omega/O*nc .
cp ${CODEPATH}/components/omega/configs/Default.yml omega.yml

cd ..
./omega_ctest.sh

[xylar]

@katsmith133, in the future, it would be helpful if Omega branch names always start with omega. This makes updating Polaris later a lot easier.