Skip to content
Snippets Groups Projects
Commit 2219af47 authored by Adam Caprez's avatar Adam Caprez
Browse files

Merge branch 'wps-patches' into 'master' 

Update WPS patches.

See merge request !337
parents 3744c5ab cea19469
No related branches found
No related tags found
1 merge request!337Update WPS patches.
Hide whitespace changes
Inline Side-by-side
content/applications/app_specific/building_wrf.md
+ 12
− 11
View file @ 2219af47
......@@ -688,14 +688,14 @@ if [ -e src/int2nc.exe ] ; then \
fi
[demo01@login.crane WPS]$ ls
arch compile configure.wps geogrid link_grib.csh metgrid.exe namelist.wps.all_options namelist.wps.global ungrib wps4_configure.patch
clean configure external geogrid.exe metgrid namelist.wps namelist.wps.fire README util
arch configure foo_81824.c geogrid.exe link_grib.csh metgrid.log namelist.wps.fire README util
clean configure.wps foo_81824.f geogrid.log metgrid namelist.wps namelist.wps.global ungrib wps3_configure.patch
compile configure.wps.backup geogrid gmeta metgrid.exe namelist.wps.all_options namelist.wps.nmm ungrib.log
[demo01@login.crane WPS]$ ls util/
avg_tsfc.exe gfs.ncl int2nc.exe plotfmt.ncl plotgrids.ncl rd_intermediate.exe vertical_grid_50_20m_63km.txt
calc_ecmwf_p.exe gfs_old.ncl Makefile plotfmt_nc.ncl plotgrids_new.ncl src vertical_grid_70_20m_80km.txt
g1print.exe height_ukmo.exe mod_levs.exe plotgrids.exe plotgrids_old.ncl vertical_grid_38_20m_G3.txt
avg_tsfc.exe gfs.ncl int2nc.exe plotfmt.ncl plotgrids_new.ncl src vertical_grid_70_20m_80km.txt
calc_ecmwf_p.exe gfs_old.ncl Makefile plotfmt_nc.ncl plotgrids_old.ncl vertical_grid_38_20m_G3.txt
g1print.exe height_ukmo.exe mod_levs.exe plotgrids.ncl rd_intermediate.exe vertical_grid_50_20m_63km.txt
{{< /highlight >}}
{{% /panel %}}
......@@ -816,13 +816,14 @@ if [ -e src/int2nc.exe ] ; then \
fi
[demo01@login.crane WPS]$ ls
arch compile configure.wps external geogrid.exe metgrid namelist.wps namelist.wps.fire README util
clean configure configure.wps.backup geogrid link_grib.csh metgrid.exe namelist.wps.all_options namelist.wps.global ungrib wps4_configure.patch
arch configure external link_grib.csh namelist.wps namelist.wps.global ungrib.exe
clean configure.wps geogrid metgrid namelist.wps.all_options README util
compile configure.wps.backup geogrid.exe metgrid.exe namelist.wps.fire ungrib wps4_configure.patch
[demo01@login.crane WPS]$ ls util/
avg_tsfc.exe gfs.ncl int2nc.exe plotfmt.ncl plotgrids_new.ncl src vertical_grid_70_20m_80km.txt
calc_ecmwf_p.exe gfs_old.ncl Makefile plotfmt_nc.ncl plotgrids_old.ncl vertical_grid_38_20m_G3.txt
g1print.exe height_ukmo.exe mod_levs.exe plotgrids.ncl rd_intermediate.exe vertical_grid_50_20m_63km.txt
avg_tsfc.exe g2print.exe height_ukmo.exe mod_levs.exe plotgrids.exe plotgrids_old.ncl vertical_grid_38_20m_G3.txt
calc_ecmwf_p.exe gfs.ncl int2nc.exe plotfmt.ncl plotgrids.ncl rd_intermediate.exe vertical_grid_50_20m_63km.txt
g1print.exe gfs_old.ncl Makefile plotfmt_nc.ncl plotgrids_new.ncl src vertical_grid_70_20m_80km.txt
{{< /highlight >}}
{{% /panel %}}
......
static/attachments/wps3_configure.patch
+ 13
− 5
View file @ 2219af47
--- arch/configure.defaults.org 2022-09-30 17:01:23.000000000 -0500
+++ arch/configure.defaults 2022-09-30 17:44:26.000000000 -0500
@@ -33,8 +33,7 @@
COMPRESSION_LIBS = CONFIGURE_COMP_L
+++ arch/configure.defaults 2022-10-05 13:15:11.000000000 -0500
@@ -30,11 +30,10 @@
########################################################################################################################
#ARCH Linux i486 i586 i686, PGI compiler # serial serial_NO_GRIB2 dmpar dmpar_NO_GRIB2
#
-COMPRESSION_LIBS = CONFIGURE_COMP_L
+COMPRESSION_LIBS = CONFIGURE_COMP_L -L${LIBPNG}/lib -L${ZLIB}/lib
COMPRESSION_INC = CONFIGURE_COMP_I
FDEFS = CONFIGURE_FDEFS
-NCARG_LIBS2 = -L${PGI}/linux86/6.1/lib -lpgftnrtl -lpgc \
......@@ -10,8 +14,12 @@
SFC = pgf90
SCC = pgcc
DM_FC = mpif90
@@ -153,8 +152,8 @@
COMPRESSION_LIBS = CONFIGURE_COMP_L
@@ -150,11 +149,11 @@
########################################################################################################################
#ARCH Linux x86_64, PGI compiler # serial serial_NO_GRIB2 dmpar dmpar_NO_GRIB2
#
-COMPRESSION_LIBS = CONFIGURE_COMP_L
+COMPRESSION_LIBS = CONFIGURE_COMP_L -L${LIBPNG}/lib -L${ZLIB}/lib
COMPRESSION_INC = CONFIGURE_COMP_I
FDEFS = CONFIGURE_FDEFS
-NCARG_LIBS2 = -L${PGI}/linux86-64/5.2/lib -lpgftnrtl -lpgc \
......
static/attachments/wps4_configure.patch
+ 14
− 6
View file @ 2219af47
--- arch/configure.defaults.org 2022-09-30 17:36:29.000000000 -0500
+++ arch/configure.defaults 2022-09-30 17:55:16.000000000 -0500
@@ -76,8 +76,8 @@
COMPRESSION_LIBS = CONFIGURE_COMP_L
--- arch/configure.defaults.orig 2022-04-26 20:39:03.000000000 -0500
+++ arch/configure.defaults 2022-10-05 12:27:38.000000000 -0500
@@ -73,11 +73,11 @@
########################################################################################################################
#ARCH Linux i486 i586 i686, PGI compiler # serial serial_NO_GRIB2 dmpar dmpar_NO_GRIB2
#
-COMPRESSION_LIBS = CONFIGURE_COMP_L
+COMPRESSION_LIBS = CONFIGURE_COMP_L -L${LIBPNG}/lib -L${ZLIB}/lib
COMPRESSION_INC = CONFIGURE_COMP_I
FDEFS = CONFIGURE_FDEFS
-NCARG_LIBS2 = -L${PGI}/linux86/6.1/lib -lpgftnrtl -lpgc \
......@@ -11,8 +15,12 @@
SFC = pgf90
SCC = pgcc
DM_FC = mpif90
@@ -198,8 +198,8 @@
COMPRESSION_LIBS = CONFIGURE_COMP_L
@@ -195,11 +195,11 @@
########################################################################################################################
#ARCH Linux x86_64, PGI compiler # serial serial_NO_GRIB2 dmpar dmpar_NO_GRIB2
#
-COMPRESSION_LIBS = CONFIGURE_COMP_L
+COMPRESSION_LIBS = CONFIGURE_COMP_L -L${LIBPNG}/lib -L${ZLIB}/lib
COMPRESSION_INC = CONFIGURE_COMP_I
FDEFS = CONFIGURE_FDEFS
-NCARG_LIBS2 = -L${PGI}/linux86-64/5.2/lib -lpgftnrtl -lpgc \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment