From 578c974704e33437f4a7cdfd01708c2337825867 Mon Sep 17 00:00:00 2001 From: Wen Meng Date: Sat, 14 Dec 2019 02:25:24 +0000 Subject: [PATCH 1/3] 1)Update with g2tmp/1.6.0; 2)Sync new routines into makefile for building post library. --- .../post/{lib-v8.0.0-cray-intel => lib-cray-intel} | 4 +++- modulefiles/post/{lib-v8.0.0-hera => lib-hera} | 0 modulefiles/post/{lib-v8.0.0-wcoss => lib-wcoss} | 0 .../{lib-v8.0.0-wcoss_dell_p3 => lib-wcoss_dell_p3} | 3 ++- modulefiles/post/v8.0.0-cray-intel | 4 +++- modulefiles/post/v8.0.0-hera | 6 ++++-- modulefiles/post/v8.0.0-wcoss_dell_p3 | 3 ++- parm/post_avblflds.xml | 10 ---------- parm/postxconfig-NT-GFS-GOES.txt | 8 ++++---- sorc/ncep_post.fd/build_ncepost_lib.sh | 4 ++-- sorc/ncep_post.fd/makefile_lib | 9 +++++---- 11 files changed, 25 insertions(+), 26 deletions(-) rename modulefiles/post/{lib-v8.0.0-cray-intel => lib-cray-intel} (93%) rename modulefiles/post/{lib-v8.0.0-hera => lib-hera} (100%) rename modulefiles/post/{lib-v8.0.0-wcoss => lib-wcoss} (100%) rename modulefiles/post/{lib-v8.0.0-wcoss_dell_p3 => lib-wcoss_dell_p3} (93%) diff --git a/modulefiles/post/lib-v8.0.0-cray-intel b/modulefiles/post/lib-cray-intel similarity index 93% rename from modulefiles/post/lib-v8.0.0-cray-intel rename to modulefiles/post/lib-cray-intel index 3c34033ae..dce41dd39 100755 --- a/modulefiles/post/lib-v8.0.0-cray-intel +++ b/modulefiles/post/lib-cray-intel @@ -41,7 +41,9 @@ module load jasper-gnu-sandybridge/1.900.1 module load png-gnu-sandybridge/1.2.49 module load zlib-gnu-sandybridge/1.2.7 module load g2-intel/3.1.0 -module load g2tmpl-intel/1.5.0 +module use -a /usrx/local/nceplibs/NCEPLIBS/modulefiles +module load g2tmpl/1.6.0 +#module load g2tmpl-intel/1.5.0 #module load xmlparse/v2.0.0 module load w3emc-intel/2.2.0 diff --git a/modulefiles/post/lib-v8.0.0-hera b/modulefiles/post/lib-hera similarity index 100% rename from modulefiles/post/lib-v8.0.0-hera rename to modulefiles/post/lib-hera diff --git a/modulefiles/post/lib-v8.0.0-wcoss b/modulefiles/post/lib-wcoss similarity index 100% rename from modulefiles/post/lib-v8.0.0-wcoss rename to modulefiles/post/lib-wcoss diff --git a/modulefiles/post/lib-v8.0.0-wcoss_dell_p3 b/modulefiles/post/lib-wcoss_dell_p3 similarity index 93% rename from modulefiles/post/lib-v8.0.0-wcoss_dell_p3 rename to modulefiles/post/lib-wcoss_dell_p3 index 97f3506a3..e0e9f12ab 100755 --- a/modulefiles/post/lib-v8.0.0-wcoss_dell_p3 +++ b/modulefiles/post/lib-wcoss_dell_p3 @@ -37,7 +37,8 @@ module load jasper/1.900.1 module load libpng/1.2.59 module load zlib/1.2.11 module load g2/3.1.0 -module load g2tmpl/1.5.0 +module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles +module load g2tmpl/1.6.0 #module load xmlparse/v2.0.0 module load w3emc/2.3.0 diff --git a/modulefiles/post/v8.0.0-cray-intel b/modulefiles/post/v8.0.0-cray-intel index 88d9c510f..8b98df88a 100644 --- a/modulefiles/post/v8.0.0-cray-intel +++ b/modulefiles/post/v8.0.0-cray-intel @@ -47,7 +47,9 @@ module load cray-netcdf/4.3.2 # module load NetCDF-cray-sandybridge/3.6.3 #### module load cray-netcdf/4.3.2 #module load g2tmpl-intel/1.4.0 -module load g2tmpl-intel/1.5.0 +module use -a /usrx/local/nceplibs/NCEPLIBS/modulefiles +module load g2tmpl/1.6.0 +#module load g2tmpl-intel/1.5.0 module load wrfio-intel/1.1.1 setenv myFC ftn diff --git a/modulefiles/post/v8.0.0-hera b/modulefiles/post/v8.0.0-hera index 3e03cc541..02e426958 100644 --- a/modulefiles/post/v8.0.0-hera +++ b/modulefiles/post/v8.0.0-hera @@ -15,8 +15,10 @@ module-whatis "post" set ver v8.0.0 # Loading Intel Compiler Suite -module load intel/19.0.4.243 -module load impi/2019.0.4 +#module load intel/19.0.4.243 +#module load impi/2019.0.4 +module load intel/18.0.5.274 +module load impi/2018.0.4 #module use /contrib/modulefiles module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles diff --git a/modulefiles/post/v8.0.0-wcoss_dell_p3 b/modulefiles/post/v8.0.0-wcoss_dell_p3 index d84ede9ed..04e1e9c02 100644 --- a/modulefiles/post/v8.0.0-wcoss_dell_p3 +++ b/modulefiles/post/v8.0.0-wcoss_dell_p3 @@ -32,9 +32,10 @@ module load sp/2.0.2 module load w3emc/2.3.0 module load w3nco/2.0.6 module load NetCDF/4.5.0 -module load g2tmpl/1.5.0 module load crtm/2.2.6 module load wrfio/1.1.1 +module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles +module load g2tmpl/1.6.0 setenv myFC mpiifort setenv OPENMP "-qopenmp" diff --git a/parm/post_avblflds.xml b/parm/post_avblflds.xml index 1f253bf4e..9e4fe8d6f 100755 --- a/parm/post_avblflds.xml +++ b/parm/post_avblflds.xml @@ -6821,7 +6821,6 @@ 958 SBTAGR7_ON_TOP_OF_ATMOS SBTAGR7 - NCEP top_of_atmos 4.0 @@ -6830,7 +6829,6 @@ 959 SBTAGR8_ON_TOP_OF_ATMOS SBTAGR8 - NCEP top_of_atmos 4.0 @@ -6839,7 +6837,6 @@ 960 SBTAGR9_ON_TOP_OF_ATMOS SBTAGR9 - NCEP top_of_atmos 4.0 @@ -6848,7 +6845,6 @@ 961 SBTAGR10_ON_TOP_OF_ATMOS SBTAGR10 - NCEP top_of_atmos 4.0 @@ -6857,7 +6853,6 @@ 962 SBTAGR11_ON_TOP_OF_ATMOS SBTAGR11 - NCEP top_of_atmos 4.0 @@ -6866,7 +6861,6 @@ 963 SBTAGR12_ON_TOP_OF_ATMOS SBTAGR12 - NCEP top_of_atmos 4.0 @@ -6875,7 +6869,6 @@ 964 SBTAGR13_ON_TOP_OF_ATMOS SBTAGR13 - NCEP top_of_atmos 4.0 @@ -6884,7 +6877,6 @@ 965 SBTAGR14_ON_TOP_OF_ATMOS SBTAGR14 - NCEP top_of_atmos 4.0 @@ -6893,7 +6885,6 @@ 966 SBTAGR15_ON_TOP_OF_ATMOS SBTAGR15 - NCEP top_of_atmos 4.0 @@ -6902,7 +6893,6 @@ 967 SBTAGR16_ON_TOP_OF_ATMOS SBTAGR16 - NCEP top_of_atmos 4.0 diff --git a/parm/postxconfig-NT-GFS-GOES.txt b/parm/postxconfig-NT-GFS-GOES.txt index 9e37655af..e23e1f5d9 100644 --- a/parm/postxconfig-NT-GFS-GOES.txt +++ b/parm/postxconfig-NT-GFS-GOES.txt @@ -170,7 +170,7 @@ SBTAGR8_ON_TOP_OF_ATMOS 1 tmpl4_0 SBTAGR8 -NCEP +? ? top_of_atmos 0 @@ -207,7 +207,7 @@ SBTAGR9_ON_TOP_OF_ATMOS 1 tmpl4_0 SBTAGR9 -NCEP +? ? top_of_atmos 0 @@ -244,7 +244,7 @@ SBTAGR10_ON_TOP_OF_ATMOS 1 tmpl4_0 SBTAGR10 -NCEP +? ? top_of_atmos 0 @@ -281,7 +281,7 @@ SBTAGR13_ON_TOP_OF_ATMOS 1 tmpl4_0 SBTAGR13 -NCEP +? ? top_of_atmos 0 diff --git a/sorc/ncep_post.fd/build_ncepost_lib.sh b/sorc/ncep_post.fd/build_ncepost_lib.sh index a5f79f8ae..1364a21c9 100755 --- a/sorc/ncep_post.fd/build_ncepost_lib.sh +++ b/sorc/ncep_post.fd/build_ncepost_lib.sh @@ -22,7 +22,7 @@ export version=${1:-"v8.0.0"} moduledir=`dirname $(readlink -f ../../modulefiles/post)` module use -a ${moduledir} -module load post/lib-${version}-${machine} +module load post/lib-${machine} #module load nceppost_modulefile # @@ -37,7 +37,7 @@ cd ${BASE} rm *.o *.mod incmod #mkdir -m 775 -p $BASE/../../lib/include/ncep_post_${version}_4 make -f makefile_lib clean -mkdir -m 775 -p include/ncep_post_${version}_4 +mkdir -m 775 -p include/ncep_post_4 make -f makefile_lib exit 0 diff --git a/sorc/ncep_post.fd/makefile_lib b/sorc/ncep_post.fd/makefile_lib index 2af4ff0b6..185b53366 100644 --- a/sorc/ncep_post.fd/makefile_lib +++ b/sorc/ncep_post.fd/makefile_lib @@ -44,8 +44,8 @@ #POSTLIBPATH=../.. #TARGET = ${POSTLIBPATH}/lib/libncep_post_${version}_4.a #INCMOD= ${POSTLIBPATH}/lib/include/ncep_post_${version}_4 - TARGET = libncep_post_${version}_4.a - INCMOD = include/ncep_post_${version}_4 + TARGET = libncep_post_4.a + INCMOD = include/ncep_post_4 AR = ar ARFLAGS = -rv @@ -108,7 +108,7 @@ OBJS= VRBLS2D_mod.o VRBLS3D_mod.o VRBLS4D_mod.o MASKS_mod.o PMICRPH.o SOIL_mod.o CLDRAD.o CLMAX.o COLLECT.o COLLECT_LOC.o DEWPOINT.o \ FDLVL.o FGAMMA.o FIXED.o FRZLVL.o FRZLVL2.o \ GET_BITS.o GRIBIT.o LFMFLD.o \ - MAPSSLP.o MISCLN.o MIXLEN.o MDL2P.o MDLFLD.o \ + MAPSSLP.o MISCLN.o MDL2STD_P.o MIXLEN.o MDL2P.o MDLFLD.o \ NGMFLD.o NGMSLP.o OTLFT.o OTLIFT.o SLP_new.o SLP_NMM.o EXCH.o \ PARA_RANGE.o PROCESS.o EXCH2.o \ READCNTRL.o READ_xml.o SET_OUTFLDS.o SCLFLD.o \ @@ -122,7 +122,8 @@ OBJS= VRBLS2D_mod.o VRBLS3D_mod.o VRBLS4D_mod.o MASKS_mod.o PMICRPH.o SOIL_mod.o ICAOHEIGHT.o \ GEO_ZENITH_ANGLE.o GFIP3.o GRIDAVG.o CALUPDHEL.o \ AllGETHERV_GSD.o MSFPS.o SELECT_CHANNELS.o ALLOCATE_ALL.o \ - gtg_ctlblk.o gtg_indices.o gtg_filter.o gtg_compute.o gtg_config.o map_routines.o gtg_algo.o + gtg_ctlblk.o gtg_indices.o gtg_filter.o gtg_compute.o gtg_config.o map_routines.o gtg_algo.o gtg_smoothseams.o CALVESSEL.o \ + CALHEL2.o CALCAPE2.o .SUFFIXES: .F .f .o .f90 .c From 1373c7a592f2ddd8f4344e1d4985c75865610ac8 Mon Sep 17 00:00:00 2001 From: Wen Meng Date: Sun, 15 Dec 2019 16:30:55 +0000 Subject: [PATCH 2/3] Switch to intel/16.3.210 for Cray. --- modulefiles/post/lib-cray-intel | 3 ++- modulefiles/post/v8.0.0-cray-intel | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modulefiles/post/lib-cray-intel b/modulefiles/post/lib-cray-intel index dce41dd39..054346457 100755 --- a/modulefiles/post/lib-cray-intel +++ b/modulefiles/post/lib-cray-intel @@ -33,7 +33,8 @@ module use -a /gpfs/hps/nco/ops/nwprod/lib/modulefiles # Loading Intel Compiler Suite module load PrgEnv-intel module load craype-sandybridge -module switch intel intel/15.0.3.187 +#module switch intel intel/15.0.3.187 +module switch intel intel/16.3.210 module load craype/2.3.0 # Loading nceplibs modules diff --git a/modulefiles/post/v8.0.0-cray-intel b/modulefiles/post/v8.0.0-cray-intel index 8b98df88a..ee663a24f 100644 --- a/modulefiles/post/v8.0.0-cray-intel +++ b/modulefiles/post/v8.0.0-cray-intel @@ -19,7 +19,8 @@ module use -a /usrx/local/prod/modulefiles module use -a /gpfs/hps/nco/ops/nwprod/lib/modulefiles module load PrgEnv-intel module load craype-sandybridge -module switch intel intel/15.0.3.187 +#module switch intel intel/15.0.3.187 +module switch intel intel/16.3.210 module load craype/2.3.0 module load prod_util/1.0.33 module load cray-libsci/13.0.3 From c74e83e2d574e7ec851f71af7e7067827f4eaae0 Mon Sep 17 00:00:00 2001 From: Wen Meng Date: Sun, 15 Dec 2019 16:34:51 +0000 Subject: [PATCH 3/3] Upgrade with g2tmpl v1.6.0 on Hera. --- modulefiles/post/lib-hera | 2 +- modulefiles/post/v8.0.0-hera | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/post/lib-hera b/modulefiles/post/lib-hera index 715b5c7f9..462f549d0 100755 --- a/modulefiles/post/lib-hera +++ b/modulefiles/post/lib-hera @@ -39,7 +39,7 @@ module load jasper/1.900.1 module load png/1.2.44 module load z/1.2.11 module load g2/3.1.0 -module load g2tmpl/1.5.0 +module load g2tmpl/1.6.0 #module load xmlparse/v2.0.0 module load w3emc/2.3.1 diff --git a/modulefiles/post/v8.0.0-hera b/modulefiles/post/v8.0.0-hera index 02e426958..9155735a6 100644 --- a/modulefiles/post/v8.0.0-hera +++ b/modulefiles/post/v8.0.0-hera @@ -41,7 +41,7 @@ module load w3nco/2.0.7 module load crtm/2.2.5 #module load netcdf/3.6.3 module load netcdf/4.7.0 -module load g2tmpl/1.5.1 +module load g2tmpl/1.6.0 module load wrfio/1.1.1 #setenv WRFPATH /scratch3/NCEPDEV/nwprod/sorc/wrf_shared.v1.1.0