Merge branch 'release/8.6.0' into main

esmf-org · Nov 9, 2023 · bf35bb7 · bf35bb7
2 parents 49fdc95 + decf14d
commit bf35bb7
Show file tree

Hide file tree

Showing 23 changed files with 104 additions and 505 deletions.
diff --git a/ESMF_CompWeights/src/DiffWeights.F90 b/ESMF_CompWeights/src/DiffWeights.F90
@@ -2,7 +2,7 @@
 ! $Id$
 !
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_CompWeights/src/MOABCheckDriver.pl b/ESMF_CompWeights/src/MOABCheckDriver.pl
@@ -3,7 +3,7 @@
 # $Id$
 #
 # Earth System Modeling Framework
-# Copyright 2002-2021, University Corporation for Atmospheric Research,
+# Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 # Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 # Laboratory, University of Michigan, National Centers for Environmental
 # Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/create/MOAB_eval_create.F90 b/ESMF_ProfileMBMesh/src/create/MOAB_eval_create.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/createfromdesc/MOAB_eval_createfromdesc.F90 b/ESMF_ProfileMBMesh/src/createfromdesc/MOAB_eval_createfromdesc.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2020, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/dual/MOAB_eval_dual.F90 b/ESMF_ProfileMBMesh/src/dual/MOAB_eval_dual.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/grid2mesh/MOAB_eval_grid2mesh.F90 b/ESMF_ProfileMBMesh/src/grid2mesh/MOAB_eval_grid2mesh.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/old/serial_create/mesh_serial_mem.F90 b/ESMF_ProfileMBMesh/src/old/serial_create/mesh_serial_mem.F90
@@ -1,7 +1,7 @@
 ! $Id:  Exp $
 !
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/redist/MOAB_eval_redist.F90 b/ESMF_ProfileMBMesh/src/redist/MOAB_eval_redist.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/regridbilinear/MOAB_eval_regridbilinear.F90 b/ESMF_ProfileMBMesh/src/regridbilinear/MOAB_eval_regridbilinear.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/regridbilinearcorner/MOAB_eval_regridbilinearcorner.F90 b/ESMF_ProfileMBMesh/src/regridbilinearcorner/MOAB_eval_regridbilinearcorner.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2020, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/regridconservative/MOAB_eval_regridconservative.F90 b/ESMF_ProfileMBMesh/src/regridconservative/MOAB_eval_regridconservative.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileMBMesh/src/rendezvous/MOAB_eval_rendezvous.F90 b/ESMF_ProfileMBMesh/src/rendezvous/MOAB_eval_rendezvous.F90
@@ -1,5 +1,5 @@
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileReconcileStress/ESMF_ReconcileStress.F90 b/ESMF_ProfileReconcileStress/ESMF_ReconcileStress.F90
@@ -1,6 +1,6 @@
 !==============================================================================
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileReconcileStress/connector.F90 b/ESMF_ProfileReconcileStress/connector.F90
@@ -1,6 +1,6 @@
 !==============================================================================
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileReconcileStress/mediator.F90 b/ESMF_ProfileReconcileStress/mediator.F90
@@ -1,6 +1,6 @@
 !==============================================================================
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_ProfileReconcileStress/model.F90 b/ESMF_ProfileReconcileStress/model.F90
@@ -1,6 +1,6 @@
 !==============================================================================
 ! Earth System Modeling Framework
-! Copyright 2002-2021, University Corporation for Atmospheric Research,
+! Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 ! Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 ! Laboratory, University of Michigan, National Centers for Environmental
 ! Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_RegridCheck/RegridCheckDriver.pl b/ESMF_RegridCheck/RegridCheckDriver.pl
@@ -3,7 +3,7 @@
 # $Id$
 #
 # Earth System Modeling Framework
-# Copyright 2002-2021, University Corporation for Atmospheric Research,
+# Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 # Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 # Laboratory, University of Michigan, National Centers for Environmental
 # Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_RegridWeightGenCheck/RegridWeightGenCheckDriver.pl b/ESMF_RegridWeightGenCheck/RegridWeightGenCheckDriver.pl
@@ -3,7 +3,7 @@
 # $Id$
 #
 # Earth System Modeling Framework
