fix so wgrib2 can compile with chosen compiler (#1449)

Issue 1428:

* pinning to a known working version of PDL
* fixing wgrib2 on QBC
* added back some envars that ended up being needed; added OpenMP flags which I realized were supported
* found version 3.1.2 works with 'oneapi_linux'
* added cleaning up back in

Resolves #1428.

---------

Co-authored-by: oodler577 <oodler@cpan.org>

Author: wwlwpd

cloud/general/asgs-brew.pl

@@ -827,7 +827,7 @@ sub get_steps {
             name        => q{Step for wgrib2},
             description => q{Downloads and builds wgrib2 on all platforms for ASGS. Note: gfortran is required, so any compiler option passed is overridden.},
             pwd         => qq{$scriptdir},
-	    command             => qq{bash init-wgrib2.sh $asgs_install_path gfortran},
+	    command             => qq{bash init-wgrib2.sh $asgs_install_path $asgs_compiler},
 	    clean               => qq{bash init-wgrib2.sh $asgs_install_path clean},
             skip_if             => sub { my ( $op, $opts_ref ) = @_; return -e qq{./bin/wgrib2}; },
             precondition_check  => sub { 1 },

cloud/general/init-perl-data-language.sh

@@ -12,4 +12,4 @@ if [[ "$COMPILER" == "clean" || "$COMPILER" == "rebuild" ]]; then
   fi
 fi
 
-cpanm --verbose PDL
+cpanm --verbose PDL@2.099

cloud/general/init-wgrib2.sh

@@ -3,33 +3,46 @@
 OPT=${1:-$ASGS_INSTALL_PATH}
 COMPILER=${2:-intel}
 
-VERSION=-3.1.1
+VERSION=3.1.2
 
 if [ $COMPILER == "clean" ]; then
   make clean
   rm -rfv grib2
-  rm -fv  wgrib2${VERSION}.tgz 
+  rm -fv  wgrib2-${VERSION}.tgz 
   exit
 fi
 
 pushd $SCRIPTDIR
 
-export COMP_SYS=gnu_linux
-export CC=gcc
-export FC=gfortran
-export CXX=g++
-
 if [ ! -e wgrib2${VERSION}.tgz ]; then
-  wget https://asgs-static-assets.sfo2.digitaloceanspaces.com/lib/wgrib2${VERSION}.tgz
+  #wget https://asgs-static-assets.sfo2.digitaloceanspaces.com/lib/wgrib2-${VERSION}.tgz -O wgrib2-${VERSION}.tgz
+  wget https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v${VERSION} -O wgrib2-${VERSION}.tgz
+fi
+
+rm -rf grib2 > /dev/null 2>&1
+tar zxvf wgrib2-${VERSION}.tgz 
+
+if [ "$compiler" == "intel" ]; then
+  CC=gcc
+  FC=gfortran
+  COMP_SYS=gnu_linux
+fi
+if [ "$compiler" == "intel" ]; then
+  CC=icc
+  FC=ifort
+  COMP_SYS=intel_linux
+fi
+if [ "$compiler" == "intel-oneapi" ]; then
+  CC=icx
+  FC=ifx
+  COMP_SYS=oneapi_linux
 fi
 
-rm -rf grib2
-tar zxvf wgrib2${VERSION}.tgz
+make -j 1 NETCDFPATH=$OPT NETCDF=enable NETCDF4=enable NETCDF4_COMPRESSION=enable MACHINE_NAME=$ASGS_MACHINE_NAME compiler=$COMPILER
 
-make -j 1 NETCDFPATH=$asgs_install_path NETCDF=enable NETCDF4=enable NETCDF4_COMPRESSION=enable MACHINE_NAME=$asgs_machine_name compiler=gfortran
-cp $SCRIPTDIR/grib2/wgrib2/wgrib2 $SCRIPTDIR/bin
+cp $SCRIPTDIR/grib2/wgrib2/wgrib2 $SCRIPTDIR/bin > /dev/null 2>&1
 
 rm -rfv grib2
-rm -fv  wgrib2${VERSION}.tgz 
+rm -fv  wgrib2-${VERSION}.tgz
 
 popd

makefile

@@ -24,11 +24,15 @@
 #
 # specify compiler=gfortran on the make command line
 
+$(info Compiler: $(compiler))
+
+export OMP_NUM_THREADS=4
+
 ifeq ($(compiler),gfortran)
    export FC := gfortran
    export CC := gcc
    export COMP_SYS := gnu_linux
-   FFLAGS := -ffree-line-length-none -ffixed-line-length-none
+   FFLAGS := -ffree-line-length-none -ffixed-line-length-none -fopenmp
    ifeq ($(DEBUG),full)
       FFLAGS := -cpp -ffree-line-length-none -g -O0 -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,underflow,overflow,denormal #-Wall
    endif
@@ -39,7 +43,7 @@ ifeq ($(compiler),intel)
    export FC := ifort
    export CC := icc
    export COMP_SYS := intel_linux
-   FFLAGS := -132
+   FFLAGS := -132 -qopenmp
    ifeq ($(DEBUG),full)
       FFLAGS := -g -O0 -fpp -traceback -debug -check all
    endif
@@ -49,20 +53,14 @@ ifeq ($(compiler),intel-oneapi)
    export FC := ifx
    export CC := icx
    export COMP_SYS := oneapi_linux
-   FFLAGS := -132
-   ifeq ($(DEBUG),full)
-      FFLAGS := -g -O0 -fpp -traceback -debug -check all
-   endif
-endif
-ifeq ($(compiler),intel-oneapi)
-   export FC := ifort
-   export CC := icx
-   export COMP_SYS := intel_linux
-   FFLAGS := -132
+   FFLAGS := -132 -qopenmp
    ifeq ($(DEBUG),full)
       FFLAGS := -g -O0 -fpp -traceback -debug -check all
    endif
 endif
+
+$(info FC: $(FC))
+
 #
 INCLUDES :=
 #