diff --git a/.github/actions/test-all-scream/README.md b/.github/actions/test-all-scream/README.md index 03ae55b4623f..8cb2debd4b29 100644 --- a/.github/actions/test-all-scream/README.md +++ b/.github/actions/test-all-scream/README.md @@ -1,4 +1,4 @@ -# Composite action to call test-all-scream inside a workflow +# Composite action to call test-all-eamxx inside a workflow This action is meant to be used inside a workflow. E.g., @@ -7,8 +7,8 @@ jobs: my-testing: steps: ... - - name: run-test-all-scream - uses: ./.github/actions/eamxx-test-all-scream + - name: run-test-all-eamxx + uses: ./.github/actions/eamxx-test-all-eamxx with: build_type: machine: @@ -23,7 +23,7 @@ As such, this action checks that its value is one of the following. - bless: runs tests and copy output files to baselines folder As for build_type and machine, we do not prescribe a list of -valid values, as that will be handled by components/eamxx/scripts/test-all-scream. +valid values, as that will be handled by components/eamxx/scripts/test-all-eamxx. If their values are not supported, it is up to test-all-scram to handle the error. As a guideline, however, you may have to ensure that the following exist: diff --git a/.github/actions/test-all-scream/action.yml b/.github/actions/test-all-scream/action.yml index b2f9dceb6138..a0b4c838025f 100644 --- a/.github/actions/test-all-scream/action.yml +++ b/.github/actions/test-all-scream/action.yml @@ -1,11 +1,11 @@ name: EAMxx standalone testing description: | Run EAMxx standalone testing with required configuration inputs. - More precisely, it launches test-all-scream with the proper flags. - See components/eamxx/scripts/test-all-scream for more details. + More precisely, it launches test-all-eamxx with the proper flags. + See components/eamxx/scripts/test-all-eamxx for more details. The configuration inputs are: - - build_type: the type of build to pass to test-all-scream. - - machine: the name of the machine to pass to test-all-scream + - build_type: the type of build to pass to test-all-eamxx. + - machine: the name of the machine to pass to test-all-eamxx - generate: whether to generate baselines - submit: whether to submit to cdash (unused if generate is 'true') @@ -14,7 +14,7 @@ inputs: description: 'Build type to run' required: true machine: - description: 'Machine name for test-all-scream' + description: 'Machine name for test-all-eamxx' required: true generate: description: 'Generate baselines instead of running tests' @@ -38,7 +38,7 @@ inputs: - 'true' - 'false' cmake-configs: - description: 'Semicolon-separated list of key=value pairs for CMake to pass to test-all-scream' + description: 'Semicolon-separated list of key=value pairs for CMake to pass to test-all-eamxx' required: false default: '' @@ -78,10 +78,10 @@ runs: echo " submit : ${{ inputs.submit }}" echo " cmake-configs: ${{ inputs.cmake-configs }}" shell: sh - - name: Run test-all-scream + - name: Run test-all-eamxx working-directory: components/eamxx run: | - cmd="./scripts/test-all-scream -m ${{ inputs.machine }} -t ${{inputs.build_type}} --baseline-dir AUTO -c EKAT_DISABLE_TPL_WARNINGS=ON" + cmd="./scripts/test-all-eamxx -m ${{ inputs.machine }} -t ${{inputs.build_type}} --baseline-dir AUTO -c EKAT_DISABLE_TPL_WARNINGS=ON" if [ "${{ inputs.generate }}" = "true" ]; then cmd+=" -g" elif [ "${{ inputs.submit }}" = "true" ]; then @@ -92,14 +92,14 @@ runs: cmd+=" -c EKAT_ENABLE_TESTS=ON" fi - # If cmake-configs is non-empty, add tokens to test-all-scream via "-c key=val" + # If cmake-configs is non-empty, add tokens to test-all-eamxx via "-c key=val" IFS=';' read -ra configs <<< "${{ inputs.cmake-configs }}" for config in "${configs[@]}"; do cmd+=" -c $config" done # Print the full command, then run it - echo "test-all-scream call: $cmd" + echo "test-all-eamxx call: $cmd" $cmd shell: sh - name: Upload ctest logs diff --git a/.github/workflows/eamxx-sa-coverage.yml b/.github/workflows/eamxx-sa-coverage.yml index 46e87f8b8b0c..b8f89eba0598 100644 --- a/.github/workflows/eamxx-sa-coverage.yml +++ b/.github/workflows/eamxx-sa-coverage.yml @@ -35,7 +35,7 @@ jobs: - name: Show action trigger uses: ./.github/actions/show-workflow-trigger - name: Run tests - uses: ./.github/actions/test-all-scream + uses: ./.github/actions/test-all-eamxx with: build_type: cov machine: ghci-snl-cpu @@ -84,7 +84,7 @@ jobs: ;; esac - name: Run tests - uses: ./.github/actions/test-all-scream + uses: ./.github/actions/test-all-eamxx with: build_type: cov machine: ghci-snl-cuda diff --git a/.github/workflows/eamxx-sa-sanitizer.yml b/.github/workflows/eamxx-sa-sanitizer.yml index 00f60f7da2e3..b879695da216 100644 --- a/.github/workflows/eamxx-sa-sanitizer.yml +++ b/.github/workflows/eamxx-sa-sanitizer.yml @@ -35,7 +35,7 @@ jobs: - name: Show action trigger uses: ./.github/actions/show-workflow-trigger - name: Run tests - uses: ./.github/actions/test-all-scream + uses: ./.github/actions/test-all-eamxx with: build_type: valg machine: ghci-snl-cpu @@ -88,7 +88,7 @@ jobs: ;; esac - name: Run tests - uses: ./.github/actions/test-all-scream + uses: ./.github/actions/test-all-eamxx with: build_type: ${{ matrix.build_type }} machine: ghci-snl-cuda diff --git a/.github/workflows/eamxx-sa-testing.yml b/.github/workflows/eamxx-sa-testing.yml index f07545b37fa8..4edd64570584 100644 --- a/.github/workflows/eamxx-sa-testing.yml +++ b/.github/workflows/eamxx-sa-testing.yml @@ -8,7 +8,7 @@ on: paths: # first, yes to these - '.github/workflows/eamxx-sa-testing.yml' - - '.github/actions/test-all-scream/**' + - '.github/actions/test-all-eamxx/**' - 'cime_config/machine/config_machines.xml' - 'components/eamxx/**' - 'components/homme/**' @@ -84,7 +84,7 @@ jobs: - name: Show action trigger uses: ./.github/actions/show-workflow-trigger - name: Run tests - uses: ./.github/actions/test-all-scream + uses: ./.github/actions/test-all-eamxx with: build_type: ${{ matrix.build_type }} machine: ghci-snl-cpu @@ -146,7 +146,7 @@ jobs: ;; esac - name: Run tests - uses: ./.github/actions/test-all-scream + uses: ./.github/actions/test-all-eamxx with: build_type: ${{ matrix.build_type }} machine: ghci-snl-cuda diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml index b59c4eba5542..45a1ac82ad3a 100644 --- a/cime_config/allactive/config_pesall.xml +++ b/cime_config/allactive/config_pesall.xml @@ -1852,32 +1852,9 @@ - - - "crusher-gpu-scream ne30np4 and ne30np4.pg2" - - -2 - -2 - -2 - -2 - -2 - -2 - -2 - -2 - - - 1 - 8 - 1 - 1 - 1 - 1 - - - - "frontier-gpu-scream ne30np4 and ne30np4.pg2" + "frontier ne30np4 and ne30np4.pg2" -2 -2 @@ -2515,30 +2492,6 @@ - - - 8 - 56 - - -6 - -6 - -6 - -6 - -6 - -6 - -6 - -6 - - - 1 - 7 - 1 - 1 - 1 - 1 - - - 8 diff --git a/cime_config/machines/config_batch.xml b/cime_config/machines/config_batch.xml index 7de27dcafcb4..53a38b05f691 100644 --- a/cime_config/machines/config_batch.xml +++ b/cime_config/machines/config_batch.xml @@ -754,26 +754,6 @@ - - - batch - batch - batch - - - - - /lustre/orion/cli133/world-shared/e3sm/tools/sbatch/throttle - - -S 0 - - - batch - batch - batch - - - /lustre/orion/cli115/world-shared/e3sm/tools/sbatch/throttle diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml index a813557119d6..a822d496b4e6 100644 --- a/cime_config/machines/config_machines.xml +++ b/cime_config/machines/config_machines.xml @@ -5714,47 +5714,6 @@ - - Docker - docker - LINUX - - gnu,gnuX - openmpi - CIME - /storage/timings - CIME - /storage/cases - /storage/inputdata - /storage/inputdata-clmforc - /storage/archive/$CASE - /storage/baselines/$COMPILER - /storage/tools/cprnc - make - 8 - e3sm_developer - none - scream - 8 - 8 - - mpiexec - - -n {{ total_tasks }} - --oversubscribe - - - - $CASEROOT/run - $CASEROOT/bld - - 1 - 1 - /opt/conda - /opt/conda - - - ${EXEROOT}/e3sm.exe >> e3sm.log.$LID 2>&1 diff --git a/components/eam/bld/configure b/components/eam/bld/configure index c11f89599a60..f6310293f0c6 100755 --- a/components/eam/bld/configure +++ b/components/eam/bld/configure @@ -1766,13 +1766,13 @@ if (defined $opts{'cppdefs'}) { } $cfg_ref->set('cppdefs', $usr_cppdefs); -# Define is_scream_config flag to select which P3 version codes to use +# Define is_eamxx_config flag to select which P3 version codes to use # If the config uses both p3 and shoc, it is recognized as a scream case. -my $is_scream_config = 0; +my $is_eamxx_config = 0; if ($microphys_pkg =~ /^p3/) { if ($shoc_sgs) { - $is_scream_config = 1; + $is_eamxx_config = 1; print "The case uses SCREAM config and SCREAM's version of P3 codes in Fortran 90.\n"; } else { print "The case use EAM's version of P3 codes in Fortran 90.\n"; @@ -2494,7 +2494,7 @@ my $fp_filename = 'Filepath'; # name of output filepath file my $cpp_filename = 'CIME_cppdefs'; # name of output file for eam's cppdefs in cime # Write the filepath file. -write_filepath("$cam_bld/$fp_filename", $cfg_ref, $is_scream_config); +write_filepath("$cam_bld/$fp_filename", $cfg_ref, $is_eamxx_config); if ($print) { print "creating $cam_bld/$fp_filename\n"; } if (($ccsm_seq)) { @@ -2538,7 +2538,7 @@ exit; sub write_filepath { - my ($file, $cfg_ref, $is_scream_config) = @_; + my ($file, $cfg_ref, $is_eamxx_config) = @_; my $fh = new IO::File; $fh->open(">$file") or die "** can't open filepath file: $file\n"; @@ -2696,7 +2696,7 @@ sub write_filepath } if (not(defined $opts{'use_MMF'})) { - if ($is_scream_config eq '1') { + if ($is_eamxx_config eq '1') { print $fh "$camsrcdir/eam/src/physics/p3/scream\n"; } else { print $fh "$camsrcdir/eam/src/physics/p3/eam\n"; diff --git a/components/eam/src/physics/cam/physics_utils.F90 b/components/eam/src/physics/cam/physics_utils.F90 index 8703d24eadb8..b486fcad49d1 100644 --- a/components/eam/src/physics/cam/physics_utils.F90 +++ b/components/eam/src/physics/cam/physics_utils.F90 @@ -13,7 +13,7 @@ module physics_utils save #ifdef SCREAM_CONFIG_IS_CMAKE -#include "scream_config.f" +#include "eamxx_config.f" integer,parameter,public :: rtype8 = c_double ! 8 byte real, compatible with c type double integer,parameter,public :: btype = c_bool ! boolean type, compatible with c diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index 14fe1446c546..0166f7896b38 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit 14fe1446c5462dd9b950a0457e20557e5fdf9c74 +Subproject commit 0166f7896b380d43588176e073e20f991df6c497 diff --git a/components/eamxx/CMakeLists.txt b/components/eamxx/CMakeLists.txt index 3462cef9a976..127a2cf31d74 100644 --- a/components/eamxx/CMakeLists.txt +++ b/components/eamxx/CMakeLists.txt @@ -208,7 +208,7 @@ endif() # Add RRTMGP settings. Note, we might consider also adding RRTMGP_EXPENSIVE_CHECKS # to turn on the RRTMGP internal checks here as well, via # option (RRTMGP_EXPENSIVE_CHECKS "Turn on internal RRTMGP error checking" ${SCREAM_DEBUG}) -# and then adding to scream_config.h: +# and then adding to eamxx_config.h: # #cmakedefine RRTMGP_EXPENSIVE_CHECKS option (SCREAM_RRTMGP_DEBUG "Turn on extra debug checks in RRTMGP" ${SCREAM_DEBUG}) @@ -401,7 +401,7 @@ if (NOT SCREAM_LIB_ONLY) # All baselines tests will add a line to the baseline_list file, # specifyiing the full name of the baseline they generated. - # When test-all-scream has to generate new baselines, it will run + # When test-all-eamxx has to generate new baselines, it will run # ctest -L baseline_gen, and then read this file to find out all the # baseline files to copy into the baseline directory set (SCREAM_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/data) @@ -556,10 +556,10 @@ if (SCREAM_DOUBLE_PRECISION) endif() # This must be done using add_definitions because it is used to determine -# whether to include scream_config.h. +# whether to include eamxx_config.h. add_definitions(-DSCREAM_CONFIG_IS_CMAKE) -# Hooks for testing test-all-scream within test-scripts +# Hooks for testing test-all-eamxx within test-scripts if ($ENV{SCREAM_FORCE_BUILD_FAIL}) add_definitions(-DSCREAM_FORCE_BUILD_FAIL) endif() @@ -578,17 +578,17 @@ if (NOT DEFINED ENV{SCREAM_FAKE_ONLY}) add_subdirectory(tests) endif() - # Generate scream_config.h and scream_config.f + # Generate eamxx_config.h and eamxx_config.f include (EkatUtils) - EkatConfigFile(${CMAKE_CURRENT_SOURCE_DIR}/src/scream_config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/src/scream_config.h - F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/scream_config.f) + EkatConfigFile(${CMAKE_CURRENT_SOURCE_DIR}/src/eamxx_config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.h + F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.f) - # Generate scream_config.h and scream_config.f + # Generate eamxx_config.h and eamxx_config.f include (EkatUtils) - EkatConfigFile(${CMAKE_CURRENT_SOURCE_DIR}/src/scream_config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/src/scream_config.h - F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/scream_config.f) + EkatConfigFile(${CMAKE_CURRENT_SOURCE_DIR}/src/eamxx_config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.h + F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/eamxx_config.f) else() # This is a "fake" build of scream, to stress test the testing scripts. # We only need to build something in our tests folder diff --git a/components/eamxx/cime_config/buildnml b/components/eamxx/cime_config/buildnml index 86852cc55406..d556d8de9631 100755 --- a/components/eamxx/cime_config/buildnml +++ b/components/eamxx/cime_config/buildnml @@ -3,7 +3,7 @@ """ Namelist creator for E3SM's SCREAM component -This script takes the namelist_defaults_scream.xml file from the repo +This script takes the namelist_defaults_eamxx.xml file from the repo and produces the processed $case/namelist_scream.xml. From the processed file, raw input files are produced which should not be modified by users. The user is allowed to modify diff --git a/components/eamxx/cime_config/eamxx_buildnml.py b/components/eamxx/cime_config/eamxx_buildnml.py index a0fffc4be8e8..268de7090589 100644 --- a/components/eamxx/cime_config/eamxx_buildnml.py +++ b/components/eamxx/cime_config/eamxx_buildnml.py @@ -483,7 +483,7 @@ def write_pretty_xml(filepath, xml): def _create_raw_xml_file_impl(case, xml, filepath=None): ############################################################################### """ - On input, xml contains the parsed content of namelist_defaults_scream.xml. + On input, xml contains the parsed content of namelist_defaults_eamxx.xml. On output, it contains the input parameters for this case. >>> from eamxx_buildnml_impl import MockCase @@ -683,7 +683,7 @@ def create_raw_xml_file(case, caseroot): else: print("Regenerating {}. Manual edits will be lost.".format(raw_xml_file)) - src = os.path.join(case.get_value("SRCROOT"), "components/eamxx/cime_config/namelist_defaults_scream.xml") + src = os.path.join(case.get_value("SRCROOT"), "components/eamxx/cime_config/namelist_defaults_eamxx.xml") # Some atmchanges will require structural changes to the XML file and must # be processed early by treating them as if they were made to the defaults file. @@ -839,7 +839,7 @@ def create_input_files(caseroot, screamroot, rundir): tree = ET.parse(fd) raw_xml = tree.getroot() - def_xml_file = os.path.join(screamroot, "cime_config/namelist_defaults_scream.xml") + def_xml_file = os.path.join(screamroot, "cime_config/namelist_defaults_eamxx.xml") with open(def_xml_file, "r") as fd: tree = ET.parse(fd) generated_files = get_child(tree.getroot(),"generated_files") diff --git a/components/eamxx/cime_config/namelist_defaults_scream.xml b/components/eamxx/cime_config/namelist_defaults_eamxx.xml similarity index 100% rename from components/eamxx/cime_config/namelist_defaults_scream.xml rename to components/eamxx/cime_config/namelist_defaults_eamxx.xml diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/scream_example_testmod_atmchange/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/example_testmod_atmchange/shell_commands similarity index 100% rename from components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/scream_example_testmod_atmchange/shell_commands rename to components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/example_testmod_atmchange/shell_commands diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/scream_example_testmod_cmake/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/example_testmod_cmake/shell_commands similarity index 100% rename from components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/scream_example_testmod_cmake/shell_commands rename to components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/example_testmod_cmake/shell_commands diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/kokkos_rrtmgp/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/kokkos_rrtmgp/shell_commands similarity index 100% rename from components/eamxx/cime_config/testdefs/testmods_dirs/scream/kokkos_rrtmgp/shell_commands rename to components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/kokkos_rrtmgp/shell_commands diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/scream/yakl_rrtmgp/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/yakl_rrtmgp/shell_commands similarity index 100% rename from components/eamxx/cime_config/testdefs/testmods_dirs/scream/yakl_rrtmgp/shell_commands rename to components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/yakl_rrtmgp/shell_commands diff --git a/components/eamxx/cime_config/user_nl_scream b/components/eamxx/cime_config/user_nl_eamxx similarity index 100% rename from components/eamxx/cime_config/user_nl_scream rename to components/eamxx/cime_config/user_nl_eamxx diff --git a/components/eamxx/cmake/BuildCprnc.cmake b/components/eamxx/cmake/BuildCprnc.cmake index 05db9b606903..73f8d4d8fc02 100644 --- a/components/eamxx/cmake/BuildCprnc.cmake +++ b/components/eamxx/cmake/BuildCprnc.cmake @@ -41,6 +41,9 @@ macro(BuildCprnc) " ) set(SRC_ROOT ${SCREAM_BASE_DIR}/../..) + # Let's make sure cprnc can at least find the FindNetCDF.cmake + # module that scorpio has. + list(APPEND CMAKE_MODULE_PATH ${SRC_ROOT}/externals/scorpio/cmake) add_subdirectory(${SRC_ROOT}/cime/CIME/non_py/cprnc ${BLDROOT}) EkatDisableAllWarning(cprnc) diff --git a/components/eamxx/cmake/machine-files/crusher-scream-cpu.cmake b/components/eamxx/cmake/machine-files/crusher-scream-cpu.cmake deleted file mode 100644 index 58f15881e31c..000000000000 --- a/components/eamxx/cmake/machine-files/crusher-scream-cpu.cmake +++ /dev/null @@ -1,6 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) -common_setup() - -include (${EKAT_MACH_FILES_PATH}/kokkos/serial.cmake) -include (${EKAT_MACH_FILES_PATH}/mpi/srun.cmake) - diff --git a/components/eamxx/cmake/machine-files/crusher-scream-gpu.cmake b/components/eamxx/cmake/machine-files/crusher-scream-gpu.cmake deleted file mode 100644 index 391a9b8d6880..000000000000 --- a/components/eamxx/cmake/machine-files/crusher-scream-gpu.cmake +++ /dev/null @@ -1,17 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) -common_setup() - -#serial is needed, but maybe it is always on? -include (${EKAT_MACH_FILES_PATH}/kokkos/mi250.cmake) -include (${EKAT_MACH_FILES_PATH}/kokkos/hip.cmake) -include (${EKAT_MACH_FILES_PATH}/mpi/srun.cmake) - -SET(MPICH_DIR "/opt/cray/pe/mpich/8.1.16/ofi/crayclang/10.0" CACHE STRING "") - -set(CMAKE_CXX_FLAGS "--amdgpu-target=gfx90a -fno-gpu-rdc -I${MPICH_DIR}/include" CACHE STRING "" FORCE) -set(CMAKE_Fortran_FLAGS "-I${MPICH_DIR}/include" CACHE STRING "" FORCE) -set(CMAKE_C_FLAGS "-I${MPICH_DIR}/include" CACHE STRING "" FORCE) -set(CMAKE_EXE_LINKER_FLAGS "-L${MPICH_DIR}/lib -lmpi -L/opt/cray/pe/mpich/8.1.16/gtl/lib -lmpi_gtl_hsa" CACHE STRING "" FORCE) - - - diff --git a/components/eamxx/cmake/machine-files/docker-scream.cmake b/components/eamxx/cmake/machine-files/docker-scream.cmake deleted file mode 100644 index 87d507fef20f..000000000000 --- a/components/eamxx/cmake/machine-files/docker-scream.cmake +++ /dev/null @@ -1,21 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) -common_setup() - -include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake) -set(CMAKE_CXX_FLAGS "-DTHRUST_IGNORE_CUB_VERSION_CHECK" CACHE STRING "" FORCE) - -set(BLAS_LIBRARIES /opt/conda/lib/libblas.so CACHE STRING "") -set(LAPACK_LIBRARIES /opt/conda/lib/liblapack.so CACHE STRING "") -set(SCREAM_INPUT_ROOT "/storage/inputdata/" CACHE STRING "") -set(PYBIND11_PYTHON_VERSION 3.9 CACHE STRING "") -option (SCREAM_ENABLE_ML_CORRECTION "Whether to enable ML correction parametrization" ON) - -if ("${PROJECT_NAME}" STREQUAL "E3SM") - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10) - set(CMAKE_Fortran_FLAGS "-fallow-argument-mismatch" CACHE STRING "" FORCE) # only works with gnu v10 and above - endif() - endif() -else() - set(CMAKE_Fortran_FLAGS "-fallow-argument-mismatch" CACHE STRING "" FORCE) # only works with gnu v10 and above -endif() diff --git a/components/eamxx/docs/developer/ci_nightly.md b/components/eamxx/docs/developer/ci_nightly.md index 0716ce4c9f3e..edca19046bd2 100644 --- a/components/eamxx/docs/developer/ci_nightly.md +++ b/components/eamxx/docs/developer/ci_nightly.md @@ -5,7 +5,7 @@ EAMxx using github actions and a Sandia product called Autotester 2 to run CI testing on a CPU and GPU machine for every github pull request. By default, we run the e3sm_scream_v1_at suite and the -standalone eamxx tests (test-all-scream). +standalone eamxx tests (test-all-eamxx). ## Nightly overview, CDash diff --git a/components/eamxx/docs/developer/source_tree.md b/components/eamxx/docs/developer/source_tree.md index ed8270db635e..ca7eab605277 100644 --- a/components/eamxx/docs/developer/source_tree.md +++ b/components/eamxx/docs/developer/source_tree.md @@ -54,5 +54,5 @@ unit and verification tests. You'll also see some other files in the `src/` directory itself, such as -+ `scream_config.h.in`: A template for generating a C++ header file with ++ `eamxx_config.h.in`: A template for generating a C++ header file with EAMxx configuration information. diff --git a/components/eamxx/docs/developer/standalone_testing.md b/components/eamxx/docs/developer/standalone_testing.md index 633dcc34dc1d..8f4b4bbecb19 100644 --- a/components/eamxx/docs/developer/standalone_testing.md +++ b/components/eamxx/docs/developer/standalone_testing.md @@ -20,40 +20,40 @@ configurations. We use several types of tests * **Test Suites** are named collections of tests that can be run on demand using the [ctest](https://cmake.org/cmake/help/latest/manual/ctest.1.html) command. -We also support a `test-all-scream` configuration that runs all of the +We also support a `test-all-eamxx` configuration that runs all of the standalone tests for an EAMxx configuration. Note, your current machine -must be known to EAMxx before `test-all-scream` will work. A machine can +must be known to EAMxx before `test-all-eamxx` will work. A machine can be made known to EAMxx by editing the eamxx/scripts/machines_specs.py files. There are some instructions on what to do at the top of this file. -`test-all-scream` has a good help dump +`test-all-eamxx` has a good help dump ```shell cd $scream_repo/components/eamxx -./scripts/test-all-scream -h +./scripts/test-all-eamxx -h ``` If you are unsure of the cmake configuration for you development cycle, one -trick you can use is to run `test-all-scream` for the `dbg` test and just +trick you can use is to run `test-all-eamxx` for the `dbg` test and just copy the cmake command it prints (then ctrl-C the process). ```shell cd $scream_repo/components/eamxx -./scripts/test-all-scream -t dbg -m $machine +./scripts/test-all-eamxx -t dbg -m $machine # wait for a few seconds* # Ctrl-C * # Copy the contents of DCMAKE_COMMAND that was passed to ctest * # Add "cmake" to beginning of contents and path to eamxx at the end. * ``` -Considerations for using `test-all-scream`: +Considerations for using `test-all-eamxx`: * Your machine must be known to our scripts, see above. -* If you try to run commands by-hand (outside of test-all-scream; +* If you try to run commands by-hand (outside of test-all-eamxx; cmake, make, ctest, etc), you'll need to remember to - load the scream-env into your shell, which can be done like this: - `cd eamxx/scripts; eval $(./scripts/scream-env-cmd $machine)` -* test-all-scream expects to be run from a compute node if you + load the eamxx-env into your shell, which can be done like this: + `cd eamxx/scripts; eval $(./scripts/eamxx-env-cmd $machine)` +* test-all-eamxx expects to be run from a compute node if you are on a batch machine. * You'll need to think about your baseline situation, as many of our tests rely on pre-existing baselines. The -b option controls the baseline diff --git a/components/eamxx/docs/user/index.md b/components/eamxx/docs/user/index.md index f72e085ab1bd..a0b6c0b71b7a 100644 --- a/components/eamxx/docs/user/index.md +++ b/components/eamxx/docs/user/index.md @@ -26,7 +26,7 @@ you may visit our public confluence [EAMxx user guide](https://acme-climate.atla ### [Doubly Periodic EAMxx](dp_eamxx.md) -### [PySCREAM](pyscream.md) +### [PySCREAM](pyeamxx.md) ### [IO Metadata](io_metadata.md) diff --git a/components/eamxx/docs/user/model_input.md b/components/eamxx/docs/user/model_input.md index 384cb312938b..266ef537096f 100644 --- a/components/eamxx/docs/user/model_input.md +++ b/components/eamxx/docs/user/model_input.md @@ -27,7 +27,7 @@ The infrastructure for reading inputs into EAMxx involves a few scripts/files: - `namelist_scream.xml`: this XML file is located in the case directory, and contains all the runtime parameters that EAMxx will read in at runtime. `buildnml` uses this XML file as an intermediate file during the generation of `scream_input.yaml` and `namelist.nl`. More specifically, `buildnml` generates this file using case information to select the - proper configurations from the file `namelist_defaults_scream.xml`, located in `SRCDIR/components/eamxx/cime_config`. + proper configurations from the file `namelist_defaults_eamxx.xml`, located in `SRCDIR/components/eamxx/cime_config`. Despite the fact that the only files that are needed at runtime are `scream_input.yaml` and `namelist.nl`, we generate and keep this XML file around to make the implementation of `atmquery` easier. @@ -260,7 +260,7 @@ For type "string" and "array(T)", it is also possible to _append_ to the current The `atmchange` script can be used to change any of the runtime parameters of EAMxx. In particular, it can be used to add, remove, or reorder atmosphere processes. When adding an atmosphere process, we must first -make sure that the defaults for that process are present in `namelist_defaults_scream.xml`. For instance, +make sure that the defaults for that process are present in `namelist_defaults_eamxx.xml`. For instance, the default settings for the "physics" atmosphere process group include the following: ```shell @@ -295,7 +295,7 @@ an atmosphere process group. Hence, we can then do > ./atmchange _my_group_::atm_procs_list+=A,B ``` -where A and B must be valid atmosphere process names (i.e., present in `namelist_defaults_scream.xml`) +where A and B must be valid atmosphere process names (i.e., present in `namelist_defaults_eamxx.xml`) or be themselves new atmosphere process groups (i.e., beginning/ending with an underscore) `atmchange` can also be used to completely change a list of atmosphere processes: diff --git a/components/eamxx/docs/user/pyscream.md b/components/eamxx/docs/user/pyeamxx.md similarity index 86% rename from components/eamxx/docs/user/pyscream.md rename to components/eamxx/docs/user/pyeamxx.md index e49993132ac0..d76f1fb1ae34 100644 --- a/components/eamxx/docs/user/pyscream.md +++ b/components/eamxx/docs/user/pyeamxx.md @@ -10,15 +10,15 @@ please post them on the ## Quick Start -For now, the only way to use pyscream is to either build it on your own +For now, the only way to use pyeamxx is to either build it on your own or use our prebuilt conda binaries. We prefer for you to use the latter. In a conda environment, please use the following command to install it: ```bash -conda install -c mahf708 pyscream=0.0.2 +conda install -c mahf708 pyeamxx=0.0.2 ``` -It is recommended to use the latest version of pyscream, wich is +It is recommended to use the latest version of pyeamxx, wich is currently 0.0.2. As you can see, it is a young package with a lot of potential. We do not guarantee that the API will remain stable, but we will try to document any changes as frequently as we could. @@ -33,9 +33,9 @@ please feel free to submit a PR. ```python from mpi4py import MPI -import pyscream +import pyeamxx -pyscream.init() +pyeamxx.init() dt = 1800 t0_str = "2020-10-10-00000" @@ -43,7 +43,7 @@ t0_str = "2020-10-10-00000" ic_file = "/lcrc/group/e3sm/public_html/inputdata/atm/scream/init/screami_unit_tests_ne2np4L72_20220822.nc" ncols = 218 nlevs = 72 -pyscream.create_grids_manager(ncols,nlevs, ic_file) +pyeamxx.create_grids_manager(ncols,nlevs, ic_file) rad_dict = { "column_chunk_size": 123, @@ -57,7 +57,7 @@ rad_dict = { "rrtmgp_cloud_optics_file_lw": "/lcrc/group/e3sm/data/inputdata/atm/scream/init/rrtmgp-cloud-optics-coeffs-lw.nc", } -rad = pyscream.AtmProc(rad_dict, 'RRTMGP') +rad = pyeamxx.AtmProc(rad_dict, 'RRTMGP') rad.read_ic(ic_file) rad.initialize(t0_str) diff --git a/components/eamxx/mkdocs.yml b/components/eamxx/mkdocs.yml index b5865f94a270..ace4f5febffe 100644 --- a/components/eamxx/mkdocs.yml +++ b/components/eamxx/mkdocs.yml @@ -12,7 +12,7 @@ nav: - 'COSP': 'user/cosp.md' - 'Regionally Refined EAMxx': 'user/rrm_eamxx.md' - 'Doubly Periodic EAMxx': 'user/dp_eamxx.md' - - 'PySCREAM': 'user/pyscream.md' + - 'PySCREAM': 'user/pyeamxx.md' - 'IO Metadata': 'user/io_metadata.md' - 'Multi-Instance and NBFB': 'user/multi-instance-mvk.md' - 'Developer Guide': diff --git a/components/eamxx/scripts/README.md b/components/eamxx/scripts/README.md index bcff04a11cd2..e31495755960 100644 --- a/components/eamxx/scripts/README.md +++ b/components/eamxx/scripts/README.md @@ -6,9 +6,9 @@ of importance, along with a brief description. For more info on a tool, run it w always strive to have an informative help dump that contains detailed info on a tool's purpose, args/options, and some example usages. -## test-all-scream +## test-all-eamxx -test-all-scream is our core testing script for standalone SCREAM. When developing on a branch, if this script +test-all-eamxx is our core testing script for standalone SCREAM. When developing on a branch, if this script runs successfully with the default options, then your branch can be considered to work on the current machine. When a PR is issued, our continuous integration will run this script (via gather-all-data (see below)) on your branch on all our core testing machines. If all those tests pass, then your PR will be eligible for merging. @@ -19,8 +19,8 @@ and have up-to-date documentation. ## gather-all-data A tool for dispatching jobs to machines, loading the SCREAM env, and doing batch submissions. This tool is -usually used to get test-all-scream jobs running on compute nodes on machines, but it can be used to run -anything you want. Our CI system uses this tool to run test-all-scream. We have used this tool in the past +usually used to get test-all-eamxx jobs running on compute nodes on machines, but it can be used to run +anything you want. Our CI system uses this tool to run test-all-eamxx. We have used this tool in the past to relatively easily gather performance data for SCREAM across all the platforms we care about with a single command. Because this tool is used in our CI testing, you should always expect this tool to work correctly @@ -29,15 +29,15 @@ and have up-to-date documentation. ## scripts-tests A test suite for this toolsuite. This should be used for any significant developments to the core testing scritpts -(test-all-scream or gather-all-data). This suite is NOT run by our CI system, so it's up to our toolsuite developers +(test-all-eamxx or gather-all-data). This suite is NOT run by our CI system, so it's up to our toolsuite developers to remember to run this. Because this testsuite is used in developing our core test scripts, you should always expect this testsuite to pass and have up-to-date documentation. -## scream-env-cmd +## eamxx-env-cmd -A scream analog for modulecmd, a tool for dumping shell commands that would load the SCREAM approved env for +An eamxx analog for modulecmd, a tool for dumping shell commands that would load the EAMXX approved env for your machine. Designed for easy integration with bash functions for easy loading of env. This tool is not used in our core testing tools, but it is simple and actively used by some of our developers diff --git a/components/eamxx/scripts/change-param-pattern b/components/eamxx/scripts/change-param-pattern index a54c7292d246..26bcd4032b59 100755 --- a/components/eamxx/scripts/change-param-pattern +++ b/components/eamxx/scripts/change-param-pattern @@ -2,7 +2,7 @@ """ A quick-and-dirty script for changing naming patterns of -items in namelist_defaults_scream.xml. +items in namelist_defaults_eamxx.xml. Run from root scream directory on mappy """ @@ -17,7 +17,7 @@ print(result) bad_pattern = "__" name_re = re.compile(r'([A-Za-z0-9]+__)([A-Za-z0-9]+__)?([A-Za-z0-9]+__)?([A-Za-z0-9]+__)?([A-Za-z0-9]+__)?([A-Za-z0-9]+)') -raw_dbl_un = run_cmd_no_fail(f"git grep {bad_pattern} cime_config/namelist_defaults_scream.xml") +raw_dbl_un = run_cmd_no_fail(f"git grep {bad_pattern} cime_config/namelist_defaults_eamxx.xml") bad_name_unders = [] for m in name_re.finditer(raw_dbl_un): name = "".join([item for item in m.groups() if item is not None]) diff --git a/components/eamxx/scripts/cime-nml-tests b/components/eamxx/scripts/cime-nml-tests index c76d0113207f..b44352d79dba 100755 --- a/components/eamxx/scripts/cime-nml-tests +++ b/components/eamxx/scripts/cime-nml-tests @@ -256,7 +256,7 @@ class TestBuildnml(unittest.TestCase): def_mach_comp = \ run_cmd_assert_result(self, "../CIME/Tools/list_e3sm_tests cime_tiny", from_dir=CIME_SCRIPTS_DIR).splitlines()[-2].split(".")[-1] - case = self._create_test(f"SMS.ne30_ne30.F2010-SCREAMv1.{def_mach_comp}.eamxx-scream_example_testmod_atmchange --no-build") + case = self._create_test(f"SMS.ne30_ne30.F2010-SCREAMv1.{def_mach_comp}.eamxx-example_testmod_atmchange --no-build") # Check that the value match what's in the testmod out = run_cmd_no_fail("./atmquery --value cubed_sphere_map", from_dir=case) diff --git a/components/eamxx/scripts/scream-env-cmd b/components/eamxx/scripts/eamxx-env-cmd similarity index 93% rename from components/eamxx/scripts/scream-env-cmd rename to components/eamxx/scripts/eamxx-env-cmd index 34b5293807f7..9d7992ac4852 100755 --- a/components/eamxx/scripts/scream-env-cmd +++ b/components/eamxx/scripts/eamxx-env-cmd @@ -2,7 +2,7 @@ """ Dump the SCREAM-approved environment setup commands for a machine. -This can be used with a bash function or the source_to_load_scream_env.sh +This can be used with a bash function or the source_to_load_eamxx_env.sh script to conveniently load the SCREAM-approved env into your current shell. """ @@ -37,7 +37,7 @@ OR > load_scream mappy \033[1;32m# Use the provided shell script to load env \033[0m - > SCREAM_MACHINE=mappy . scream/scripts/source_to_load_scream_env.sh + > SCREAM_MACHINE=mappy . scream/scripts/source_to_load_eamxx_env.sh """.format(pathlib.Path(args[0]).name), description=description, diff --git a/components/eamxx/scripts/eamxx-params-docs-autogen b/components/eamxx/scripts/eamxx-params-docs-autogen index 90e19ed59d6a..b074edf37351 100755 --- a/components/eamxx/scripts/eamxx-params-docs-autogen +++ b/components/eamxx/scripts/eamxx-params-docs-autogen @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -This script parses the file `cime_config/namelist_defaults_scream.xml' +This script parses the file `cime_config/namelist_defaults_eamxx.xml' and generates the markdown file `docs/common/eamxx_params.md`, containing all the runtime parameters that can be configured via calls to `atmchange` (in the case folder). For each parameter, we also report @@ -90,7 +90,7 @@ def generate_params_docs(): ########################################################################### eamxx = pathlib.Path(__file__).parent.parent.resolve() - xml_defaults_file = eamxx / "cime_config" / "namelist_defaults_scream.xml" + xml_defaults_file = eamxx / "cime_config" / "namelist_defaults_eamxx.xml" output_file = eamxx / "docs" / "common" / "eamxx_params.md" print("Generating eamxx params documentation...") diff --git a/components/eamxx/scripts/gather-all-data b/components/eamxx/scripts/gather-all-data index f56bd416b20e..44e621ef6e96 100755 --- a/components/eamxx/scripts/gather-all-data +++ b/components/eamxx/scripts/gather-all-data @@ -40,10 +40,10 @@ OR \033[1mEXAMPLES:\033[0m \033[1;32m# Test scream on all platforms \033[0m - > {0} './scripts/test-all-scream -m $machine' + > {0} './scripts/test-all-eamxx -m $machine' \033[1;32m# Do correctness testing locally for SCREAM (expects ./scream and ./scream-docs) \033[0m - > {0} './scripts/test-all-scream -m $machine' -l -m $machine + > {0} './scripts/test-all-eamxx -m $machine' -l -m $machine \033[1;32m# Do correctness testing for scream-docs micro apps \033[0m > {0} './test-all $cxx_compiler $kokkos' -o diff --git a/components/eamxx/scripts/gather_all_data.py b/components/eamxx/scripts/gather_all_data.py index 1881b304092d..afa42bde493a 100644 --- a/components/eamxx/scripts/gather_all_data.py +++ b/components/eamxx/scripts/gather_all_data.py @@ -50,7 +50,7 @@ def formulate_command(self, machine): repo = scream_docs_repo if self._scream_docs else scream_repo - # Compute kokkos location. scream itself won't allow this, and test-all-scream will error out, + # Compute kokkos location. scream itself won't allow this, and test-all-eamxx will error out, # but one can use gather-all-data for plenty of other apps, so we need to support this here. local_cmd = self._run if self._kokkos: diff --git a/components/eamxx/scripts/gen_boiler.py b/components/eamxx/scripts/gen_boiler.py index f22256516204..fcbce1ab4f21 100644 --- a/components/eamxx/scripts/gen_boiler.py +++ b/components/eamxx/scripts/gen_boiler.py @@ -14,7 +14,7 @@ "cxx_bfb_unit_impl": lambda phys, sub, gen_code: f"""#include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "physics/{phys}/{phys}_functions.hpp" diff --git a/components/eamxx/scripts/git_utils.py b/components/eamxx/scripts/git_utils.py index a7202bfbfaba..932051cc8b89 100644 --- a/components/eamxx/scripts/git_utils.py +++ b/components/eamxx/scripts/git_utils.py @@ -140,7 +140,7 @@ def merge_git_ref(git_ref, repo=None, verbose=False, dry_run=False): def create_backup_commit (repo=None, dry_run=False): ############################################################################### - bkp_cmd = "git add -A && git commit -m 'WARNING: test-all-scream backup commit'" + bkp_cmd = "git add -A && git commit -m 'WARNING: test-all-eamxx backup commit'" if dry_run: print (f"Would run: {bkp_cmd}") else: @@ -210,7 +210,7 @@ def cleanup_repo(orig_branch, orig_commit, has_backup_commit=False, repo=None, d checkout_git_ref(orig_branch if orig_branch else orig_commit, repo=repo, dry_run=dry_run) - # This *can* happen. test_all_scream can merge origin/master into current branch. + # This *can* happen. test-all-eamxx can merge origin/master into current branch. # Checking out orig_branch doesn't do anything if we were on a branch (not detached # head mode), since the branch tip moved with the master merge. In that case, # what we really need is a hard reset to the original commit. @@ -219,7 +219,7 @@ def cleanup_repo(orig_branch, orig_commit, has_backup_commit=False, repo=None, d run_cmd_no_fail("git reset --hard {}".format(orig_commit), from_dir=repo) if has_backup_commit: # This can happen if we ran an integration test with a dirty repo. - # test_all_scream will create a temporary backup commit, which we + # test-all-eamxx will create a temporary backup commit, which we # need to undo, but leaving the changed files in the workspace. # So DON'T add --hard to this call! run_cmd_no_fail("git reset {HEAD~1}", from_dir=repo) diff --git a/components/eamxx/scripts/jenkins/jenkins_common_impl.sh b/components/eamxx/scripts/jenkins/jenkins_common_impl.sh index f1be10d4eda6..540aba7f4870 100755 --- a/components/eamxx/scripts/jenkins/jenkins_common_impl.sh +++ b/components/eamxx/scripts/jenkins/jenkins_common_impl.sh @@ -68,7 +68,7 @@ if [ $skip_testing -eq 0 ]; then fi declare -i fails=0 - # The special string "AUTO" makes test-all-scream look for a baseline dir in the machine_specs.py file. + # The special string "AUTO" makes test-all-eamxx look for a baseline dir in the machine_specs.py file. # IF such dir is not found, then the default (ctest-build/baselines) is used BASELINES_DIR=AUTO @@ -96,7 +96,7 @@ if [ $skip_testing -eq 0 ]; then SA_FAILURES_DETAILS="" # Run scream stand-alone tests (SA) if [ $test_SA -eq 1 ]; then - this_output=$(./scripts/gather-all-data "./scripts/test-all-scream ${TAS_ARGS}" -l -m $SCREAM_MACHINE) + this_output=$(./scripts/gather-all-data "./scripts/test-all-eamxx ${TAS_ARGS}" -l -m $SCREAM_MACHINE) if [[ $? != 0 ]]; then fails=$fails+1; sa_fail=1 @@ -109,7 +109,7 @@ if [ $skip_testing -eq 0 ]; then # Add memcheck and coverage tests for nightlies on specific machines if [[ $is_at_run == 0 ]]; then if [[ "$SCREAM_MACHINE" == "mappy" ]]; then - ./scripts/gather-all-data "./scripts/test-all-scream -t cov ${TAS_ARGS}" -l -m $SCREAM_MACHINE + ./scripts/gather-all-data "./scripts/test-all-eamxx -t cov ${TAS_ARGS}" -l -m $SCREAM_MACHINE if [[ $? != 0 ]]; then fails=$fails+1; cov_fail=1 @@ -118,7 +118,7 @@ if [ $skip_testing -eq 0 ]; then # Add a memcheck test for mappy for nightlies if [[ "$SCREAM_MACHINE" == "mappy" ]]; then - ./scripts/gather-all-data "./scripts/test-all-scream -t mem ${TAS_ARGS}" -l -m $SCREAM_MACHINE + ./scripts/gather-all-data "./scripts/test-all-eamxx -t mem ${TAS_ARGS}" -l -m $SCREAM_MACHINE if [[ $? != 0 ]]; then fails=$fails+1; memcheck_fail=1 @@ -128,7 +128,7 @@ if [ $skip_testing -eq 0 ]; then if [[ -z "$SCREAM_FAKE_ONLY" && "$SCREAM_MACHINE" == "weaver" ]]; then # The fake-only tests don't launch any kernels which will cause all # the compute-sanitizer runs to fail. - ./scripts/gather-all-data "./scripts/test-all-scream -t csm -t csr -t csi -t css ${TAS_ARGS}" -l -m $SCREAM_MACHINE + ./scripts/gather-all-data "./scripts/test-all-eamxx -t csm -t csr -t csi -t css ${TAS_ARGS}" -l -m $SCREAM_MACHINE if [[ $? != 0 ]]; then fails=$fails+1; memcheck_fail=1 diff --git a/components/eamxx/scripts/query-cf-database/CMakeLists.txt b/components/eamxx/scripts/query-cf-database/CMakeLists.txt index 912007606024..5a46c400bb5a 100644 --- a/components/eamxx/scripts/query-cf-database/CMakeLists.txt +++ b/components/eamxx/scripts/query-cf-database/CMakeLists.txt @@ -2,7 +2,7 @@ set (CF_STANDARD_NAME_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cf-standard-name-table.yaml" CACHE STRING "Location of the cf standard name yaml table") -set (CF_SCREAM_NAME_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cf-scream-name-table.yaml" +set (CF_SCREAM_NAME_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cf-eamxx-name-table.yaml" CACHE STRING "Location of the scream-specific cf name yaml table") add_executable(query-cf-database query-cf-database.cpp) diff --git a/components/eamxx/scripts/query-cf-database/cf-scream-name-table.yaml b/components/eamxx/scripts/query-cf-database/cf-eamxx-name-table.yaml similarity index 59% rename from components/eamxx/scripts/query-cf-database/cf-scream-name-table.yaml rename to components/eamxx/scripts/query-cf-database/cf-eamxx-name-table.yaml index bc8f8d6eb809..f105e074cfb5 100644 --- a/components/eamxx/scripts/query-cf-database/cf-scream-name-table.yaml +++ b/components/eamxx/scripts/query-cf-database/cf-eamxx-name-table.yaml @@ -1,4 +1,4 @@ -# ../data/cf-scream-name-table.yaml - just a starter file for now. +# ../data/cf-eamxx-name-table.yaml - just a starter file for now. change_me_to_a_real_field_name: description: 'This is a fake field name.' diff --git a/components/eamxx/scripts/query-scream b/components/eamxx/scripts/query-eamxx similarity index 88% rename from components/eamxx/scripts/query-scream rename to components/eamxx/scripts/query-eamxx index b1cec87c90a1..f46f187a884b 100755 --- a/components/eamxx/scripts/query-scream +++ b/components/eamxx/scripts/query-eamxx @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Query the SCREAM machines_specs.py file +Query the EAMXX machines_specs.py file """ from utils import check_minimum_python_version, GoodFormatter @@ -9,7 +9,7 @@ check_minimum_python_version(3, 4) import argparse, sys, pathlib -from query_scream import query_scream, CHOICES +from query_eamxx import query_eamxx, CHOICES ############################################################################### def parse_command_line(args, description): @@ -36,7 +36,7 @@ OR ############################################################################### def _main_func(description): ############################################################################### - print(query_scream(**vars(parse_command_line(sys.argv, description)))) + print(query_eamxx(**vars(parse_command_line(sys.argv, description)))) ############################################################################### diff --git a/components/eamxx/scripts/query_scream.py b/components/eamxx/scripts/query_eamxx.py similarity index 97% rename from components/eamxx/scripts/query_scream.py rename to components/eamxx/scripts/query_eamxx.py index a6fe5096bfb5..c72ed16b2e4b 100644 --- a/components/eamxx/scripts/query_scream.py +++ b/components/eamxx/scripts/query_eamxx.py @@ -15,7 +15,7 @@ ) ############################################################################### -def query_scream(machine, param): +def query_eamxx(machine, param): ############################################################################### assert_machine_supported(machine) expect(param in CHOICES, f"Unknown param {param}") diff --git a/components/eamxx/scripts/scripts-tests b/components/eamxx/scripts/scripts-tests index 67416b23d2b5..63309d524f59 100755 --- a/components/eamxx/scripts/scripts-tests +++ b/components/eamxx/scripts/scripts-tests @@ -214,24 +214,24 @@ class TestTestAllScream(TestBaseOuter.TestBase): ############################################################################### CMDS_TO_TEST = [ - "./test-all-scream -m $machine -p -c EKAT_DISABLE_TPL_WARNINGS=ON", - "./test-all-scream -m $machine -t dbg", + "./test-all-eamxx -m $machine -p -c EKAT_DISABLE_TPL_WARNINGS=ON", + "./test-all-eamxx -m $machine -t dbg", ] def __init__(self, *internal_args): super(TestTestAllScream, self).__init__( - "test_all_scream.py", + "test_all_eamxx.py", TestTestAllScream.CMDS_TO_TEST, *internal_args) # Test that each build type generates the correct CMakeCache def test_dbg_details(self): """ - Test the 'dbg' test in test-all-scream. It should set certain CMake values + Test the 'dbg' test in test-all-eamxx. It should set certain CMake values """ if not self._jenkins: options = "-t dbg --config-only" - cmd = self.get_cmd(f"./test-all-scream -m $machine {options}", + cmd = self.get_cmd(f"./test-all-eamxx -m $machine {options}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_cmake_cache_contents(self, "full_debug", "CMAKE_BUILD_TYPE", "Debug") @@ -246,11 +246,11 @@ class TestTestAllScream(TestBaseOuter.TestBase): def test_sp_details(self): """ - Test the 'sp' test in test-all-scream. It should set certain CMake values + Test the 'sp' test in test-all-eamxx. It should set certain CMake values """ if not self._jenkins: options = "-t sp --config-only" - cmd = self.get_cmd(f"./test-all-scream -m $machine {options}", + cmd = self.get_cmd(f"./test-all-eamxx -m $machine {options}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_cmake_cache_contents(self, "full_sp_debug", "CMAKE_BUILD_TYPE", "Debug") @@ -265,14 +265,14 @@ class TestTestAllScream(TestBaseOuter.TestBase): def test_fpe_details(self): """ - Test the 'fpe' test in test-all-scream. It should set certain CMake values + Test the 'fpe' test in test-all-eamxx. It should set certain CMake values """ if not self._jenkins: if self._machine.uses_gpu(): self.skipTest("Skipping FPE check on gpu machines") else: options = "-t fpe --config-only" - cmd = self.get_cmd(f"./test-all-scream -m $machine {options}", + cmd = self.get_cmd(f"./test-all-eamxx -m $machine {options}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_cmake_cache_contents(self, "debug_nopack_fpe", "CMAKE_BUILD_TYPE", "Debug") @@ -284,11 +284,11 @@ class TestTestAllScream(TestBaseOuter.TestBase): def test_mem_check_details(self): """ - Test the mem (default mem-check build) in test-all-scream. It should set certain CMake values + Test the mem (default mem-check build) in test-all-eamxx. It should set certain CMake values """ if not self._jenkins: options = "-t mem --config-only" - cmd = self.get_cmd(f"./test-all-scream -m $machine {options}", + cmd = self.get_cmd(f"./test-all-eamxx -m $machine {options}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) builddir = "compute_sanitizer_memcheck" if self._machine.gpu_arch=="cuda" else "valgrind" @@ -305,44 +305,44 @@ class TestTestAllScream(TestBaseOuter.TestBase): def test_opt_details(self): """ - Test the 'opt' test in test-all-scream. It should set certain CMake values + Test the 'opt' test in test-all-eamxx. It should set certain CMake values """ if not self._jenkins: options = "-t opt --config-only" - cmd = self.get_cmd(f"./test-all-scream -m $machine {options}", + cmd = self.get_cmd(f"./test-all-eamxx -m $machine {options}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_cmake_cache_contents(self, "release", "CMAKE_BUILD_TYPE", "Release") else: self.skipTest("Skipping config-only run for jenkins test") - # Test that a fail in config, build, or run phase of ctest is correctly captured by test-all-scream + # Test that a fail in config, build, or run phase of ctest is correctly captured by test-all-eamxx def test_config_fail_captured(self): """ - Test that the 'dbg' test in test-all-scream detects and returns non-zero if there's a cmake configure error + Test that the 'dbg' test in test-all-eamxx detects and returns non-zero if there's a cmake configure error """ if self._full: - cmd = self.get_cmd("./test-all-scream -e SCREAM_FORCE_CONFIG_FAIL=True -m $machine -t dbg", self._machine) + cmd = self.get_cmd("./test-all-eamxx -e SCREAM_FORCE_CONFIG_FAIL=True -m $machine -t dbg", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR, expect_works=False) else: self.skipTest("Skipping full run") def test_build_fail_captured(self): """ - Test that the 'dbg' test in test-all-scream detects and returns non-zero if there's a build error + Test that the 'dbg' test in test-all-eamxx detects and returns non-zero if there's a build error """ if self._full: - cmd = self.get_cmd("./test-all-scream -e SCREAM_FORCE_BUILD_FAIL=True -m $machine -t dbg", self._machine) + cmd = self.get_cmd("./test-all-eamxx -e SCREAM_FORCE_BUILD_FAIL=True -m $machine -t dbg", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR, expect_works=False) else: self.skipTest("Skipping full run") def test_run_fail_captured(self): """ - Test that a failure from ctest in the testing phase is caught by test-all-scream + Test that a failure from ctest in the testing phase is caught by test-all-eamxx """ if self._full: - cmd = self.get_cmd("./test-all-scream -e SCREAM_FORCE_RUN_FAIL=True -m $machine -t dbg", self._machine) + cmd = self.get_cmd("./test-all-eamxx -e SCREAM_FORCE_RUN_FAIL=True -m $machine -t dbg", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR, expect_works=False) else: self.skipTest("Skipping full run") @@ -352,7 +352,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): Test that the at test level works """ if self._full: - cmd = self.get_cmd("./test-all-scream -x -m $machine -t dbg", self._machine) + cmd = self.get_cmd("./test-all-eamxx -x -m $machine -t dbg", self._machine) output = run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_test_levels_were_run(self, output, ["AT"], ["NIGHTLY", "EXPERIMENTAL"]) else: @@ -363,7 +363,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): Test that the nightly test level works """ if self._full: - cmd = self.get_cmd("./test-all-scream -x --test-level=nightly -m $machine -t dbg", self._machine) + cmd = self.get_cmd("./test-all-eamxx -x --test-level=nightly -m $machine -t dbg", self._machine) output = run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_test_levels_were_run(self, output, ["AT", "NIGHTLY"], ["EXPERIMENTAL"]) else: @@ -374,7 +374,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): Test that the experimental test level works """ if self._full: - cmd = self.get_cmd("./test-all-scream -x --test-level=experimental -m $machine -t dbg", self._machine) + cmd = self.get_cmd("./test-all-eamxx -x --test-level=experimental -m $machine -t dbg", self._machine) output = run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_test_levels_were_run(self, output, ["AT", "NIGHTLY", "EXPERIMENTAL"], []) else: @@ -382,9 +382,9 @@ class TestTestAllScream(TestBaseOuter.TestBase): def test_baseline_handling(self): """ - Test the mechanics of test-all-scream's handling of baselines + Test the mechanics of test-all-eamxx's handling of baselines Note: we don't really run scream to generate real baselines. - We simply have to test the logic in test-all-scream. + We simply have to test the logic in test-all-eamxx. So set SCREAM_FAKE_ONLY=ON, to lower the build time """ if self._full: @@ -392,7 +392,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): # Start a couple new tests, baselines will be generated in ctest-build/baselines env = "SCREAM_FAKE_ONLY=ON SCREAM_FAKE_GIT_HEAD=FAKE1" opts = "-b LOCAL -g -t dbg -t sp" - cmd = self.get_cmd(f"{env} ./test-all-scream -m $machine {opts}", + cmd = self.get_cmd(f"{env} ./test-all-eamxx -m $machine {opts}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) @@ -402,7 +402,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): # Re-run reusing baselines from above env = "SCREAM_FAKE_ONLY=ON SCREAM_FAKE_GIT_HEAD=FAKE2" opts = "-b LOCAL -t dbg -t sp" - cmd = self.get_cmd(f"{env} ./test-all-scream -m $machine {opts}", + cmd = self.get_cmd(f"{env} ./test-all-eamxx -m $machine {opts}", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) @@ -422,11 +422,11 @@ class TestTestAllScream(TestBaseOuter.TestBase): if self._full and self._machine == "mappy": spread_test_opts = "-x -e SCREAM_TEST_THREAD_SPREAD=True -e SCREAM_TEST_RANK_SPREAD=True -c EKAT_TEST_LAUNCHER_MANAGE_RESOURCES=True -c EKAT_MPIRUN_EXE=mpiexec -c EKAT_MPI_EXTRA_ARGS='-bind-to core' -c EKAT_MPI_NP_FLAG='--map-by' -c EKAT_MPI_THREAD_FLAG='' -m $machine -t dbg" - cmd = self.get_cmd(f"./test-all-scream {spread_test_opts} --ctest-parallel-level=40 ", self._machine) + cmd = self.get_cmd(f"./test-all-eamxx {spread_test_opts} --ctest-parallel-level=40 ", self._machine) output = run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_omp_spread(self, output, 40) - cmd = self.get_cmd(f"taskset -c 8-47 ./test-all-scream {spread_test_opts} --ctest-parallel-level=40 ", self._machine) + cmd = self.get_cmd(f"taskset -c 8-47 ./test-all-eamxx {spread_test_opts} --ctest-parallel-level=40 ", self._machine) output = run_cmd_assert_result(self, cmd, from_dir=TEST_DIR) test_omp_spread(self, output, 48, begin=8) @@ -466,7 +466,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): Test the jenkins script in autotester mode with a failure, should return non-zero """ if self._jenkins: - # Any fail will do, we already checked test-all-scream captures all the fail types + # Any fail will do, we already checked test-all-eamxx captures all the fail types cmd = self.get_cmd(f"PR_LABELS= SCREAM_FORCE_CONFIG_FAIL=True NODE_NAME={self._machine.name} SCREAM_FAKE_AUTO=TRUE PULLREQUESTNUM=42 ./jenkins/jenkins_common.sh", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR, expect_works=False) @@ -479,7 +479,7 @@ class TestTestAllScream(TestBaseOuter.TestBase): Test the jenkins script in nightly mode with a failure, should return non-zero """ if self._jenkins: - # Any fail will do, we already checked test-all-scream captures all the fail types + # Any fail will do, we already checked test-all-eamxx captures all the fail types cmd = self.get_cmd(f"PR_LABELS= SCREAM_FORCE_CONFIG_FAIL=True NODE_NAME={self._machine} SCREAM_FAKE_AUTO=TRUE PULLREQUESTNUM= ./jenkins/jenkins_common.sh", self._machine) run_cmd_assert_result(self, cmd, from_dir=TEST_DIR, expect_works=False) @@ -525,13 +525,13 @@ OR \033[1;32m# Run basic pylint and doctests for everything \033[0m > {0} - \033[1;32m# Run basic pylint and doctests for test_all_scream \033[0m + \033[1;32m# Run basic pylint and doctests for test_all_eamxx \033[0m > {0} TestTestAllScream - \033[1;32m# Run pylint tests for test_all_scream \033[0m + \033[1;32m# Run pylint tests for test_all_eamxx \033[0m > {0} TestTestAllScream.test_pylint - \033[1;32m# Do a full test run of test_all_scream \033[0m + \033[1;32m# Do a full test run of test_all_eamxx \033[0m > {0} -f -m $machine TestTestAllScream \033[1;32m# Run every possible test. This should be done before a PR is issued \033[0m diff --git a/components/eamxx/scripts/source_to_load_scream_env.sh b/components/eamxx/scripts/source_to_load_eamxx_env.sh similarity index 53% rename from components/eamxx/scripts/source_to_load_scream_env.sh rename to components/eamxx/scripts/source_to_load_eamxx_env.sh index 8657ff5bc166..e0d10c109985 100644 --- a/components/eamxx/scripts/source_to_load_scream_env.sh +++ b/components/eamxx/scripts/source_to_load_eamxx_env.sh @@ -1,14 +1,14 @@ # -# A script for loading the scream-approved env for your machine. +# A script for loading the eamxx-approved env for your machine. # Requires SCREAM_MACHINE to be set # DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) -load_scream () { eval $($DIR/scream-env-cmd $1); } +load_eamxx () { eval $($DIR/eamxx-env-cmd $1); } if [ -z "$SCREAM_MACHINE" ]; then echo "Must set SCREAM_MACHINE" else - load_scream $SCREAM_MACHINE + load_eamxx $SCREAM_MACHINE fi diff --git a/components/eamxx/scripts/test-all-scream b/components/eamxx/scripts/test-all-eamxx similarity index 94% rename from components/eamxx/scripts/test-all-scream rename to components/eamxx/scripts/test-all-eamxx index da388278663a..7e6e8e02f316 100755 --- a/components/eamxx/scripts/test-all-scream +++ b/components/eamxx/scripts/test-all-eamxx @@ -10,12 +10,12 @@ IMPORTANT: the default behavior of this script *changes your environment*, by loading machine-specific modules and setting machine-specific env vars. To prevent this behavior, use --preserve-env flag. -Baselines: By default, test-all-scream will not run baseline tests. If you set +Baselines: By default, test-all-eamxx will not run baseline tests. If you set -b AUTO, baseline tests will be done with the pre-existing public baselines in the location specified by the machine spec. You can regenerate baselines any time by using the -g flag, but be aware this will impact everyone if you regenerate the public baselines. You can change the target baseline area -using -b $path. You can also use the magic word "LOCAL" to have test-all-scream +using -b $path. You can also use the magic word "LOCAL" to have test-all-eamxx pick a local directory for you if you want to manage your own baselines within the current repo. If -g is provided, no tests will be run; -g means generate only. @@ -29,8 +29,8 @@ If you are developing a branch and baselines tests are failing unexpectedly, it likely that your branch has fallen out of date. You should upstream merge or rebase your branch. -To sum up, the baseline handling for test-all-scream should basically match what we -do for create_test tests, the only difference is that test-all-scream does baseline +To sum up, the baseline handling for test-all-eamxx should basically match what we +do for create_test tests, the only difference is that test-all-eamxx does baseline comparison tests by default. """ @@ -40,7 +40,7 @@ check_minimum_python_version(3, 4) import argparse, sys, pathlib from test_factory import get_test_name_dict -from test_all_scream import TestAllScream +from test_all_eamxx import TestAllScream ############################################################################### def parse_command_line(args, description): @@ -84,7 +84,7 @@ OR help="Launch the different build types stacks in parallel") parser.add_argument("-g", "--generate", action="store_true", - help="Instruct test-all-scream to generate baselines from current commit. Skips tests") + help="Instruct test-all-eamxx to generate baselines from current commit. Skips tests") parser.add_argument("-b", "--baseline-dir", help="Directory where baselines should be read from (or written to, if -g is used). Default is None which skips all baseline tests. AUTO means use public baselines. You can also use LOCAL to manage baselines in your local work dir. Lastly, you can provide a path here as well.") @@ -115,7 +115,7 @@ OR help=f"Only run specific test configurations, choices={choices_doc}") parser.add_argument("-l", "--local", action="store_true", - help="Allow to not specify a machine name, and have test-all-scream to look" + help="Allow to not specify a machine name, and have test-all-eamxx to look" "for '~/.cime/scream_mach_specs.py' for machine specifications.") parser.add_argument("-r", "--root-dir", @@ -156,7 +156,7 @@ def _main_func(description): ############################################################################### tas = TestAllScream(**vars(parse_command_line(sys.argv, description))) - success = tas.test_all_scream() + success = tas.test_all_eamxx() print("OVERALL STATUS: {}".format("PASS" if success else "FAIL")) diff --git a/components/eamxx/scripts/test_all_scream.py b/components/eamxx/scripts/test_all_eamxx.py similarity index 99% rename from components/eamxx/scripts/test_all_scream.py rename to components/eamxx/scripts/test_all_eamxx.py index 81dd2f4cb7c2..1fd656fcdf81 100644 --- a/components/eamxx/scripts/test_all_scream.py +++ b/components/eamxx/scripts/test_all_eamxx.py @@ -35,7 +35,7 @@ def __init__(self, cxx_compiler=None, f90_compiler=None, c_compiler=None, extra_verbose=False, limit_test_regex=None, test_level="at", test_size=None): ########################################################################### - # When using scripts-tests, we can't pass "-l" to test-all-scream, + # When using scripts-tests, we can't pass "-l" to test-all-eamxx, # but we can pass "-m local". So if machine="local", reset things # as if local=True and machine=None if machine=="local": @@ -84,7 +84,7 @@ def __init__(self, cxx_compiler=None, f90_compiler=None, c_compiler=None, self._machine = get_machine(os.environ["SCREAM_MACHINE"]) else: expect(local, - "test-all-scream requires either the machine arg (-m $machine) or the -l flag," + "test-all-eamxx requires either the machine arg (-m $machine) or the -l flag," "which makes it look for machine specs in '~/.cime/scream_mach_specs.py'.") self._machine = get_machine("local") @@ -161,7 +161,7 @@ def __init__(self, cxx_compiler=None, f90_compiler=None, c_compiler=None, # if we try to oversubscribe. We would need to implement some kind of wrap-around # mechanism if make_jobs_per_test == 0 or ctest_jobs_per_test == 0: - expect(False, "test-all-scream does not currently support oversubscription. " + expect(False, "test-all-eamxx does not currently support oversubscription. " "Either run fewer test types or turn off parallel testing") for test in self._tests: @@ -612,7 +612,7 @@ def run_test(self, test): if self._quick_rerun_failed: ctest_config += "--rerun-failed " else: - # This directory might have been used before during another test-all-scream run. + # This directory might have been used before during another test-all-eamxx run. # Although it's ok to build in the same dir, we MUST make sure to erase cmake's cache # and internal files from the previous build (CMakeCache.txt and CMakeFiles folder), # Otherwise, we may not pick up changes in certain cmake vars that are already cached. @@ -713,7 +713,7 @@ def baselines_to_be_generated(self): return ret ############################################################################### - def test_all_scream(self): + def test_all_eamxx(self): ############################################################################### # Add any override the user may have requested diff --git a/components/eamxx/scripts/test_factory.py b/components/eamxx/scripts/test_factory.py index 47ae47367218..7d7a6794796a 100644 --- a/components/eamxx/scripts/test_factory.py +++ b/components/eamxx/scripts/test_factory.py @@ -1,4 +1,4 @@ -# This module contains classes that describe a test type for test-all-scream +# This module contains classes that describe a test type for test-all-eamxx # Each test type (here represented by a TestProperty object) can have different # flags, build type, profiling, cmake options, etc. # The function "test_factory" can be used to get a list of test types from @@ -12,16 +12,16 @@ class TestProperty(object): ############################################################################### """ - Parent class of predefined test types for SCREAM standalone. test-all-scream + Parent class of predefined test types for SCREAM standalone. test-all-eamxx offers a number of customization points, but you may need to just use - cmake if you need maximal customization. You can run test-all-scream --dry-run + cmake if you need maximal customization. You can run test-all-eamxx --dry-run to get the corresponding cmake command which can then be used as a starting point for making your own cmake command. """ def __init__(self, longname, description, cmake_args, uses_baselines=True, on_by_default=True, default_test_len=None): - # What the user uses to select tests via test-all-scream CLI. + # What the user uses to select tests via test-all-eamxx CLI. # Should also match the class name when converted to caps self.shortname = type(self).__name__.lower() diff --git a/components/eamxx/src/control/atmosphere_driver.cpp b/components/eamxx/src/control/atmosphere_driver.cpp index 65a09df0f1c7..1b7e697ddc76 100644 --- a/components/eamxx/src/control/atmosphere_driver.cpp +++ b/components/eamxx/src/control/atmosphere_driver.cpp @@ -4,14 +4,14 @@ #include "physics/share/physics_constants.hpp" -#include "share/scream_config.hpp" +#include "share/eamxx_config.hpp" #include "share/atm_process/atmosphere_process_group.hpp" #include "share/atm_process/atmosphere_process_dag.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/util/scream_timing.hpp" -#include "share/util/scream_utils.hpp" -#include "share/io/scream_io_utils.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/util/eamxx_timing.hpp" +#include "share/util/eamxx_utils.hpp" +#include "share/io/eamxx_io_utils.hpp" #include "share/property_checks/mass_and_energy_column_conservation_check.hpp" #include "ekat/ekat_assert.hpp" @@ -91,7 +91,7 @@ namespace control { * - for atm proc -> src/share/atm_process/atmosphere_process.hpp * - for atm proc group -> src/share/atm_process/atmosphere_process_group.hpp * - for scorpio input/output -> src/share/io/scorpio_[input|output].hpp - * - for output manager -> src/share/io/scream_output_manager.hpp + * - for output manager -> src/share/io/eamxx_output_manager.hpp */ AtmosphereDriver:: @@ -1783,7 +1783,7 @@ void AtmosphereDriver::finalize ( /* inputs? */ ) { // Write all timers to file, and possibly finalize gptl if (not m_gptl_externally_handled) { - write_timers_to_file (m_atm_comm,"scream_timing.txt"); + write_timers_to_file (m_atm_comm,"eamxx_timing.txt"); finalize_gptl(); } diff --git a/components/eamxx/src/control/atmosphere_driver.hpp b/components/eamxx/src/control/atmosphere_driver.hpp index eb305409666c..4b60f25d8e07 100644 --- a/components/eamxx/src/control/atmosphere_driver.hpp +++ b/components/eamxx/src/control/atmosphere_driver.hpp @@ -4,9 +4,9 @@ #include "control/surface_coupling_utils.hpp" #include "share/field/field_manager.hpp" #include "share/grid/grids_manager.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" #include "share/atm_process/ATMBufferManager.hpp" #include "share/atm_process/SCDataManager.hpp" diff --git a/components/eamxx/src/control/atmosphere_surface_coupling_exporter.cpp b/components/eamxx/src/control/atmosphere_surface_coupling_exporter.cpp index 5b5ea600a857..b4264dd7243c 100644 --- a/components/eamxx/src/control/atmosphere_surface_coupling_exporter.cpp +++ b/components/eamxx/src/control/atmosphere_surface_coupling_exporter.cpp @@ -363,7 +363,7 @@ void SurfaceCouplingExporter::set_from_file_exports(const int dt) // ========================================================================================= // This compute_eamxx_exports routine handles all export variables that are derived from the EAMxx state. // Important! This setup assumes the numerical order of export_cpl_indices as listed in -// /src/mct_coupling/scream_cpl_indices.F90 +// /src/mct_coupling/eamxx_cpl_indices.F90 // // If this order is changed or a new variable is added it is important to update the corresponding // index query in the below. diff --git a/components/eamxx/src/control/atmosphere_surface_coupling_exporter.hpp b/components/eamxx/src/control/atmosphere_surface_coupling_exporter.hpp index ca7772fdf1be..b28bc6407771 100644 --- a/components/eamxx/src/control/atmosphere_surface_coupling_exporter.hpp +++ b/components/eamxx/src/control/atmosphere_surface_coupling_exporter.hpp @@ -4,7 +4,7 @@ #include "surface_coupling_utils.hpp" #include "share/atm_process/atmosphere_process.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/util/eamxx_time_interpolation.hpp" #include "share/atm_process/ATMBufferManager.hpp" #include "share/atm_process/SCDataManager.hpp" diff --git a/components/eamxx/src/control/surface_coupling_utils.hpp b/components/eamxx/src/control/surface_coupling_utils.hpp index 9872b159b825..2524fbfa7fba 100644 --- a/components/eamxx/src/control/surface_coupling_utils.hpp +++ b/components/eamxx/src/control/surface_coupling_utils.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_SURFACE_COUPLING_UTILS_HPP #define SCREAM_SURFACE_COUPLING_UTILS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "share/field/field.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/aerocom_cld.cpp b/components/eamxx/src/diagnostics/aerocom_cld.cpp index cca55f6c19f1..2e35e2ea7d4f 100644 --- a/components/eamxx/src/diagnostics/aerocom_cld.cpp +++ b/components/eamxx/src/diagnostics/aerocom_cld.cpp @@ -4,7 +4,7 @@ #include #include "diagnostics/aerocom_cld_util.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/aodvis.cpp b/components/eamxx/src/diagnostics/aodvis.cpp index ac16c0033730..4d6bbf1e75ee 100644 --- a/components/eamxx/src/diagnostics/aodvis.cpp +++ b/components/eamxx/src/diagnostics/aodvis.cpp @@ -2,7 +2,7 @@ #include -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_universal_constants.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/aodvis.hpp b/components/eamxx/src/diagnostics/aodvis.hpp index 20dc58ae8f25..b6661dbeba7a 100644 --- a/components/eamxx/src/diagnostics/aodvis.hpp +++ b/components/eamxx/src/diagnostics/aodvis.hpp @@ -2,7 +2,7 @@ #define EAMXX_AODVIS_DIAG #include "share/atm_process/atmosphere_diagnostic.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/atm_backtend.cpp b/components/eamxx/src/diagnostics/atm_backtend.cpp index 4b147de2d6c8..935b329d9fc1 100644 --- a/components/eamxx/src/diagnostics/atm_backtend.cpp +++ b/components/eamxx/src/diagnostics/atm_backtend.cpp @@ -2,7 +2,7 @@ #include -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_universal_constants.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/atm_backtend.hpp b/components/eamxx/src/diagnostics/atm_backtend.hpp index a8bd72883dbe..36a04b10529d 100644 --- a/components/eamxx/src/diagnostics/atm_backtend.hpp +++ b/components/eamxx/src/diagnostics/atm_backtend.hpp @@ -2,7 +2,7 @@ #define EAMXX_ATM_BACKTEND_DIAG_HPP #include "share/atm_process/atmosphere_diagnostic.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/atm_density.cpp b/components/eamxx/src/diagnostics/atm_density.cpp index 8f1e8b77b54a..abeaa123f86d 100644 --- a/components/eamxx/src/diagnostics/atm_density.cpp +++ b/components/eamxx/src/diagnostics/atm_density.cpp @@ -1,5 +1,5 @@ #include "diagnostics/atm_density.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/dry_static_energy.cpp b/components/eamxx/src/diagnostics/dry_static_energy.cpp index 8b0264dd0532..1ca6b3c11763 100644 --- a/components/eamxx/src/diagnostics/dry_static_energy.cpp +++ b/components/eamxx/src/diagnostics/dry_static_energy.cpp @@ -1,5 +1,5 @@ #include "diagnostics/dry_static_energy.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include diff --git a/components/eamxx/src/diagnostics/dry_static_energy.hpp b/components/eamxx/src/diagnostics/dry_static_energy.hpp index ab25e042add7..5801cb5ed212 100644 --- a/components/eamxx/src/diagnostics/dry_static_energy.hpp +++ b/components/eamxx/src/diagnostics/dry_static_energy.hpp @@ -3,7 +3,7 @@ #include "share/atm_process/atmosphere_diagnostic.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include namespace scream diff --git a/components/eamxx/src/diagnostics/exner.cpp b/components/eamxx/src/diagnostics/exner.cpp index 16f0d5da4491..afb1a2e48655 100644 --- a/components/eamxx/src/diagnostics/exner.cpp +++ b/components/eamxx/src/diagnostics/exner.cpp @@ -1,5 +1,5 @@ #include "diagnostics/exner.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/field_at_pressure_level.cpp b/components/eamxx/src/diagnostics/field_at_pressure_level.cpp index 78ed921e7585..ac29e9aca36f 100644 --- a/components/eamxx/src/diagnostics/field_at_pressure_level.cpp +++ b/components/eamxx/src/diagnostics/field_at_pressure_level.cpp @@ -1,5 +1,5 @@ #include "diagnostics/field_at_pressure_level.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_universal_constants.hpp" #include "ekat/std_meta/ekat_std_utils.hpp" #include "ekat/util/ekat_upper_bound.hpp" diff --git a/components/eamxx/src/diagnostics/potential_temperature.hpp b/components/eamxx/src/diagnostics/potential_temperature.hpp index 0ac1a1201d8f..044458bbbf51 100644 --- a/components/eamxx/src/diagnostics/potential_temperature.hpp +++ b/components/eamxx/src/diagnostics/potential_temperature.hpp @@ -2,7 +2,7 @@ #define EAMXX_POTENTIAL_TEMP_DIAGNOSTIC_HPP #include "share/atm_process/atmosphere_diagnostic.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/sea_level_pressure.cpp b/components/eamxx/src/diagnostics/sea_level_pressure.cpp index 47cf709bafe2..d0cb5a29852a 100644 --- a/components/eamxx/src/diagnostics/sea_level_pressure.cpp +++ b/components/eamxx/src/diagnostics/sea_level_pressure.cpp @@ -1,5 +1,5 @@ #include "diagnostics/sea_level_pressure.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/aerocom_cld_test.cpp b/components/eamxx/src/diagnostics/tests/aerocom_cld_test.cpp index f2a686ca136c..eb8a3d097a53 100644 --- a/components/eamxx/src/diagnostics/tests/aerocom_cld_test.cpp +++ b/components/eamxx/src/diagnostics/tests/aerocom_cld_test.cpp @@ -3,7 +3,7 @@ #include "diagnostics/register_diagnostics.hpp" #include "share/field/field_utils.hpp" #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/aodvis_test.cpp b/components/eamxx/src/diagnostics/tests/aodvis_test.cpp index 8090a9300fd9..887b9930d420 100644 --- a/components/eamxx/src/diagnostics/tests/aodvis_test.cpp +++ b/components/eamxx/src/diagnostics/tests/aodvis_test.cpp @@ -4,8 +4,8 @@ #include "diagnostics/register_diagnostics.hpp" #include "share/field/field_utils.hpp" #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_universal_constants.hpp" namespace scream { std::shared_ptr create_gm(const ekat::Comm &comm, const int ncols, diff --git a/components/eamxx/src/diagnostics/tests/atm_backtend_test.cpp b/components/eamxx/src/diagnostics/tests/atm_backtend_test.cpp index 47086b5ddedc..49836f7e4e5e 100644 --- a/components/eamxx/src/diagnostics/tests/atm_backtend_test.cpp +++ b/components/eamxx/src/diagnostics/tests/atm_backtend_test.cpp @@ -2,8 +2,8 @@ #include "diagnostics/register_diagnostics.hpp" #include "share/field/field_utils.hpp" #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_universal_constants.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/atm_density_test.cpp b/components/eamxx/src/diagnostics/tests/atm_density_test.cpp index 6ef7e50abd2f..5ef0c4bce4c5 100644 --- a/components/eamxx/src/diagnostics/tests/atm_density_test.cpp +++ b/components/eamxx/src/diagnostics/tests/atm_density_test.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/dry_static_energy_test.cpp b/components/eamxx/src/diagnostics/tests/dry_static_energy_test.cpp index d7cf0f163ffc..39cb03e48eeb 100644 --- a/components/eamxx/src/diagnostics/tests/dry_static_energy_test.cpp +++ b/components/eamxx/src/diagnostics/tests/dry_static_energy_test.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/exner_test.cpp b/components/eamxx/src/diagnostics/tests/exner_test.cpp index 53c7c25e9230..105f60b026fe 100644 --- a/components/eamxx/src/diagnostics/tests/exner_test.cpp +++ b/components/eamxx/src/diagnostics/tests/exner_test.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/field_at_height_tests.cpp b/components/eamxx/src/diagnostics/tests/field_at_height_tests.cpp index 6e071e4b2013..c1f1614501fc 100644 --- a/components/eamxx/src/diagnostics/tests/field_at_height_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/field_at_height_tests.cpp @@ -5,7 +5,7 @@ #include "share/grid/mesh_free_grids_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/field_at_level_tests.cpp b/components/eamxx/src/diagnostics/tests/field_at_level_tests.cpp index b7867c3ac726..aa09ba7fb46b 100644 --- a/components/eamxx/src/diagnostics/tests/field_at_level_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/field_at_level_tests.cpp @@ -4,7 +4,7 @@ #include "share/grid/mesh_free_grids_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/field_at_pressure_level_tests.cpp b/components/eamxx/src/diagnostics/tests/field_at_pressure_level_tests.cpp index ba733980cade..4303483d4f23 100644 --- a/components/eamxx/src/diagnostics/tests/field_at_pressure_level_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/field_at_pressure_level_tests.cpp @@ -6,7 +6,7 @@ #include "share/grid/mesh_free_grids_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/horiz_avg_test.cpp b/components/eamxx/src/diagnostics/tests/horiz_avg_test.cpp index 9b9ec2022fa0..009ccfb1b374 100644 --- a/components/eamxx/src/diagnostics/tests/horiz_avg_test.cpp +++ b/components/eamxx/src/diagnostics/tests/horiz_avg_test.cpp @@ -2,8 +2,8 @@ #include "diagnostics/register_diagnostics.hpp" #include "share/field/field_utils.hpp" #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_universal_constants.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/longwave_cloud_forcing_tests.cpp b/components/eamxx/src/diagnostics/tests/longwave_cloud_forcing_tests.cpp index 9469ac27f61c..6a58e1e0b422 100644 --- a/components/eamxx/src/diagnostics/tests/longwave_cloud_forcing_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/longwave_cloud_forcing_tests.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/number_paths_tests.cpp b/components/eamxx/src/diagnostics/tests/number_paths_tests.cpp index 1fb23ef94228..ff8545a635e8 100644 --- a/components/eamxx/src/diagnostics/tests/number_paths_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/number_paths_tests.cpp @@ -7,9 +7,9 @@ #include "physics/share/physics_constants.hpp" #include "share/field/field_utils.hpp" #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_common_physics_functions.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_utils.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/tests/potential_temperature_test.cpp b/components/eamxx/src/diagnostics/tests/potential_temperature_test.cpp index 1f584ec7e71c..f256bcce75af 100644 --- a/components/eamxx/src/diagnostics/tests/potential_temperature_test.cpp +++ b/components/eamxx/src/diagnostics/tests/potential_temperature_test.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/precip_surf_mass_flux_tests.cpp b/components/eamxx/src/diagnostics/tests/precip_surf_mass_flux_tests.cpp index 997445860876..602d240e9383 100644 --- a/components/eamxx/src/diagnostics/tests/precip_surf_mass_flux_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/precip_surf_mass_flux_tests.cpp @@ -5,7 +5,7 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/field/field_utils.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/diagnostics/tests/relative_humidity_tests.cpp b/components/eamxx/src/diagnostics/tests/relative_humidity_tests.cpp index bb11fa794900..0d3ee2d8b9e9 100644 --- a/components/eamxx/src/diagnostics/tests/relative_humidity_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/relative_humidity_tests.cpp @@ -7,8 +7,8 @@ #include "physics/share/physics_constants.hpp" #include "physics/share/physics_functions.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/sea_level_pressure_test.cpp b/components/eamxx/src/diagnostics/tests/sea_level_pressure_test.cpp index 8ed25938812e..8845563cde4a 100644 --- a/components/eamxx/src/diagnostics/tests/sea_level_pressure_test.cpp +++ b/components/eamxx/src/diagnostics/tests/sea_level_pressure_test.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/shortwave_cloud_forcing_tests.cpp b/components/eamxx/src/diagnostics/tests/shortwave_cloud_forcing_tests.cpp index 94d719c1884a..c612efbe9a72 100644 --- a/components/eamxx/src/diagnostics/tests/shortwave_cloud_forcing_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/shortwave_cloud_forcing_tests.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/surf_upward_latent_heat_flux_tests.cpp b/components/eamxx/src/diagnostics/tests/surf_upward_latent_heat_flux_tests.cpp index f233bfaf1713..3bfe47f3b41b 100644 --- a/components/eamxx/src/diagnostics/tests/surf_upward_latent_heat_flux_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/surf_upward_latent_heat_flux_tests.cpp @@ -6,7 +6,7 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/field/field_utils.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/diagnostics/tests/vapor_flux_tests.cpp b/components/eamxx/src/diagnostics/tests/vapor_flux_tests.cpp index bcd7efc8bb87..511834287ecd 100644 --- a/components/eamxx/src/diagnostics/tests/vapor_flux_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/vapor_flux_tests.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/diagnostics/tests/virtual_temperature_test.cpp b/components/eamxx/src/diagnostics/tests/virtual_temperature_test.cpp index 74a934a8c327..e9bde5ba4e51 100644 --- a/components/eamxx/src/diagnostics/tests/virtual_temperature_test.cpp +++ b/components/eamxx/src/diagnostics/tests/virtual_temperature_test.cpp @@ -6,8 +6,8 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/diagnostics/tests/water_path_tests.cpp b/components/eamxx/src/diagnostics/tests/water_path_tests.cpp index f78615f0cfae..2201f2b3cf2a 100644 --- a/components/eamxx/src/diagnostics/tests/water_path_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/water_path_tests.cpp @@ -5,9 +5,9 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_utils.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/field/field_utils.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/diagnostics/tests/wind_speed_tests.cpp b/components/eamxx/src/diagnostics/tests/wind_speed_tests.cpp index 1298536c4232..59601868efc0 100644 --- a/components/eamxx/src/diagnostics/tests/wind_speed_tests.cpp +++ b/components/eamxx/src/diagnostics/tests/wind_speed_tests.cpp @@ -2,7 +2,7 @@ #include "diagnostics/register_diagnostics.hpp" #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/field/field_utils.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/vertical_layer.cpp b/components/eamxx/src/diagnostics/vertical_layer.cpp index f9ff526dfcd8..470048c25c9c 100644 --- a/components/eamxx/src/diagnostics/vertical_layer.cpp +++ b/components/eamxx/src/diagnostics/vertical_layer.cpp @@ -1,8 +1,8 @@ #include "diagnostics/vertical_layer.hpp" #include "physics/share/physics_constants.hpp" -#include "share/util/scream_common_physics_functions.hpp" -#include "share/util/scream_column_ops.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" +#include "share/util/eamxx_column_ops.hpp" namespace scream { diff --git a/components/eamxx/src/diagnostics/virtual_temperature.hpp b/components/eamxx/src/diagnostics/virtual_temperature.hpp index 9e920a40fa2f..ff8d2baa8612 100644 --- a/components/eamxx/src/diagnostics/virtual_temperature.hpp +++ b/components/eamxx/src/diagnostics/virtual_temperature.hpp @@ -2,7 +2,7 @@ #define EAMXX_VIRTUAL_TEMP_DIAGNOSTIC_HPP #include "share/atm_process/atmosphere_diagnostic.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp b/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp index a6c97a8ec52b..d3560e470540 100644 --- a/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp +++ b/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp @@ -27,10 +27,10 @@ #include "dynamics/homme/physics_dynamics_remapper.hpp" #include "dynamics/homme/homme_dimensions.hpp" #include "dynamics/homme/homme_dynamics_helpers.hpp" -#include "dynamics/homme/interface/scream_homme_interface.hpp" +#include "dynamics/homme/interface/eamxx_homme_interface.hpp" #include "physics/share/physics_constants.hpp" -#include "share/util/scream_common_physics_functions.hpp" -#include "share/util/scream_column_ops.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" +#include "share/util/eamxx_column_ops.hpp" #include "share/property_checks/field_lower_bound_check.hpp" // Ekat includes diff --git a/components/eamxx/src/dynamics/homme/eamxx_homme_rayleigh_friction.cpp b/components/eamxx/src/dynamics/homme/eamxx_homme_rayleigh_friction.cpp index 3b4cbdb711e6..b6bcf7653a80 100644 --- a/components/eamxx/src/dynamics/homme/eamxx_homme_rayleigh_friction.cpp +++ b/components/eamxx/src/dynamics/homme/eamxx_homme_rayleigh_friction.cpp @@ -1,7 +1,7 @@ #include "eamxx_homme_process_interface.hpp" // Scream includes -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" // Homme includes #include "dynamics/homme/homme_dimensions.hpp" diff --git a/components/eamxx/src/dynamics/homme/homme_grids_manager.cpp b/components/eamxx/src/dynamics/homme/homme_grids_manager.cpp index 7376e9af9dde..f0ed5e079c5e 100644 --- a/components/eamxx/src/dynamics/homme/homme_grids_manager.cpp +++ b/components/eamxx/src/dynamics/homme/homme_grids_manager.cpp @@ -1,5 +1,5 @@ #include "dynamics/homme/homme_grids_manager.hpp" -#include "dynamics/homme/interface/scream_homme_interface.hpp" +#include "dynamics/homme/interface/eamxx_homme_interface.hpp" #include "dynamics/homme/physics_dynamics_remapper.hpp" #include "dynamics/homme/homme_dynamics_helpers.hpp" diff --git a/components/eamxx/src/dynamics/homme/interface/scream_homme_interface.hpp b/components/eamxx/src/dynamics/homme/interface/eamxx_homme_interface.hpp similarity index 100% rename from components/eamxx/src/dynamics/homme/interface/scream_homme_interface.hpp rename to components/eamxx/src/dynamics/homme/interface/eamxx_homme_interface.hpp diff --git a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp index c262c29506cd..3c077cb6f66f 100644 --- a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp +++ b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.cpp @@ -11,7 +11,7 @@ #include "dynamics/homme/homme_dynamics_helpers.hpp" #include "dynamics/homme/homme_dimensions.hpp" #include "share/grid/se_grid.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" #include "ekat/ekat_pack_utils.hpp" #include "ekat/ekat_assert.hpp" diff --git a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp index 57f994670783..e56930fb880e 100644 --- a/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp +++ b/components/eamxx/src/dynamics/homme/physics_dynamics_remapper.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_PHYSICS_DYNAMICS_REMAPPER_HPP #define SCREAM_PHYSICS_DYNAMICS_REMAPPER_HPP -#include "share/scream_config.hpp" +#include "share/eamxx_config.hpp" #include "share/grid/remap/abstract_remapper.hpp" diff --git a/components/eamxx/src/dynamics/homme/tests/dyn_grid_io.cpp b/components/eamxx/src/dynamics/homme/tests/dyn_grid_io.cpp index 5a7f9a620967..07e5c044bd6a 100644 --- a/components/eamxx/src/dynamics/homme/tests/dyn_grid_io.cpp +++ b/components/eamxx/src/dynamics/homme/tests/dyn_grid_io.cpp @@ -4,23 +4,23 @@ #include "dynamics/homme/homme_grids_manager.hpp" #include "dynamics/homme/homme_dimensions.hpp" -#include "dynamics/homme/interface/scream_homme_interface.hpp" +#include "dynamics/homme/interface/eamxx_homme_interface.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/field/field_utils.hpp" #include "share/field/field_manager.hpp" #include "share/grid/grids_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "ekat/util/ekat_units.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/mpi/ekat_comm.hpp" extern "C" { -// These are specific C/F calls for these tests (i.e., not part of scream_homme_interface.hpp) +// These are specific C/F calls for these tests (i.e., not part of eamxx_homme_interface.hpp) void init_test_params_f90 (); void cleanup_test_f90 (); } diff --git a/components/eamxx/src/dynamics/homme/tests/homme_pd_remap_tests.cpp b/components/eamxx/src/dynamics/homme/tests/homme_pd_remap_tests.cpp index 71ca2bdef66d..7c0a8695acea 100644 --- a/components/eamxx/src/dynamics/homme/tests/homme_pd_remap_tests.cpp +++ b/components/eamxx/src/dynamics/homme/tests/homme_pd_remap_tests.cpp @@ -1,11 +1,11 @@ #include #include "dynamics/homme/physics_dynamics_remapper.hpp" -#include "dynamics/homme/interface/scream_homme_interface.hpp" +#include "dynamics/homme/interface/eamxx_homme_interface.hpp" #include "share/field/field.hpp" #include "share/grid/se_grid.hpp" #include "share/grid/point_grid.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "mpi/BoundaryExchange.hpp" #include "SimulationParams.hpp" @@ -22,7 +22,7 @@ #include extern "C" { -// These are specific C/F calls for these tests (i.e., not part of scream_homme_interface.hpp) +// These are specific C/F calls for these tests (i.e., not part of eamxx_homme_interface.hpp) void init_test_params_f90 (); void cleanup_test_f90 (); } diff --git a/components/eamxx/src/scream_config.h.in b/components/eamxx/src/eamxx_config.h.in similarity index 100% rename from components/eamxx/src/scream_config.h.in rename to components/eamxx/src/eamxx_config.h.in diff --git a/components/eamxx/src/mct_coupling/CMakeLists.txt b/components/eamxx/src/mct_coupling/CMakeLists.txt index 39f864e728aa..fa6ed7c6d0e4 100644 --- a/components/eamxx/src/mct_coupling/CMakeLists.txt +++ b/components/eamxx/src/mct_coupling/CMakeLists.txt @@ -20,11 +20,11 @@ if ("${SCREAM_DYNAMICS_DYCORE}" STREQUAL "HOMME") endif() set(ATM_SRC - scream_cxx_f90_interface.cpp + eamxx_cxx_f90_interface.cpp atm_comp_mct.F90 ekat_string_utils.F90 - scream_f2c_mod.F90 - scream_cpl_indices.F90 + eamxx_f2c_mod.F90 + eamxx_cpl_indices.F90 ${SCREAM_BASE_DIR}/../eam/src/physics/cam/physics_utils.F90 ) diff --git a/components/eamxx/src/mct_coupling/atm_comp_mct.F90 b/components/eamxx/src/mct_coupling/atm_comp_mct.F90 index a7a308fc4bf9..76d36bbf4cc6 100644 --- a/components/eamxx/src/mct_coupling/atm_comp_mct.F90 +++ b/components/eamxx/src/mct_coupling/atm_comp_mct.F90 @@ -71,7 +71,7 @@ module atm_comp_mct #if defined(SCREAM_SYSTEM_WORKAROUND) && (SCREAM_SYSTEM_WORKAROUND == 1) !=============================================================================== subroutine atm_init_hip_mct() - use scream_f2c_mod, only: scream_init_hip_atm + use eamxx_f2c_mod, only: scream_init_hip_atm call scream_init_hip_atm() @@ -81,9 +81,9 @@ end subroutine atm_init_hip_mct !=============================================================================== subroutine atm_init_mct( EClock, cdata, x2a, a2x, NLFilename ) use iso_c_binding, only: c_ptr, c_loc, c_int, c_char, c_bool - use scream_f2c_mod, only: scream_create_atm_instance, scream_setup_surface_coupling, & + use eamxx_f2c_mod, only: scream_create_atm_instance, scream_setup_surface_coupling, & scream_init_atm - use scream_cpl_indices, only: scream_set_cpl_indices, & + use eamxx_cpl_indices, only: scream_set_cpl_indices, & num_cpl_imports, num_scream_imports, & num_cpl_exports, num_scream_exports, & import_field_size, export_field_size, & @@ -304,7 +304,7 @@ end subroutine atm_init_mct !=============================================================================== subroutine atm_run_mct(EClock, cdata, x2a, a2x) use iso_c_binding, only: c_double - use scream_f2c_mod, only: scream_run + use eamxx_f2c_mod, only: scream_run #ifdef HAVE_MOAB use seq_flds_mod, only: seq_flds_a2x_fields, seq_flds_x2a_fields use shr_kind_mod , only: cxx=>shr_kind_cxx @@ -405,7 +405,7 @@ end subroutine atm_run_mct !=============================================================================== subroutine atm_final_mct(EClock, cdata, x2a, a2x) - use scream_f2c_mod, only: scream_finalize + use eamxx_f2c_mod, only: scream_finalize ! !INPUT/OUTPUT PARAMETERS: type(ESMF_Clock) ,intent(inout) :: EClock ! clock @@ -424,7 +424,7 @@ end subroutine atm_final_mct subroutine atm_Set_gsMap_mct( mpicom_atm, ATMID, GSMap_atm ) use iso_c_binding, only: c_int, c_loc - use scream_f2c_mod, only: scream_get_num_global_cols, scream_get_num_local_cols, & + use eamxx_f2c_mod, only: scream_get_num_global_cols, scream_get_num_local_cols, & scream_get_local_cols_gids use mct_mod, only: mct_gsMap_init !------------------------------------------------------------------- @@ -466,7 +466,7 @@ subroutine atm_domain_mct( lsize, gsMap_atm, dom_atm ) mct_gsMap_orderedPoints use seq_flds_mod, only: seq_flds_dom_coord, seq_flds_dom_other use shr_const_mod, only: SHR_CONST_PI - use scream_f2c_mod, only: scream_get_cols_latlon, scream_get_cols_area + use eamxx_f2c_mod, only: scream_get_cols_latlon, scream_get_cols_area !------------------------------------------------------------------- ! ! Arguments @@ -523,9 +523,9 @@ subroutine moab_atm_phys_scream() iMOAB_DefineTagStorage, iMOAB_SetIntTagStorage, iMOAB_SetDoubleTagStorage, & iMOAB_ResolveSharedEntities, iMOAB_UpdateMeshInfo use iso_c_binding, only: c_int, c_loc - use scream_f2c_mod, only: scream_get_num_global_cols, scream_get_num_local_cols, & + use eamxx_f2c_mod, only: scream_get_num_global_cols, scream_get_num_local_cols, & scream_get_local_cols_gids - use scream_f2c_mod, only: scream_get_cols_latlon, scream_get_cols_area + use eamxx_f2c_mod, only: scream_get_cols_latlon, scream_get_cols_area use seq_flds_mod, only: seq_flds_dom_fields use shr_kind_mod , only: r8 => shr_kind_r8, cl=>shr_kind_cl, cxx=>shr_kind_cxx use shr_const_mod, only: SHR_CONST_PI diff --git a/components/eamxx/src/mct_coupling/scream_cpl_indices.F90 b/components/eamxx/src/mct_coupling/eamxx_cpl_indices.F90 similarity index 99% rename from components/eamxx/src/mct_coupling/scream_cpl_indices.F90 rename to components/eamxx/src/mct_coupling/eamxx_cpl_indices.F90 index 9462750297fb..571b5894b766 100644 --- a/components/eamxx/src/mct_coupling/scream_cpl_indices.F90 +++ b/components/eamxx/src/mct_coupling/eamxx_cpl_indices.F90 @@ -1,4 +1,4 @@ -module scream_cpl_indices +module eamxx_cpl_indices use iso_c_binding, only: c_int, c_double, c_char, c_bool @@ -225,4 +225,4 @@ subroutine scream_set_cpl_indices (x2a, a2x) end subroutine scream_set_cpl_indices -end module scream_cpl_indices +end module eamxx_cpl_indices diff --git a/components/eamxx/src/mct_coupling/scream_cxx_f90_interface.cpp b/components/eamxx/src/mct_coupling/eamxx_cxx_f90_interface.cpp similarity index 98% rename from components/eamxx/src/mct_coupling/scream_cxx_f90_interface.cpp rename to components/eamxx/src/mct_coupling/eamxx_cxx_f90_interface.cpp index 8d2edd5ee9ff..f9f450b9b1fe 100644 --- a/components/eamxx/src/mct_coupling/scream_cxx_f90_interface.cpp +++ b/components/eamxx/src/mct_coupling/eamxx_cxx_f90_interface.cpp @@ -1,4 +1,4 @@ -#include "scream_config.h" +#include "eamxx_config.h" #include "share/atm_process/atmosphere_process.hpp" #include "control/atmosphere_driver.hpp" @@ -11,9 +11,9 @@ #include "mct_coupling/ScreamContext.hpp" #include "share/grid/point_grid.hpp" -#include "share/scream_session.hpp" -#include "share/scream_config.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_session.hpp" +#include "share/eamxx_config.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_parse_yaml_file.hpp" #include "ekat/logging/ekat_logger.hpp" @@ -126,7 +126,7 @@ void scream_create_atm_instance (const MPI_Fint f_comm, const int atm_id, auto& atm_comm = c.create(mpi_comm_c); // Initialize the scream session. - scream::initialize_scream_session(atm_comm.am_i_root()); + scream::initialize_eamxx_session(atm_comm.am_i_root()); std::string cal = calendar_name; if (cal=="NO_LEAP") { @@ -290,7 +290,7 @@ void scream_finalize (/* args ? */) { scream::cleanup_singleton(); // Finalize scream session - scream::finalize_scream_session(); + scream::finalize_eamxx_session(); }); } diff --git a/components/eamxx/src/mct_coupling/scream_f2c_mod.F90 b/components/eamxx/src/mct_coupling/eamxx_f2c_mod.F90 similarity index 99% rename from components/eamxx/src/mct_coupling/scream_f2c_mod.F90 rename to components/eamxx/src/mct_coupling/eamxx_f2c_mod.F90 index 434639e8f823..e8896773cd25 100644 --- a/components/eamxx/src/mct_coupling/scream_f2c_mod.F90 +++ b/components/eamxx/src/mct_coupling/eamxx_f2c_mod.F90 @@ -1,4 +1,4 @@ -module scream_f2c_mod +module eamxx_f2c_mod implicit none @@ -137,4 +137,4 @@ subroutine scream_get_local_cols_gids (gids) bind(c) end subroutine scream_get_local_cols_gids end interface -end module scream_f2c_mod +end module eamxx_f2c_mod diff --git a/components/eamxx/src/physics/cld_fraction/cld_fraction.cpp b/components/eamxx/src/physics/cld_fraction/cld_fraction.cpp index 48c334b82dba..1ee69f870fee 100644 --- a/components/eamxx/src/physics/cld_fraction/cld_fraction.cpp +++ b/components/eamxx/src/physics/cld_fraction/cld_fraction.cpp @@ -1,5 +1,5 @@ #include "physics/cld_fraction/cld_fraction_main_impl.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" namespace scream { namespace cld_fraction { diff --git a/components/eamxx/src/physics/cld_fraction/cld_fraction_functions.hpp b/components/eamxx/src/physics/cld_fraction/cld_fraction_functions.hpp index f86ccd8e05ba..b805706da2c5 100644 --- a/components/eamxx/src/physics/cld_fraction/cld_fraction_functions.hpp +++ b/components/eamxx/src/physics/cld_fraction/cld_fraction_functions.hpp @@ -1,7 +1,7 @@ #ifndef CLD_FRAC_FUNCTIONS_HPP #define CLD_FRAC_FUNCTIONS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack_kokkos.hpp" #include "ekat/ekat_workspace.hpp" diff --git a/components/eamxx/src/physics/cosp/cosp_functions.hpp b/components/eamxx/src/physics/cosp/cosp_functions.hpp index c4dc813c7025..c213c39d580b 100644 --- a/components/eamxx/src/physics/cosp/cosp_functions.hpp +++ b/components/eamxx/src/physics/cosp/cosp_functions.hpp @@ -1,6 +1,6 @@ #ifndef SCREAM_COSP_FUNCTIONS_HPP #define SCREAM_COSP_FUNCTIONS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" using scream::Real; extern "C" void cosp_c2f_init(int ncol, int nsubcol, int nlay); extern "C" void cosp_c2f_final(); diff --git a/components/eamxx/src/physics/cosp/eamxx_cosp.hpp b/components/eamxx/src/physics/cosp/eamxx_cosp.hpp index 117d50ef01fb..6d601c79b483 100644 --- a/components/eamxx/src/physics/cosp/eamxx_cosp.hpp +++ b/components/eamxx/src/physics/cosp/eamxx_cosp.hpp @@ -2,7 +2,7 @@ #define SCREAM_COSP_HPP #include "share/atm_process/atmosphere_process.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "ekat/ekat_parameter_list.hpp" #include diff --git a/components/eamxx/src/physics/iop_forcing/eamxx_iop_forcing_process_interface.hpp b/components/eamxx/src/physics/iop_forcing/eamxx_iop_forcing_process_interface.hpp index 7cec311a231c..aca7aa93b894 100644 --- a/components/eamxx/src/physics/iop_forcing/eamxx_iop_forcing_process_interface.hpp +++ b/components/eamxx/src/physics/iop_forcing/eamxx_iop_forcing_process_interface.hpp @@ -6,7 +6,7 @@ #include "share/atm_process/atmosphere_process.hpp" #include "share/atm_process/ATMBufferManager.hpp" -#include "share/util/scream_column_ops.hpp" +#include "share/util/eamxx_column_ops.hpp" #include "physics/share/physics_constants.hpp" diff --git a/components/eamxx/src/physics/mam/eamxx_mam_aci_functions.hpp b/components/eamxx/src/physics/mam/eamxx_mam_aci_functions.hpp index 0c2d9cae5fd4..9c694eb8c216 100644 --- a/components/eamxx/src/physics/mam/eamxx_mam_aci_functions.hpp +++ b/components/eamxx/src/physics/mam/eamxx_mam_aci_functions.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include namespace scream { diff --git a/components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.hpp b/components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.hpp index 532e30423014..4be81cfee498 100644 --- a/components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.hpp +++ b/components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include "readfiles/tracer_reader_utils.hpp" // For calling MAM4 processes #include diff --git a/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.cpp b/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.cpp index f6e3c400615a..321857a85787 100644 --- a/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.cpp +++ b/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.cpp @@ -3,7 +3,7 @@ #include #include -#include "scream_config.h" // for SCREAM_CIME_BUILD +#include "eamxx_config.h" // for SCREAM_CIME_BUILD #include "share/grid/point_grid.hpp" #include "share/io/scorpio_input.hpp" diff --git a/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.hpp b/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.hpp index 466cdcb9febe..e0fc874a0e83 100644 --- a/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.hpp +++ b/components/eamxx/src/physics/mam/eamxx_mam_optics_process_interface.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #ifndef KOKKOS_ENABLE_CUDA diff --git a/components/eamxx/src/physics/mam/mam_aerosol_optics_read_tables.hpp b/components/eamxx/src/physics/mam/mam_aerosol_optics_read_tables.hpp index a62954fe553a..7ce22cc24fd8 100644 --- a/components/eamxx/src/physics/mam/mam_aerosol_optics_read_tables.hpp +++ b/components/eamxx/src/physics/mam/mam_aerosol_optics_read_tables.hpp @@ -7,7 +7,7 @@ #include "share/grid/abstract_grid.hpp" #include "share/grid/grids_manager.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" // later to mam_coupling.hpp namespace scream::mam_coupling { diff --git a/components/eamxx/src/physics/mam/mam_coupling.hpp b/components/eamxx/src/physics/mam/mam_coupling.hpp index 265889155fd0..3522f16fdfd8 100644 --- a/components/eamxx/src/physics/mam/mam_coupling.hpp +++ b/components/eamxx/src/physics/mam/mam_coupling.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include // These data structures and functions are used to move data between EAMxx // and mam4xx. This file must be adjusted whenever the aerosol modes and diff --git a/components/eamxx/src/physics/mam/readfiles/find_season_index_utils.hpp b/components/eamxx/src/physics/mam/readfiles/find_season_index_utils.hpp index 2e930cc65cbf..e190321c22e7 100644 --- a/components/eamxx/src/physics/mam/readfiles/find_season_index_utils.hpp +++ b/components/eamxx/src/physics/mam/readfiles/find_season_index_utils.hpp @@ -5,7 +5,7 @@ #include #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" namespace scream::mam_coupling { diff --git a/components/eamxx/src/physics/mam/readfiles/fractional_land_use_impl.hpp b/components/eamxx/src/physics/mam/readfiles/fractional_land_use_impl.hpp index 59f17889829d..93cd40bcd8aa 100644 --- a/components/eamxx/src/physics/mam/readfiles/fractional_land_use_impl.hpp +++ b/components/eamxx/src/physics/mam/readfiles/fractional_land_use_impl.hpp @@ -3,8 +3,8 @@ #include "share/grid/remap/identity_remapper.hpp" #include "share/grid/remap/refining_remapper_p2p.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_timing.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_timing.hpp" namespace scream { namespace frac_landuse { diff --git a/components/eamxx/src/physics/mam/readfiles/marine_organics.hpp b/components/eamxx/src/physics/mam/readfiles/marine_organics.hpp index a04dff129f49..b05a42bf5ccd 100644 --- a/components/eamxx/src/physics/mam/readfiles/marine_organics.hpp +++ b/components/eamxx/src/physics/mam/readfiles/marine_organics.hpp @@ -22,7 +22,7 @@ struct marineOrganicsFunctions { // The current month int current_month = -1; // Julian Date for the beginning of the month, as defined in - // /src/share/util/scream_time_stamp.hpp + // /src/share/util/eamxx_time_stamp.hpp // See this file for definition of Julian Date. Real t_beg_month; // Current simulation Julian Date diff --git a/components/eamxx/src/physics/mam/readfiles/marine_organics_impl.hpp b/components/eamxx/src/physics/mam/readfiles/marine_organics_impl.hpp index 40e5e3ee1caf..5505cec5e1e3 100644 --- a/components/eamxx/src/physics/mam/readfiles/marine_organics_impl.hpp +++ b/components/eamxx/src/physics/mam/readfiles/marine_organics_impl.hpp @@ -3,8 +3,8 @@ #include "share/grid/remap/identity_remapper.hpp" #include "share/grid/remap/refining_remapper_p2p.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_timing.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_timing.hpp" namespace scream { namespace marine_organics { diff --git a/components/eamxx/src/physics/mam/readfiles/photo_table_utils.cpp b/components/eamxx/src/physics/mam/readfiles/photo_table_utils.cpp index ab5a05092745..474bdbe3a081 100644 --- a/components/eamxx/src/physics/mam/readfiles/photo_table_utils.cpp +++ b/components/eamxx/src/physics/mam/readfiles/photo_table_utils.cpp @@ -36,7 +36,7 @@ std::vector populate_etfphot_from_e3sm_case() { return etfphot_data; } -// This version uses scream_scorpio_interface to read netcdf files. +// This version uses eamxx_scorpio_interface to read netcdf files. mam4::mo_photo::PhotoTableData read_photo_table( const std::string &rsf_file, const std::string &xs_long_file) { // set up the lng_indexer and pht_alias_mult_1 views based on our diff --git a/components/eamxx/src/physics/mam/readfiles/soil_erodibility_impl.hpp b/components/eamxx/src/physics/mam/readfiles/soil_erodibility_impl.hpp index efd3d8a7c909..ac6bd164f4a5 100644 --- a/components/eamxx/src/physics/mam/readfiles/soil_erodibility_impl.hpp +++ b/components/eamxx/src/physics/mam/readfiles/soil_erodibility_impl.hpp @@ -3,8 +3,8 @@ #include "share/grid/remap/identity_remapper.hpp" #include "share/grid/remap/refining_remapper_p2p.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_timing.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_timing.hpp" namespace scream { namespace soil_erodibility { diff --git a/components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp b/components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp index e5c948a5dd26..8eeeb904700c 100644 --- a/components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp +++ b/components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp @@ -9,7 +9,7 @@ #include "share/grid/remap/identity_remapper.hpp" #include "share/grid/remap/refining_remapper_p2p.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" namespace scream::mam_coupling { @@ -96,7 +96,7 @@ struct TracerTimeState { // The current month int current_month = -1; // Julian Date for the beginning of the month, as defined in - // /src/share/util/scream_time_stamp.hpp + // /src/share/util/eamxx_time_stamp.hpp // See this file for definition of Julian Date. Real t_beg_month; // Current simulation Julian Date diff --git a/components/eamxx/src/physics/mam/srf_emission.hpp b/components/eamxx/src/physics/mam/srf_emission.hpp index 8dc5be1d05a6..6d7ba1832186 100644 --- a/components/eamxx/src/physics/mam/srf_emission.hpp +++ b/components/eamxx/src/physics/mam/srf_emission.hpp @@ -1,7 +1,7 @@ #ifndef SRF_EMISSION_HPP #define SRF_EMISSION_HPP -#include "share/util/scream_timing.hpp" +#include "share/util/eamxx_timing.hpp" namespace scream::mam_coupling { template @@ -17,7 +17,7 @@ struct srfEmissFunctions { // The current month int current_month = -1; // Julian Date for the beginning of the month, as defined in - // /src/share/util/scream_time_stamp.hpp + // /src/share/util/eamxx_time_stamp.hpp // See this file for definition of Julian Date. Real t_beg_month; // Current simulation Julian Date diff --git a/components/eamxx/src/physics/mam/srf_emission_impl.hpp b/components/eamxx/src/physics/mam/srf_emission_impl.hpp index 8c78408bcdca..34cbcfffa15a 100644 --- a/components/eamxx/src/physics/mam/srf_emission_impl.hpp +++ b/components/eamxx/src/physics/mam/srf_emission_impl.hpp @@ -3,7 +3,7 @@ #include "share/grid/remap/identity_remapper.hpp" #include "share/grid/remap/refining_remapper_p2p.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" namespace scream::mam_coupling { template diff --git a/components/eamxx/src/physics/ml_correction/eamxx_ml_correction_process_interface.hpp b/components/eamxx/src/physics/ml_correction/eamxx_ml_correction_process_interface.hpp index eaf5a98b9d33..c692c7ae25ac 100644 --- a/components/eamxx/src/physics/ml_correction/eamxx_ml_correction_process_interface.hpp +++ b/components/eamxx/src/physics/ml_correction/eamxx_ml_correction_process_interface.hpp @@ -9,13 +9,13 @@ #include "share/atm_process/atmosphere_process.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/util/ekat_lin_interp.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_output.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/mesh_free_grids_manager.hpp" #include "share/grid/point_grid.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" namespace scream { diff --git a/components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.cpp b/components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.cpp index 339cde6ae1b1..a4b3e6256f72 100644 --- a/components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.cpp +++ b/components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.cpp @@ -1,9 +1,9 @@ #include "eamxx_nudging_process_interface.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_universal_constants.hpp" #include "share/grid/remap/refining_remapper_p2p.hpp" -#include "share/util/scream_utils.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/util/eamxx_utils.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include #include diff --git a/components/eamxx/src/physics/nudging/tests/create_map_file.cpp b/components/eamxx/src/physics/nudging/tests/create_map_file.cpp index d8a67d84b27d..694b92429388 100644 --- a/components/eamxx/src/physics/nudging/tests/create_map_file.cpp +++ b/components/eamxx/src/physics/nudging/tests/create_map_file.cpp @@ -1,6 +1,6 @@ #include -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" TEST_CASE("create_map_file") { diff --git a/components/eamxx/src/physics/nudging/tests/nudging_tests_helpers.hpp b/components/eamxx/src/physics/nudging/tests/nudging_tests_helpers.hpp index ab0a8420ade0..051a2b2b27de 100644 --- a/components/eamxx/src/physics/nudging/tests/nudging_tests_helpers.hpp +++ b/components/eamxx/src/physics/nudging/tests/nudging_tests_helpers.hpp @@ -1,9 +1,9 @@ -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/grid/mesh_free_grids_manager.hpp" #include "share/field/field.hpp" #include "share/field/field_manager.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" namespace scream { diff --git a/components/eamxx/src/physics/p3/eamxx_p3_process_interface.hpp b/components/eamxx/src/physics/p3/eamxx_p3_process_interface.hpp index 839458c91c30..c396696884ec 100644 --- a/components/eamxx/src/physics/p3/eamxx_p3_process_interface.hpp +++ b/components/eamxx/src/physics/p3/eamxx_p3_process_interface.hpp @@ -4,7 +4,7 @@ #include "share/atm_process/atmosphere_process.hpp" #include "ekat/ekat_parameter_list.hpp" #include "physics/p3/p3_functions.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include diff --git a/components/eamxx/src/physics/p3/p3_functions.hpp b/components/eamxx/src/physics/p3/p3_functions.hpp index c6d69f9f081c..40af64812c13 100644 --- a/components/eamxx/src/physics/p3/p3_functions.hpp +++ b/components/eamxx/src/physics/p3/p3_functions.hpp @@ -3,7 +3,7 @@ #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack_kokkos.hpp" #include "ekat/ekat_workspace.hpp" diff --git a/components/eamxx/src/physics/p3/tests/infra/p3_data.hpp b/components/eamxx/src/physics/p3/tests/infra/p3_data.hpp index 1a5c232df9d0..0a6b82d96e89 100644 --- a/components/eamxx/src/physics/p3/tests/infra/p3_data.hpp +++ b/components/eamxx/src/physics/p3/tests/infra/p3_data.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_P3_DATA_HPP #define SCREAM_P3_DATA_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/src/physics/p3/tests/infra/p3_main_wrap.hpp b/components/eamxx/src/physics/p3/tests/infra/p3_main_wrap.hpp index c55007427cdb..3dbfa7b74ae8 100644 --- a/components/eamxx/src/physics/p3/tests/infra/p3_main_wrap.hpp +++ b/components/eamxx/src/physics/p3/tests/infra/p3_main_wrap.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_P3_MAIN_WRAP_HPP #define SCREAM_P3_MAIN_WRAP_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/src/physics/p3/tests/infra/p3_test_data.hpp b/components/eamxx/src/physics/p3/tests/infra/p3_test_data.hpp index cd441fa6ea55..c30f36e092b2 100644 --- a/components/eamxx/src/physics/p3/tests/infra/p3_test_data.hpp +++ b/components/eamxx/src/physics/p3/tests/infra/p3_test_data.hpp @@ -3,7 +3,7 @@ #include "physics/p3/p3_functions.hpp" #include "physics/share/physics_test_data.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_file_utils.hpp" #include diff --git a/components/eamxx/src/physics/p3/tests/infra/p3_unit_tests_common.hpp b/components/eamxx/src/physics/p3/tests/infra/p3_unit_tests_common.hpp index 232963ca7809..3fcaa030f813 100644 --- a/components/eamxx/src/physics/p3/tests/infra/p3_unit_tests_common.hpp +++ b/components/eamxx/src/physics/p3/tests/infra/p3_unit_tests_common.hpp @@ -1,8 +1,8 @@ #ifndef P3_UNIT_TESTS_COMMON_HPP #define P3_UNIT_TESTS_COMMON_HPP -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "p3_functions.hpp" #include "p3_data.hpp" #include "ekat/util/ekat_test_utils.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_autoconversion_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_autoconversion_unit_tests.cpp index be08e5b0d4f3..98c7ca9c102c 100644 --- a/components/eamxx/src/physics/p3/tests/p3_autoconversion_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_autoconversion_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_back_to_cell_average_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_back_to_cell_average_unit_tests.cpp index 121ef2664544..94cba79fdb72 100644 --- a/components/eamxx/src/physics/p3/tests/p3_back_to_cell_average_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_back_to_cell_average_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_calc_liq_relaxation_timescale_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_calc_liq_relaxation_timescale_unit_tests.cpp index cf302d78166c..2389d560c9e9 100644 --- a/components/eamxx/src/physics/p3/tests/p3_calc_liq_relaxation_timescale_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_calc_liq_relaxation_timescale_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_calc_rime_density_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_calc_rime_density_unit_tests.cpp index 9b7722895faf..a1594b6281e4 100644 --- a/components/eamxx/src/physics/p3/tests/p3_calc_rime_density_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_calc_rime_density_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_check_values_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_check_values_unit_tests.cpp index 90c8d28be932..4f720587ac30 100644 --- a/components/eamxx/src/physics/p3/tests/p3_check_values_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_check_values_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_cldliq_imm_freezing_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_cldliq_imm_freezing_unit_tests.cpp index bbaa95e87a03..9467dca3c353 100644 --- a/components/eamxx/src/physics/p3/tests/p3_cldliq_imm_freezing_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_cldliq_imm_freezing_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_cloud_rain_acc_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_cloud_rain_acc_unit_tests.cpp index 271f7e27bd61..c3ad418eeea8 100644 --- a/components/eamxx/src/physics/p3/tests/p3_cloud_rain_acc_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_cloud_rain_acc_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_cloud_sed_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_cloud_sed_unit_tests.cpp index b29bf11faa1c..ff547bc61fd0 100644 --- a/components/eamxx/src/physics/p3/tests/p3_cloud_sed_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_cloud_sed_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_droplet_self_coll_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_droplet_self_coll_unit_tests.cpp index f183bba65da6..f956e414172a 100644 --- a/components/eamxx/src/physics/p3/tests/p3_droplet_self_coll_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_droplet_self_coll_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_dsd2_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_dsd2_unit_tests.cpp index 9eb783b0eb62..a5f4cd36a00a 100644 --- a/components/eamxx/src/physics/p3/tests/p3_dsd2_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_dsd2_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_evaporate_rain_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_evaporate_rain_unit_tests.cpp index a84b1e0448ad..9883717a8118 100644 --- a/components/eamxx/src/physics/p3/tests/p3_evaporate_rain_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_evaporate_rain_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_find_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_find_unit_tests.cpp index 6e8e09226b7f..de88a48f8335 100644 --- a/components/eamxx/src/physics/p3/tests/p3_find_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_find_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_cldliq_wet_growth_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_cldliq_wet_growth_unit_tests.cpp index cca204b9b3a3..488fb80acd5f 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_cldliq_wet_growth_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_cldliq_wet_growth_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_collection_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_collection_unit_tests.cpp index 5d36ee79d546..92cb2213a1c6 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_collection_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_collection_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_deposition_sublimation_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_deposition_sublimation_tests.cpp index 9b261409ad09..ce4506201c8b 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_deposition_sublimation_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_deposition_sublimation_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_melting_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_melting_unit_tests.cpp index 4e24cc8be0e0..e7fce2a5652d 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_melting_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_melting_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_nucleation_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_nucleation_unit_tests.cpp index 7eeb4fa875ec..9d83f5c67b15 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_nucleation_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_nucleation_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_relaxation_timescale_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_relaxation_timescale_unit_tests.cpp index 59768bbf82c6..7ef4fa64f85f 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_relaxation_timescale_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_relaxation_timescale_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_sed_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_sed_unit_tests.cpp index faa6da1596ef..873aab1879cb 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_sed_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_sed_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_supersat_conservation_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_supersat_conservation_tests.cpp index db31bf8f25c5..8604adf9f397 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_supersat_conservation_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_supersat_conservation_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ice_tables_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ice_tables_unit_tests.cpp index 0c75d81ab6e6..71867c981669 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ice_tables_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ice_tables_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_incloud_mixingratios_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_incloud_mixingratios_unit_tests.cpp index eae1454c36a0..998d41670033 100644 --- a/components/eamxx/src/physics/p3/tests/p3_incloud_mixingratios_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_incloud_mixingratios_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_main_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_main_unit_tests.cpp index 3fdf6d2f9805..46d10faaa1c9 100644 --- a/components/eamxx/src/physics/p3/tests/p3_main_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_main_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_nc_conservation_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_nc_conservation_tests.cpp index 4cf38e534bf1..575d09012559 100644 --- a/components/eamxx/src/physics/p3/tests/p3_nc_conservation_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_nc_conservation_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_ni_conservation_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_ni_conservation_tests.cpp index dd2ca05eb481..6cfcfcc51bb6 100644 --- a/components/eamxx/src/physics/p3/tests/p3_ni_conservation_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_ni_conservation_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_nr_conservation_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_nr_conservation_tests.cpp index dc9a44af88d0..42770a572188 100644 --- a/components/eamxx/src/physics/p3/tests/p3_nr_conservation_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_nr_conservation_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_prevent_liq_supersaturation_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_prevent_liq_supersaturation_tests.cpp index 1b439aca7aac..21878421b162 100644 --- a/components/eamxx/src/physics/p3/tests/p3_prevent_liq_supersaturation_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_prevent_liq_supersaturation_tests.cpp @@ -4,7 +4,7 @@ #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" #include "p3_test_data.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "physics/share/physics_functions.hpp" #include "p3_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_rain_imm_freezing_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_rain_imm_freezing_unit_tests.cpp index 935842cb6d98..b7e99365fddd 100644 --- a/components/eamxx/src/physics/p3/tests/p3_rain_imm_freezing_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_rain_imm_freezing_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_rain_sed_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_rain_sed_unit_tests.cpp index ac34856eea62..21d2bfec0690 100644 --- a/components/eamxx/src/physics/p3/tests/p3_rain_sed_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_rain_sed_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_rain_self_collection_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_rain_self_collection_tests.cpp index 26440b6680bf..251a3825c330 100644 --- a/components/eamxx/src/physics/p3/tests/p3_rain_self_collection_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_rain_self_collection_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "p3_functions.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_run_and_cmp.cpp b/components/eamxx/src/physics/p3/tests/p3_run_and_cmp.cpp index f596b0910eb2..d2558bd1fc74 100644 --- a/components/eamxx/src/physics/p3/tests/p3_run_and_cmp.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_run_and_cmp.cpp @@ -1,6 +1,6 @@ -#include "share/scream_types.hpp" -#include "share/scream_session.hpp" -#include "share/util/scream_utils.hpp" +#include "share/eamxx_types.hpp" +#include "share/eamxx_session.hpp" +#include "share/util/eamxx_utils.hpp" #include "p3_main_wrap.hpp" #include "p3_test_data.hpp" @@ -321,7 +321,7 @@ int main (int argc, char** argv) { // Compute full baseline file name with precision. baseline_fn += "/p3_run_and_cmp.baseline" + std::to_string(sizeof(scream::Real)); - scream::initialize_scream_session(argc, argv); + scream::initialize_eamxx_session(argc, argv); { Baseline bln(timesteps, static_cast(dt), ncol, nlev, repeat, predict_nc, prescribed_ccn); if (generate) { @@ -336,7 +336,7 @@ int main (int argc, char** argv) { nerr += bln.run_and_cmp(baseline_fn, tol, no_baseline); } } - scream::finalize_scream_session(); + scream::finalize_eamxx_session(); return nerr != 0 ? 1 : 0; } diff --git a/components/eamxx/src/physics/p3/tests/p3_subgrid_variance_scaling_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_subgrid_variance_scaling_unit_tests.cpp index c58ac68b4a6a..5b5783ec8a68 100644 --- a/components/eamxx/src/physics/p3/tests/p3_subgrid_variance_scaling_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_subgrid_variance_scaling_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "p3_functions.hpp" #include "p3_test_data.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_table3_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_table3_unit_tests.cpp index 001a875c7e8c..a8c029f2431a 100644 --- a/components/eamxx/src/physics/p3/tests/p3_table3_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_table3_unit_tests.cpp @@ -5,7 +5,7 @@ #include "p3_functions.hpp" #include "p3_test_data.hpp" #include "p3_data.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_tables_setup.cpp b/components/eamxx/src/physics/p3/tests/p3_tables_setup.cpp index ad9b299a4d9e..37abd7552479 100644 --- a/components/eamxx/src/physics/p3/tests/p3_tables_setup.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_tables_setup.cpp @@ -1,14 +1,14 @@ // This is a tiny program that calls p3_init() to generate tables used by p3 #include "physics/p3/p3_functions.hpp" -#include "share/scream_session.hpp" +#include "share/eamxx_session.hpp" int main(int argc, char** argv) { using P3F = scream::p3::Functions; - scream::initialize_scream_session(argc, argv); + scream::initialize_eamxx_session(argc, argv); P3F::p3_init(/* write_tables = */ true, /* masterproc */ true); - scream::finalize_scream_session(); + scream::finalize_eamxx_session(); return 0; } diff --git a/components/eamxx/src/physics/p3/tests/p3_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_unit_tests.cpp index 13fa56ab1ea8..7c0c83cedf89 100644 --- a/components/eamxx/src/physics/p3/tests/p3_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/p3/tests/p3_upwind_unit_tests.cpp b/components/eamxx/src/physics/p3/tests/p3_upwind_unit_tests.cpp index 6e83a8ee4eaa..8c57e8bf4453 100644 --- a/components/eamxx/src/physics/p3/tests/p3_upwind_unit_tests.cpp +++ b/components/eamxx/src/physics/p3/tests/p3_upwind_unit_tests.cpp @@ -5,7 +5,7 @@ #include "p3_functions.hpp" #include "p3_test_data.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/physics/rrtmgp/CMakeLists.txt b/components/eamxx/src/physics/rrtmgp/CMakeLists.txt index 1989555b31ec..b75b44cc7f14 100644 --- a/components/eamxx/src/physics/rrtmgp/CMakeLists.txt +++ b/components/eamxx/src/physics/rrtmgp/CMakeLists.txt @@ -170,22 +170,22 @@ target_include_directories(rrtmgp PUBLIC ################################## set(SCREAM_RRTMGP_SOURCES_INTERFACE - scream_rrtmgp_interface.cpp + eamxx_rrtmgp_interface.cpp ) -add_library(scream_rrtmgp_interface ${SCREAM_RRTMGP_SOURCES_INTERFACE}) +add_library(eamxx_rrtmgp_interface ${SCREAM_RRTMGP_SOURCES_INTERFACE}) if (SCREAM_RRTMGP_ENABLE_YAKL) - yakl_process_target(scream_rrtmgp_interface) + yakl_process_target(eamxx_rrtmgp_interface) endif() # NOTE: cannot use 'PUBLIC' in target_link_libraries, # since yakl_process_target already used it # with the "plain" signature find_library(NETCDF_C netcdf HINTS ${NetCDF_C_PATH}/lib) -target_link_libraries(scream_rrtmgp_interface ${NETCDF_C} rrtmgp scream_share Kokkos::kokkos) -target_include_directories(scream_rrtmgp_interface PUBLIC +target_link_libraries(eamxx_rrtmgp_interface ${NETCDF_C} rrtmgp scream_share Kokkos::kokkos) +target_include_directories(eamxx_rrtmgp_interface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_include_directories(scream_rrtmgp_interface SYSTEM PUBLIC +target_include_directories(eamxx_rrtmgp_interface SYSTEM PUBLIC ${NetCDF_C_PATH}/include ${EAM_RRTMGP_DIR}/external) @@ -199,7 +199,7 @@ set(SCREAM_RRTMGP_SOURCES ) add_library(scream_rrtmgp ${SCREAM_RRTMGP_SOURCES}) -target_link_libraries(scream_rrtmgp PUBLIC scream_share physics_share csm_share scream_rrtmgp_interface Kokkos::kokkos) +target_link_libraries(scream_rrtmgp PUBLIC scream_share physics_share csm_share eamxx_rrtmgp_interface Kokkos::kokkos) set_target_properties(scream_rrtmgp PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/modules ) diff --git a/components/eamxx/src/physics/rrtmgp/scream_rrtmgp_interface.cpp b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_interface.cpp similarity index 99% rename from components/eamxx/src/physics/rrtmgp/scream_rrtmgp_interface.cpp rename to components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_interface.cpp index 9796ce49dbe0..e59d11dc2f83 100644 --- a/components/eamxx/src/physics/rrtmgp/scream_rrtmgp_interface.cpp +++ b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_interface.cpp @@ -1,4 +1,4 @@ -#include "scream_rrtmgp_interface.hpp" +#include "eamxx_rrtmgp_interface.hpp" #include "physics/share/physics_constants.hpp" namespace scream { diff --git a/components/eamxx/src/physics/rrtmgp/scream_rrtmgp_interface.hpp b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_interface.hpp similarity index 100% rename from components/eamxx/src/physics/rrtmgp/scream_rrtmgp_interface.hpp rename to components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_interface.hpp diff --git a/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.cpp b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.cpp index 9a2f08400e8a..27fbe3d79599 100644 --- a/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.cpp +++ b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.cpp @@ -1,14 +1,14 @@ -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp" #include "physics/rrtmgp/rrtmgp_utils.hpp" #include "physics/rrtmgp/shr_orb_mod_c2f.hpp" -#include "physics/share/scream_trcmix.hpp" +#include "physics/share/eamxx_trcmix.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/util/eamxx_fv_phys_rrtmgp_active_gases_workaround.hpp" #include "share/property_checks/field_within_interval_check.hpp" -#include "share/util/scream_common_physics_functions.hpp" -#include "share/util/scream_column_ops.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" +#include "share/util/eamxx_column_ops.hpp" #include "ekat/ekat_assert.hpp" diff --git a/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp index 02a047cce598..c7c11c9df841 100644 --- a/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp +++ b/components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp @@ -2,7 +2,7 @@ #define SCREAM_RRTMGP_RADIATION_HPP #include "cpp/rrtmgp/mo_gas_concentrations.h" -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "share/atm_process/atmosphere_process.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/util/ekat_string_utils.hpp" diff --git a/components/eamxx/src/physics/rrtmgp/rrtmgp_test_utils.hpp b/components/eamxx/src/physics/rrtmgp/rrtmgp_test_utils.hpp index b1cb1f424ec1..576cbe6d7d1b 100644 --- a/components/eamxx/src/physics/rrtmgp/rrtmgp_test_utils.hpp +++ b/components/eamxx/src/physics/rrtmgp/rrtmgp_test_utils.hpp @@ -2,7 +2,7 @@ #define RRTMGP_TEST_UTILS_HPP #include "cpp/extensions/cloud_optics/mo_cloud_optics.h" -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "cpp/rrtmgp/mo_gas_concentrations.h" #include "cpp/rte/mo_fluxes.h" #include "cpp/extensions/cloud_optics/mo_cloud_optics.h" diff --git a/components/eamxx/src/physics/rrtmgp/tests/generate_baseline.cpp b/components/eamxx/src/physics/rrtmgp/tests/generate_baseline.cpp index 9f59edcc116e..7d107aec284b 100644 --- a/components/eamxx/src/physics/rrtmgp/tests/generate_baseline.cpp +++ b/components/eamxx/src/physics/rrtmgp/tests/generate_baseline.cpp @@ -1,7 +1,7 @@ -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "physics/rrtmgp/rrtmgp_test_utils.hpp" -#include "share/scream_types.hpp" -#include "share/scream_session.hpp" +#include "share/eamxx_types.hpp" +#include "share/eamxx_session.hpp" // From RRTMGP submodule #include diff --git a/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_tests.cpp b/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_tests.cpp index 165272a237d4..bc5d9eca70f1 100644 --- a/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_tests.cpp +++ b/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_tests.cpp @@ -1,8 +1,8 @@ -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "physics/rrtmgp/rrtmgp_test_utils.hpp" -#include "share/scream_types.hpp" -#include "share/scream_session.hpp" +#include "share/eamxx_types.hpp" +#include "share/eamxx_session.hpp" #include "cpp/rrtmgp/mo_gas_concentrations.h" #include "examples/all-sky/mo_garand_atmos_io.h" diff --git a/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_unit_tests.cpp b/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_unit_tests.cpp index f716e64791b8..b179533b4eaf 100644 --- a/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_unit_tests.cpp +++ b/components/eamxx/src/physics/rrtmgp/tests/rrtmgp_unit_tests.cpp @@ -1,6 +1,6 @@ #include "catch2/catch.hpp" #include "physics/rrtmgp/rrtmgp_utils.hpp" -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "physics/share/physics_constants.hpp" #include "physics/rrtmgp/shr_orb_mod_c2f.hpp" #include "mo_load_coefficients.h" diff --git a/components/eamxx/src/physics/share/CMakeLists.txt b/components/eamxx/src/physics/share/CMakeLists.txt index 52ec3e5c8a6a..18ff3844ea59 100644 --- a/components/eamxx/src/physics/share/CMakeLists.txt +++ b/components/eamxx/src/physics/share/CMakeLists.txt @@ -2,7 +2,7 @@ set(PHYSICS_SHARE_SRCS physics_share_f2c.F90 physics_share.cpp physics_test_data.cpp - scream_trcmix.cpp + eamxx_trcmix.cpp ) # Add ETI source files if not on CUDA/HIP diff --git a/components/eamxx/src/physics/share/scream_trcmix.cpp b/components/eamxx/src/physics/share/eamxx_trcmix.cpp similarity index 99% rename from components/eamxx/src/physics/share/scream_trcmix.cpp rename to components/eamxx/src/physics/share/eamxx_trcmix.cpp index fa4e8c4785d1..3daf7c26d6b7 100644 --- a/components/eamxx/src/physics/share/scream_trcmix.cpp +++ b/components/eamxx/src/physics/share/eamxx_trcmix.cpp @@ -1,4 +1,4 @@ -#include "scream_trcmix.hpp" +#include "eamxx_trcmix.hpp" #include "physics_constants.hpp" #include "ekat/util/ekat_math_utils.hpp" diff --git a/components/eamxx/src/physics/share/scream_trcmix.hpp b/components/eamxx/src/physics/share/eamxx_trcmix.hpp similarity index 97% rename from components/eamxx/src/physics/share/scream_trcmix.hpp rename to components/eamxx/src/physics/share/eamxx_trcmix.hpp index b0fd0fd0921e..3bf2f7746271 100644 --- a/components/eamxx/src/physics/share/scream_trcmix.hpp +++ b/components/eamxx/src/physics/share/eamxx_trcmix.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_TRCMIX_HPP #define SCREAM_TRCMIX_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" // // Bridge function to call trcmix from CXX diff --git a/components/eamxx/src/physics/share/physics_constants.hpp b/components/eamxx/src/physics/share/physics_constants.hpp index c8c638ca88c6..a02005e3497f 100644 --- a/components/eamxx/src/physics/share/physics_constants.hpp +++ b/components/eamxx/src/physics/share/physics_constants.hpp @@ -1,7 +1,7 @@ #ifndef PHYSICS_CONSTANTS_HPP #define PHYSICS_CONSTANTS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_string_utils.hpp" #include "ekat/ekat_scalar_traits.hpp" diff --git a/components/eamxx/src/physics/share/physics_functions.hpp b/components/eamxx/src/physics/share/physics_functions.hpp index 24ab66ecc5fb..73853a1f4e93 100644 --- a/components/eamxx/src/physics/share/physics_functions.hpp +++ b/components/eamxx/src/physics/share/physics_functions.hpp @@ -3,7 +3,7 @@ #include "physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack_kokkos.hpp" #include "ekat/ekat_workspace.hpp" diff --git a/components/eamxx/src/physics/share/physics_saturation.cpp b/components/eamxx/src/physics/share/physics_saturation.cpp index 09b997ca0b8d..6c8c4a4141dd 100644 --- a/components/eamxx/src/physics/share/physics_saturation.cpp +++ b/components/eamxx/src/physics/share/physics_saturation.cpp @@ -1,6 +1,6 @@ #include "physics_saturation_impl.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" namespace scream { namespace physics { diff --git a/components/eamxx/src/physics/share/physics_share.hpp b/components/eamxx/src/physics/share/physics_share.hpp index ae61281cf0a4..8a57c0bd05e8 100644 --- a/components/eamxx/src/physics/share/physics_share.hpp +++ b/components/eamxx/src/physics/share/physics_share.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_PHYSICS_SHARE_HPP #define SCREAM_PHYSICS_SHARE_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" namespace scream { diff --git a/components/eamxx/src/physics/share/physics_share_f2c.F90 b/components/eamxx/src/physics/share/physics_share_f2c.F90 index 885b026eac74..c22d676bfbda 100644 --- a/components/eamxx/src/physics/share/physics_share_f2c.F90 +++ b/components/eamxx/src/physics/share/physics_share_f2c.F90 @@ -2,7 +2,7 @@ module physics_share_f2c use iso_c_binding implicit none -#include "scream_config.f" +#include "eamxx_config.f" #ifdef SCREAM_DOUBLE_PRECISION # define c_real c_double #else diff --git a/components/eamxx/src/physics/share/physics_test_data.hpp b/components/eamxx/src/physics/share/physics_test_data.hpp index ddd7d77fa860..92522d499e68 100644 --- a/components/eamxx/src/physics/share/physics_test_data.hpp +++ b/components/eamxx/src/physics/share/physics_test_data.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_PHYSICS_TEST_DATA_HPP #define SCREAM_PHYSICS_TEST_DATA_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_math_utils.hpp" #include "ekat/ekat_assert.hpp" diff --git a/components/eamxx/src/physics/share/tests/physics_saturation_run_and_cmp.cpp b/components/eamxx/src/physics/share/tests/physics_saturation_run_and_cmp.cpp index 2fcb68f6337c..cdb2e2f59290 100644 --- a/components/eamxx/src/physics/share/tests/physics_saturation_run_and_cmp.cpp +++ b/components/eamxx/src/physics/share/tests/physics_saturation_run_and_cmp.cpp @@ -4,9 +4,9 @@ #include "physics/share/physics_saturation_impl.hpp" #include "physics_unit_tests_common.hpp" -#include "share/scream_types.hpp" -#include "share/scream_session.hpp" -#include "share/util/scream_utils.hpp" +#include "share/eamxx_types.hpp" +#include "share/eamxx_session.hpp" +#include "share/util/eamxx_utils.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_file_utils.hpp" @@ -317,7 +317,7 @@ int main (int argc, char** argv) { args.push_back(argv[i]); } - scream::initialize_scream_session(args.size(), args.data()); { + scream::initialize_eamxx_session(args.size(), args.data()); { TestSaturation bln; if (generate) { std::cout << "Generating to " << baseline_fn << "\n"; @@ -326,7 +326,7 @@ int main (int argc, char** argv) { printf("Comparing with %s at tol %1.1e\n", baseline_fn.c_str(), tol); nerr += bln.run_and_cmp(baseline_fn, tol); } - } scream::finalize_scream_session(); + } scream::finalize_eamxx_session(); return nerr != 0 ? 1 : 0; } diff --git a/components/eamxx/src/physics/share/tests/physics_test_data_unit_tests.cpp b/components/eamxx/src/physics/share/tests/physics_test_data_unit_tests.cpp index 178a3462db4b..3375844ec266 100644 --- a/components/eamxx/src/physics/share/tests/physics_test_data_unit_tests.cpp +++ b/components/eamxx/src/physics/share/tests/physics_test_data_unit_tests.cpp @@ -1,10 +1,10 @@ #include "catch2/catch.hpp" #include "physics/share/physics_test_data.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "physics_unit_tests_common.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { namespace physics { diff --git a/components/eamxx/src/physics/share/tests/physics_unit_tests_common.hpp b/components/eamxx/src/physics/share/tests/physics_unit_tests_common.hpp index d2f2d907cd5a..9774a19e23ac 100644 --- a/components/eamxx/src/physics/share/tests/physics_unit_tests_common.hpp +++ b/components/eamxx/src/physics/share/tests/physics_unit_tests_common.hpp @@ -3,7 +3,7 @@ #include "physics/share/physics_functions.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" namespace scream { namespace physics { diff --git a/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp b/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp index 1bbb17f84806..97fe098bfbc4 100644 --- a/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp +++ b/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp @@ -4,7 +4,7 @@ #include "share/property_checks/field_lower_bound_check.hpp" #include "share/property_checks/field_within_interval_check.hpp" -#include "scream_config.h" // for SCREAM_CIME_BUILD +#include "eamxx_config.h" // for SCREAM_CIME_BUILD namespace scream { diff --git a/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.hpp b/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.hpp index de38a7cac7f7..e3fd61703bf9 100644 --- a/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.hpp +++ b/components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.hpp @@ -4,7 +4,7 @@ #include "share/atm_process/atmosphere_process.hpp" #include "ekat/ekat_parameter_list.hpp" #include "physics/shoc/shoc_functions.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "share/atm_process/ATMBufferManager.hpp" #include diff --git a/components/eamxx/src/physics/shoc/impl/shoc_energy_fixer_impl.hpp b/components/eamxx/src/physics/shoc/impl/shoc_energy_fixer_impl.hpp index 324c672d2e35..d18a6387d48b 100644 --- a/components/eamxx/src/physics/shoc/impl/shoc_energy_fixer_impl.hpp +++ b/components/eamxx/src/physics/shoc/impl/shoc_energy_fixer_impl.hpp @@ -2,7 +2,7 @@ #define SHOC_ENERGY_FIXER_IMPL_HPP #include "shoc_functions.hpp" // for ETI only but harmless for GPU -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" namespace scream { diff --git a/components/eamxx/src/physics/shoc/shoc_functions.hpp b/components/eamxx/src/physics/shoc/shoc_functions.hpp index 8913ad53841b..5dceedbdd5d8 100644 --- a/components/eamxx/src/physics/shoc/shoc_functions.hpp +++ b/components/eamxx/src/physics/shoc/shoc_functions.hpp @@ -4,7 +4,7 @@ #include "physics/share/physics_constants.hpp" #include "physics/shoc/shoc_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack_kokkos.hpp" #include "ekat/ekat_workspace.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/infra/shoc_data.hpp b/components/eamxx/src/physics/shoc/tests/infra/shoc_data.hpp index 453ddbcda85f..adbd4914fea9 100644 --- a/components/eamxx/src/physics/shoc/tests/infra/shoc_data.hpp +++ b/components/eamxx/src/physics/shoc/tests/infra/shoc_data.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_SHOC_F90_HPP #define SCREAM_SHOC_F90_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/src/physics/shoc/tests/infra/shoc_main_wrap.hpp b/components/eamxx/src/physics/shoc/tests/infra/shoc_main_wrap.hpp index f11cf14992d7..d4e1f71fa3f4 100644 --- a/components/eamxx/src/physics/shoc/tests/infra/shoc_main_wrap.hpp +++ b/components/eamxx/src/physics/shoc/tests/infra/shoc_main_wrap.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_SHOC_MAIN_WRAP_HPP #define SCREAM_SHOC_MAIN_WRAP_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.cpp b/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.cpp index 2773c7ad220b..d7588ffe6cee 100644 --- a/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.cpp +++ b/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.cpp @@ -7,7 +7,7 @@ #include "ekat/ekat_pack_kokkos.hpp" #include "ekat/kokkos/ekat_subview_utils.hpp" -#include "share/util/scream_deep_copy.hpp" +#include "share/util/eamxx_deep_copy.hpp" #include diff --git a/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.hpp b/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.hpp index 2eb4236b4ed0..9676dd287699 100644 --- a/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.hpp +++ b/components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_SHOC_FUNCTIONS_F90_HPP #define SCREAM_SHOC_FUNCTIONS_F90_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "physics/share/physics_test_data.hpp" #include "shoc_functions.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/infra/shoc_unit_tests_common.hpp b/components/eamxx/src/physics/shoc/tests/infra/shoc_unit_tests_common.hpp index f7326c06df95..aee2c9e604d6 100644 --- a/components/eamxx/src/physics/shoc/tests/infra/shoc_unit_tests_common.hpp +++ b/components/eamxx/src/physics/shoc/tests/infra/shoc_unit_tests_common.hpp @@ -2,9 +2,9 @@ #define SHOC_UNIT_TESTS_COMMON_HPP #include "shoc_functions.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/util/ekat_file_utils.hpp" #include "ekat/util/ekat_test_utils.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_assumed_pdf_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_assumed_pdf_tests.cpp index 93926020d82f..41809959d6a7 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_assumed_pdf_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_assumed_pdf_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_brunt_length_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_brunt_length_tests.cpp index 21112e0d0a2f..c68dd06dc5c3 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_brunt_length_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_brunt_length_tests.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_check_length_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_check_length_tests.cpp index 404176bfe3ad..8a410ff00314 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_check_length_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_check_length_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_check_tke_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_check_tke_tests.cpp index 5aa189cfb5dc..562db42c48d2 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_check_tke_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_check_tke_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_clip_third_moms_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_clip_third_moms_tests.cpp index 4f254e65cc59..dac99a082fab 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_clip_third_moms_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_clip_third_moms_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_compute_diag_third_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_compute_diag_third_tests.cpp index fc52c64550ba..5a03ab1d5798 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_compute_diag_third_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_compute_diag_third_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_temperature_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_temperature_tests.cpp index 0566d12d9320..e3e5173bf33c 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_temperature_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_temperature_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_vapor_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_vapor_tests.cpp index 1e0d41342045..25fc80e55d19 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_vapor_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_compute_shoc_vapor_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_obklen_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_obklen_tests.cpp index 47e4f72ed995..7c46e21c8bc2 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_obklen_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_obklen_tests.cpp @@ -4,8 +4,8 @@ #include "physics/share/physics_constants.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_srf_test.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_srf_test.cpp index 95abfefab984..ebd8ada779fc 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_srf_test.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_srf_test.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_ubycond_test.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_ubycond_test.cpp index 06f8ccdd45a4..bee98cac5048 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_ubycond_test.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_mom_ubycond_test.cpp @@ -5,14 +5,14 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" -//#include "share/scream_types.hpp" +//#include "share/eamxx_types.hpp" #include #include #include diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_lbycond_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_lbycond_tests.cpp index 9680984a4463..31d75d14aa0b 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_lbycond_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_lbycond_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_tests.cpp index bd5dc1a77b1a..99997f10c90a 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_moments_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_shoc_moments_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_shoc_moments_tests.cpp index 45964c6b1d57..4e84b73a78b3 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_second_shoc_moments_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_second_shoc_moments_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_diag_third_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_diag_third_tests.cpp index 3f1bfd557f02..fba0261606c4 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_diag_third_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_diag_third_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_eddy_diffusivities_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_eddy_diffusivities_tests.cpp index 3d33d55640ca..99ca097edbc0 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_eddy_diffusivities_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_eddy_diffusivities_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_energy_fixer_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_energy_fixer_tests.cpp index 89deaf7ad4bb..a99e2a3809ae 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_energy_fixer_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_energy_fixer_tests.cpp @@ -6,8 +6,8 @@ #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" #include "shoc_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_energy_integral_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_energy_integral_tests.cpp index e26ec03139f7..679af10683f9 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_energy_integral_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_energy_integral_tests.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_energy_update_dse_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_energy_update_dse_tests.cpp index 639d48fc70d7..24286e5bf5ea 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_energy_update_dse_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_energy_update_dse_tests.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_grid_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_grid_tests.cpp index f9bd348dc47d..d9c5af98afdc 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_grid_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_grid_tests.cpp @@ -6,8 +6,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_impli_comp_tmpi_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_impli_comp_tmpi_tests.cpp index 1616bff130d8..15e0c736eff9 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_impli_comp_tmpi_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_impli_comp_tmpi_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_impli_dp_inverse_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_impli_dp_inverse_tests.cpp index b5feb285f559..7a27c2d9034e 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_impli_dp_inverse_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_impli_dp_inverse_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_l_inf_length_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_l_inf_length_tests.cpp index db769d170107..159fef9f2e05 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_l_inf_length_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_l_inf_length_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_length_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_length_tests.cpp index b492f6a8e4bf..ece2c5e3dad3 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_length_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_length_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_linear_interp_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_linear_interp_tests.cpp index 6be406bda093..e03b9eac290b 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_linear_interp_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_linear_interp_tests.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_main_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_main_tests.cpp index b007da41322e..712407aed6f4 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_main_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_main_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_mix_length_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_mix_length_tests.cpp index 88336e52ea4f..0b5bb5d684ac 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_mix_length_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_mix_length_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_check_pblh_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_check_pblh_tests.cpp index 02489c97fd38..659e94cb1441 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_check_pblh_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_check_pblh_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_cldcheck_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_cldcheck_tests.cpp index a0beea7e4ea7..abfef8b1a697 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_cldcheck_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_cldcheck_tests.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_height_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_height_tests.cpp index 1a44d74782f1..278c41333784 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_height_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_height_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_init_pot_test.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_init_pot_test.cpp index 9f7c2d65142c..ce1831e51e32 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_init_pot_test.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_init_pot_test.cpp @@ -5,8 +5,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_surf_temp_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_surf_temp_tests.cpp index 2e876996a6a4..aa0c58554d3d 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_surf_temp_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_surf_temp_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_tests.cpp index dedc534fbd1b..4e8bc8f4fdc3 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pblintd_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pblintd_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_buoyflux_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_buoyflux_tests.cpp index 53c91a605c74..d1a6f119aa09 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_buoyflux_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_buoyflux_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_cloudvar_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_cloudvar_tests.cpp index 7fdd57ff005a..75e68bfc5d58 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_cloudvar_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_cloudvar_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_liqflux_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_liqflux_tests.cpp index bee4f5db740c..8155c30d7e92 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_liqflux_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_liqflux_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_qs_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_qs_tests.cpp index 4a3e0cf8a6f5..b13fd4027040 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_qs_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_qs_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_s_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_s_tests.cpp index ffdddaa1928d..ecdbfca52d33 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_s_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_s_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_sgsliq_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_sgsliq_tests.cpp index af5e87dc418a..cf40400dda57 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_sgsliq_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_compute_sgsliq_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_computetemp_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_computetemp_tests.cpp index f9044517b6a1..2b881423b25e 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_computetemp_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_computetemp_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_inplume_corr_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_inplume_corr_tests.cpp index a9ffdf242f36..e08c111a1210 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_inplume_corr_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_inplume_corr_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_qw_parameters_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_qw_parameters_tests.cpp index 0aabe3da33b8..1e7e25419e5c 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_qw_parameters_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_qw_parameters_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_thl_parameters_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_thl_parameters_tests.cpp index 96fdbbc2dfc0..a595c40be539 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_thl_parameters_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_thl_parameters_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_tildetoreal_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_tildetoreal_tests.cpp index a0728f2e3584..38ec2e9123e7 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_tildetoreal_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_tildetoreal_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_pdf_vv_parameters_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_pdf_vv_parameters_tests.cpp index f923e1b47e2a..546a7a6c952b 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_pdf_vv_parameters_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_pdf_vv_parameters_tests.cpp @@ -4,7 +4,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_run_and_cmp.cpp b/components/eamxx/src/physics/shoc/tests/shoc_run_and_cmp.cpp index 8c2313082e54..9b90f99838d8 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_run_and_cmp.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_run_and_cmp.cpp @@ -2,9 +2,9 @@ #include "shoc_test_data.hpp" #include "shoc_ic_cases.hpp" -#include "share/scream_types.hpp" -#include "share/scream_session.hpp" -#include "share/util/scream_utils.hpp" +#include "share/eamxx_types.hpp" +#include "share/eamxx_session.hpp" +#include "share/util/eamxx_utils.hpp" #include "ekat/util/ekat_file_utils.hpp" #include "ekat/util/ekat_test_utils.hpp" @@ -291,7 +291,7 @@ int main (int argc, char** argv) { // Compute full baseline file name with precision. baseline_fn += "/shoc_run_and_cmp.baseline" + std::to_string(sizeof(scream::Real)); - scream::initialize_scream_session(argc, argv); + scream::initialize_eamxx_session(argc, argv); { Baseline bln(nsteps, static_cast(dt), ncol, nlev, num_qtracers, nadv, repeat); if (generate) { @@ -306,7 +306,7 @@ int main (int argc, char** argv) { nerr += bln.run_and_cmp(baseline_fn, tol, no_baseline); } } - scream::finalize_scream_session(); + scream::finalize_eamxx_session(); return nerr != 0 ? 1 : 0; } diff --git a/components/eamxx/src/physics/shoc/tests/shoc_tke_adv_sgs_tke_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_tke_adv_sgs_tke_tests.cpp index 165bf302e4c6..6e7d9faab7c7 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_tke_adv_sgs_tke_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_tke_adv_sgs_tke_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_test_data.hpp" #include "shoc_functions.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_tke_column_stab_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_tke_column_stab_tests.cpp index d234273f4c0a..674d5e020354 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_tke_column_stab_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_tke_column_stab_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_tke_isotropic_ts_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_tke_isotropic_ts_tests.cpp index b7fba522d8f1..02699f78ee44 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_tke_isotropic_ts_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_tke_isotropic_ts_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_tke_shr_prod_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_tke_shr_prod_tests.cpp index 00b60a5efdbd..ff5f875ccfac 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_tke_shr_prod_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_tke_shr_prod_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_tke_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_tke_tests.cpp index 5273607dd707..ebbd6328fdf5 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_tke_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_tke_tests.cpp @@ -4,8 +4,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_unit_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_unit_tests.cpp index f564c74fab4e..fdde2658e769 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_unit_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_unit_tests.cpp @@ -5,7 +5,7 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_update_prognostics_implicit_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_update_prognostics_implicit_tests.cpp index 175be8429283..833dc953b640 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_update_prognostics_implicit_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_update_prognostics_implicit_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_varorcovar_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_varorcovar_tests.cpp index 35d60abfa5fa..53fea85f9c8c 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_varorcovar_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_varorcovar_tests.cpp @@ -6,8 +6,8 @@ #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_vd_shoc_decomp_and_solve_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_vd_shoc_decomp_and_solve_tests.cpp index 27326a0df167..ca32a394f95f 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_vd_shoc_decomp_and_solve_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_vd_shoc_decomp_and_solve_tests.cpp @@ -1,11 +1,11 @@ #include "catch2/catch.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "shoc_unit_tests_common.hpp" diff --git a/components/eamxx/src/physics/shoc/tests/shoc_vertflux_tests.cpp b/components/eamxx/src/physics/shoc/tests/shoc_vertflux_tests.cpp index 895040f9b11a..545307f6a854 100644 --- a/components/eamxx/src/physics/shoc/tests/shoc_vertflux_tests.cpp +++ b/components/eamxx/src/physics/shoc/tests/shoc_vertflux_tests.cpp @@ -4,8 +4,8 @@ #include "physics/share/physics_constants.hpp" #include "shoc_functions.hpp" #include "shoc_test_data.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_arch.hpp" diff --git a/components/eamxx/src/physics/spa/eamxx_spa_process_interface.cpp b/components/eamxx/src/physics/spa/eamxx_spa_process_interface.cpp index 847c191d1335..7ebdbeb6ecd2 100644 --- a/components/eamxx/src/physics/spa/eamxx_spa_process_interface.cpp +++ b/components/eamxx/src/physics/spa/eamxx_spa_process_interface.cpp @@ -1,7 +1,7 @@ #include "eamxx_spa_process_interface.hpp" #include "share/util/eamxx_data_interpolation.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/property_checks/field_within_interval_check.hpp" #include diff --git a/components/eamxx/src/physics/tms/eamxx_tms_process_interface.hpp b/components/eamxx/src/physics/tms/eamxx_tms_process_interface.hpp index ef140d1b76cf..589b392a972f 100644 --- a/components/eamxx/src/physics/tms/eamxx_tms_process_interface.hpp +++ b/components/eamxx/src/physics/tms/eamxx_tms_process_interface.hpp @@ -3,7 +3,7 @@ #include "physics/tms/tms_functions.hpp" #include "share/atm_process/atmosphere_process.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" #include "ekat/ekat_parameter_list.hpp" #include diff --git a/components/eamxx/src/physics/tms/tests/compute_tms_tests.cpp b/components/eamxx/src/physics/tms/tests/compute_tms_tests.cpp index ad6296524134..9da8b7bd1bca 100644 --- a/components/eamxx/src/physics/tms/tests/compute_tms_tests.cpp +++ b/components/eamxx/src/physics/tms/tests/compute_tms_tests.cpp @@ -2,12 +2,12 @@ #include "tms_unit_tests_common.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" #include "tms_functions.hpp" #include "tms_functions_f90.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { namespace tms { diff --git a/components/eamxx/src/physics/tms/tests/tms_unit_tests_common.hpp b/components/eamxx/src/physics/tms/tests/tms_unit_tests_common.hpp index c6df67f694d1..7159b41173e2 100644 --- a/components/eamxx/src/physics/tms/tests/tms_unit_tests_common.hpp +++ b/components/eamxx/src/physics/tms/tests/tms_unit_tests_common.hpp @@ -2,7 +2,7 @@ #define TMS_UNIT_TESTS_COMMON_HPP #include "tms_functions.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" namespace scream { diff --git a/components/eamxx/src/physics/tms/tms_functions.hpp b/components/eamxx/src/physics/tms/tms_functions.hpp index b61291c79745..767fbb66dc4b 100644 --- a/components/eamxx/src/physics/tms/tms_functions.hpp +++ b/components/eamxx/src/physics/tms/tms_functions.hpp @@ -3,7 +3,7 @@ #include "physics/share/physics_constants.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/kokkos/ekat_subview_utils.hpp" #include "ekat/ekat_pack_kokkos.hpp" diff --git a/components/eamxx/src/physics/tms/tms_functions_f90.cpp b/components/eamxx/src/physics/tms/tms_functions_f90.cpp index f1aa2e771778..790e5320d6c2 100644 --- a/components/eamxx/src/physics/tms/tms_functions_f90.cpp +++ b/components/eamxx/src/physics/tms/tms_functions_f90.cpp @@ -5,7 +5,7 @@ #include "ekat/ekat_pack_kokkos.hpp" #include "ekat/kokkos/ekat_subview_utils.hpp" -#include "share/util/scream_deep_copy.hpp" +#include "share/util/eamxx_deep_copy.hpp" #include diff --git a/components/eamxx/src/physics/tms/tms_functions_f90.hpp b/components/eamxx/src/physics/tms/tms_functions_f90.hpp index 9176aa52cf12..12b12b14a986 100644 --- a/components/eamxx/src/physics/tms/tms_functions_f90.hpp +++ b/components/eamxx/src/physics/tms/tms_functions_f90.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_TMS_FUNCTIONS_F90_HPP #define SCREAM_TMS_FUNCTIONS_F90_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "physics/share/physics_test_data.hpp" #include "tms_functions.hpp" diff --git a/components/eamxx/src/physics/tms/tms_iso_c.f90 b/components/eamxx/src/physics/tms/tms_iso_c.f90 index 8f5602da98ff..38ae1f286a8a 100644 --- a/components/eamxx/src/physics/tms/tms_iso_c.f90 +++ b/components/eamxx/src/physics/tms/tms_iso_c.f90 @@ -3,7 +3,7 @@ module tms_iso_c use iso_c_binding implicit none -#include "scream_config.f" +#include "eamxx_config.f" ! ! This file contains bridges from scream c++ to tms fortran. diff --git a/components/eamxx/src/python/CMakeLists.txt b/components/eamxx/src/python/CMakeLists.txt index d19bc05c240e..01df409551c2 100644 --- a/components/eamxx/src/python/CMakeLists.txt +++ b/components/eamxx/src/python/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(libpyscream) +add_subdirectory(libpyeamxx) diff --git a/components/eamxx/src/python/libpyscream/CMakeLists.txt b/components/eamxx/src/python/libpyeamxx/CMakeLists.txt similarity index 81% rename from components/eamxx/src/python/libpyscream/CMakeLists.txt rename to components/eamxx/src/python/libpyeamxx/CMakeLists.txt index 7569d1cf7e60..43144f624c03 100644 --- a/components/eamxx/src/python/libpyscream/CMakeLists.txt +++ b/components/eamxx/src/python/libpyeamxx/CMakeLists.txt @@ -6,8 +6,8 @@ execute_process( find_package(nanobind REQUIRED) find_package(mpi4py REQUIRED) -nanobind_add_module(pyscream_ext pyscream_ext.cpp) -target_link_libraries(pyscream_ext PUBLIC +nanobind_add_module(pyeamxx_ext pyeamxx_ext.cpp) +target_link_libraries(pyeamxx_ext PUBLIC mpi4py scream_share scream_io diff --git a/components/eamxx/src/python/libpyscream/pyatmproc.hpp b/components/eamxx/src/python/libpyeamxx/pyatmproc.hpp similarity index 98% rename from components/eamxx/src/python/libpyscream/pyatmproc.hpp rename to components/eamxx/src/python/libpyeamxx/pyatmproc.hpp index 086b4467f996..e1a19d86f38b 100644 --- a/components/eamxx/src/python/libpyscream/pyatmproc.hpp +++ b/components/eamxx/src/python/libpyeamxx/pyatmproc.hpp @@ -3,12 +3,12 @@ #include "share/atm_process/atmosphere_process.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "pygrid.hpp" #include "pyfield.hpp" #include "pyparamlist.hpp" -#include "pyscream_ext.hpp" +#include "pyeamxx_ext.hpp" #include diff --git a/components/eamxx/src/python/libpyscream/pyscream_ext.cpp b/components/eamxx/src/python/libpyeamxx/pyeamxx_ext.cpp similarity index 89% rename from components/eamxx/src/python/libpyscream/pyscream_ext.cpp rename to components/eamxx/src/python/libpyeamxx/pyeamxx_ext.cpp index 892d40e8ca3c..16288392fa43 100644 --- a/components/eamxx/src/python/libpyscream/pyscream_ext.cpp +++ b/components/eamxx/src/python/libpyeamxx/pyeamxx_ext.cpp @@ -1,4 +1,4 @@ -#include +#include #include "pyfield.hpp" #include "pygrid.hpp" #include "pyatmproc.hpp" @@ -17,7 +17,7 @@ namespace scream { void initialize (MPI_Comm mpi_comm) { ekat::Comm comm(mpi_comm); - initialize_scream_session(comm.am_i_root()); + initialize_eamxx_session(comm.am_i_root()); scorpio::init_subsystem(comm); // Register everything in the eamxx factories @@ -42,10 +42,10 @@ void finalize () { s.inited = false; scorpio::finalize_subsystem(); - finalize_scream_session(); + finalize_eamxx_session(); } -NB_MODULE (pyscream_ext,m) { +NB_MODULE (pyeamxx_ext,m) { m.doc() = "Python interfaces to certain EAMxx infrastructure code"; diff --git a/components/eamxx/src/python/libpyscream/pyscream_ext.hpp b/components/eamxx/src/python/libpyeamxx/pyeamxx_ext.hpp similarity index 100% rename from components/eamxx/src/python/libpyscream/pyscream_ext.hpp rename to components/eamxx/src/python/libpyeamxx/pyeamxx_ext.hpp diff --git a/components/eamxx/src/python/libpyscream/pyfield.hpp b/components/eamxx/src/python/libpyeamxx/pyfield.hpp similarity index 100% rename from components/eamxx/src/python/libpyscream/pyfield.hpp rename to components/eamxx/src/python/libpyeamxx/pyfield.hpp diff --git a/components/eamxx/src/python/libpyscream/pygrid.hpp b/components/eamxx/src/python/libpyeamxx/pygrid.hpp similarity index 92% rename from components/eamxx/src/python/libpyscream/pygrid.hpp rename to components/eamxx/src/python/libpyeamxx/pygrid.hpp index 83cb78d6729e..6e93cf1979b9 100644 --- a/components/eamxx/src/python/libpyscream/pygrid.hpp +++ b/components/eamxx/src/python/libpyeamxx/pygrid.hpp @@ -3,7 +3,7 @@ #include "share/grid/mesh_free_grids_manager.hpp" -#include "pyscream_ext.hpp" +#include "pyeamxx_ext.hpp" #include #include @@ -17,7 +17,7 @@ namespace scream { inline void create_grids_manager (int ncols, int nlevs, const std::string& latlon_nc_file) { EKAT_REQUIRE_MSG (PySession::get().inited, - "Error! You did not initialize pyscream, or you already finalized it!\n"); + "Error! You did not initialize pyeamxx, or you already finalized it!\n"); auto& comm = PySession::get().comm; ekat::ParameterList gm_params; std::vector grids_names = {"Physics"}; diff --git a/components/eamxx/src/python/libpyscream/pyparamlist.hpp b/components/eamxx/src/python/libpyeamxx/pyparamlist.hpp similarity index 100% rename from components/eamxx/src/python/libpyscream/pyparamlist.hpp rename to components/eamxx/src/python/libpyeamxx/pyparamlist.hpp diff --git a/components/eamxx/src/python/libpyscream/pyutils.hpp b/components/eamxx/src/python/libpyeamxx/pyutils.hpp similarity index 100% rename from components/eamxx/src/python/libpyscream/pyutils.hpp rename to components/eamxx/src/python/libpyeamxx/pyutils.hpp diff --git a/components/eamxx/src/python/pyeamxx/__init__.py b/components/eamxx/src/python/pyeamxx/__init__.py new file mode 100644 index 000000000000..176c260dd41a --- /dev/null +++ b/components/eamxx/src/python/pyeamxx/__init__.py @@ -0,0 +1,20 @@ +""" + This file will serve as a way to organize and expose + libpyeamxx internals to the rest of pyeamxx +""" + +from libpyeamxx.pyeamxx_ext import init +from libpyeamxx.pyeamxx_ext import finalize +from libpyeamxx.pyeamxx_ext import Field +from libpyeamxx.pyeamxx_ext import AtmProc +from libpyeamxx.pyeamxx_ext import ParameterList +from libpyeamxx.pyeamxx_ext import create_grids_manager + +__all__ = [ + "init", + "finalize", + "Field", + "AtmProc", + "ParameterList", + "create_grids_manager", +] diff --git a/components/eamxx/src/python/pyproject.toml b/components/eamxx/src/python/pyproject.toml index 490ea99c143e..fa5d6fc44817 100644 --- a/components/eamxx/src/python/pyproject.toml +++ b/components/eamxx/src/python/pyproject.toml @@ -3,15 +3,15 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] -name = "pyscream" +name = "pyeamxx" version = "0.0.2" dependencies = ["numpy", "mpi4py"] [tool.setuptools.packages.find] where = ["."] -include = ["pyscream", "libpyscream"] +include = ["pyeamxx", "libpyeamxx"] exclude = ["build_src", "tests"] namespaces = true [tool.setuptools.package-data] -"libpyscream" = ["*.so*"] +"libpyeamxx" = ["*.so*"] diff --git a/components/eamxx/src/python/pyscream/__init__.py b/components/eamxx/src/python/pyscream/__init__.py deleted file mode 100644 index e76f52170fb3..000000000000 --- a/components/eamxx/src/python/pyscream/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -""" - This file will serve as a way to organize and expose - libpyscream internals to the rest of pyscream -""" - -from libpyscream.pyscream_ext import init -from libpyscream.pyscream_ext import finalize -from libpyscream.pyscream_ext import Field -from libpyscream.pyscream_ext import AtmProc -from libpyscream.pyscream_ext import ParameterList -from libpyscream.pyscream_ext import create_grids_manager - -__all__ = [ - "init", - "finalize", - "Field", - "AtmProc", - "ParameterList", - "create_grids_manager", -] diff --git a/components/eamxx/src/python/readme b/components/eamxx/src/python/readme index c16c32a5d217..f5ed48f058ee 100644 --- a/components/eamxx/src/python/readme +++ b/components/eamxx/src/python/readme @@ -1,7 +1,7 @@ INFO: - EAMxx python bindings -- pyscream is where we will house the python code -- libpyscream is where we will house the extensions +- pyeamxx is where we will house the python code +- libpyeamxx is where we will house the extensions - packaging moved to https://github.com/mahf708/experimental-scream-feedstock TODO: @@ -11,5 +11,5 @@ TODO: - decide archs/pythons/mpis to tgt USER: -- conda install pyscream -c mahf708/label/$mac (mac is chrysalis or pm-cpu) +- conda install pyeamxx -c mahf708/label/$mac (mac is chrysalis or pm-cpu) - see example in components/eamxx/tests/python/pyp3 diff --git a/components/eamxx/src/share/CMakeLists.txt b/components/eamxx/src/share/CMakeLists.txt index 5816397c3600..8a7bc7d4463a 100644 --- a/components/eamxx/src/share/CMakeLists.txt +++ b/components/eamxx/src/share/CMakeLists.txt @@ -1,8 +1,8 @@ include (EkatSetCompilerFlags) set(SHARE_SRC - scream_config.cpp - scream_session.cpp + eamxx_config.cpp + eamxx_session.cpp atm_process/atmosphere_process.cpp atm_process/atmosphere_process_hash.cpp atm_process/atmosphere_process_group.cpp @@ -37,10 +37,10 @@ set(SHARE_SRC util/eamxx_data_interpolation.cpp util/eamxx_fv_phys_rrtmgp_active_gases_workaround.cpp util/eamxx_time_interpolation.cpp - util/scream_time_stamp.cpp - util/scream_timing.cpp - util/scream_utils.cpp - util/scream_bfbhash.cpp + util/eamxx_time_stamp.cpp + util/eamxx_timing.cpp + util/eamxx_utils.cpp + util/eamxx_bfbhash.cpp ) # Append ETI sources (I didn't do it above for clarity of reading) @@ -111,7 +111,7 @@ target_compile_options(scream_share PUBLIC $<$:${SCREAM_Fortran_FLAGS}> ) -# This used to be in `scream_config.h/scream_config.f`, but we did accidentally remove +# This used to be in `eamxx_config.h/eamxx_config.f`, but we did accidentally remove # the includes at least twice. To avoid this from happening again, we add this crucial # macro as a compile definition of the scream_share, which is linked to all other # scream libraries. @@ -151,7 +151,7 @@ if (NOT SCREAM_LIB_ONLY) # Create test_support lib add_library(scream_test_support grid/mesh_free_grids_manager.cpp - util/scream_test_session.cpp + util/eamxx_test_session.cpp ) target_link_libraries(scream_test_support PUBLIC scream_share scream_io) diff --git a/components/eamxx/src/share/atm_process/ATMBufferManager.hpp b/components/eamxx/src/share/atm_process/ATMBufferManager.hpp index 5c938a6ce18f..c5e8ea7554e0 100644 --- a/components/eamxx/src/share/atm_process/ATMBufferManager.hpp +++ b/components/eamxx/src/share/atm_process/ATMBufferManager.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_ATM_BUFFERS_MANAGER_HPP #define SCREAM_ATM_BUFFERS_MANAGER_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_assert.hpp" namespace scream { diff --git a/components/eamxx/src/share/atm_process/IOPDataManager.cpp b/components/eamxx/src/share/atm_process/IOPDataManager.cpp index ee95401fc001..563c3830d3b3 100644 --- a/components/eamxx/src/share/atm_process/IOPDataManager.cpp +++ b/components/eamxx/src/share/atm_process/IOPDataManager.cpp @@ -1,7 +1,7 @@ #include "share/grid/point_grid.hpp" #include "share/grid/remap/iop_remapper.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/atm_process/IOPDataManager.hpp" #include "ekat/ekat_assert.hpp" diff --git a/components/eamxx/src/share/atm_process/IOPDataManager.hpp b/components/eamxx/src/share/atm_process/IOPDataManager.hpp index ad77f80fa405..d5b704727d48 100644 --- a/components/eamxx/src/share/atm_process/IOPDataManager.hpp +++ b/components/eamxx/src/share/atm_process/IOPDataManager.hpp @@ -1,11 +1,11 @@ #ifndef SCREAM_IOP_HPP #define SCREAM_IOP_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "share/field/field_manager.hpp" #include "share/grid/abstract_grid.hpp" #include "share/grid/remap/abstract_remapper.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/share/atm_process/SCDataManager.hpp b/components/eamxx/src/share/atm_process/SCDataManager.hpp index 76bc9e5bd843..6d73030d66e6 100644 --- a/components/eamxx/src/share/atm_process/SCDataManager.hpp +++ b/components/eamxx/src/share/atm_process/SCDataManager.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_SC_DATA_MANAGER_HPP #define SCREAM_SC_DATA_MANAGER_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_assert.hpp" namespace scream { diff --git a/components/eamxx/src/share/atm_process/atmosphere_process.cpp b/components/eamxx/src/share/atm_process/atmosphere_process.cpp index 6a85097539ae..3ebe02e777ac 100644 --- a/components/eamxx/src/share/atm_process/atmosphere_process.cpp +++ b/components/eamxx/src/share/atm_process/atmosphere_process.cpp @@ -1,5 +1,5 @@ #include "share/atm_process/atmosphere_process.hpp" -#include "share/util/scream_timing.hpp" +#include "share/util/eamxx_timing.hpp" #include "share/property_checks/mass_and_energy_column_conservation_check.hpp" #include "share/field/field_utils.hpp" diff --git a/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp b/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp index cb9d9690db97..123b232d6cde 100644 --- a/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp +++ b/components/eamxx/src/share/atm_process/atmosphere_process_hash.cpp @@ -1,7 +1,7 @@ #include "share/atm_process/atmosphere_process.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_array_utils.hpp" -#include "share/util/scream_bfbhash.hpp" +#include "share/util/eamxx_array_utils.hpp" +#include "share/util/eamxx_bfbhash.hpp" #include "ekat/ekat_assert.hpp" #include diff --git a/components/eamxx/src/share/scream_config.cpp b/components/eamxx/src/share/eamxx_config.cpp similarity index 88% rename from components/eamxx/src/share/scream_config.cpp rename to components/eamxx/src/share/eamxx_config.cpp index 88a9ca48071f..e3e7cc2f9a3f 100644 --- a/components/eamxx/src/share/scream_config.cpp +++ b/components/eamxx/src/share/eamxx_config.cpp @@ -1,13 +1,13 @@ -#include "scream_config.hpp" -#include "scream_session.hpp" -#include "scream_types.hpp" +#include "eamxx_config.hpp" +#include "eamxx_session.hpp" +#include "eamxx_types.hpp" #include "ekat/util/ekat_arch.hpp" #include "ekat/ekat_assert.hpp" namespace scream { -std::string scream_config_string() { +std::string eamxx_config_string() { std::string config = "\n-------- EKAT CONFIGS --------\n\n"; config += ekat::ekat_config_string(); config += "\n-------- SCREAM CONFIGS --------\n\n"; diff --git a/components/eamxx/src/share/scream_config.hpp b/components/eamxx/src/share/eamxx_config.hpp similarity index 82% rename from components/eamxx/src/share/scream_config.hpp rename to components/eamxx/src/share/eamxx_config.hpp index 391f0afdfbde..1873a2f2609c 100644 --- a/components/eamxx/src/share/scream_config.hpp +++ b/components/eamxx/src/share/eamxx_config.hpp @@ -4,11 +4,11 @@ #include // Include this file, not any lower-level configuration file such as that -// generated by CMake from scream_config.h.in. The intent is to funnel all +// generated by CMake from eamxx_config.h.in. The intent is to funnel all // configuration decisions through this header. #ifdef SCREAM_CONFIG_IS_CMAKE -# include "scream_config.h" +# include "eamxx_config.h" #else // Purposely error out. "A non-cmake build of scream is currently not supported." @@ -16,7 +16,7 @@ namespace scream { -std::string scream_config_string(); +std::string eamxx_config_string(); // Utils to set/get whether leap year is used or not bool use_leap_year (); diff --git a/components/eamxx/src/share/scream_session.cpp b/components/eamxx/src/share/eamxx_session.cpp similarity index 69% rename from components/eamxx/src/share/scream_session.cpp rename to components/eamxx/src/share/eamxx_session.cpp index ab688e5c41f3..9021a360d3dd 100644 --- a/components/eamxx/src/share/scream_session.cpp +++ b/components/eamxx/src/share/eamxx_session.cpp @@ -1,5 +1,5 @@ -#include "scream_session.hpp" -#include "scream_config.hpp" +#include "eamxx_session.hpp" +#include "eamxx_config.hpp" #include "ekat/ekat_assert.hpp" #include "ekat/ekat_session.hpp" @@ -19,7 +19,7 @@ int get_default_fpes () { #endif } -void initialize_scream_session (bool print_config) { +void initialize_eamxx_session (bool print_config) { ekat::initialize_ekat_session(print_config); // Make sure scream only has its FPEs @@ -27,10 +27,10 @@ void initialize_scream_session (bool print_config) { ekat::enable_fpes(get_default_fpes()); if (print_config) - std::cout << scream_config_string() << "\n"; + std::cout << eamxx_config_string() << "\n"; } -void initialize_scream_session (int argc, char **argv, bool print_config) { +void initialize_eamxx_session (int argc, char **argv, bool print_config) { ekat::initialize_ekat_session(argc,argv,print_config); // Make sure scream only has its FPEs @@ -38,11 +38,11 @@ void initialize_scream_session (int argc, char **argv, bool print_config) { ekat::enable_fpes(get_default_fpes()); if (print_config) - std::cout << scream_config_string() << "\n"; + std::cout << eamxx_config_string() << "\n"; } extern "C" { -void finalize_scream_session () { +void finalize_eamxx_session () { ekat::finalize_ekat_session(); } } // extern "C" diff --git a/components/eamxx/src/share/scream_session.hpp b/components/eamxx/src/share/eamxx_session.hpp similarity index 62% rename from components/eamxx/src/share/scream_session.hpp rename to components/eamxx/src/share/eamxx_session.hpp index 5afa7a8cc4bf..6537c968b379 100644 --- a/components/eamxx/src/share/scream_session.hpp +++ b/components/eamxx/src/share/eamxx_session.hpp @@ -4,13 +4,13 @@ namespace scream { int get_default_fpes (); -void initialize_scream_session(bool print_config = true); -void initialize_scream_session (int argc, char **argv, bool print_config = true); +void initialize_eamxx_session(bool print_config = true); +void initialize_eamxx_session (int argc, char **argv, bool print_config = true); // A version callable from Fortran, which can help // in case of errors to correctly shut down Kokkos extern "C" { -void finalize_scream_session(); +void finalize_eamxx_session(); } // extern "C" } // namespace scream diff --git a/components/eamxx/src/share/scream_types.hpp b/components/eamxx/src/share/eamxx_types.hpp similarity index 98% rename from components/eamxx/src/share/scream_types.hpp rename to components/eamxx/src/share/eamxx_types.hpp index cbe26aae75f3..cc6cdf0fbc95 100644 --- a/components/eamxx/src/share/scream_types.hpp +++ b/components/eamxx/src/share/eamxx_types.hpp @@ -3,7 +3,7 @@ #include "ekat/ekat.hpp" #include "ekat/kokkos/ekat_kokkos_types.hpp" -#include "scream_config.h" +#include "eamxx_config.h" namespace scream { diff --git a/components/eamxx/src/share/field/field.cpp b/components/eamxx/src/share/field/field.cpp index 3669a2faeb5b..24d91d42f751 100644 --- a/components/eamxx/src/share/field/field.cpp +++ b/components/eamxx/src/share/field/field.cpp @@ -1,5 +1,5 @@ #include "share/field/field.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/field/field.hpp b/components/eamxx/src/share/field/field.hpp index fc56dd441665..535632c8e7e0 100644 --- a/components/eamxx/src/share/field/field.hpp +++ b/components/eamxx/src/share/field/field.hpp @@ -2,8 +2,8 @@ #define SCREAM_FIELD_HPP #include "share/field/field_header.hpp" -#include "share/util/scream_combine_ops.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_combine_ops.hpp" +#include "share/eamxx_types.hpp" #include "ekat/std_meta/ekat_std_type_traits.hpp" #include "ekat/kokkos/ekat_subview_utils.hpp" @@ -208,7 +208,7 @@ class Field { void deep_copy (const Field& src) { update(src,1,0); } // Updates this field y as y=combine(x,y,alpha,beta) - // See share/util/scream_combine_ops.hpp for more details on CombineMode options + // See share/util/eamxx_combine_ops.hpp for more details on CombineMode options // NOTE: ST=void is just so we can give a default to HD, // but ST will *always* be deduced from input arguments. // NOTE: the type ST must be such that no narrowing happens when diff --git a/components/eamxx/src/share/field/field_alloc_prop.hpp b/components/eamxx/src/share/field/field_alloc_prop.hpp index 32b6947b9019..a6396bcb7539 100644 --- a/components/eamxx/src/share/field/field_alloc_prop.hpp +++ b/components/eamxx/src/share/field/field_alloc_prop.hpp @@ -2,7 +2,7 @@ #define SCREAM_FIELD_ALLOC_PROP_HPP #include "share/field/field_layout.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_scalar_traits.hpp" #include "ekat/ekat_assert.hpp" diff --git a/components/eamxx/src/share/field/field_header.hpp b/components/eamxx/src/share/field/field_header.hpp index 0f92f20160a8..2b6852f7fcaf 100644 --- a/components/eamxx/src/share/field/field_header.hpp +++ b/components/eamxx/src/share/field/field_header.hpp @@ -4,10 +4,10 @@ #include "share/field/field_identifier.hpp" #include "share/field/field_tracking.hpp" #include "share/field/field_alloc_prop.hpp" -#include "share/util/scream_family_tracking.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_family_tracking.hpp" +#include "share/eamxx_types.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "ekat/std_meta/ekat_std_any.hpp" #include diff --git a/components/eamxx/src/share/field/field_identifier.hpp b/components/eamxx/src/share/field/field_identifier.hpp index 7a2ff5c61337..d7127bd0c645 100644 --- a/components/eamxx/src/share/field/field_identifier.hpp +++ b/components/eamxx/src/share/field/field_identifier.hpp @@ -2,7 +2,7 @@ #define SCREAM_FIELD_IDENTIFIER_HPP #include "share/field/field_layout.hpp" -#include "share/util/scream_data_type.hpp" +#include "share/util/eamxx_data_type.hpp" #include "ekat/util/ekat_string_utils.hpp" #include "ekat/util/ekat_units.hpp" diff --git a/components/eamxx/src/share/field/field_impl.hpp b/components/eamxx/src/share/field/field_impl.hpp index 6a9a94af19af..ebc79580650d 100644 --- a/components/eamxx/src/share/field/field_impl.hpp +++ b/components/eamxx/src/share/field/field_impl.hpp @@ -2,8 +2,8 @@ #define SCREAM_FIELD_IMPL_HPP #include "share/field/field.hpp" -#include "share/util/scream_array_utils.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_array_utils.hpp" +#include "share/util/eamxx_universal_constants.hpp" #include diff --git a/components/eamxx/src/share/field/field_layout.hpp b/components/eamxx/src/share/field/field_layout.hpp index b317a7345a06..f4d54168b866 100644 --- a/components/eamxx/src/share/field/field_layout.hpp +++ b/components/eamxx/src/share/field/field_layout.hpp @@ -2,7 +2,7 @@ #define SCREAM_FIELD_LAYOUT_HPP #include "share/field/field_tag.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/src/share/field/field_manager.cpp b/components/eamxx/src/share/field/field_manager.cpp index 9d1c3be9f71c..e1060dc5525e 100644 --- a/components/eamxx/src/share/field/field_manager.cpp +++ b/components/eamxx/src/share/field/field_manager.cpp @@ -278,7 +278,7 @@ void FieldManager::registration_ends () // 4) If there is no group in the cluster that contains all the fields of the cluster, // create the cluster group C. In order to accommodate all requests for bundled groups, // we must be able to allocate C bundled. - // 5) For each cluster, call the function contiguous_superset from scream_utils.hpp + // 5) For each cluster, call the function contiguous_superset from eamxx_utils.hpp // (see that file for details). If the fcn fails to find an ordering of the cluster's // field that accommodate all bundled requests, it will return an empty list. // Otherwise it will return the ordering of all fields in the cluster that allows all diff --git a/components/eamxx/src/share/field/field_manager.hpp b/components/eamxx/src/share/field/field_manager.hpp index ad0c8bc47d8a..cff49a8f1175 100644 --- a/components/eamxx/src/share/field/field_manager.hpp +++ b/components/eamxx/src/share/field/field_manager.hpp @@ -5,8 +5,8 @@ #include "share/field/field.hpp" #include "share/field/field_group.hpp" #include "share/field/field_request.hpp" -#include "share/util/scream_utils.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_utils.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/src/share/field/field_request.hpp b/components/eamxx/src/share/field/field_request.hpp index bca9c46f4da6..f74ce543b173 100644 --- a/components/eamxx/src/share/field/field_request.hpp +++ b/components/eamxx/src/share/field/field_request.hpp @@ -3,7 +3,7 @@ #include "share/field/field_identifier.hpp" #include "share/field/field_alloc_prop.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/field/field_tracking.hpp b/components/eamxx/src/share/field/field_tracking.hpp index 6a8f52a7f0da..2e7bde4bab74 100644 --- a/components/eamxx/src/share/field/field_tracking.hpp +++ b/components/eamxx/src/share/field/field_tracking.hpp @@ -2,9 +2,9 @@ #define SCREAM_FIELD_TRACKING_HPP #include "share/field/field_group_info.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/util/scream_family_tracking.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/util/eamxx_family_tracking.hpp" #include "ekat/util/ekat_string_utils.hpp" #include "ekat/std_meta/ekat_std_utils.hpp" diff --git a/components/eamxx/src/share/grid/grid_import_export.hpp b/components/eamxx/src/share/grid/grid_import_export.hpp index 19975be50cad..c9ad03104470 100644 --- a/components/eamxx/src/share/grid/grid_import_export.hpp +++ b/components/eamxx/src/share/grid/grid_import_export.hpp @@ -2,8 +2,8 @@ #define EAMXX_GRID_IMPORT_EXPORT_HPP #include "share/grid/abstract_grid.hpp" -#include "share/scream_types.hpp" // For KokkosTypes -#include "share/util/scream_utils.hpp" // For check_mpi_call +#include "share/eamxx_types.hpp" // For KokkosTypes +#include "share/util/eamxx_utils.hpp" // For check_mpi_call #include #include // We do some direct MPI calls diff --git a/components/eamxx/src/share/grid/mesh_free_grids_manager.cpp b/components/eamxx/src/share/grid/mesh_free_grids_manager.cpp index f6ef029b2590..7165b8e725bb 100644 --- a/components/eamxx/src/share/grid/mesh_free_grids_manager.cpp +++ b/components/eamxx/src/share/grid/mesh_free_grids_manager.cpp @@ -3,7 +3,7 @@ #include "share/grid/se_grid.hpp" #include "share/property_checks/field_nan_check.hpp" #include "share/property_checks/field_within_interval_check.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/io/scorpio_input.hpp" #include "physics/share/physics_constants.hpp" diff --git a/components/eamxx/src/share/grid/point_grid.hpp b/components/eamxx/src/share/grid/point_grid.hpp index 771c6b55847d..736ce6ab6ac0 100644 --- a/components/eamxx/src/share/grid/point_grid.hpp +++ b/components/eamxx/src/share/grid/point_grid.hpp @@ -3,7 +3,7 @@ #include #include "share/grid/abstract_grid.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/mpi/ekat_comm.hpp" diff --git a/components/eamxx/src/share/grid/remap/coarsening_remapper.hpp b/components/eamxx/src/share/grid/remap/coarsening_remapper.hpp index 92c17ebe277a..7464aa420ae2 100644 --- a/components/eamxx/src/share/grid/remap/coarsening_remapper.hpp +++ b/components/eamxx/src/share/grid/remap/coarsening_remapper.hpp @@ -2,7 +2,7 @@ #define SCREAM_COARSENING_REMAPPER_HPP #include "share/grid/remap/horiz_interp_remapper_base.hpp" -#include "scream_config.h" +#include "eamxx_config.h" #include diff --git a/components/eamxx/src/share/grid/remap/horiz_interp_remapper_data.cpp b/components/eamxx/src/share/grid/remap/horiz_interp_remapper_data.cpp index a67c2d101017..6b6d382b2fb9 100644 --- a/components/eamxx/src/share/grid/remap/horiz_interp_remapper_data.cpp +++ b/components/eamxx/src/share/grid/remap/horiz_interp_remapper_data.cpp @@ -2,7 +2,7 @@ #include "share/grid/point_grid.hpp" #include "share/grid/grid_import_export.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include diff --git a/components/eamxx/src/share/grid/remap/refining_remapper_p2p.cpp b/components/eamxx/src/share/grid/remap/refining_remapper_p2p.cpp index f0ea70336c5e..3791a56aa110 100644 --- a/components/eamxx/src/share/grid/remap/refining_remapper_p2p.cpp +++ b/components/eamxx/src/share/grid/remap/refining_remapper_p2p.cpp @@ -3,7 +3,7 @@ #include "share/grid/point_grid.hpp" #include "share/grid/grid_import_export.hpp" #include "share/io/scorpio_input.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" #include #include diff --git a/components/eamxx/src/share/grid/remap/refining_remapper_p2p.hpp b/components/eamxx/src/share/grid/remap/refining_remapper_p2p.hpp index 140d73b7e102..d56c2e62e864 100644 --- a/components/eamxx/src/share/grid/remap/refining_remapper_p2p.hpp +++ b/components/eamxx/src/share/grid/remap/refining_remapper_p2p.hpp @@ -3,7 +3,7 @@ #include "share/grid/remap/abstract_remapper.hpp" #include "share/grid/remap/horiz_interp_remapper_base.hpp" -#include "scream_config.h" +#include "eamxx_config.h" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/share/grid/remap/refining_remapper_rma.hpp b/components/eamxx/src/share/grid/remap/refining_remapper_rma.hpp index 52c5487945c9..31562b2a2b6a 100644 --- a/components/eamxx/src/share/grid/remap/refining_remapper_rma.hpp +++ b/components/eamxx/src/share/grid/remap/refining_remapper_rma.hpp @@ -3,8 +3,8 @@ #include "share/grid/remap/abstract_remapper.hpp" #include "share/grid/remap/horiz_interp_remapper_base.hpp" -#include "share/util/scream_utils.hpp" -#include "scream_config.h" +#include "share/util/eamxx_utils.hpp" +#include "eamxx_config.h" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/share/grid/remap/vertical_remapper.cpp b/components/eamxx/src/share/grid/remap/vertical_remapper.cpp index 85a2181594ce..4d3895cbce39 100644 --- a/components/eamxx/src/share/grid/remap/vertical_remapper.cpp +++ b/components/eamxx/src/share/grid/remap/vertical_remapper.cpp @@ -4,8 +4,8 @@ #include "share/io/scorpio_input.hpp" #include "share/field/field_tag.hpp" #include "share/field/field_identifier.hpp" -#include "share/util/scream_universal_constants.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/util/eamxx_universal_constants.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include #include diff --git a/components/eamxx/src/share/io/CMakeLists.txt b/components/eamxx/src/share/io/CMakeLists.txt index 4908e4ae0c95..fbbd00f23b6a 100644 --- a/components/eamxx/src/share/io/CMakeLists.txt +++ b/components/eamxx/src/share/io/CMakeLists.txt @@ -7,39 +7,39 @@ # small structs, holding handlers to PIO data and extra metadata, which # allows to perform sanity checks and print more helpful messages -add_library(scream_scorpio_interface - scream_scorpio_types.cpp - scream_scorpio_interface.cpp +add_library(eamxx_scorpio_interface + eamxx_scorpio_types.cpp + eamxx_scorpio_interface.cpp ) -target_link_libraries(scream_scorpio_interface PUBLIC ekat) -target_link_libraries(scream_scorpio_interface PRIVATE pioc) -target_include_directories(scream_scorpio_interface PUBLIC - ${SCREAM_BIN_DIR}/src # For scream_config.h +target_link_libraries(eamxx_scorpio_interface PUBLIC ekat) +target_link_libraries(eamxx_scorpio_interface PRIVATE pioc) +target_include_directories(eamxx_scorpio_interface PUBLIC + ${SCREAM_BIN_DIR}/src # For eamxx_config.h ) if (DEFINED ENV{ADIOS2_ROOT}) - target_include_directories(scream_scorpio_interface PRIVATE $ENV{ADIOS2_ROOT}/include) + target_include_directories(eamxx_scorpio_interface PRIVATE $ENV{ADIOS2_ROOT}/include) endif () if (SCORPIO_Fortran_INCLUDE_DIRS) - target_include_directories(scream_scorpio_interface PUBLIC ${SCORPIO_Fortran_INCLUDE_DIRS}) + target_include_directories(eamxx_scorpio_interface PUBLIC ${SCORPIO_Fortran_INCLUDE_DIRS}) endif () if (SCORPIO_C_INCLUDE_DIRS) - target_include_directories(scream_scorpio_interface PUBLIC ${SCORPIO_C_INCLUDE_DIRS}) + target_include_directories(eamxx_scorpio_interface PUBLIC ${SCORPIO_C_INCLUDE_DIRS}) endif () if (SCREAM_CIME_BUILD) # Add interface to E3SM shr lib (to retrieve PIO subsystem info) - target_sources (scream_scorpio_interface PRIVATE - scream_shr_interface_c2f.F90 + target_sources (eamxx_scorpio_interface PRIVATE + eamxx_shr_interface_c2f.F90 ) - target_compile_definitions (scream_scorpio_interface PRIVATE SCREAM_CIME_BUILD) - set_target_properties(scream_scorpio_interface PROPERTIES + target_compile_definitions (eamxx_scorpio_interface PRIVATE SCREAM_CIME_BUILD) + set_target_properties(eamxx_scorpio_interface PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/modules ) - target_include_directories(scream_scorpio_interface PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/modules) - target_link_libraries(scream_scorpio_interface PUBLIC csm_share) + target_include_directories(eamxx_scorpio_interface PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/modules) + target_link_libraries(eamxx_scorpio_interface PUBLIC csm_share) endif() ################################## @@ -52,14 +52,14 @@ endif() # Create io lib add_library(scream_io - scream_output_manager.cpp + eamxx_output_manager.cpp scorpio_input.cpp scorpio_scm_input.cpp scorpio_output.cpp - scream_io_utils.cpp + eamxx_io_utils.cpp ) -target_link_libraries(scream_io PUBLIC scream_share scream_scorpio_interface diagnostics) +target_link_libraries(scream_io PUBLIC scream_share eamxx_scorpio_interface diagnostics) if (NOT SCREAM_LIB_ONLY) add_subdirectory(tests) diff --git a/components/eamxx/src/share/io/scream_io_control.hpp b/components/eamxx/src/share/io/eamxx_io_control.hpp similarity index 99% rename from components/eamxx/src/share/io/scream_io_control.hpp rename to components/eamxx/src/share/io/eamxx_io_control.hpp index 07e60b4f24df..0661a21888cd 100644 --- a/components/eamxx/src/share/io/scream_io_control.hpp +++ b/components/eamxx/src/share/io/eamxx_io_control.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_IO_CONTROL_HPP #define SCREAM_IO_CONTROL_HPP -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include diff --git a/components/eamxx/src/share/io/scream_io_file_specs.hpp b/components/eamxx/src/share/io/eamxx_io_file_specs.hpp similarity index 96% rename from components/eamxx/src/share/io/scream_io_file_specs.hpp rename to components/eamxx/src/share/io/eamxx_io_file_specs.hpp index ae5a00ff55b0..27b203c513a8 100644 --- a/components/eamxx/src/share/io/scream_io_file_specs.hpp +++ b/components/eamxx/src/share/io/eamxx_io_file_specs.hpp @@ -1,9 +1,9 @@ #ifndef SCREAM_IO_FILE_SPECS_HPP #define SCREAM_IO_FILE_SPECS_HPP -#include "share/io/scream_scorpio_types.hpp" -#include "share/io/scream_io_utils.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/io/eamxx_scorpio_types.hpp" +#include "share/io/eamxx_io_utils.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include diff --git a/components/eamxx/src/share/io/scream_io_utils.cpp b/components/eamxx/src/share/io/eamxx_io_utils.cpp similarity index 98% rename from components/eamxx/src/share/io/scream_io_utils.cpp rename to components/eamxx/src/share/io/eamxx_io_utils.cpp index cacb153b929e..cd8b8aa2e457 100644 --- a/components/eamxx/src/share/io/scream_io_utils.cpp +++ b/components/eamxx/src/share/io/eamxx_io_utils.cpp @@ -1,9 +1,9 @@ -#include "share/io/scream_io_utils.hpp" +#include "share/io/eamxx_io_utils.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/library_grids_manager.hpp" -#include "share/util/scream_utils.hpp" -#include "share/scream_config.hpp" +#include "share/util/eamxx_utils.hpp" +#include "share/eamxx_config.hpp" #include #include diff --git a/components/eamxx/src/share/io/scream_io_utils.hpp b/components/eamxx/src/share/io/eamxx_io_utils.hpp similarity index 97% rename from components/eamxx/src/share/io/scream_io_utils.hpp rename to components/eamxx/src/share/io/eamxx_io_utils.hpp index 0bea91dc3fac..46d7f8681b2e 100644 --- a/components/eamxx/src/share/io/scream_io_utils.hpp +++ b/components/eamxx/src/share/io/eamxx_io_utils.hpp @@ -1,8 +1,8 @@ #ifndef SCREAM_IO_UTILS_HPP #define SCREAM_IO_UTILS_HPP -#include "scream_io_control.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "eamxx_io_control.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "share/atm_process/atmosphere_diagnostic.hpp" #include "share/grid/abstract_grid.hpp" diff --git a/components/eamxx/src/share/io/scream_output_manager.cpp b/components/eamxx/src/share/io/eamxx_output_manager.cpp similarity index 99% rename from components/eamxx/src/share/io/scream_output_manager.cpp rename to components/eamxx/src/share/io/eamxx_output_manager.cpp index 050a55936b4a..5988c7fa2f72 100644 --- a/components/eamxx/src/share/io/scream_output_manager.cpp +++ b/components/eamxx/src/share/io/eamxx_output_manager.cpp @@ -1,9 +1,9 @@ -#include "scream_output_manager.hpp" +#include "eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_timing.hpp" -#include "share/scream_config.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_timing.hpp" +#include "share/eamxx_config.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/mpi/ekat_comm.hpp" diff --git a/components/eamxx/src/share/io/scream_output_manager.hpp b/components/eamxx/src/share/io/eamxx_output_manager.hpp similarity index 96% rename from components/eamxx/src/share/io/scream_output_manager.hpp rename to components/eamxx/src/share/io/eamxx_output_manager.hpp index 1e4f2dba5698..2adae04037dd 100644 --- a/components/eamxx/src/share/io/scream_output_manager.hpp +++ b/components/eamxx/src/share/io/eamxx_output_manager.hpp @@ -2,14 +2,14 @@ #define SCREAM_OUTPUT_MANAGER_HPP #include "share/io/scorpio_output.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/io/scream_io_utils.hpp" -#include "share/io/scream_io_file_specs.hpp" -#include "share/io/scream_io_control.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/io/eamxx_io_utils.hpp" +#include "share/io/eamxx_io_file_specs.hpp" +#include "share/io/eamxx_io_control.hpp" #include "share/field/field_manager.hpp" #include "share/grid/grids_manager.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "ekat/logging/ekat_logger.hpp" #include "ekat/mpi/ekat_comm.hpp" @@ -167,12 +167,12 @@ class OutputManager bool m_is_model_restart_output; // Frequency of output and checkpointing - // See scream_io_utils.hpp for details. + // See eamxx_io_utils.hpp for details. IOControl m_output_control; IOControl m_checkpoint_control; // The specs (name, capacity, size) of output and checkpoint file. - // See scream_io_utils.hpp for details. + // See eamxx_io_utils.hpp for details. IOFileSpecs m_output_file_specs; IOFileSpecs m_checkpoint_file_specs; diff --git a/components/eamxx/src/share/io/scream_scorpio_interface.cpp b/components/eamxx/src/share/io/eamxx_scorpio_interface.cpp similarity index 99% rename from components/eamxx/src/share/io/scream_scorpio_interface.cpp rename to components/eamxx/src/share/io/eamxx_scorpio_interface.cpp index 57ec02fc298c..84e4e738ffaf 100644 --- a/components/eamxx/src/share/io/scream_scorpio_interface.cpp +++ b/components/eamxx/src/share/io/eamxx_scorpio_interface.cpp @@ -1,7 +1,7 @@ -#include "scream_scorpio_interface.hpp" -#include "scream_shr_interface_c2f.hpp" +#include "eamxx_scorpio_interface.hpp" +#include "eamxx_shr_interface_c2f.hpp" -#include "scream_config.h" +#include "eamxx_config.h" #include #include diff --git a/components/eamxx/src/share/io/scream_scorpio_interface.hpp b/components/eamxx/src/share/io/eamxx_scorpio_interface.hpp similarity index 99% rename from components/eamxx/src/share/io/scream_scorpio_interface.hpp rename to components/eamxx/src/share/io/eamxx_scorpio_interface.hpp index 54e3d9027651..55b1e1eb8554 100644 --- a/components/eamxx/src/share/io/scream_scorpio_interface.hpp +++ b/components/eamxx/src/share/io/eamxx_scorpio_interface.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_SCORPIO_INTERFACE_HPP #define SCREAM_SCORPIO_INTERFACE_HPP -#include "scream_scorpio_types.hpp" +#include "eamxx_scorpio_types.hpp" #include #include diff --git a/components/eamxx/src/share/io/scream_scorpio_types.cpp b/components/eamxx/src/share/io/eamxx_scorpio_types.cpp similarity index 97% rename from components/eamxx/src/share/io/scream_scorpio_types.cpp rename to components/eamxx/src/share/io/eamxx_scorpio_types.cpp index 5ef7c5ae512c..317306f5239b 100644 --- a/components/eamxx/src/share/io/scream_scorpio_types.cpp +++ b/components/eamxx/src/share/io/eamxx_scorpio_types.cpp @@ -1,4 +1,4 @@ -#include "scream_scorpio_types.hpp" +#include "eamxx_scorpio_types.hpp" #include diff --git a/components/eamxx/src/share/io/scream_scorpio_types.hpp b/components/eamxx/src/share/io/eamxx_scorpio_types.hpp similarity index 99% rename from components/eamxx/src/share/io/scream_scorpio_types.hpp rename to components/eamxx/src/share/io/eamxx_scorpio_types.hpp index 7998965e09c6..2fd545c9e05a 100644 --- a/components/eamxx/src/share/io/scream_scorpio_types.hpp +++ b/components/eamxx/src/share/io/eamxx_scorpio_types.hpp @@ -46,7 +46,7 @@ using offset_t = std::int64_t; * of scream_io will never be able to get any object of these types out * of the internal database. In particular, all data is stored in a * ScorpioSession singleton class, whose declaration is hidden inside - * scream_scorpio_interface.cpp. + * eamxx_scorpio_interface.cpp. */ // The basic common data of any PIO entity diff --git a/components/eamxx/src/share/io/scream_shr_interface_c2f.F90 b/components/eamxx/src/share/io/eamxx_shr_interface_c2f.F90 similarity index 100% rename from components/eamxx/src/share/io/scream_shr_interface_c2f.F90 rename to components/eamxx/src/share/io/eamxx_shr_interface_c2f.F90 diff --git a/components/eamxx/src/share/io/scream_shr_interface_c2f.hpp b/components/eamxx/src/share/io/eamxx_shr_interface_c2f.hpp similarity index 100% rename from components/eamxx/src/share/io/scream_shr_interface_c2f.hpp rename to components/eamxx/src/share/io/eamxx_shr_interface_c2f.hpp diff --git a/components/eamxx/src/share/io/scorpio_input.cpp b/components/eamxx/src/share/io/scorpio_input.cpp index 5fe8e8260043..589442a9d97b 100644 --- a/components/eamxx/src/share/io/scorpio_input.cpp +++ b/components/eamxx/src/share/io/scorpio_input.cpp @@ -1,6 +1,6 @@ #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include diff --git a/components/eamxx/src/share/io/scorpio_output.cpp b/components/eamxx/src/share/io/scorpio_output.cpp index 6803f1d6849b..9569cdac9c6c 100644 --- a/components/eamxx/src/share/io/scorpio_output.cpp +++ b/components/eamxx/src/share/io/scorpio_output.cpp @@ -1,9 +1,9 @@ #include "share/io/scorpio_output.hpp" #include "share/io/scorpio_input.hpp" -#include "share/util/scream_array_utils.hpp" +#include "share/util/eamxx_array_utils.hpp" #include "share/grid/remap/coarsening_remapper.hpp" #include "share/grid/remap/vertical_remapper.hpp" -#include "share/util/scream_timing.hpp" +#include "share/util/eamxx_timing.hpp" #include "share/field/field_utils.hpp" #include "diagnostics/register_diagnostics.hpp" diff --git a/components/eamxx/src/share/io/scorpio_output.hpp b/components/eamxx/src/share/io/scorpio_output.hpp index b1dd6b36cf3e..26c438b6a10f 100644 --- a/components/eamxx/src/share/io/scorpio_output.hpp +++ b/components/eamxx/src/share/io/scorpio_output.hpp @@ -1,19 +1,19 @@ #ifndef SCREAM_SCORPIO_OUTPUT_HPP #define SCREAM_SCORPIO_OUTPUT_HPP -#include "share/io/scream_scorpio_interface.hpp" -#include "share/io/scream_io_utils.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/io/eamxx_io_utils.hpp" #include "share/field/field_manager.hpp" #include "share/grid/abstract_grid.hpp" #include "share/grid/grids_manager.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/util/eamxx_utils.hpp" #include "share/atm_process/atmosphere_diagnostic.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/mpi/ekat_comm.hpp" /* The AtmosphereOutput class handles an output stream in SCREAM. - * Typical usage is to register an AtmosphereOutput object with the OutputManager (see scream_output_manager.hpp + * Typical usage is to register an AtmosphereOutput object with the OutputManager (see eamxx_output_manager.hpp * * Similar to other SCREAM classes, output streams have a init, run and finalize routines. * These routines are called during the homonymous steps of the AD. diff --git a/components/eamxx/src/share/io/scorpio_scm_input.cpp b/components/eamxx/src/share/io/scorpio_scm_input.cpp index 77cf7b8b68b7..c35969692029 100644 --- a/components/eamxx/src/share/io/scorpio_scm_input.cpp +++ b/components/eamxx/src/share/io/scorpio_scm_input.cpp @@ -1,7 +1,7 @@ #include "share/io/scorpio_scm_input.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/point_grid.hpp" #include diff --git a/components/eamxx/src/share/io/tests/CMakeLists.txt b/components/eamxx/src/share/io/tests/CMakeLists.txt index 89d92075723d..4733c5f22312 100644 --- a/components/eamxx/src/share/io/tests/CMakeLists.txt +++ b/components/eamxx/src/share/io/tests/CMakeLists.txt @@ -7,7 +7,7 @@ BuildCprnc() ## Test scorpio interfaces CreateUnitTest(scorpio_interface_tests "scorpio_interface_tests.cpp" - LIBS scream_scorpio_interface LABELS "io" + LIBS eamxx_scorpio_interface LABELS "io" MPI_RANKS 1 ${SCREAM_TEST_MAX_RANKS} ) diff --git a/components/eamxx/src/share/io/tests/create_diag.cpp b/components/eamxx/src/share/io/tests/create_diag.cpp index bc5091759719..1517f120e014 100644 --- a/components/eamxx/src/share/io/tests/create_diag.cpp +++ b/components/eamxx/src/share/io/tests/create_diag.cpp @@ -2,7 +2,7 @@ #include "diagnostics/register_diagnostics.hpp" -#include "share/io/scream_io_utils.hpp" +#include "share/io/eamxx_io_utils.hpp" #include "share/grid/point_grid.hpp" namespace scream { diff --git a/components/eamxx/src/share/io/tests/io_basic.cpp b/components/eamxx/src/share/io/tests/io_basic.cpp index fd745d3e2bf5..5f839a5a01c2 100644 --- a/components/eamxx/src/share/io/tests/io_basic.cpp +++ b/components/eamxx/src/share/io/tests/io_basic.cpp @@ -1,6 +1,6 @@ #include -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" #include "share/grid/mesh_free_grids_manager.hpp" @@ -9,10 +9,10 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" -#include "share/util/scream_universal_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_universal_constants.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_units.hpp" #include "ekat/ekat_parameter_list.hpp" diff --git a/components/eamxx/src/share/io/tests/io_diags.cpp b/components/eamxx/src/share/io/tests/io_diags.cpp index 5379a0ab89f0..4feb8b29b39a 100644 --- a/components/eamxx/src/share/io/tests/io_diags.cpp +++ b/components/eamxx/src/share/io/tests/io_diags.cpp @@ -2,7 +2,7 @@ #include "share/atm_process/atmosphere_diagnostic.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" #include "share/grid/mesh_free_grids_manager.hpp" @@ -11,9 +11,9 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_units.hpp" #include "ekat/ekat_parameter_list.hpp" diff --git a/components/eamxx/src/share/io/tests/io_filled.cpp b/components/eamxx/src/share/io/tests/io_filled.cpp index b53b5ef45918..40c94807f8f7 100644 --- a/components/eamxx/src/share/io/tests/io_filled.cpp +++ b/components/eamxx/src/share/io/tests/io_filled.cpp @@ -1,8 +1,8 @@ #include -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_io_utils.hpp" +#include "share/io/eamxx_io_utils.hpp" #include "share/grid/mesh_free_grids_manager.hpp" @@ -10,10 +10,10 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" -#include "share/util/scream_universal_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_universal_constants.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_units.hpp" #include "ekat/ekat_parameter_list.hpp" diff --git a/components/eamxx/src/share/io/tests/io_monthly.cpp b/components/eamxx/src/share/io/tests/io_monthly.cpp index de1ef6918258..26480cdf316e 100644 --- a/components/eamxx/src/share/io/tests/io_monthly.cpp +++ b/components/eamxx/src/share/io/tests/io_monthly.cpp @@ -1,6 +1,6 @@ #include -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" #include "share/grid/mesh_free_grids_manager.hpp" @@ -9,10 +9,10 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" -#include "share/util/scream_universal_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_universal_constants.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_units.hpp" #include "ekat/ekat_parameter_list.hpp" diff --git a/components/eamxx/src/share/io/tests/io_packed.cpp b/components/eamxx/src/share/io/tests/io_packed.cpp index 58c819dd19b4..81e5a0f93736 100644 --- a/components/eamxx/src/share/io/tests/io_packed.cpp +++ b/components/eamxx/src/share/io/tests/io_packed.cpp @@ -1,6 +1,6 @@ #include -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" #include "share/grid/mesh_free_grids_manager.hpp" @@ -9,9 +9,9 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" #include "ekat/util/ekat_units.hpp" #include "ekat/ekat_parameter_list.hpp" diff --git a/components/eamxx/src/share/io/tests/io_remap_test.cpp b/components/eamxx/src/share/io/tests/io_remap_test.cpp index 55095ef8a96a..45d3fab18fe3 100644 --- a/components/eamxx/src/share/io/tests/io_remap_test.cpp +++ b/components/eamxx/src/share/io/tests/io_remap_test.cpp @@ -3,9 +3,9 @@ #include "diagnostics/register_diagnostics.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/mesh_free_grids_manager.hpp" diff --git a/components/eamxx/src/share/io/tests/io_scm_reader.cpp b/components/eamxx/src/share/io/tests/io_scm_reader.cpp index 0714cc97bc5e..68164b6e919d 100644 --- a/components/eamxx/src/share/io/tests/io_scm_reader.cpp +++ b/components/eamxx/src/share/io/tests/io_scm_reader.cpp @@ -1,13 +1,13 @@ #include #include "share/io/scorpio_scm_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/point_grid.hpp" #include "share/field/field.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" namespace scream { diff --git a/components/eamxx/src/share/io/tests/io_se_grid.cpp b/components/eamxx/src/share/io/tests/io_se_grid.cpp index 0e6d28b53d62..a519cbfc9c37 100644 --- a/components/eamxx/src/share/io/tests/io_se_grid.cpp +++ b/components/eamxx/src/share/io/tests/io_se_grid.cpp @@ -1,8 +1,8 @@ #include -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/mesh_free_grids_manager.hpp" @@ -11,9 +11,9 @@ #include "share/field/field_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/util/ekat_units.hpp" diff --git a/components/eamxx/src/share/io/tests/io_utils.cpp b/components/eamxx/src/share/io/tests/io_utils.cpp index cf7b66ad8596..c4e3fbae1a6c 100644 --- a/components/eamxx/src/share/io/tests/io_utils.cpp +++ b/components/eamxx/src/share/io/tests/io_utils.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/components/eamxx/src/share/io/tests/output_restart.cpp b/components/eamxx/src/share/io/tests/output_restart.cpp index 30dfa1b4270b..2a16699b061b 100644 --- a/components/eamxx/src/share/io/tests/output_restart.cpp +++ b/components/eamxx/src/share/io/tests/output_restart.cpp @@ -1,9 +1,9 @@ #include -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "share/io/scorpio_output.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/mesh_free_grids_manager.hpp" #include "share/grid/point_grid.hpp" @@ -13,9 +13,9 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util//scream_setup_random_test.hpp" +#include "share/util//eamxx_setup_random_test.hpp" -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/util/ekat_string_utils.hpp" diff --git a/components/eamxx/src/share/io/tests/scorpio_interface_tests.cpp b/components/eamxx/src/share/io/tests/scorpio_interface_tests.cpp index d5dcafd839a7..85fa8a9612da 100644 --- a/components/eamxx/src/share/io/tests/scorpio_interface_tests.cpp +++ b/components/eamxx/src/share/io/tests/scorpio_interface_tests.cpp @@ -1,6 +1,6 @@ #include -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include namespace scream { diff --git a/components/eamxx/src/share/property_checks/field_nan_check.cpp b/components/eamxx/src/share/property_checks/field_nan_check.cpp index 5b709ff916de..0734cdafd8c4 100644 --- a/components/eamxx/src/share/property_checks/field_nan_check.cpp +++ b/components/eamxx/src/share/property_checks/field_nan_check.cpp @@ -1,6 +1,6 @@ #include "share/property_checks/field_nan_check.hpp" #include "share/field/field_utils.hpp" -#include "share/util//scream_array_utils.hpp" +#include "share/util//eamxx_array_utils.hpp" #include "ekat/util/ekat_math_utils.hpp" diff --git a/components/eamxx/src/share/property_checks/field_within_interval_check.cpp b/components/eamxx/src/share/property_checks/field_within_interval_check.cpp index eee5f96855d5..b8822badc4af 100644 --- a/components/eamxx/src/share/property_checks/field_within_interval_check.cpp +++ b/components/eamxx/src/share/property_checks/field_within_interval_check.cpp @@ -1,5 +1,5 @@ #include "share/property_checks/field_within_interval_check.hpp" -#include "share/util/scream_array_utils.hpp" +#include "share/util/eamxx_array_utils.hpp" #include "share/field/field_utils.hpp" #include diff --git a/components/eamxx/src/share/tests/atm_process_tests.cpp b/components/eamxx/src/share/tests/atm_process_tests.cpp index fce25cd28e21..481f371f4eae 100644 --- a/components/eamxx/src/share/tests/atm_process_tests.cpp +++ b/components/eamxx/src/share/tests/atm_process_tests.cpp @@ -11,7 +11,7 @@ #include "share/grid/point_grid.hpp" #include "share/grid/mesh_free_grids_manager.hpp" #include "share/grid/remap/inverse_remapper.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "ekat/ekat_parameter_list.hpp" #include "ekat/ekat_parse_yaml_file.hpp" diff --git a/components/eamxx/src/share/tests/coarsening_remapper_tests.cpp b/components/eamxx/src/share/tests/coarsening_remapper_tests.cpp index a404ce1dc4ad..16df958b9800 100644 --- a/components/eamxx/src/share/tests/coarsening_remapper_tests.cpp +++ b/components/eamxx/src/share/tests/coarsening_remapper_tests.cpp @@ -2,8 +2,8 @@ #include "share/grid/remap/coarsening_remapper.hpp" #include "share/grid/point_grid.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/field/field_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/tests/column_ops.cpp b/components/eamxx/src/share/tests/column_ops.cpp index 4f3e4c7db909..c4cf3a4e7e3e 100644 --- a/components/eamxx/src/share/tests/column_ops.cpp +++ b/components/eamxx/src/share/tests/column_ops.cpp @@ -3,7 +3,7 @@ #include "ekat/kokkos/ekat_kokkos_types.hpp" #include "ekat/kokkos/ekat_subview_utils.hpp" #include "ekat/util/ekat_arch.hpp" -#include "share/util/scream_column_ops.hpp" +#include "share/util/eamxx_column_ops.hpp" namespace { diff --git a/components/eamxx/src/share/tests/common_physics_functions_tests.cpp b/components/eamxx/src/share/tests/common_physics_functions_tests.cpp index c4cff428d676..6148c1d83e11 100644 --- a/components/eamxx/src/share/tests/common_physics_functions_tests.cpp +++ b/components/eamxx/src/share/tests/common_physics_functions_tests.cpp @@ -2,9 +2,9 @@ #include "physics/share/physics_constants.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_common_physics_functions.hpp" -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" +#include "share/util/eamxx_utils.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/kokkos/ekat_kokkos_utils.hpp" diff --git a/components/eamxx/src/share/tests/data_interpolation_setup.cpp b/components/eamxx/src/share/tests/data_interpolation_setup.cpp index d7df24030281..87915778f9e6 100644 --- a/components/eamxx/src/share/tests/data_interpolation_setup.cpp +++ b/components/eamxx/src/share/tests/data_interpolation_setup.cpp @@ -2,8 +2,8 @@ #include "data_interpolation_tests.hpp" -#include "share/io/scream_io_utils.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_io_utils.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/grid/point_grid.hpp" namespace scream { diff --git a/components/eamxx/src/share/tests/data_interpolation_tests.cpp b/components/eamxx/src/share/tests/data_interpolation_tests.cpp index 0f2c49f7f582..00ffa3460973 100644 --- a/components/eamxx/src/share/tests/data_interpolation_tests.cpp +++ b/components/eamxx/src/share/tests/data_interpolation_tests.cpp @@ -2,11 +2,11 @@ #include "data_interpolation_tests.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/util/eamxx_data_interpolation.hpp" #include "share/grid/point_grid.hpp" #include "share/field/field_utils.hpp" -#include "share/scream_config.hpp" +#include "share/eamxx_config.hpp" namespace scream { diff --git a/components/eamxx/src/share/tests/data_interpolation_tests.hpp b/components/eamxx/src/share/tests/data_interpolation_tests.hpp index 3a1959f93b81..506231f0b9c5 100644 --- a/components/eamxx/src/share/tests/data_interpolation_tests.hpp +++ b/components/eamxx/src/share/tests/data_interpolation_tests.hpp @@ -3,7 +3,7 @@ #include "share/grid/abstract_grid.hpp" #include "share/field/field.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_universal_constants.hpp" #include diff --git a/components/eamxx/src/share/tests/eamxx_time_interpolation_tests.cpp b/components/eamxx/src/share/tests/eamxx_time_interpolation_tests.cpp index 238887e909aa..8b31d548289b 100644 --- a/components/eamxx/src/share/tests/eamxx_time_interpolation_tests.cpp +++ b/components/eamxx/src/share/tests/eamxx_time_interpolation_tests.cpp @@ -7,10 +7,10 @@ #include "share/field/field_manager.hpp" #include "share/util/eamxx_time_interpolation.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_time_stamp.hpp" -#include "share/io/scream_output_manager.hpp" +#include "share/io/eamxx_output_manager.hpp" #include "ekat/ekat_parameter_list.hpp" /*----------------------------------------------------------------------------------------------- diff --git a/components/eamxx/src/share/tests/field_tests.cpp b/components/eamxx/src/share/tests/field_tests.cpp index e2b403458499..343d619251f7 100644 --- a/components/eamxx/src/share/tests/field_tests.cpp +++ b/components/eamxx/src/share/tests/field_tests.cpp @@ -7,7 +7,7 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/grid/point_grid.hpp" diff --git a/components/eamxx/src/share/tests/field_utils.cpp b/components/eamxx/src/share/tests/field_utils.cpp index 8dc1dcd940df..5779615278e0 100644 --- a/components/eamxx/src/share/tests/field_utils.cpp +++ b/components/eamxx/src/share/tests/field_utils.cpp @@ -7,7 +7,7 @@ #include "share/field/field.hpp" #include "share/field/field_manager.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/grid/point_grid.hpp" diff --git a/components/eamxx/src/share/tests/grid_import_export_tests.cpp b/components/eamxx/src/share/tests/grid_import_export_tests.cpp index 1d21b0ee174c..722e93d2ada5 100644 --- a/components/eamxx/src/share/tests/grid_import_export_tests.cpp +++ b/components/eamxx/src/share/tests/grid_import_export_tests.cpp @@ -4,8 +4,8 @@ #include "share/grid/point_grid.hpp" #include "share/grid/grid_import_export.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/eamxx_types.hpp" #include diff --git a/components/eamxx/src/share/tests/grid_tests.cpp b/components/eamxx/src/share/tests/grid_tests.cpp index b9a7b81cf731..dcff0f438142 100644 --- a/components/eamxx/src/share/tests/grid_tests.cpp +++ b/components/eamxx/src/share/tests/grid_tests.cpp @@ -4,8 +4,8 @@ #include "share/grid/se_grid.hpp" #include "share/grid/mesh_free_grids_manager.hpp" #include "share/grid/grid_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" diff --git a/components/eamxx/src/share/tests/iop_remapper_tests.cpp b/components/eamxx/src/share/tests/iop_remapper_tests.cpp index a5fefa1a2884..6ede2ca20dcc 100644 --- a/components/eamxx/src/share/tests/iop_remapper_tests.cpp +++ b/components/eamxx/src/share/tests/iop_remapper_tests.cpp @@ -3,7 +3,7 @@ #include "share/grid/remap/iop_remapper.hpp" #include "share/grid/point_grid.hpp" #include "share/grid/se_grid.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/field/field_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/tests/property_checks.cpp b/components/eamxx/src/share/tests/property_checks.cpp index e0da898a8416..a52101d2d6a3 100644 --- a/components/eamxx/src/share/tests/property_checks.cpp +++ b/components/eamxx/src/share/tests/property_checks.cpp @@ -5,7 +5,7 @@ #include "share/property_checks/field_lower_bound_check.hpp" #include "share/property_checks/field_upper_bound_check.hpp" #include "share/property_checks/field_nan_check.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "share/grid/point_grid.hpp" #include "share/field/field_utils.hpp" diff --git a/components/eamxx/src/share/tests/refining_remapper_p2p_tests.cpp b/components/eamxx/src/share/tests/refining_remapper_p2p_tests.cpp index fe19b0c255b9..c82d2db0e5f9 100644 --- a/components/eamxx/src/share/tests/refining_remapper_p2p_tests.cpp +++ b/components/eamxx/src/share/tests/refining_remapper_p2p_tests.cpp @@ -2,9 +2,9 @@ #include "share/grid/remap/refining_remapper_p2p.hpp" #include "share/grid/point_grid.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_utils.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_utils.hpp" #include "share/field/field_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/tests/refining_remapper_rma_tests.cpp b/components/eamxx/src/share/tests/refining_remapper_rma_tests.cpp index ed19099039e3..a4457ffa2e4d 100644 --- a/components/eamxx/src/share/tests/refining_remapper_rma_tests.cpp +++ b/components/eamxx/src/share/tests/refining_remapper_rma_tests.cpp @@ -2,9 +2,9 @@ #include "share/grid/remap/refining_remapper_rma.hpp" #include "share/grid/point_grid.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/util/scream_utils.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/util/eamxx_utils.hpp" #include "share/field/field_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/tests/subfield_tests.cpp b/components/eamxx/src/share/tests/subfield_tests.cpp index 97fe20318c5c..51e7652a96a0 100644 --- a/components/eamxx/src/share/tests/subfield_tests.cpp +++ b/components/eamxx/src/share/tests/subfield_tests.cpp @@ -3,7 +3,7 @@ #include "share/field/field.hpp" #include "share/field/field_utils.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include "ekat/util/ekat_test_utils.hpp" diff --git a/components/eamxx/src/share/tests/utils_tests.cpp b/components/eamxx/src/share/tests/utils_tests.cpp index b3b18bf206b5..0d62f3e3ab01 100644 --- a/components/eamxx/src/share/tests/utils_tests.cpp +++ b/components/eamxx/src/share/tests/utils_tests.cpp @@ -1,11 +1,11 @@ #include -#include "share/util/scream_array_utils.hpp" -#include "share/util/scream_universal_constants.hpp" -#include "share/util/scream_utils.hpp" -#include "share/util/scream_time_stamp.hpp" -#include "share/util/scream_setup_random_test.hpp" -#include "share/scream_config.hpp" +#include "share/util/eamxx_array_utils.hpp" +#include "share/util/eamxx_universal_constants.hpp" +#include "share/util/eamxx_utils.hpp" +#include "share/util/eamxx_time_stamp.hpp" +#include "share/util/eamxx_setup_random_test.hpp" +#include "share/eamxx_config.hpp" TEST_CASE("contiguous_superset") { using namespace scream; diff --git a/components/eamxx/src/share/tests/vertical_remapper_tests.cpp b/components/eamxx/src/share/tests/vertical_remapper_tests.cpp index fe26c89eaf07..448aeb749cb7 100644 --- a/components/eamxx/src/share/tests/vertical_remapper_tests.cpp +++ b/components/eamxx/src/share/tests/vertical_remapper_tests.cpp @@ -3,8 +3,8 @@ #include "share/grid/remap/vertical_remapper.hpp" #include "share/grid/remap/coarsening_remapper.hpp" #include "share/grid/point_grid.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/util/scream_timing.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/util/eamxx_timing.hpp" #include "share/field/field_utils.hpp" namespace scream { diff --git a/components/eamxx/src/share/util/scream_array_utils.hpp b/components/eamxx/src/share/util/eamxx_array_utils.hpp similarity index 99% rename from components/eamxx/src/share/util/scream_array_utils.hpp rename to components/eamxx/src/share/util/eamxx_array_utils.hpp index 46f4dfb220a6..68b17df721be 100644 --- a/components/eamxx/src/share/util/scream_array_utils.hpp +++ b/components/eamxx/src/share/util/eamxx_array_utils.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_ARRAY_UTILS_HPP #define SCREAM_ARRAY_UTILS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include diff --git a/components/eamxx/src/share/util/scream_bfbhash.cpp b/components/eamxx/src/share/util/eamxx_bfbhash.cpp similarity index 95% rename from components/eamxx/src/share/util/scream_bfbhash.cpp rename to components/eamxx/src/share/util/eamxx_bfbhash.cpp index ea2f10a68455..7e98dbc18ca9 100644 --- a/components/eamxx/src/share/util/scream_bfbhash.cpp +++ b/components/eamxx/src/share/util/eamxx_bfbhash.cpp @@ -1,4 +1,4 @@ -#include "share/util/scream_bfbhash.hpp" +#include "share/util/eamxx_bfbhash.hpp" namespace scream { namespace bfbhash { diff --git a/components/eamxx/src/share/util/scream_bfbhash.hpp b/components/eamxx/src/share/util/eamxx_bfbhash.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_bfbhash.hpp rename to components/eamxx/src/share/util/eamxx_bfbhash.hpp diff --git a/components/eamxx/src/share/util/scream_column_ops.hpp b/components/eamxx/src/share/util/eamxx_column_ops.hpp similarity index 99% rename from components/eamxx/src/share/util/scream_column_ops.hpp rename to components/eamxx/src/share/util/eamxx_column_ops.hpp index a219e3931654..6e02c0782a6e 100644 --- a/components/eamxx/src/share/util/scream_column_ops.hpp +++ b/components/eamxx/src/share/util/eamxx_column_ops.hpp @@ -1,8 +1,8 @@ #ifndef SCREAM_COLUMN_OPS_HPP #define SCREAM_COLUMN_OPS_HPP -#include "share/util/scream_combine_ops.hpp" -#include "share/scream_types.hpp" +#include "share/util/eamxx_combine_ops.hpp" +#include "share/eamxx_types.hpp" #include "ekat/ekat_pack.hpp" #include "ekat/ekat_pack_math.hpp" @@ -56,7 +56,7 @@ namespace scream { * view y will be updated as y = beta*y + alpha*f(x). The values alpha * and beta are used only if CM needs them, and an error is thrown if the * user specifies non-trivial alpha/beta when they are not needed. - * See scream_combine_ops.hpp for more details. + * See eamxx_combine_ops.hpp for more details. * * RECALL: k=0 is the model top, while k=num_mid_levels+1 is the surface! */ diff --git a/components/eamxx/src/share/util/scream_combine_ops.hpp b/components/eamxx/src/share/util/eamxx_combine_ops.hpp similarity index 98% rename from components/eamxx/src/share/util/scream_combine_ops.hpp rename to components/eamxx/src/share/util/eamxx_combine_ops.hpp index 0bc991b38def..eec3c262c703 100644 --- a/components/eamxx/src/share/util/scream_combine_ops.hpp +++ b/components/eamxx/src/share/util/eamxx_combine_ops.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_COMBINE_OPS_HPP #define SCREAM_COMBINE_OPS_HPP -#include "share/util/scream_universal_constants.hpp" +#include "share/util/eamxx_universal_constants.hpp" // For KOKKOS_INLINE_FUNCTION #include diff --git a/components/eamxx/src/share/util/scream_common_physics_functions.hpp b/components/eamxx/src/share/util/eamxx_common_physics_functions.hpp similarity index 99% rename from components/eamxx/src/share/util/scream_common_physics_functions.hpp rename to components/eamxx/src/share/util/eamxx_common_physics_functions.hpp index 87ae6604d999..8e4e67d559ad 100644 --- a/components/eamxx/src/share/util/scream_common_physics_functions.hpp +++ b/components/eamxx/src/share/util/eamxx_common_physics_functions.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_COMMON_PHYSICS_FUNCTIONS_HPP #define SCREAM_COMMON_PHYSICS_FUNCTIONS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" namespace scream { @@ -556,4 +556,4 @@ struct PhysicsFunctions // E.g., we don't know InputProvider, or ScalarT (although we could // ETI the "common" cases, where the provider is a view_1d, and // Scalar=Real or Scalar=Pack). -# include "scream_common_physics_functions_impl.hpp" +# include "eamxx_common_physics_functions_impl.hpp" diff --git a/components/eamxx/src/share/util/scream_common_physics_functions_impl.hpp b/components/eamxx/src/share/util/eamxx_common_physics_functions_impl.hpp similarity index 99% rename from components/eamxx/src/share/util/scream_common_physics_functions_impl.hpp rename to components/eamxx/src/share/util/eamxx_common_physics_functions_impl.hpp index f41e389bf67b..c93a135daa23 100644 --- a/components/eamxx/src/share/util/scream_common_physics_functions_impl.hpp +++ b/components/eamxx/src/share/util/eamxx_common_physics_functions_impl.hpp @@ -2,7 +2,7 @@ #define SCREAM_COMMON_PHYSICS_IMPL_HPP #include "physics/share/physics_constants.hpp" -#include "share/util/scream_column_ops.hpp" +#include "share/util/eamxx_column_ops.hpp" namespace scream { diff --git a/components/eamxx/src/share/util/eamxx_data_interpolation.cpp b/components/eamxx/src/share/util/eamxx_data_interpolation.cpp index e4d3f52d4669..bf1c3cd81729 100644 --- a/components/eamxx/src/share/util/eamxx_data_interpolation.cpp +++ b/components/eamxx/src/share/util/eamxx_data_interpolation.cpp @@ -5,10 +5,10 @@ #include "share/grid/remap/refining_remapper_p2p.hpp" #include "share/grid/remap/iop_remapper.hpp" #include "share/grid/point_grid.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" #include "share/io/scorpio_input.hpp" -#include "share/io/scream_io_utils.hpp" -#include "share/util/scream_universal_constants.hpp" +#include "share/io/eamxx_io_utils.hpp" +#include "share/util/eamxx_universal_constants.hpp" #include "physics/share/physics_constants.hpp" #include diff --git a/components/eamxx/src/share/util/eamxx_data_interpolation.hpp b/components/eamxx/src/share/util/eamxx_data_interpolation.hpp index 228c4c8a3f5c..fc1ed427b657 100644 --- a/components/eamxx/src/share/util/eamxx_data_interpolation.hpp +++ b/components/eamxx/src/share/util/eamxx_data_interpolation.hpp @@ -3,7 +3,7 @@ #include "share/grid/abstract_grid.hpp" #include "share/grid/remap/abstract_remapper.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "share/field/field.hpp" namespace scream diff --git a/components/eamxx/src/share/util/scream_data_type.hpp b/components/eamxx/src/share/util/eamxx_data_type.hpp similarity index 97% rename from components/eamxx/src/share/util/scream_data_type.hpp rename to components/eamxx/src/share/util/eamxx_data_type.hpp index 8c45cd734b6f..888d1975b26b 100644 --- a/components/eamxx/src/share/util/scream_data_type.hpp +++ b/components/eamxx/src/share/util/eamxx_data_type.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_DATA_TYPE_HPP #define SCREAM_DATA_TYPE_HPP -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" #include diff --git a/components/eamxx/src/share/util/scream_deep_copy.hpp b/components/eamxx/src/share/util/eamxx_deep_copy.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_deep_copy.hpp rename to components/eamxx/src/share/util/eamxx_deep_copy.hpp diff --git a/components/eamxx/src/share/util/scream_family_tracking.hpp b/components/eamxx/src/share/util/eamxx_family_tracking.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_family_tracking.hpp rename to components/eamxx/src/share/util/eamxx_family_tracking.hpp diff --git a/components/eamxx/src/share/util/scream_setup_random_test.hpp b/components/eamxx/src/share/util/eamxx_setup_random_test.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_setup_random_test.hpp rename to components/eamxx/src/share/util/eamxx_setup_random_test.hpp diff --git a/components/eamxx/src/share/util/scream_test_session.cpp b/components/eamxx/src/share/util/eamxx_test_session.cpp similarity index 85% rename from components/eamxx/src/share/util/scream_test_session.cpp rename to components/eamxx/src/share/util/eamxx_test_session.cpp index 7e8b7ce2ef98..841fc8043ed9 100644 --- a/components/eamxx/src/share/util/scream_test_session.cpp +++ b/components/eamxx/src/share/util/eamxx_test_session.cpp @@ -1,4 +1,4 @@ -#include "share/scream_session.hpp" +#include "share/eamxx_session.hpp" /* * This small file contains the default implementation of a test session @@ -15,9 +15,9 @@ */ void ekat_initialize_test_session (int argc, char** argv, const bool print_config) { - scream::initialize_scream_session (argc,argv,print_config); + scream::initialize_eamxx_session (argc,argv,print_config); } void ekat_finalize_test_session () { - scream::finalize_scream_session (); + scream::finalize_eamxx_session (); } diff --git a/components/eamxx/src/share/util/eamxx_time_interpolation.cpp b/components/eamxx/src/share/util/eamxx_time_interpolation.cpp index aa46328acac3..3bc6e95712cb 100644 --- a/components/eamxx/src/share/util/eamxx_time_interpolation.cpp +++ b/components/eamxx/src/share/util/eamxx_time_interpolation.cpp @@ -1,6 +1,6 @@ #include "share/util/eamxx_time_interpolation.hpp" -#include "share/io/scream_scorpio_interface.hpp" -#include "share/io/scream_io_utils.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" +#include "share/io/eamxx_io_utils.hpp" namespace scream{ namespace util { diff --git a/components/eamxx/src/share/util/eamxx_time_interpolation.hpp b/components/eamxx/src/share/util/eamxx_time_interpolation.hpp index 5e5fa5112f21..6af35efa2b74 100644 --- a/components/eamxx/src/share/util/eamxx_time_interpolation.hpp +++ b/components/eamxx/src/share/util/eamxx_time_interpolation.hpp @@ -3,7 +3,7 @@ #include "share/grid/abstract_grid.hpp" -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" #include "share/field/field.hpp" #include "share/field/field_manager.hpp" diff --git a/components/eamxx/src/share/util/scream_time_stamp.cpp b/components/eamxx/src/share/util/eamxx_time_stamp.cpp similarity index 98% rename from components/eamxx/src/share/util/scream_time_stamp.cpp rename to components/eamxx/src/share/util/eamxx_time_stamp.cpp index 3bd8d092964f..b064d57e4669 100644 --- a/components/eamxx/src/share/util/scream_time_stamp.cpp +++ b/components/eamxx/src/share/util/eamxx_time_stamp.cpp @@ -1,7 +1,7 @@ -#include "share/util/scream_time_stamp.hpp" +#include "share/util/eamxx_time_stamp.hpp" -#include "share/util/scream_universal_constants.hpp" -#include "share/scream_config.hpp" +#include "share/util/eamxx_universal_constants.hpp" +#include "share/eamxx_config.hpp" #include "ekat/ekat_assert.hpp" #include diff --git a/components/eamxx/src/share/util/scream_time_stamp.hpp b/components/eamxx/src/share/util/eamxx_time_stamp.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_time_stamp.hpp rename to components/eamxx/src/share/util/eamxx_time_stamp.hpp diff --git a/components/eamxx/src/share/util/scream_timing.cpp b/components/eamxx/src/share/util/eamxx_timing.cpp similarity index 93% rename from components/eamxx/src/share/util/scream_timing.cpp rename to components/eamxx/src/share/util/eamxx_timing.cpp index 0dfeb5e6ee70..dd762f480d41 100644 --- a/components/eamxx/src/share/util/scream_timing.cpp +++ b/components/eamxx/src/share/util/eamxx_timing.cpp @@ -1,4 +1,4 @@ -#include "share/util/scream_timing.hpp" +#include "share/util/eamxx_timing.hpp" #include diff --git a/components/eamxx/src/share/util/scream_timing.hpp b/components/eamxx/src/share/util/eamxx_timing.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_timing.hpp rename to components/eamxx/src/share/util/eamxx_timing.hpp diff --git a/components/eamxx/src/share/util/scream_universal_constants.hpp b/components/eamxx/src/share/util/eamxx_universal_constants.hpp similarity index 100% rename from components/eamxx/src/share/util/scream_universal_constants.hpp rename to components/eamxx/src/share/util/eamxx_universal_constants.hpp diff --git a/components/eamxx/src/share/util/scream_utils.cpp b/components/eamxx/src/share/util/eamxx_utils.cpp similarity index 98% rename from components/eamxx/src/share/util/scream_utils.cpp rename to components/eamxx/src/share/util/eamxx_utils.cpp index 2083f4d62b64..17ba48ebf038 100644 --- a/components/eamxx/src/share/util/scream_utils.cpp +++ b/components/eamxx/src/share/util/eamxx_utils.cpp @@ -1,4 +1,4 @@ -#include "share/util/scream_utils.hpp" +#include "share/util/eamxx_utils.hpp" #include #if defined(SCREAM_ENABLE_STATM) diff --git a/components/eamxx/src/share/util/scream_utils.hpp b/components/eamxx/src/share/util/eamxx_utils.hpp similarity index 99% rename from components/eamxx/src/share/util/scream_utils.hpp rename to components/eamxx/src/share/util/eamxx_utils.hpp index 99829419f8f8..a24891a9d61d 100644 --- a/components/eamxx/src/share/util/scream_utils.hpp +++ b/components/eamxx/src/share/util/eamxx_utils.hpp @@ -1,7 +1,7 @@ #ifndef SCREAM_UTILS_HPP #define SCREAM_UTILS_HPP -#include "share/scream_types.hpp" +#include "share/eamxx_types.hpp" #include #include diff --git a/components/eamxx/tests/CMakeLists.txt b/components/eamxx/tests/CMakeLists.txt index ad80045a0c13..d32b5edad2ea 100644 --- a/components/eamxx/tests/CMakeLists.txt +++ b/components/eamxx/tests/CMakeLists.txt @@ -26,7 +26,7 @@ function (CreateBaselineTest TEST_BASE_NAME GEN_TEST_NRANKS OUT_FILE FIXTURES_BA LABELS baseline_cmp FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_np${TEST_RANK_END}_omp1) - # Add the test that generated the baseline to the baseline_gen label, so scripts/test-all-scream + # Add the test that generated the baseline to the baseline_gen label, so scripts/test-all-eamxx # can run it when it has to generate baselines if (TEST ${TEST_BASE_NAME}_np${GEN_TEST_NRANKS}) set (GEN_TEST_FULL_NAME ${TEST_BASE_NAME}_np${GEN_TEST_NRANKS}) @@ -42,7 +42,7 @@ function (CreateBaselineTest TEST_BASE_NAME GEN_TEST_NRANKS OUT_FILE FIXTURES_BA endif() set_tests_properties (${GEN_TEST_FULL_NAME} PROPERTIES LABELS baseline_gen) - # test-all-scream will read this file to get the list of baseline nc files to + # test-all-eamxx will read this file to get the list of baseline nc files to # copy into the baseline dir file (APPEND ${SCREAM_TEST_OUTPUT_DIR}/baseline_list "${SRC_FILE}\n" diff --git a/components/eamxx/tests/generic/bfbhash/bfbhash.cpp b/components/eamxx/tests/generic/bfbhash/bfbhash.cpp index 5f049265f6ea..3f3c86283e11 100644 --- a/components/eamxx/tests/generic/bfbhash/bfbhash.cpp +++ b/components/eamxx/tests/generic/bfbhash/bfbhash.cpp @@ -1,4 +1,4 @@ -#include "share/util/scream_bfbhash.hpp" +#include "share/util/eamxx_bfbhash.hpp" #include diff --git a/components/eamxx/tests/meta-tests/build_fail.cpp b/components/eamxx/tests/meta-tests/build_fail.cpp index 8ed7844235a6..20ab610e1d46 100644 --- a/components/eamxx/tests/meta-tests/build_fail.cpp +++ b/components/eamxx/tests/meta-tests/build_fail.cpp @@ -1,7 +1,7 @@ #include #ifdef SCREAM_FORCE_BUILD_FAIL -#error "Forcing failure to test test-all-scream" +#error "Forcing failure to test test-all-eamxx" #endif int main(int,char**) diff --git a/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/create_vert_remap_and_weights.cpp b/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/create_vert_remap_and_weights.cpp index 8cedad048a64..353b5ad859f6 100644 --- a/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/create_vert_remap_and_weights.cpp +++ b/components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/create_vert_remap_and_weights.cpp @@ -1,6 +1,6 @@ #include -#include "share/io/scream_output_manager.hpp" -#include "share/io/scream_scorpio_interface.hpp" +#include "share/io/eamxx_output_manager.hpp" +#include "share/io/eamxx_scorpio_interface.hpp" namespace { diff --git a/components/eamxx/tests/python/pyp3/CMakeLists.txt b/components/eamxx/tests/python/pyp3/CMakeLists.txt index 945f15faaf65..7142be8dd8f8 100644 --- a/components/eamxx/tests/python/pyp3/CMakeLists.txt +++ b/components/eamxx/tests/python/pyp3/CMakeLists.txt @@ -53,6 +53,6 @@ foreach (rank IN LISTS MpiRanks) SRC_FILE p3_standalone_cxx.INSTANT.nsteps_x1.np${rank}.2021-10-12-45000.nc TGT_FILE p3_standalone_py.INSTANT.nsteps_x1.np${rank}.2021-10-12-45000.nc FIXTURES_REQUIRED ${FIXTURES_BASE_NAME}_cxx${suffix} ${FIXTURES_BASE_NAME}_py${suffix} - LABELS pyscream + LABELS pyeamxx ) endforeach() diff --git a/components/eamxx/tests/python/pyp3/p3_standalone_py b/components/eamxx/tests/python/pyp3/p3_standalone_py index 34747943d081..0db6bcfcef61 100755 --- a/components/eamxx/tests/python/pyp3/p3_standalone_py +++ b/components/eamxx/tests/python/pyp3/p3_standalone_py @@ -5,7 +5,7 @@ import sys # Add path to scream libs sys.path.append('@SCREAM_BASE_DIR@/scripts') -# Add path to pyscream libs +# Add path to pyeamxx libs sys.path.append('@CMAKE_BINARY_DIR@/src/python') # Without these, and manual init/finalize, on my laptop I get @@ -15,7 +15,7 @@ mpi4py.rc.initialize = False # do not initialize MPI automatically mpi4py.rc.finalize = False # do not finalize MPI automatically from mpi4py import MPI -import pyscream +import pyeamxx from pathlib import Path from utils import ensure_yaml @@ -38,9 +38,9 @@ def main (): # Create the grid ncols = 218 nlevs = 72 - pyscream.create_grids_manager(ncols,nlevs,str(ic_file)) + pyeamxx.create_grids_manager(ncols,nlevs,str(ic_file)) - p3 = pyscream.AtmProc(yaml_input['atmosphere_processes']['p3'],'p3') + p3 = pyeamxx.AtmProc(yaml_input['atmosphere_processes']['p3'],'p3') params = p3.get_params() old = params.get_dbl('max_total_ni') print (f"max_total_ni: {params.get_dbl('max_total_ni')}") @@ -64,7 +64,7 @@ if __name__ == "__main__": # This level of indirection ensures all pybind structs are destroyed # before we finalize eamxx (and hence kokkos) MPI.Init() - pyscream.init() + pyeamxx.init() main () - pyscream.finalize() + pyeamxx.finalize() MPI.Finalize() diff --git a/components/eamxx/tests/single-process/rrtmgp/rrtmgp_standalone_unit.cpp b/components/eamxx/tests/single-process/rrtmgp/rrtmgp_standalone_unit.cpp index 5be27ce2b1e2..1e69d37ad9ad 100644 --- a/components/eamxx/tests/single-process/rrtmgp/rrtmgp_standalone_unit.cpp +++ b/components/eamxx/tests/single-process/rrtmgp/rrtmgp_standalone_unit.cpp @@ -5,14 +5,14 @@ // Other rrtmgp specific code needed specifically for this test #include "physics/rrtmgp/rrtmgp_test_utils.hpp" -#include "physics/rrtmgp/scream_rrtmgp_interface.hpp" +#include "physics/rrtmgp/eamxx_rrtmgp_interface.hpp" #include "physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp" #include "physics/register_physics.hpp" #include "physics/share/physics_constants.hpp" // scream share headers #include "share/grid/mesh_free_grids_manager.hpp" -#include "share/util/scream_common_physics_functions.hpp" +#include "share/util/eamxx_common_physics_functions.hpp" // EKAT headers #include diff --git a/components/eamxx/tests/single-process/surface_coupling/surface_coupling.cpp b/components/eamxx/tests/single-process/surface_coupling/surface_coupling.cpp index 73a74056d29b..8ef7de663b20 100644 --- a/components/eamxx/tests/single-process/surface_coupling/surface_coupling.cpp +++ b/components/eamxx/tests/single-process/surface_coupling/surface_coupling.cpp @@ -7,8 +7,8 @@ #include "share/grid/mesh_free_grids_manager.hpp" #include "share/field/field_manager.hpp" #include "share/atm_process/atmosphere_process.hpp" -#include "share/scream_types.hpp" -#include "share/util/scream_setup_random_test.hpp" +#include "share/eamxx_types.hpp" +#include "share/util/eamxx_setup_random_test.hpp" #include #include @@ -600,7 +600,7 @@ TEST_CASE("surface-coupling", "") { std::strcpy(export_names[16], "Faxa_lwdn" ); // Setup the import/export data. This is meant to replicate the structures coming - // from mct_coupling/scream_cpl_indices.F90 + // from mct_coupling/eamxx_cpl_indices.F90 setup_import_and_export_data(engine, atm_comm, num_cpl_imports, num_scream_imports, import_cpl_indices_view, import_vec_comps_view, diff --git a/externals/ekat b/externals/ekat index ada2c92db385..12057410f6b9 160000 --- a/externals/ekat +++ b/externals/ekat @@ -1 +1 @@ -Subproject commit ada2c92db3857372cd51455da4c619f40067899b +Subproject commit 12057410f6b9e32fe3c12b2eaf7203e488da0d86