-# Copyright 2002-2021, University Corporation for Atmospheric Research,
+# Copyright (c) 2002-2023, University Corporation for Atmospheric Research,
 # Massachusetts Institute of Technology, Geophysical Fluid Dynamics
 # Laboratory, University of Michigan, National Centers for Environmental
 # Prediction, Los Alamos National Laboratory, Argonne National Laboratory,

diff --git a/ESMF_RegridWeightReproCheck/bfb.pbs b/ESMF_RegridWeightReproCheck/bfb.pbs
@@ -1,102 +1,99 @@
 #!/bin/bash
 #PBS -N bfbrun
 #PBS -A P93300606
-#PBS -l walltime=08:00:00
-#PBS -q economy
+#PBS -l walltime=04:00:00
+#PBS -q main
 #PBS -j oe
 #PBS -m abe
-#PBS -M [email protected]
-#PBS -l select=1:ncpus=36:mpiprocs=36
-
-# April 1 2021
-# This script will output a file with the BFB changes between the results of ESMF_RegridWeightGenCheck at
-# the ESMF_8_0_0 tag run with ESMF installations from 800 and 810. 
-
-module purge; module load python/3.7.5 ncarenv/1.3 intel/19.0.5 ncarcompilers/0.5.0 mpt/2.21 netcdf/4.7.3
-
-module load nccmp/1.8.2.1
-
+#PBS -M [email protected]
+#PBS -l select=1:ncpus=4:mpiprocs=4
+
+# Oct 2021
+# This script will output a file with the BFB changes between the 
+# results of ESMF_RegridWeightGenCheck between BASE_TAG and COMP_TAG
+# This scrip needs to be run after bob_pre_bfb and in the same directory 
+export BASE_TAG=8.5.0
+export COMP_TAG=8.6.0
+
+# Setup modules with which to build ESMF
+module purge
+module load ncarenv/23.06 craype/2.7.20 cmake/3.26.3
+module load intel/2023.0.0 ncarcompilers/1.0.0 cray-mpich/8.1.25
+module load hdf5/1.12.2 netcdf/4.9.2
+
+# module for comparison program
+module load nccmp/1.9.0.1
+
+# Set ESMF compiler variables
 export ESMF_COMPILER=intel
-export ESMF_COMM=mpt
+export ESMF_COMM=mpi
 export BOPT=O
+export ESMF_OPTLEVEL=2
 export ESMF_NETCDF=nc-config
+export ESMF_PIO=internal
+export ESMF_CXXCOMPILEOPTS="-fp-model precise"
+export ESMF_F90COMPILEOPTS="-fp-model precise"
 
+# Set working directory
 export BFBDIR=${PWD}
 
+# Set up directory for base
+export BASE_DIR=${BFBDIR}/${BASE_TAG}
+cd ${BASE_DIR}
 
-# build 800
-export DIR800=${BFBDIR}/esmf800
-mkdir ${DIR800}
-cd ${DIR800}
-
-git clone -b ESMF_8_0_0 https://github.com/esmf-org/esmf.git
-export ESMF_DIR=${DIR800}/esmf
+# Build and install base
+export ESMF_DIR=${BASE_DIR}/esmf
 cd ${ESMF_DIR}
 
-make -j36 > make.out 2>&1
+make -j4 > make.out 2>&1
 
-export ESMF_INSTALL_PREFIX=${DIR800}/esmfinstall
+export ESMF_INSTALL_PREFIX=${BASE_DIR}/esmfinstall
 export ESMF_INSTALL_LIBDIR=${ESMF_INSTALL_PREFIX}/lib
 
 make install
 
 
-# build 810
-export DIR810=${BFBDIR}/esmf810
-mkdir ${DIR810}
-cd ${DIR810}
+# Set up directory for comp
+export COMP_DIR=${BFBDIR}/${COMP_TAG}
+cd ${COMP_DIR}
 
-git clone -b ESMF_8_1_0 https://github.com/esmf-org/esmf.git
-export ESMF_DIR=${DIR810}/esmf
+# Build and install comp
+export ESMF_DIR=${COMP_DIR}/esmf
 cd ${ESMF_DIR}
 
-make -j36 > make.out 2>&1
+make -j4 > make.out 2>&1
 
