From 4f999f242a448f4d0c12f07e85359412f19a4449 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Fri, 26 Jun 2020 11:12:43 -0400 Subject: [PATCH 1/3] Update version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7d5fbe7..984420d5 100755 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ make install ``` #### Version -3.2.0 +3.3.0 #### Authors * **[NCEP/EMC](mailto:NCEP.List.EMC.nceplibs.Developers@noaa.gov)** From 5dfe6483e82b7a55aaa1763ee3398972a133de73 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Fri, 26 Jun 2020 14:48:38 -0400 Subject: [PATCH 2/3] Remove make build --- Conf/Analyse_args.sh | 49 --------------- Conf/Collect_info.sh | 107 --------------------------------- Conf/G2_gnu_General.sh | 62 ------------------- Conf/G2_intel_Cray.sh | 30 --------- Conf/G2_intel_Dell.sh | 30 --------- Conf/G2_intel_Gaea.sh | 30 --------- Conf/G2_intel_General.sh | 62 ------------------- Conf/G2_intel_Hera.sh | 40 ------------ Conf/G2_intel_Jet.sh | 30 --------- Conf/G2_intel_Theia.sh | 30 --------- Conf/G2_intel_Wcoss.sh | 30 --------- Conf/Gen_cfunction.sh | 91 ---------------------------- Conf/Reset_version.sh | 18 ------ build_g2.sh | 127 --------------------------------------- src/Makefile | 52 ---------------- 15 files changed, 788 deletions(-) delete mode 100644 Conf/Analyse_args.sh delete mode 100644 Conf/Collect_info.sh delete mode 100644 Conf/G2_gnu_General.sh delete mode 100644 Conf/G2_intel_Cray.sh delete mode 100644 Conf/G2_intel_Dell.sh delete mode 100644 Conf/G2_intel_Gaea.sh delete mode 100644 Conf/G2_intel_General.sh delete mode 100644 Conf/G2_intel_Hera.sh delete mode 100644 Conf/G2_intel_Jet.sh delete mode 100644 Conf/G2_intel_Theia.sh delete mode 100644 Conf/G2_intel_Wcoss.sh delete mode 100644 Conf/Gen_cfunction.sh delete mode 100644 Conf/Reset_version.sh delete mode 100755 build_g2.sh delete mode 100644 src/Makefile diff --git a/Conf/Analyse_args.sh b/Conf/Analyse_args.sh deleted file mode 100644 index 1b230cbc..00000000 --- a/Conf/Analyse_args.sh +++ /dev/null @@ -1,49 +0,0 @@ - if (( $# == 0 )); then - echo "*** Usage: $0 dell|cray|wcoss|theia|hera|gaea|jet|intel_general|gnu_general libver= [debug] [compileonly] [prefix=]" >&2 - exit 1 - fi - sys=${1,,} - [[ $sys == dell || $sys == cray || $sys == wcoss || \ - $sys == theia || $sys == hera || $sys == gaea || $sys == jet || \ - $sys == intel_general || $sys == gnu_general ]] || { - echo "*** Usage: $0 dell|cray|wcoss|theia|hera|gaea|jet|intel_general|gnu_general libver= [debug] [compileonly] [prefix=]" >&2 - exit 1 - } - - debg=false - inst=true - rinst=false - local=true - instloc="---" - (( nrinst = 0 )) - (( nconfm = 0 )) - for n in 2 3 4; do - if (( $# > (n-1) )); then - [[ ${!n,,} == debug ]] && debg=true - [[ ${!n,,} == compileonly ]] && inst=false - [[ ${!n,,} == libver=* ]] && libver=${!n:$(expr length "libver=")} - [[ ${!n,,} == prefix=* ]] && { - local=false - instloc=${!n:$(expr length "prefix=")} - [[ $instloc == /* ]] || { [[ -n $CDIR ]] && instloc=$CDIR/$instloc; } - } - [[ ${!n,,} == install ]] && (( nrinst = n )) - [[ ${!n,,} == confirm:yes ]] && (( nconfm = n-1 )) - fi - done - (( nrinst > 0 && nconfm == 0 )) && { - echo "*** Info: ignore unsupported option \"install\" ***" - (( nrinst = 0 )) - } - (( nrinst == 0 && nconfm > 0 )) && { - echo "*** Info: ignore \"confirm:YES\"; must be present along with \"install\" ***" - (( nrinst = 0 )) - } - (( nconfm > 0 && ! nrinst == nconfm )) && { - echo "*** Info: ignore \"confirm:YES\"; must be present immediately after \"install\" ***" - (( nrinst = 0 )) - } - (( nconfm > 0 && nrinst == nconfm )) && rinst=true - - $rinst && { local=false; inst=true; } - diff --git a/Conf/Collect_info.sh b/Conf/Collect_info.sh deleted file mode 100644 index 4b2d2397..00000000 --- a/Conf/Collect_info.sh +++ /dev/null @@ -1,107 +0,0 @@ - collect_info() { - local setx_status=${-//[^x]/} - [[ -n $setx_status ]] && set +x - - local lname=$1 - local precsn=$2 - local msgline=$3 - local msginfo=$4 - - local info - local oneline - - USEMPI=false - grep -i mpi <<< "$COMP" &> /dev/null && USEMPI=true - -# libver=${lname~~}_VER - [[ $precsn == "-" ]] && { - cflg=CFLAGS - fflg=FFLAGS - libfile=${lname}Lib - NCLIBVER="${lname,,} (${lname~~}) ${!libver}" - } || { - cflg=CFLAGS${precsn%/*} - [[ -z "${!cflg}" ]] && cflg=CFLAGS - fflg=FFLAGS${precsn%/*} - libfile=${lname}Lib${precsn#*/} - NCLIBVER="${lname,,} (${lname~~} _${precsn%/*}) ${!libver}" - } - mpicflg=MPI"$cflg" - mpifflg=MPI"$fflg" - - $USEMPI && mpiver=$(mpirun --version | grep Version | sed 's/://' | \ - tr -s " " | sed 's/^.* Version //; s/ Build.*$//') - - COMPILED="compiled by" - $CC --version | grep " (ICC) " &> /dev/null && - $FC --version | grep " (IFORT) " &> /dev/null && { - ccstr=$($CC --version | grep " (ICC) ") - cfstr=$($FC --version | grep " (IFORT) ") - COMPILER="${ccstr/(ICC)*/(ICC)}, $cfstr" - } || { - $CC --version | grep " (.*GCC.*) " &> /dev/null && - $FC --version | grep " (.*GCC.*) " &> /dev/null && { - ccstr=$($CC --version | grep " (.*GCC.*) ") - cfstr=$($FC --version | grep " (.*GCC.*) ") - COMPILER="${ccstr/ (*GCC*)*/}, $cfstr" - } || { - ccstr=$($CC --version | grep -E 'ICC|GCC') - cfstr=$($FC --version | grep -E 'IFORT|GCC') - COMPILER="$ccstr, $cfstr" - } - } - [[ -z "$USECC" || ${USECC,,} == no ]] && { COMPILER="$cfstr"; } - [[ -z "$USEFC" || ${USEFC,,} == no ]] && { COMPILER="$ccstr"; } - - $USEMPI && { COMPILER=" $COMPILER"; } - (( ${#COMPILER} > 50 )) && COMPILER=${COMPILER% (*)*} - - DATETIME="$(date +'on %x at %X')" - - oneline="nclibver = '$NCLIBVER'," - oneline="$oneline"$'\n'"compiled = ' $COMPILED'," - oneline="$oneline"$'\n'"compiler = ' $COMPILER'," - oneline="$oneline"$'\n'"datetime = ' $DATETIME'" - - info="*** ${lname} information ***" - info=$info$'\n'"LIBRARY NAME: ${lname~~}" - info=$info$'\n'"LIBRARY VERSION: ${!libver}" - [[ $precsn != "-" ]] && { - info=$info$'\n'"LIBRARY PRECISION: (_${precsn%/*})" - } - info=$info$'\n'"LIBRARY FILE NAME: ${!libfile}" - info=$info$'\n'"*** building information ***" - info=$info$'\n'"BUILDING TIME: $(date)" - info=$info$'\n'"SYSTEM/PLATFORM: $(uname -srm)" - [[ -n "$USECC" && ${USECC,,} != no ]] && { - $USEMPI && { - info=$info$'\n'"C COMPILER NAME: $MPICC" - info=$info$'\n'"C COMPILER VERSION: $($MPICC --version | head -1)" - info=$info$'\n'"MPICFLAGS: "${!mpicflg} - } || { - info=$info$'\n'"C COMPILER NAME: $CC" - info=$info$'\n'"C COMPILER VERSION: $($CC --version | head -1)" - info=$info$'\n'"CFLAGS: "${!cflg} - } - } - [[ -n "$USEFC" && ${USEFC,,} != no ]] && { - $USEMPI && { - info=$info$'\n'"FORTRAN COMPILER NAME: $MPIFC" - info=$info$'\n'"FORTRAN COMPILER VERSION: $($MPIFC --version | head -1)" - info=$info$'\n'"MPIFFLAGS: "${!mpifflg} - } || { - info=$info$'\n'"FORTRAN COMPILER NAME: $FC" - info=$info$'\n'"FORTRAN COMPILER VERSION: $($FC --version | head -1)" - info=$info$'\n'"FFLAGS: "${!fflg} - } - } - - $USEMPI && { info=$info$'\n'"MPI VERSION: $mpiver"; } - - [[ -n "$DEPS" ]] && { info=$info$'\n'"DEPENDENCES: $DEPS"; } - - eval $msgline="\"$oneline\"" - eval $msginfo="\"$info\"" - - [[ -n $setx_status ]] && set -x - } diff --git a/Conf/G2_gnu_General.sh b/Conf/G2_gnu_General.sh deleted file mode 100644 index 081cebf7..00000000 --- a/Conf/G2_gnu_General.sh +++ /dev/null @@ -1,62 +0,0 @@ -# *** manually set environments (for gnu compiler) of g2 *** - - : ${USERMODE:=false} # user mode (USERMODE) is closed by default - # set env var USERMODE to "true" to active it - ${USERMODE} && { - echo "Environment set by user" -# On theia/cray, user can load environment - module load gcc/6.2.0 - } - -# JASPER, PNG and Z LIB in default system include * -# *** set nothing *** - -# WCOSS WCOSS WCOSS WCOSS WCOSS WCOSS WCOSS WCOSS * -#JPZlib=/nwprod2/lib -#JASPER_VER=v1.900.1 -#PNG_VER=v1.2.44 -#Z_VER=v1.2.6 -#JASPER_INC=$JPZlib/jasper/v1.900.1/include -#PNG_INC=$JPZlib/png/v1.2.44/include -#Z_INC=$JPZlib/z/v1.2.6/include - -# THEIA THEIA THEIA THEIA THEIA THEIA THEIA THEIA * -#JPZlib=/scratch3/NCEPDEV/nwprod/lib -#JASPER_VER=v1.900.1 -#PNG_VER=v1.2.44 -#Z_VER=v1.2.6 -#JASPER_INC=$JPZlib/jasper/v1.900.1/include -#PNG_INC=$JPZlib/png/v1.2.44/src/include -#Z_INC=$JPZlib/z/v1.2.6/include - - export CC=gcc - export FC=gfortran - export CPP=cpp - export OMPCC="$CC -fopenmp" - export OMPFC="$FC -fopenmp" - export MPICC=mpigcc - export MPIFC=mpigfortran - - export DEBUG="-g -fbacktrace -O0" - export CFLAGS="-g -O3 -fPIC" - export FFLAGS="-g -fbacktrace -O3 -fPIC" - export FREEFORM="-ffree-form" - export FPPCPP="-cpp" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -O3 -fPIC" - export MPIFFLAGS="-g -fbacktrace -O3 -fPIC" - export MODPATH="-J" - export I4R4="" - export I4R8="-fdefault-real-8" - export I8R8="-fdefault-integer-8 -fdefault-real-8" - - export CPPDEFS="" - [[ -z "${PNG_INC-}" ]] && { IPNG= ; } || { IPNG=-I$PNG_INC; } - [[ -z "${JASPER_INC-}" ]] && { IJASPER= ; } || { IJASPER=-I$JASPER_INC; } - [[ -z "${Z_INC-}" ]] && { IZ= ; } || { IZ=-I$Z_INC; } - export CFLAGSDEFS="$IPNG $IJASPER $IZ -DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="-fno-range-check" - - export USECC="YES" - export USEFC="YES" - export DEPS="JASPER ${JASPER_VER-}, LIBPNG ${PNG_VER-}, ZLIB ${Z_VER-}" diff --git a/Conf/G2_intel_Cray.sh b/Conf/G2_intel_Cray.sh deleted file mode 100644 index c840597c..00000000 --- a/Conf/G2_intel_Cray.sh +++ /dev/null @@ -1,30 +0,0 @@ -# *** for WCOSS Cray (intel) *** - - export CC=cc - export FC=ftn - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=$CC - export MPIFC=$FC - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -traceback -O3 -axCORE-AVX2 -fPIC" - export FFLAGS="-g -traceback -O3 -axCORE-AVX2 -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS=$CFLAGS - export MPIFFLAGS=$FFLAGS - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-I${PNG_INC} -I${JASPER_INC} -I${Z_INC} -DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="JASPER $JASPER_VER, LIBPNG $PNG_VER, ZLIB $Z_VER" diff --git a/Conf/G2_intel_Dell.sh b/Conf/G2_intel_Dell.sh deleted file mode 100644 index 55710b59..00000000 --- a/Conf/G2_intel_Dell.sh +++ /dev/null @@ -1,30 +0,0 @@ -# *** for WCOSS Dell (intel) *** - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -traceback -O3 -fPIC" - export FFLAGS="-g -traceback -O3 -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -traceback -O3 -fPIC" - export MPIFFLAGS="-g -traceback -O3 -xHOST -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-I${PNG_INC} -I${JASPER_INC} -I${Z_INC} -DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="JASPER $JASPER_VER, LIBPNG $PNG_VER, ZLIB $Z_VER" diff --git a/Conf/G2_intel_Gaea.sh b/Conf/G2_intel_Gaea.sh deleted file mode 100644 index 4bedbcca..00000000 --- a/Conf/G2_intel_Gaea.sh +++ /dev/null @@ -1,30 +0,0 @@ -# *** for Theia/Gaea/Jet (intel) *** - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -O3 -traceback -xHOST -fPIC" - export FFLAGS="-g -O3 -traceback -xHOST -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -O3 -traceback -xHOST -fPIC" - export MPIFFLAGS="-g -O3 -traceback -xHOST -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="" diff --git a/Conf/G2_intel_General.sh b/Conf/G2_intel_General.sh deleted file mode 100644 index 0e4b84c9..00000000 --- a/Conf/G2_intel_General.sh +++ /dev/null @@ -1,62 +0,0 @@ -# *** manually set environments (for intel compiler) of g2 *** - - : ${USERMODE:=false} # user mode (USERMODE) is closed by default - # set env var USERMODE to "true" to active it - ${USERMODE} && { - echo "Environment set by user" -# On theia/cray, user can load environment - module load intel/18.0.1.163 - } - -# JASPER, PNG and Z LIB in default system include * -# *** set nothing *** - -# WCOSS WCOSS WCOSS WCOSS WCOSS WCOSS WCOSS WCOSS * -#JPZlib=/nwprod2/lib -#JASPER_VER=v1.900.1 -#PNG_VER=v1.2.44 -#Z_VER=v1.2.6 -#JASPER_INC=$JPZlib/jasper/v1.900.1/include -#PNG_INC=$JPZlib/png/v1.2.44/include -#Z_INC=$JPZlib/z/v1.2.6/include - -# THEIA THEIA THEIA THEIA THEIA THEIA THEIA THEIA * -#JPZlib=/scratch3/NCEPDEV/nwprod/lib -#JASPER_VER=v1.900.1 -#PNG_VER=v1.2.44 -#Z_VER=v1.2.6 -#JASPER_INC=$JPZlib/jasper/v1.900.1/include -#PNG_INC=$JPZlib/png/v1.2.44/src/include -#Z_INC=$JPZlib/z/v1.2.6/include - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -traceback -O3 -fPIC" - export FFLAGS="-g -traceback -O3 -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -traceback -O3 -fPIC" - export MPIFFLAGS="-g -traceback -O3 -xHOST -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - [[ -z "${PNG_INC-}" ]] && { IPNG= ; } || { IPNG=-I$PNG_INC; } - [[ -z "${JASPER_INC-}" ]] && { IJASPER= ; } || { IJASPER=-I$JASPER_INC; } - [[ -z "${Z_INC-}" ]] && { IZ= ; } || { IZ=-I$Z_INC; } - export CFLAGSDEFS="$IPNG $IJASPER $IZ -DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="JASPER ${JASPER_VER-}, LIBPNG ${PNG_VER-}, ZLIB ${Z_VER-}" diff --git a/Conf/G2_intel_Hera.sh b/Conf/G2_intel_Hera.sh deleted file mode 100644 index 35743035..00000000 --- a/Conf/G2_intel_Hera.sh +++ /dev/null @@ -1,40 +0,0 @@ -# *** for Hera (intel) *** - $rinst && { - grep -E "(^|:|/)jasper/" <<< "$LOADEDMODULES" &> /dev/null \ - || module load jasper/1.900.1 - grep -E "(^|:|/)png/" <<< "$LOADEDMODULES" &> /dev/null \ - || module load png/1.2.44 - grep -E "(^|:|/)z/" <<< "$LOADEDMODULES" &> /dev/null \ - || module load z/1.2.11 - grep -E "(^|:|/)g2/" <<< "$LOADEDMODULES" &> /dev/null \ - || module load g2/3.1.1 - } - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -O3 -ftz -traceback -xHOST -axcore-avx512 -fPIC" - export FFLAGS="-g -O3 -ftz -traceback -fpe0 -xHOST -axcore-avx512 -assume noold_ldout_format -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -O3 -ftz -traceback -xHOST -axcore-avx512 -fPIC" - export MPIFFLAGS="-g -O3 -ftz -traceback -fpe0 -xHOST -axcore-avx512 -assume noold_ldout_format -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-I${PNG_INC} -I${JASPER_INC} -I${Z_INC} -DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="JASPER $JASPER_VER, LIBPNG $PNG_VER, ZLIB $Z_VER" diff --git a/Conf/G2_intel_Jet.sh b/Conf/G2_intel_Jet.sh deleted file mode 100644 index 4bedbcca..00000000 --- a/Conf/G2_intel_Jet.sh +++ /dev/null @@ -1,30 +0,0 @@ -# *** for Theia/Gaea/Jet (intel) *** - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -O3 -traceback -xHOST -fPIC" - export FFLAGS="-g -O3 -traceback -xHOST -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -O3 -traceback -xHOST -fPIC" - export MPIFFLAGS="-g -O3 -traceback -xHOST -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="" diff --git a/Conf/G2_intel_Theia.sh b/Conf/G2_intel_Theia.sh deleted file mode 100644 index 328f6593..00000000 --- a/Conf/G2_intel_Theia.sh +++ /dev/null @@ -1,30 +0,0 @@ -# *** for Theia (intel) *** - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -O3 -ftz -traceback -xHOST -axcore-avx512 -fPIC" - export FFLAGS="-g -O3 -ftz -traceback -fpe0 -xHOST -axcore-avx512 -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -O3 -ftz -traceback -xHOST -axcore-avx512 -fPIC" - export MPIFFLAGS="-g -O3 -ftz -traceback -fpe0 -xHOST -axcore-avx512 -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS= diff --git a/Conf/G2_intel_Wcoss.sh b/Conf/G2_intel_Wcoss.sh deleted file mode 100644 index 7c7bd7aa..00000000 --- a/Conf/G2_intel_Wcoss.sh +++ /dev/null @@ -1,30 +0,0 @@ -# *** for WCOSS IBM phase1 (intel) *** - - export CC=icc - export FC=ifort - export CPP=cpp - export OMPCC="$CC -qopenmp" - export OMPFC="$FC -qopenmp" - export MPICC=mpiicc - export MPIFC=mpiifort - - export DEBUG="-g -traceback -O0" - export CFLAGS="-g -traceback -O3 -fPIC" - export FFLAGS="-g -traceback -O3 -fPIC" - export FPPCPP="-cpp" - export FREEFORM="-free" - export CPPFLAGS="-P -traditional-cpp" - export MPICFLAGS="-g -traceback -O3 -fPIC" - export MPIFFLAGS="-g -traceback -O3 -xHOST -fPIC" - export MODPATH="-module " - export I4R4="-integer-size 32 -real-size 32" - export I4R8="-integer-size 32 -real-size 64" - export I8R8="-integer-size 64 -real-size 64" - - export CPPDEFS="" - export CFLAGSDEFS="-I${PNG_INC} -I${JASPER_INC} -I${Z_INC} -DUNDERSCORE -DLINUX -DUSE_JPEG2000 -DUSE_PNG -D__64BIT__" - export FFLAGSDEFS="" - - export USECC="YES" - export USEFC="YES" - export DEPS="JASPER $JASPER_VER, LIBPNG $PNG_VER, ZLIB $Z_VER" diff --git a/Conf/Gen_cfunction.sh b/Conf/Gen_cfunction.sh deleted file mode 100644 index 1428829c..00000000 --- a/Conf/Gen_cfunction.sh +++ /dev/null @@ -1,91 +0,0 @@ - gen_cfunction() { - local setx_status=${-//[^x]/} - [[ -n $setx_status ]] && set +x - - logFILE=$1 - oneLINE=$2 - libINFO=$3 - LIB=$(echo "${!libINFO}" | \ - grep "LIBRARY FILE NAME: " | \ - sed -e 's/LIBRARY FILE NAME: //') - [[ $LIB == lib*.a ]] || { - echo "??? gen_cfunction: unknown library name ($LIB) ???" >&2 - exit -1 - } - libNAME=$(echo ${LIB:3} | \ - sed -e 's/^\(.*\)_v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+.*$/\1/') - cFunFILE=$(basename ${logFILE} .txt).c - oFunFILE=${cFunFILE/%.c/.o} - brfFunct=${libNAME}_brief_info - libFunct=${libNAME}_library_info - logFunct=${libNAME}_building_log - - cat << EOI > $cFunFILE -#include -#include -#include -#include - char *${brfFunct}(char *infoline); - int ${libFunct}(void); - int ${logFunct}(void); - static void tprintf(const char *str); - void ${brfFunct}_(char *oneline, size_t n) { - char infoline[256]; - ${brfFunct}(infoline); - strncpy(oneline, infoline, n); - return; - } - void ${libFunct}_(void) { - ${libFunct}(); - return; - } - void ${logFunct}_(void) { - ${logFunct}(); - return; - } - char *${brfFunct}(char *infoline) { - $(sed -e '1,$ s/^\(.*\) = '\''\(.*\)'\'',\?$/ const char \1[] = "\2";/g' <<< "${!oneLINE}") - infoline[0] = '\0'; - strcat(infoline, nclibver); - strcat(infoline, compiled); - strcat(infoline, compiler); - strcat(infoline, datetime); - return infoline; - } - int ${libFunct}(void) { -$(sed -e 's/^/ tprintf("/g; 1,$ s/$/");/g' <<< "${!libINFO}") - return 0; - } - int ${logFunct}(void) { - printf("... building log ...\n"); -$(sed -e 's/"/\\"/g; 1,$ s/%/%%/g; 1,$ s/^/ printf("/g; 1,$ s/$/\\n");/g' $logFILE) - return 0; - } - static void tprintf(const char *str) { - const char *boldon = "\e[1m"; - const char *boldoff = "\e[0m"; - char *str1 = strdup(str); - char *temp = strstr(str1, ": "); //Get the pointer to substr token - if (temp) { - temp += 2; - char *str2 = strdup(temp); - *temp = '\0'; - if (isatty(STDOUT_FILENO)) { - printf("%s%s%s%s\n", boldon, str1, boldoff, str2); - free(str2); - free(str1); - return; - } - free(str2); - } - free(str1); - printf("%s\n", str); - return; - } -EOI - - rm $logFILE - echo $cFunFILE - - [[ -n $setx_status ]] && set -x - } diff --git a/Conf/Reset_version.sh b/Conf/Reset_version.sh deleted file mode 100644 index 6d8bff57..00000000 --- a/Conf/Reset_version.sh +++ /dev/null @@ -1,18 +0,0 @@ - reset_version() { - local setx_status=${-//[^x]/} - [[ -n $setx_status ]] && set +x - (( $# == 2 )) && { - local var=$1 - local ver_name=${var^^}_VER - local old_ver=${!ver_name} - local new_ver=$2 - } || { - local var=$1 - local old_ver=$2 - local new_ver=$3 - } - for vline in "$(env | grep ${var^^})"; do - eval ${vline//${old_ver}/${new_ver}} - done - [[ -n $setx_status ]] && set -x - } diff --git a/build_g2.sh b/build_g2.sh deleted file mode 100755 index 1d55bcca..00000000 --- a/build_g2.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - - : ${THISDIR:=$(dirname $(readlink -f -n ${BASH_SOURCE[0]}))} - CDIR=$PWD; cd $THISDIR - - source ./Conf/Analyse_args.sh - source ./Conf/Collect_info.sh - source ./Conf/Gen_cfunction.sh - source ./Conf/Reset_version.sh - - if [[ ${sys} == "intel_general" ]]; then - sys6=${sys:6} - source ./Conf/G2_${sys:0:5}_${sys6^}.sh - rinst=false - elif [[ ${sys} == "gnu_general" ]]; then - sys4=${sys:4} - source ./Conf/G2_${sys:0:3}_${sys4^}.sh - rinst=false - else - source ./Conf/G2_intel_${sys^}.sh - fi - $CC --version &> /dev/null || { - echo "??? G2: compilers not set." >&2 - exit 1 - } - [[ -z ${G2_VER+x} || -z ${G2_LIB4+x} ]] && { - [[ -z ${libver+x} || -z ${libver} ]] && { - echo "??? G2: \"libver\" not set." >&2 - exit - } - G2_INC4=${libver}_4 - G2_INCd=${libver}_d - G2_LIB4=lib${libver}_4.a - G2_LIBd=lib${libver}_d.a - G2_VER=v${libver##*_v} - } - -set -x - g2Lib4=$(basename $G2_LIB4) - g2Libd=$(basename $G2_LIBd) - g2Inc4=$(basename $G2_INC4) - g2Incd=$(basename $G2_INCd) - -################# - cd src -################# - -#------------------------------------------------------------------- -# Start building libraries -# - echo - echo " ... build (i4/r4) g2 library ..." - echo - make clean LIB=$g2Lib4 MOD=$g2Inc4 - mkdir -p $g2Inc4 - FFLAGS4="$I4R4 $FFLAGS ${MODPATH}$g2Inc4" - collect_info g2 4 OneLine4 LibInfo4 - g2Info4=g2_info_and_log4.txt - $debg && make debug FFLAGS="$FFLAGS4" LIB=$g2Lib4 &> $g2Info4 \ - || make build FFLAGS="$FFLAGS4" LIB=$g2Lib4 &> $g2Info4 - make message MSGSRC="$(gen_cfunction $g2Info4 OneLine4 LibInfo4)" LIB=$g2Lib4 - - echo - echo " ... build (i4/r8) g2 library ..." - echo - make clean LIB=$g2Libd MOD=$g2Incd - mkdir -p $g2Incd - FFLAGSd="$I4R8 $FFLAGS ${MODPATH}$g2Incd" - collect_info g2 d OneLined LibInfod - g2Infod=g2_info_and_logd.txt - $debg && make debug FFLAGS="$FFLAGSd" LIB=$g2Libd &> $g2Infod \ - || make build FFLAGS="$FFLAGSd" LIB=$g2Libd &> $g2Infod - make message MSGSRC="$(gen_cfunction $g2Infod OneLined LibInfod)" LIB=$g2Libd - - $inst && { -# -# Install libraries and source files -# - $local && { - instloc=.. - LIB_DIR=$instloc/lib - INCP_DIR=$instloc/include - [ -d $LIB_DIR ] || { mkdir -p $LIB_DIR; } - [ -d $INCP_DIR ] || { mkdir -p $INCP_DIR; } - LIB_DIR4=$LIB_DIR - LIB_DIRd=$LIB_DIR - INCP_DIR4=$INCP_DIR - INCP_DIRd=$INCP_DIR - SRC_DIR= - } || { - $rinst && { - LIB_DIR4=$(dirname ${G2_LIB4}) - LIB_DIRd=$(dirname ${G2_LIBd}) - INCP_DIR4=$(dirname $G2_INC4) - INCP_DIRd=$(dirname $G2_INCd) - [ -d $G2_INC4 ] && { rm -rf $G2_INC4; } \ - || { mkdir -p $INCP_DIR4; } - [ -d $G2_INCd ] && { rm -rf $G2_INCd; } \ - || { mkdir -p $INCP_DIRd; } - SRC_DIR=$G2_SRC - } || { - LIB_DIR=$instloc/lib - LIB_DIR4=$LIB_DIR - LIB_DIRd=$LIB_DIR - INCP_DIR=$instloc/include - INCP_DIR4=$INCP_DIR - INCP_DIRd=$INCP_DIR - G2_INC4=$INCP_DIR4/$G2_INC4 - G2_INCd=$INCP_DIRd/$G2_INCd - [ -d $G2_INC4 ] && { rm -rf $G2_INC4; } \ - || { mkdir -p $INCP_DIR4; } - [ -d $G2_INCd ] && { rm -rf $G2_INCd; } \ - || { mkdir -p $INCP_DIRd; } - SRC_DIR=$instloc/src/${libver} - [[ $instloc == .. ]] && SRC_DIR= - } - [ -d $LIB_DIR4 ] || mkdir -p $LIB_DIR4 - [ -d $LIB_DIRd ] || mkdir -p $LIB_DIRd - [ -z $SRC_DIR ] || { [ -d $SRC_DIR ] || mkdir -p $SRC_DIR; } - } - - make clean LIB= - make install LIB=$g2Lib4 MOD=$g2Inc4 \ - LIB_DIR=$LIB_DIR4 INC_DIR=$INCP_DIR4 SRC_DIR= - make install LIB=$g2Libd MOD=$g2Incd \ - LIB_DIR=$LIB_DIRd INC_DIR=$INCP_DIRd SRC_DIR=$SRC_DIR - } diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 049ce337..00000000 --- a/src/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -SHELL=/bin/sh -# sources, headers, objects, library and etc. -SRCS_C = dec_jpeg2000.c dec_png.c enc_jpeg2000.c \ - enc_png.c mova2i.c -SRCS_f = $(wildcard *.f) -SRCS_m = gridtemplates.f pdstemplates.f \ - drstemplates.f gribmod.f realloc.f \ - intmath.f -SRCS_F = $(SRCS_m) $(filter-out $(SRCS_m), $(SRCS_f)) -OBJS = $(patsubst %.c, %.o, $(SRCS_C)) \ - $(patsubst %.f, %.o, $(SRCS_F)) - -all: build - -build: $(LIB) - -$(LIB): $(OBJS) - $(AR) $(ARFLAGS) $@ $^ - -debug: dbg_build - -dbg_build: override CFLAGS += $(DEBUG) -dbg_build: override FFLAGS += $(DEBUG) -dbg_build: $(LIB) - -%.o: %.c - $(CC) -c $(CFLAGS) $(CFLAGSDEFS) $< - -%.o: %.f - $(FC) -c $(FFLAGS) $(FFLAGSDEFS) $< - -message: $(MSGSRC) - $(CC) -c $(MSGSRC) - $(AR) $(ARFLAGS) $(LIB) $(patsubst %.c, %.o, $(MSGSRC)) - $(RM) $(MSGSRC) $(patsubst %.c, %.o, $(MSGSRC)) - -install: - [[ -z "$(LIB)" || -z "$(LIB_DIR)" ]] || mv $(LIB) $(LIB_DIR) - [[ -z "$(MOD)" || -z "$(INC_DIR)" ]] || mv $(MOD) $(INC_DIR) - [[ -z "$(SRC_DIR)" ]] || cp ./* $(SRC_DIR) - -test: - @echo "*** unit test unavailable currently ***" - -clean: - $(RM) $(OBJS) $(LIB) - [[ -z "$(MOD)" ]] || $(RM) -r $(MOD) - -.SUFFIXES: .f .mod .c .o .a - -# Specify targets that do not generate filesystem objects -.PHONY: all build install debug dbg_build message test clean From 36bdf12d4fe58c880d3b88686339950c2fcef129 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Fri, 26 Jun 2020 14:51:48 -0400 Subject: [PATCH 3/3] Bump version to 3.4 --- README.md | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 984420d5..2cbd3383 100755 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ make install ``` #### Version -3.3.0 +3.4.0 #### Authors * **[NCEP/EMC](mailto:NCEP.List.EMC.nceplibs.Developers@noaa.gov)** diff --git a/VERSION b/VERSION index 15a27998..18091983 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0 +3.4.0