diff --git a/.github/workflows/CEFI_MOM6-ci.yaml b/.github/workflows/CEFI_MOM6-ci._yaml similarity index 100% rename from .github/workflows/CEFI_MOM6-ci.yaml rename to .github/workflows/CEFI_MOM6-ci._yaml diff --git a/.github/workflows/CEFI_MOM6_c6-ci.yaml b/.github/workflows/CEFI_MOM6_c6-ci.yaml new file mode 100644 index 000000000..8fba31384 --- /dev/null +++ b/.github/workflows/CEFI_MOM6_c6-ci.yaml @@ -0,0 +1,130 @@ +name: CEFI-MOM6_c6-ci + +on: + # Triggers this workflow on pull request event with "CEFI_MOM6_RT_gaea_c6" label + pull_request: + branches: [ "main" ] + types: [ labeled ] + +# +env: + TEST_DIR: ${{ github.workspace }}/${{ github.run_id }} + PR_NUMBER: ${{ github.event.number }} + +# +jobs: + checkout-build: + if: ${{ github.event.label.name == 'CEFI_MOM6_RT_gaea_c6' }} + runs-on: self-hosted + timeout-minutes: 600 + strategy: + max-parallel: 1 + + steps: + - name: Checkout CEFI-regional-MOM6 + uses: actions/checkout@v4 + with: + path: ${{ github.run_id }}/CEFI_MOM6_CHECK + fetch-depth: 1 + submodules: recursive + + - name: Build MOM6SIS2 + run: | + cd ${{ env.TEST_DIR }}/CEFI_MOM6_CHECK/builds + jobid=$(sbatch --parsable ci_build_driver_c6.sh | awk -F';' '{print $1}' | cut -f1) + # + sleep 1 + while :; do + job_status=$(squeue -h -j "$jobid" -o "%T" 2>/dev/null) + if [ -z "$job_status" ]; then + echo "Job with ID $jobid is not found or completed." + break + else + echo "Job with ID $jobid is still running." + echo "Job Status: $job_status" + fi + sleep 60 # Adjust the sleep duration as needed + done + # + check_file="${{ env.TEST_DIR }}/CEFI_MOM6_CHECK/builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2" + if [ -f "$check_file" ]; then + echo "PASSED: $check_file" + else + echo "FAILED: $check_file" + exit 1 + fi + + run-CEFI_MOM6-ci: + needs: checkout-build + runs-on: self-hosted + strategy: + max-parallel: 2 + matrix: + case: ["NWA12.COBALT"] #["NWA12.COBALT", "NEP10.COBALT"] + steps: + - name: Run Experiment ${{ matrix.case }} + run: | + cd ${{ env.TEST_DIR }}/CEFI_MOM6_CHECK/exps/${{ matrix.case }} + jobid=$(sbatch --parsable driver.sh | awk -F';' '{print $1}' | cut -f1) + # + sleep 1 + while :; do + job_status=$(squeue -h -j "$jobid" -o "%T" 2>/dev/null) + if [ -z "$job_status" ]; then + echo "Job with ID $jobid is not found or completed." + break + else + echo "Job with ID $jobid is still running." + echo "Job Status: $job_status" + fi + sleep 60 # Adjust the sleep duration as needed + done + # + expected_string="All restart files are identical, PASS" + check_file="${{ env.TEST_DIR }}/CEFI_MOM6_CHECK/exps/${{ matrix.case }}/${{ matrix.case }}_o.$jobid" + if [ -f "$check_file" ]; then + if grep -qF "$expected_string" $check_file; then + echo "PASSED: ${{ matrix.case }}" + else + echo "FAILED: ${{ matrix.case }}" + exit 1 + fi + else + echo "Can not find $check_file. STOP" + exit 10 + fi + + add-pass-label: + needs: run-CEFI_MOM6-ci + runs-on: self-hosted + if: ${{ needs.run-CEFI_MOM6-ci.result == 'success' }} + steps: + - name: Add "pass_CEFI_MOM6_RT" label on success + run: | + TOKEN=${{ secrets.GITHUB_TOKEN }} + RT_TEST_LABEL="CEFI_MOM6_RT_gaea_c6" + PASS_LABEL="pass_CEFI_MOM6_RT" + + # Remove the "CEFI_MOM6_RT_gaea_c6" label + curl -X DELETE \ + -H "Authorization: Bearer $TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ env.PR_NUMBER }}/labels/$RT_TEST_LABEL" + + # Add the "pass_CEFI_MOM6_RT" label + curl -X POST \ + -H "Authorization: Bearer $TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ env.PR_NUMBER }}/labels" \ + -d "{\"labels\":[\"$PASS_LABEL\"]}" + + clean-up: + needs: add-pass-label + runs-on: self-hosted + strategy: + max-parallel: 1 + steps: + - name: Clean-up + run: | + cd ${{ github.workspace }} + rm -rf ${{ github.run_id }} diff --git a/builds/ci_build_driver_c6.sh b/builds/ci_build_driver_c6.sh new file mode 100755 index 000000000..40ecf1c3c --- /dev/null +++ b/builds/ci_build_driver_c6.sh @@ -0,0 +1,65 @@ +#!/bin/bash +#SBATCH --nodes=1 +#SBATCH --time=60 +#SBATCH --job-name="MOM6SIS2_ci_build" +#SBATCH --output=MOM6SIS2_ci_build_o.%j +#SBATCH --error=MOM6SIS2_ci_build_e.%j +#SBATCH --qos=debug +#SBATCH --partition=batch +#SBATCH --clusters=c6 +#SBATCH --account=ira-cefi + +# +[ -d "build" ] && rm -rf build + +# +echo "Build MOM6SIS2-COBALT for CI testing started: " `date` + +# +machine_name="gaea" +platform="ncrc6.intel23" +target="repro" +flavor="fms1_mom6sis2" + +FMSlib_PATH="/ncrc/home2/Yi-cheng.Teng/github/FMS/2024.02_FMS1" +rootdir=$(pwd) +abs_rootdir=$rootdir + +echo $abs_rootdir + +#load modules +source $MODULESHOME/init/bash +source $rootdir/$machine_name/$platform.env +. $rootdir/$machine_name/$platform.env + +makeflags="NETCDF=3" + +if [[ $target =~ "repro" ]] ; then + makeflags="$makeflags REPRO=1" +fi + +srcdir=$abs_rootdir/../src + +# +sed -i 's/static pid_t gettid(void)/pid_t gettid(void)/g' $srcdir/FMS/affinity/affinity.c + +# +if [[ $flavor == "fms1_mom6sis2" ]] ; then + echo "build mom6sis2 with FMS1 cap" + + mkdir -p build/$machine_name-$platform/ocean_ice/$target + pushd build/$machine_name-$platform/ocean_ice/$target + rm -f path_names + $srcdir/mkmf/bin/list_paths $srcdir/MOM6/{config_src/infra/FMS1,config_src/memory/dynamic_symmetric,config_src/drivers/FMS_cap,config_src/external/ODA_hooks,config_src/external/database_comms,config_src/external/drifters,config_src/external/stochastic_physics,pkg/GSW-Fortran/{modules,toolbox}/,src/{*,*/*}/} $srcdir/SIS2/{config_src/dynamic_symmetric,config_src/external/Icepack_interfaces,src} $srcdir/icebergs/src $srcdir/FMS/{coupler,include}/ $srcdir/{ocean_BGC/generic_tracers,ocean_BGC/mocsy/src}/ $srcdir/{atmos_null,ice_param,land_null,coupler/shared/,coupler/full/}/ + + compiler_options='-DINTERNAL_FILE_NML -DMAX_FIELDS_=600 -DNOT_SET_AFFINITY -Duse_deprecated_io -D_USE_MOM6_DIAG -D_USE_GENERIC_TRACER -DUSE_PRECISION=2 -D_USE_LEGACY_LAND_ -Duse_AM3_physics' + + $srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -o "-I${FMSlib_PATH}/shared/$target" -p MOM6SIS2 -l "-L${FMSlib_PATH}/shared/$target -lfms" -c "$compiler_options" path_names + + make $makeflags MOM6SIS2 + +fi + + + +echo "Build MOM6SIS2-COBALT for CI testing ended: " `date` diff --git a/builds/gaea/ncrc6.intel23.env b/builds/gaea/ncrc6.intel23.env new file mode 100644 index 000000000..6d54db3fb --- /dev/null +++ b/builds/gaea/ncrc6.intel23.env @@ -0,0 +1,11 @@ +source $MODULESHOME/init/tcsh +module unload cray-netcdf cray-hdf5 fre +module unload PrgEnv-pgi PrgEnv-intel PrgEnv-gnu PrgEnv-cray +module load PrgEnv-intel/8.5.0 +module unload intel intel-classic intel-oneapi +module load intel-classic/2023.2.0 +module load cray-hdf5/1.12.2.11 +module load cray-netcdf/4.9.0.9 +module load libyaml/0.2.5 +module list +ftn --version diff --git a/builds/gaea/ncrc6.intel23.mk b/builds/gaea/ncrc6.intel23.mk new file mode 100644 index 000000000..0d87140da --- /dev/null +++ b/builds/gaea/ncrc6.intel23.mk @@ -0,0 +1,279 @@ +# Template for the Intel Compilers on a Cray System +# +# Typical use with mkmf +# mkmf -t ncrc-cray.mk -c"-Duse_libMPI -Duse_netCDF" path_names /usr/local/include + +############ +# Commands Macros +############ +FC = ftn +CC = cc +LD = ftn $(MAIN_PROGRAM) + +####################### +# Build target macros +# +# Macros that modify compiler flags used in the build. Target +# macrose are usually set on the call to make: +# +# make REPRO=on NETCDF=3 +# +# Most target macros are activated when their value is non-blank. +# Some have a single value that is checked. Others will use the +# value of the macro in the compile command. + +DEBUG = # If non-blank, perform a debug build (Cannot be + # mixed with REPRO or TEST) + +REPRO = # If non-blank, erform a build that guarentees + # reprodicuibilty from run to run. Cannot be used + # with DEBUG or TEST + +TEST = # If non-blank, use the compiler options defined in + # the FFLAGS_TEST and CFLAGS_TEST macros. Cannot be + # use with REPRO or DEBUG + +VERBOSE = # If non-blank, add additional verbosity compiler + # options + +OPENMP = # If non-blank, compile with openmp enabled + +NO_OVERRIDE_LIMITS = # If non-blank, do not use the -qoverride-limits + # compiler option. Default behavior is to compile + # with -qoverride-limits. + +NETCDF = # If value is '3' and CPPDEFS contains + # '-Duse_netCDF', then the additional cpp macro + # '-Duse_LARGEFILE' is added to the CPPDEFS macro. + +INCLUDES = # A list of -I Include directories to be added to the + # the compile command. + +#ISA = -xsse2 # The Intel Instruction Set Archetecture (ISA) compile +ISA = -march=core-avx-i -qno-opt-dynamic-align + # option to use. If blank, than use the default SSE + # settings for the host. Current default is to use SSE2. + +COVERAGE = # Add the code coverage compile options. + +# Need to use at least GNU Make version 3.81 +need := 3.81 +ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need)))) +ifneq ($(need),$(ok)) +$(error Need at least make version $(need). Load module gmake/3.81) +endif + +# REPRO, DEBUG and TEST need to be mutually exclusive of each other. +# Make sure the user hasn't supplied two at the same time +ifdef REPRO +ifneq ($(DEBUG),) +$(error Options REPRO and DEBUG cannot be used together) +else ifneq ($(TEST),) +$(error Options REPRO and TEST cannot be used together) +endif +else ifdef DEBUG +ifneq ($(TEST),) +$(error Options DEBUG and TEST cannot be used together) +endif +endif + +MAKEFLAGS += --jobs=$(shell grep '^processor' /proc/cpuinfo | wc -l) + +# Required Preprocessor Macros: +CPPDEFS += -Duse_netCDF + +# Additional Preprocessor Macros needed due to Autotools and CMake +CPPDEFS += -DHAVE_SCHED_GETAFFINITY -DHAVE_GETTID + +# Macro for Fortran preprocessor +FPPFLAGS := -fpp -Wp,-w $(INCLUDES) +# Fortran Compiler flags for the NetCDF library +FPPFLAGS += $(shell nf-config --fflags) + +# Base set of Fortran compiler flags +FFLAGS := -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -i4 -r8 -nowarn -sox -traceback + +# Flags based on perforance target (production (OPT), reproduction (REPRO), or debug (DEBUG) +FFLAGS_OPT = -O3 -debug minimal -fp-model source +FFLAGS_REPRO = -O2 -debug minimal -fp-model source +FFLAGS_DEBUG = -g -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fpe0 -ftrapuv + +# Flags to add additional build options +FFLAGS_OPENMP = -qopenmp +FFLAGS_OVERRIDE_LIMITS = -qoverride-limits +FFLAGS_VERBOSE = -v -V -what -warn all -qopt-report-phase=vec -qopt-report=2 +FFLAGS_COVERAGE = -prof-gen=srcpos + +# Macro for C preprocessor +CPPFLAGS := -D__IFC $(INCLUDES) +# C Compiler flags for the NetCDF library +CPPFLAGS += $(shell nc-config --cflags) + +# Base set of C compiler flags +CFLAGS := -sox -traceback + +# Flags based on perforance target (production (OPT), reproduction (REPRO), or debug (DEBUG) +CFLAGS_OPT = -O2 -debug minimal +CFLAGS_REPRO = -O2 -debug minimal +CFLAGS_DEBUG = -O0 -g -ftrapuv + +# Flags to add additional build options +CFLAGS_OPENMP = -qopenmp +CFLAGS_VERBOSE = -w3 +CFLAGS_COVERAGE = -prof-gen=srcpos + +# Optional Testing compile flags. Mutually exclusive from DEBUG, REPRO, and OPT +# *_TEST will match the production if no new option(s) is(are) to be tested. +FFLAGS_TEST := $(FFLAGS_OPT) +CFLAGS_TEST := $(CFLAGS_OPT) + +# Linking flags +LDFLAGS := +LDFLAGS_OPENMP := -qopenmp +LDFLAGS_VERBOSE := -Wl,-V,--verbose,-cref,-M +LDFLAGS_COVERAGE = -prof-gen=srcpos + +# Start with blank LIBS +LIBS := + +# Get compile flags based on target macros. +ifdef REPRO +CFLAGS += $(CFLAGS_REPRO) +FFLAGS += $(FFLAGS_REPRO) +else ifdef DEBUG +CFLAGS += $(CFLAGS_DEBUG) +FFLAGS += $(FFLAGS_DEBUG) +else ifdef TEST +CFLAGS += $(CFLAGS_TEST) +FFLAGS += $(FFLAGS_TEST) +else +CFLAGS += $(CFLAGS_OPT) +FFLAGS += $(FFLAGS_OPT) +endif + +ifdef OPENMP +CFLAGS += $(CFLAGS_OPENMP) +FFLAGS += $(FFLAGS_OPENMP) +LDFLAGS += $(LDFLAGS_OPENMP) +endif + +ifdef ISA +CFLAGS += $(ISA) +FFLAGS += $(ISA) +endif + +ifdef NO_OVERRIDE_LIMITS +FFLAGS += $(FFLAGS_OVERRIDE_LIMITS) +endif + +ifdef VERBOSE +CFLAGS += $(CFLAGS_VERBOSE) +FFLAGS += $(FFLAGS_VERBOSE) +LDFLAGS += $(LDFLAGS_VERBOSE) +endif + +ifeq ($(NETCDF),3) + # add the use_LARGEFILE cppdef + CPPDEFS += -Duse_LARGEFILE +endif + +ifdef COVERAGE +ifdef BUILDROOT +PROF_DIR=-prof-dir=$(BUILDROOT) +endif +CFLAGS += $(CFLAGS_COVERAGE) $(PROF_DIR) +FFLAGS += $(FFLAGS_COVERAGE) $(PROF_DIR) +LDFLAGS += $(LDFLAGS_COVERAGE) $(PROF_DIR) +endif + +LDFLAGS += $(LIBS) + +#--------------------------------------------------------------------------- +# you should never need to change any lines below. + +# see the MIPSPro F90 manual for more details on some of the file extensions +# discussed here. +# this makefile template recognizes fortran sourcefiles with extensions +# .f, .f90, .F, .F90. Given a sourcefile ., where is one of +# the above, this provides a number of default actions: + +# make .opt create an optimization report +# make .o create an object file +# make .s create an assembly listing +# make .x create an executable file, assuming standalone +# source +# make .i create a preprocessed file (for .F) +# make .i90 create a preprocessed file (for .F90) + +# The macro TMPFILES is provided to slate files like the above for removal. + +RM = rm -f +SHELL = /bin/csh -f +TMPFILES = .*.m *.B *.L *.i *.i90 *.l *.s *.mod *.opt + +.SUFFIXES: .F .F90 .H .L .T .f .f90 .h .i .i90 .l .o .s .opt .x + +.f.L: + $(FC) $(FFLAGS) -c -listing $*.f +.f.opt: + $(FC) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.f +.f.l: + $(FC) $(FFLAGS) -c $(LIST) $*.f +.f.T: + $(FC) $(FFLAGS) -c -cif $*.f +.f.o: + $(FC) $(FFLAGS) -c $*.f +.f.s: + $(FC) $(FFLAGS) -S $*.f +.f.x: + $(FC) $(FFLAGS) -o $*.x $*.f *.o $(LDFLAGS) +.f90.L: + $(FC) $(FFLAGS) -c -listing $*.f90 +.f90.opt: + $(FC) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.f90 +.f90.l: + $(FC) $(FFLAGS) -c $(LIST) $*.f90 +.f90.T: + $(FC) $(FFLAGS) -c -cif $*.f90 +.f90.o: + $(FC) $(FFLAGS) -c $*.f90 +.f90.s: + $(FC) $(FFLAGS) -c -S $*.f90 +.f90.x: + $(FC) $(FFLAGS) -o $*.x $*.f90 *.o $(LDFLAGS) +.F.L: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -listing $*.F +.F.opt: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.F +.F.l: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $(LIST) $*.F +.F.T: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -cif $*.F +.F.f: + $(FC) $(CPPDEFS) $(FPPFLAGS) -EP $*.F > $*.f +.F.i: + $(FC) $(CPPDEFS) $(FPPFLAGS) -P $*.F +.F.o: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $*.F +.F.s: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -S $*.F +.F.x: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -o $*.x $*.F *.o $(LDFLAGS) +.F90.L: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -listing $*.F90 +.F90.opt: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.F90 +.F90.l: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $(LIST) $*.F90 +.F90.T: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -cif $*.F90 +.F90.f90: + $(FC) $(CPPDEFS) $(FPPFLAGS) -EP $*.F90 > $*.f90 +.F90.i90: + $(FC) $(CPPDEFS) $(FPPFLAGS) -P $*.F90 +.F90.o: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $*.F90 +.F90.s: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -S $*.F90 +.F90.x: + $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -o $*.x $*.F90 *.o $(LDFLAGS) diff --git a/exps/NEP10.COBALT/driver.sh b/exps/NEP10.COBALT/driver.sh index b00da5eb4..461d487a1 100644 --- a/exps/NEP10.COBALT/driver.sh +++ b/exps/NEP10.COBALT/driver.sh @@ -1,13 +1,13 @@ #!/bin/bash -#SBATCH --nodes=8 +#SBATCH --nodes=5 #SBATCH --time=60 #SBATCH --job-name="NEP10.COBALT" #SBATCH --output=NEP10.COBALT_o.%j #SBATCH --error=NEP10.COBALT_e.%j #SBATCH --qos=debug #SBATCH --partition=batch -#SBATCH --clusters=c5 -#SBATCH --account=cefi +#SBATCH --clusters=c6 +#SBATCH --account=ira-cefi # ntasks1=904 @@ -21,19 +21,19 @@ echo "Test started: " `date` # echo "link datasets ..." pushd ../ -ln -fs /gpfs/f5/cefi/world-shared/datasets ./ +ln -fs /gpfs/f6/ira-cefi/world-shared/datasets ./ popd echo "run 20x56 48hrs test ..." ln -fs input.nml_48hr input.nml -srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out1 2>err1 +srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out1 2>err1 mv RESTART RESTART_48hrs mv ocean.stats RESTART_48hrs # echo "run 20x56 24hrs test ..." ln -fs input.nml_24hr input.nml -srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out2 2>err2 +srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out2 2>err2 mv RESTART RESTART_24hrs mv ocean.stats RESTART_24hrs @@ -46,11 +46,12 @@ popd # echo "run 20x56 24hrs rst test ..." ln -fs input.nml_24hr_rst input.nml -srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out3 2>err3 +srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out3 2>err3 mv RESTART RESTART_24hrs_rst mv ocean.stats RESTART_24hrs_rst # Define the directories containing the files +module load nccmp DIR1="./RESTART_24hrs_rst" DIR2="./RESTART_48hrs" diff --git a/exps/NWA12.CFC/driver.sh b/exps/NWA12.CFC/driver.sh index d5b654278..afea7c4c5 100644 --- a/exps/NWA12.CFC/driver.sh +++ b/exps/NWA12.CFC/driver.sh @@ -6,8 +6,8 @@ #SBATCH --error=NWA12.CFC_e.%j #SBATCH --qos=debug #SBATCH --partition=batch -#SBATCH --clusters=c5 -#SBATCH --account=cefi +#SBATCH --clusters=c6 +#SBATCH --account=ira-cefi # ntasks1=128 @@ -16,7 +16,7 @@ ntasks2=64 # echo "link datasets ..." pushd ../ -ln -fs /gpfs/f5/cefi/world-shared/datasets ./ +ln -fs /gpfs/f6/ira-cefi/world-shared/datasets ./ popd # @@ -30,13 +30,13 @@ echo "run 16x8 2hrs test ..." ln -fs input.nml_2hr input.nml ln -fs MOM_layout_16x8 MOM_layout ln -fs MOM_layout_16x8 SIS_layout -srun -n ${ntasks1} ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out 2>err +srun -n ${ntasks1} ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out 2>err mv RESTART RESTART_2hrs # echo "run 16x8 1hrs test ..." ln -fs input.nml_1hr input.nml -srun -n ${ntasks1} ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out2 2>err2 +srun -n ${ntasks1} ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out2 2>err2 mv RESTART RESTART_1hrs # @@ -50,10 +50,11 @@ echo "run 8x8 1hrs rst test ..." ln -fs input.nml_1hr_rst input.nml ln -fs MOM_layout_8x8 MOM_layout ln -fs MOM_layout_8x8 SIS_layout -srun -n ${ntasks2} ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out3 2>err3 +srun -n ${ntasks2} ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out3 2>err3 mv RESTART RESTART_1hrs_rst # Define the directories containing the files +module load nccmp DIR1="RESTART_1hrs_rst/" DIR2="RESTART_2hrs/" diff --git a/exps/NWA12.COBALT/INPUT/MOM_layout_30 b/exps/NWA12.COBALT/INPUT/MOM_layout_30 new file mode 100755 index 000000000..e848502ec --- /dev/null +++ b/exps/NWA12.COBALT/INPUT/MOM_layout_30 @@ -0,0 +1,3 @@ +#override IO_LAYOUT = 1,1 +#override LAYOUT = 30,30 +#override MASKTABLE = MOM_mask_table diff --git a/exps/NWA12.COBALT/driver.sh b/exps/NWA12.COBALT/driver.sh index 4a778eb7f..d6edb890b 100644 --- a/exps/NWA12.COBALT/driver.sh +++ b/exps/NWA12.COBALT/driver.sh @@ -6,12 +6,12 @@ #SBATCH --error=NWA12.COBALT_e.%j #SBATCH --qos=debug #SBATCH --partition=batch -#SBATCH --clusters=c5 -#SBATCH --account=cefi +#SBATCH --clusters=c6 +#SBATCH --account=ira-cefi # -ntasks1=625 -ntasks2=400 +ntasks1=900 +ntasks2=625 # echo "Test started: " `date` @@ -19,23 +19,23 @@ echo "Test started: " `date` # echo "link datasets ..." pushd ../ -ln -fs /gpfs/f5/cefi/world-shared/datasets ./ +ln -fs /gpfs/f6/ira-cefi/world-shared/datasets ./ popd -echo "run 25x25 48hrs test ..." +echo "run 30x30 48hrs test ..." ln -fs input.nml_48hr input.nml pushd INPUT/ -ln -fs MOM_layout_25 MOM_layout -ln -fs MOM_layout_25 SIS_layout +ln -fs MOM_layout_30 MOM_layout +ln -fs MOM_layout_30 SIS_layout popd -srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out1 2>err1 +srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out1 2>err1 mv RESTART RESTART_48hrs mv ocean.stats RESTART_48hrs # -echo "run 25x25 24hrs test ..." +echo "run 30x30 24hrs test ..." ln -fs input.nml_24hr input.nml -srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out2 2>err2 +srun --ntasks ${ntasks1} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out2 2>err2 mv RESTART RESTART_24hrs mv ocean.stats RESTART_24hrs @@ -46,20 +46,21 @@ ln -fs ../RESTART_24hrs/* ./ popd # -echo "run 20x20 24hrs rst test ..." +echo "run 25x25 24hrs rst test ..." ln -fs input.nml_24hr_rst input.nml pushd INPUT/ -ln -fs MOM_layout_20 MOM_layout -ln -fs MOM_layout_20 SIS_layout +ln -fs MOM_layout_25 MOM_layout +ln -fs MOM_layout_25 SIS_layout popd -srun --ntasks ${ntasks2} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out3 2>err3 +srun --ntasks ${ntasks2} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc6.intel23/ocean_ice/repro/MOM6SIS2 > out3 2>err3 mv RESTART RESTART_24hrs_rst mv ocean.stats RESTART_24hrs_rst # Define the directories containing the files +module load nccmp DIR1="./RESTART_24hrs_rst" -DIR2="/gpfs/f5/cefi/proj-shared/github/ci_data/reference/main/NWA12.COBALT/20240708" +DIR2="/gpfs/f6/ira-cefi/proj-shared/github/ci_data/reference/main/NWA12.COBALT/20240813" # Define the files to compare FILES=("$DIR2"/*.nc) diff --git a/exps/NWA12.COBALT/run.sub b/exps/NWA12.COBALT/run.sub index 36e480c55..a39bef59f 100644 --- a/exps/NWA12.COBALT/run.sub +++ b/exps/NWA12.COBALT/run.sub @@ -1,14 +1,14 @@ #!/bin/bash -#SBATCH --nodes=13 +#SBATCH --nodes=9 #SBATCH --time=60 #SBATCH --job-name="NWA12_cobalt" #SBATCH --output=NWA12_cobalt_o.%j #SBATCH --error=NWA12_cobalt_e.%j #SBATCH --qos=normal #SBATCH --partition=batch -#SBATCH --clusters=c5 -#SBATCH --account=cefi +#SBATCH --clusters=c6 +#SBATCH --account=ira-cefi echo "Model started: " `date` diff --git a/xmls/NWA12/CEFI_NWA12_cobalt.xml b/xmls/NWA12/CEFI_NWA12_cobalt.xml index dfe47b93f..22856d516 100644 --- a/xmls/NWA12/CEFI_NWA12_cobalt.xml +++ b/xmls/NWA12/CEFI_NWA12_cobalt.xml @@ -6,32 +6,32 @@ Quick start guide Load module: On GFDL Analysis: -module load fre/bronx-22 +module load fre/test On Gaea: module use -a /ncrc/home2/fms/local/modulefiles -module load fre/bronx-22 +module load fre/test Compile and build mom6-sis2-cobalt: -fremake -x CEFI_NWA12_cobalt.xml -p ncrc5.intel22 -t prod MOM6_SIS2_GENERIC_4P_compile_symm +fremake -x CEFI_NWA12_cobalt.xml -p ncrc6.intel23 -t prod MOM6_SIS2_GENERIC_4P_compile_symm Run experiment -frerun -x CEFI_NWA12_cobalt.xml -p ncrc5.intel22 -t prod CEFI_NWA12_COBALT_V1 +frerun -x CEFI_NWA12_cobalt.xml -p ncrc6.intel23 -t prod CEFI_NWA12_COBALT_V1 Run postprocessing later on GFDL Analysis: -frepp -t 1997 -c ocean_monthly -d /archive/YOUR_USER_NAME/fre/CEFI/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc5-intel22-prod/history/ -x CEFI_NWA12_cobalt.xml -p gfdl.ncrc5-intel22 -T prod CEFI_NWA12_COBALT_V1 +frepp -t 1997 -c ocean_monthly -d /archive/YOUR_USER_NAME/fre/CEFI/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc6-intel23-prod/history/ -x CEFI_NWA12_cobalt.xml -p gfdl.ncrc6-intel23 -T prod CEFI_NWA12_COBALT_V1 Run analysis after the postprocessing on GFDL Analysis: -frepp -t 1997 -c ocean_monthly -o -d /archive/YOUR_USER_NAME/fre/cefi/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc5-intel22-prod/history/ -x CEFI_NWA12_cobalt.xml -p gfdl.ncrc5-intel22 -T prod CEFI_NWA12_COBALT_V1 +frepp -t 1997 -c ocean_monthly -o -d /archive/YOUR_USER_NAME/fre/cefi/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc6-intel23-prod/history/ -x CEFI_NWA12_cobalt.xml -p gfdl.ncrc6-intel23 -T prod CEFI_NWA12_COBALT_V1 Regression test for layout: -frerun -x CEFI_NWA12_cobalt.xml -p ncrc5.intel22 -q debug -r layout CEFI_NWA12_COBALT_V1 +frerun -x CEFI_NWA12_cobalt.xml -p ncrc6.intel23 -q debug -r layout CEFI_NWA12_COBALT_V1 Regression test for restart: -frerun -x CEFI_NWA12_cobalt.xml -p ncrc5.intel22 -q debug -r restart CEFI_NWA12_COBALT_V1 +frerun -x CEFI_NWA12_cobalt.xml -p ncrc6.intel23 -q debug -r restart CEFI_NWA12_COBALT_V1 To check if the restart files are identical from regression test: -frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V1 +frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V1 --> @@ -52,10 +52,10 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V - + - + @@ -70,16 +70,16 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V - + - + - + @@ -93,9 +93,6 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V - - - @@ -107,6 +104,8 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V + + @@ -121,18 +120,19 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V Make the executable for ocean-ice experiments. - Uses FMS1 (including -Duse_deprecated_io) because the nudging experiment is much slower with FMS2 + Uses FMS1 (including -Duse_deprecated_io) + Uses FMS2 (for unknown reason FMS1 does not work with intel23 on C6) FMS.git - -Duse_deprecated_io -Duse_libMPI -Duse_netCDF $(F2003_FLAGS) -DMAXFIELDMETHODS_=600 + -Duse_libMPI -Duse_netCDF $(F2003_FLAGS) -DMAXFIELDMETHODS_=600 - + CEFI-regional-MOM6.git - + @@ -150,7 +150,7 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V ice_param.git - + @@ -176,7 +176,7 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V coupler.git - + @@ -620,7 +620,7 @@ COBALT_INPUT_EOF - + @@ -842,29 +842,29 @@ endif - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drydust_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetdust_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_dryfe_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetfe_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drynh4_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetnh4_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drynoy_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetnoy_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/co2/mole_fraction_of_co2_extended_ssp245.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_drydust_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetdust_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_dryfe_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetfe_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_drynh4_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetnh4_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_drynoy_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetnoy_climo_1993-2014.nc + $(GLOBAL_WORLD)/co2/mole_fraction_of_co2_extended_ssp245.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_msl_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_t2m_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_sphum_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_strd_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_ssrd_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_lp_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_sf_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_u10_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_v10_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_msl_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_t2m_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_sphum_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_strd_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_ssrd_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_lp_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_sf_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_u10_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_v10_${fyear}_padded.nc $(NWA12_WORLD)/glofas/2023_04_v2/glofas_runoff_${fyear}.nc diff --git a/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml b/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml index 2cdb28ff8..28d00f176 100644 --- a/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml +++ b/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml @@ -6,32 +6,32 @@ Quick start guide Load module: On GFDL Analysis: -module load fre/bronx-22 +module load fre/test On Gaea: module use -a /ncrc/home2/fms/local/modulefiles -module load fre/bronx-22 +module load fre/test Compile and build mom6-sis2-cobalt: -fremake -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc5.intel22 -t prod MOM6_SIS2_GENERIC_4P_compile_symm_yaml +fremake -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc6.intel23 -t prod MOM6_SIS2_GENERIC_4P_compile_symm_yaml Run experiment -frerun -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc5.intel22 -t prod CEFI_NWA12_COBALT_V1 +frerun -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc6.intel23 -t prod CEFI_NWA12_COBALT_V1 Run postprocessing later on GFDL Analysis: -frepp -t 1997 -c ocean_monthly -d /archive/YOUR_USER_NAME/fre/CEFI/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc5-intel22-prod/history/ -x CEFI_NWA12_cobalt_fms2_yaml.xml -p gfdl.ncrc5-intel22 -T prod CEFI_NWA12_COBALT_V1 +frepp -t 1997 -c ocean_monthly -d /archive/YOUR_USER_NAME/fre/CEFI/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc6-intel23-prod/history/ -x CEFI_NWA12_cobalt_fms2_yaml.xml -p gfdl.ncrc6-intel23 -T prod CEFI_NWA12_COBALT_V1 Run analysis after the postprocessing on GFDL Analysis: -frepp -t 1997 -c ocean_monthly -o -d /archive/YOUR_USER_NAME/fre/cefi/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc5-intel22-prod/history/ -x CEFI_NWA12_cobalt_fms2_yaml.xml -p gfdl.ncrc5-intel22 -T prod CEFI_NWA12_COBALT_V1 +frepp -t 1997 -c ocean_monthly -o -d /archive/YOUR_USER_NAME/fre/cefi/NWA/CEFI_NWA12_COBALT_V1/gfdl.ncrc6-intel23-prod/history/ -x CEFI_NWA12_cobalt_fms2_yaml.xml -p gfdl.ncrc6-intel23 -T prod CEFI_NWA12_COBALT_V1 Regression test for layout: -frerun -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc5.intel22 -q debug -r layout CEFI_NWA12_COBALT_V1 +frerun -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc6.intel23 -q debug -r layout CEFI_NWA12_COBALT_V1 Regression test for restart: -frerun -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc5.intel22 -q debug -r restart CEFI_NWA12_COBALT_V1 +frerun -x CEFI_NWA12_cobalt_fms2_yaml.xml -p ncrc6.intel23 -q debug -r restart CEFI_NWA12_COBALT_V1 To check if the restart files are identical from regression test: -frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA12_COBALT_V1 +frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA12_COBALT_V1 --> @@ -52,10 +52,10 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1 - + - + @@ -70,16 +70,16 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1 - + - + - + @@ -93,9 +93,6 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1 - - - @@ -107,6 +104,8 @@ frecheck -r layout -p ncrc5.intel22 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1 + + @@ -583,7 +582,7 @@ cat > $work/INPUT/MOM_override << MOM_OVERRIDE_EOF #override USE_generic_tracer = True #override MAX_FIELDS=500 #override OBC_TIDE_NODAL_REF_DATE = ${fyear},7,2 -DT_OBC_SEG_UPDATE_OBGC = 1800 +DT_OBC_SEG_UPDATE_OBGC = 1800 #override CHL_FROM_FILE = False #override DO_GEOTHERMAL = True #override GENERIC_TRACER_IC_FILE = "NWA12_COBALT_2023_10_spinup_2003.nc" @@ -610,7 +609,7 @@ do_case2_mod = True COBALT_INPUT_EOF #hack to test yaml diag_table, convert the diag_table to yaml format -diag-table-to-yaml -f $work/diag_table -o $work/diag_table.yaml +diag-table-to-yaml --force-write $work/diag_table #-o $work/diag_table.yam ]]> @@ -846,29 +845,29 @@ endif - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drydust_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetdust_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_dryfe_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetfe_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drynh4_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetnh4_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drynoy_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetnoy_climo_1993-2014.nc - /gpfs/f5/gfdl_med/world-shared/global/co2/mole_fraction_of_co2_extended_ssp245.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_drydust_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetdust_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_dryfe_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetfe_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_drynh4_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetnh4_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_drynoy_climo_1993-2014.nc + $(GLOBAL_WORLD)/esm4_deposition/esm4_wetnoy_climo_1993-2014.nc + $(GLOBAL_WORLD)/co2/mole_fraction_of_co2_extended_ssp245.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_msl_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_t2m_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_sphum_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_strd_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_ssrd_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_lp_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_sf_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_u10_${fyear}_padded.nc - /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_v10_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_msl_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_t2m_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_sphum_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_strd_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_ssrd_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_lp_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_sf_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_u10_${fyear}_padded.nc + $(NWA_ERA5)/ERA5_v10_${fyear}_padded.nc $(NWA12_WORLD)/glofas/2023_04_v2/glofas_runoff_${fyear}.nc diff --git a/xmls/xml_include/xml_building_blocks/platforms.xml b/xmls/xml_include/xml_building_blocks/platforms.xml index 2831cafbb..fe32a201a 100644 --- a/xmls/xml_include/xml_building_blocks/platforms.xml +++ b/xmls/xml_include/xml_building_blocks/platforms.xml @@ -17,6 +17,9 @@ + + + @@ -25,11 +28,45 @@ + + $(FRE_VERSION) + + $(NCRC_GROUP) + + /gpfs/f6/$(project)/scratch/$USER/$(stem) + $(rootDir)/$(name)/$(platform)-$(target)/scripts + $(rootDir)/$(name)/$(platform)-$(target)/state + $(rootDir)/$(name)/src + $(rootDir)/$(name)/$(platform)-$(target)/exec + $(rootDir)/$(name)/$(platform)-$(target)/archive + $(rootDir)/$(name)/$(platform)-$(target)/stdout + /gpfs/f6/$(project)/scratch/$USER/work/$FRE_JOBID + + + + + + + + + + + + + + + + $(FRE_VERSION) $(GFDL_GROUP) @@ -54,7 +91,7 @@ module purge module load fre/$(FRE_VERSION) module load git - setenv FREVERSION fre/$(FRE_VERSION) + setenv FREVERSION fre/$(FRE_VERSION) setenv NBROOT $(NB_ROOT) ]]> @@ -62,4 +99,7 @@ + + +