-export ESMF_INSTALL_PREFIX=${DIR810}/esmfinstall
+export ESMF_INSTALL_PREFIX=${COMP_DIR}/esmfinstall
 export ESMF_INSTALL_LIBDIR=${ESMF_INSTALL_PREFIX}/lib
 
 make install
 
 
-# download RWG
-
-cd ${BFBDIR}
-git clone -b ESMF_8_0_0 [email protected]:esmf-org/esmf-extended-tests.git
-# which tag should we use here? 800 or 810 or develop even?
-
+# Setup to run
 export ESMF_MPIRUN=mpiexec
-export ESMF_NUM_PROCS=36
-
+export ESMF_NUM_PROCS=4
 
-# run RWG with 800
 
+# run RWG with BASE_TAG
 cd ${BFBDIR}/esmf-extended-tests/ESMF_RegridWeightGenCheck
-
-export ESMFMKFILE=${DIR800}/esmfinstall/lib/esmf.mk
-
+export ESMFMKFILE=${BASE_DIR}/esmfinstall/lib/esmf.mk
 make clean
 make run
 
-mkdir ${DIR800}/ncfiles
-cp *.nc ${DIR800}/ncfiles
+mkdir ${BASE_DIR}/ncfiles
+cp *.nc ${BASE_DIR}/ncfiles
 
 
-# run RWG with 810
-
+# run RWG with COMP_TAG
 cd ${BFBDIR}/esmf-extended-tests/ESMF_RegridWeightGenCheck
-
-export ESMFMKFILE=${DIR810}/esmfinstall/lib/esmf.mk
-
+export ESMFMKFILE=${COMP_DIR}/esmfinstall/lib/esmf.mk
 make clean
 make run
 
-mkdir ${DIR810}/ncfiles
-cp *.nc ${DIR810}/ncfiles
+mkdir ${COMP_DIR}/ncfiles
+cp *.nc ${COMP_DIR}/ncfiles
 
 
 # run nccmp
 cd ${BFBDIR}
-./bfb_comp ${DIR800} ${DIR810} > 810_Cheyenne_BFB800_intel19mpt-O.txt 2>&1 
-
-
-
+./bfb_comp ${BASE_DIR}/ncfiles ${COMP_DIR}/ncfiles > Derecho_intel_2023.0.0_mpi_O_from_${BASE_TAG}_to_${COMP_TAG}.txt 2>&1 
diff --git a/ESMF_RegridWeightReproCheck/bfb_comp b/ESMF_RegridWeightReproCheck/bfb_comp
@@ -5,7 +5,7 @@ dir1=$1
 dir2=$2
 
 homedir=`pwd`
-rm failed_list passed_list not_found_list
+rm -f failed_list passed_list not_found_list
 pass=0
 fail=0
 not_found=0
@@ -23,7 +23,6 @@ Files=*.nc
 
                         #nccmp -d   $f  $dir2/$f
                         nccmp -dSqf  $f  $dir2/$f
-
                         if [ "$?" != "0" ]
                         then
                                 echo "$f" >> $homedir/failed_list

diff --git a/ESMF_RegridWeightReproCheck/pre_bfb.sh b/ESMF_RegridWeightReproCheck/pre_bfb.sh
@@ -0,0 +1,31 @@
+
+# Get tags
+export BASE_TAG=$1
+export COMP_TAG=$2
+
+# Set working directory
+export BFBDIR=${PWD}
+
+# Setup directories for base
+export BASE_DIR=${BFBDIR}/${BASE_TAG}
+mkdir -p ${BASE_DIR}
+cd ${BASE_DIR}
+
+# Get base version of ESMF
+git clone -b release/${BASE_TAG} https://github.com/esmf-org/esmf.git
+
+# Setup directories for comp
+export COMP_DIR=${BFBDIR}/${COMP_TAG}
+mkdir -p ${COMP_DIR}
+cd ${COMP_DIR}
+
+# Get comp version of ESMF
+# BOB: add release just this time, because having "release" in the dir seems to cause a problem
+#git clone -b ${COMP_TAG} https://github.com/esmf-org/esmf.git
+git clone -b release/${COMP_TAG} https://github.com/esmf-org/esmf.git
+
+# Download RWG
+# (Using base tag because base stuff more likely to work with comp tag, 
+# than vise versa)
+cd ${BFBDIR}
+git clone -b release/${BASE_TAG} https://github.com/esmf-org/esmf-extended-tests