Merge pull request NOAA-EMC#65 from hertneky/DTC_post_merge_20200204

Merge develop into DTC_post
fossell · Feb 5, 2020 · af181ba · af181ba
2 parents 172bab0 + 55419ab
commit af181ba
Show file tree

Hide file tree

Showing 30 changed files with 2,889 additions and 1,480 deletions.
diff --git a/modulefiles/post/lib-cray-intel b/modulefiles/post/lib-cray-intel
@@ -17,7 +17,7 @@ module-whatis " NCEPPOST lib whatis description"
 
 #setenv COMPF_MP mpiifort
 setenv myFC ftn
-setenv myFCFLAGS "-O2 -convert big_endian -traceback -g -fp-model source -qopenmp -fpp"
+setenv myFCFLAGS "-O2 -convert big_endian -traceback -g -fp-model source -fpp"
 setenv myCPP /lib/cpp
 setenv myCPPFLAGS "-P"
 setenv ARCHV ar

diff --git a/modulefiles/post/lib-hera b/modulefiles/post/lib-hera
@@ -17,7 +17,7 @@ module-whatis " NCEPPOST lib whatis description"
 
 #setenv COMPF_MP mpiifort
 setenv myFC mpiifort
-setenv myFCFLAGS "-O3 -convert big_endian -traceback -g -fp-model source -qopenmp -fpp"
+setenv myFCFLAGS "-O3 -convert big_endian -traceback -g -fp-model source -fpp"
 setenv myCPP /lib/cpp
 setenv myCPPFLAGS "-P"
 setenv ARCHV ar

diff --git a/modulefiles/post/lib-jet b/modulefiles/post/lib-jet
@@ -0,0 +1,52 @@
+#%Module######################################################################
+## [email protected]: Started  NCEPPOST lib v6.3.0
+## [email protected] 10/2019: Upgraded to v8.0.0
+##_____________________________________________________
+proc ModulesHelp { } {
+puts stderr "Set environment veriables for NCEPPOST"
+puts stderr "This module initializes the enviro nment "
+puts stderr "for the Intel Compiler Suite $version\n"
+}
+module-whatis " NCEPPOST lib whatis description"
+
+#set ver v6.3.0
+#set envir dev
+#set NCEPLIB /nwprod/lib
+
+#set sys [uname sysname]
+
+#setenv COMPF_MP mpiifort
+setenv myFC mpiifort
+setenv myFCFLAGS "-O3 -convert big_endian -traceback -g -fp-model source -fpp"
+setenv myCPP /lib/cpp
+setenv myCPPFLAGS "-P"
+setenv ARCHV ar
+setenv CPPC /lib/cpp
+setenv version v8.0.0
+#
+
+module purge
+
+# Loading Intel Compiler Suite
+module load intel/18.0.5.274
+module load impi
+
+# Loading nceplibs modules
+module use -a /mnt/lfs3/projects/hfv3gfs/nwprod/NCEPLIBS/modulefiles
+module load jasper/v1.900.1
+module load png/v1.2.44
+module load z/v1.2.6
+module load g2/v3.1.0
+module load g2tmpl/v1.6.0
+#module load xmlparse/v2.0.0
+
+module load w3emc/v2.3.0
+module load w3nco/v2.0.6
+module load bacio/v2.0.2
+module load gfsio/v1.1.0
+#module load sigio/2.1.1
+module load ip/v3.0.1
+module load sp/v2.0.2
+module load crtm/v2.2.6
+
+
diff --git a/modulefiles/post/lib-wcoss_dell_p3 b/modulefiles/post/lib-wcoss_dell_p3
@@ -17,7 +17,8 @@ module-whatis " NCEPPOST lib whatis description"
 
 #setenv COMPF_MP mpiifort
 setenv myFC mpiifort
-setenv myFCFLAGS "-O3 -convert big_endian -traceback -g -fp-model source -qopenmp -fpp"
+setenv myFCFLAGS "-O3 -convert big_endian -traceback -g -fp-model source -fpp"
+#setenv myFCFLAGS "-O3 -convert big_endian -traceback -g -fp-model source -qopenmp -fpp"
 setenv myCPP /lib/cpp
 setenv myCPPFLAGS "-P"
 setenv ARCHV ar

diff --git a/modulefiles/post/v8.0.0-jet b/modulefiles/post/v8.0.0-jet
@@ -22,46 +22,50 @@ module load impi
 module use /contrib/modulefiles
 
 # Loding nceplibs modules
-module use -a /mnt/lfs3/projects/hfv3gfs/nwprod/lib/modulefiles
-module load sigio/v2.0.1
+#module use -a /mnt/lfs3/projects/hfv3gfs/nwprod/lib/modulefiles
+module use -a /mnt/lfs3/projects/hfv3gfs/nwprod/NCEPLIBS/modulefiles
+module load sigio/v2.1.0
 module load jasper/v1.900.1
 module load png/v1.2.44
 module load z/v1.2.6
 module load sfcio/v1.0.0
-module load nemsio/v2.2.2
-module load bacio/v2.0.1
+module load nemsio/v2.2.3
+module load bacio/v2.0.2
 #module load g2/v2.5.2
 module load xmlparse/v2.0.0
 module load gfsio/v1.1.0
-module load ip/v3.0.0
+module load ip/v3.0.1
 module load sp/v2.0.2
-module load w3emc/v2.2.0
+module load w3emc/v2.3.0
 module load w3nco/v2.0.6
-module load crtm/v2.2.3
+module load crtm/v2.2.6
+module load g2/v3.1.0
+module load g2tmpl/v1.6.0
+module load wrfio/v1.1.1
 #module load netcdf/3.6.3
 module load netcdf/4.6.1
 
-setenv NCEPLIBS /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib
+#setenv NCEPLIBS /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib
 
-module use /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib/modulefiles
-module load g2tmpl-intel/1.5.0
+#module use /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib/modulefiles
+#module load g2tmpl-intel/1.5.0
 
 #module use /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib/wrf.post.lib/modulefiles
 #module load wrf-io-v1.1.1
 #
-setenv WRFIO_LIB /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib/wrf.post.lib/v1.1.1/lib/wrf_io/libwrfio_nf.a
+#setenv WRFIO_LIB /mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib/wrf.post.lib/v1.1.1/lib/wrf_io/libwrfio_nf.a
 
 
-set dlib   /mnt/lfs3/projects/hfv3gfs/gwv/ltmp2/lib/g2/v3.1.0/
-set bname  "G2"
+#set dlib   /mnt/lfs3/projects/hfv3gfs/gwv/ltmp2/lib/g2/v3.1.0/
+#set bname  "G2"
 #
 ### Export environment variables
-setenv ${bname}_SRC  $dlib/src
-setenv ${bname}_INC4 $dlib/intel/include/g2_v3.1.0_4
-setenv ${bname}_INCd $dlib/intel/include/g2_v3.1.0_d
-setenv ${bname}_LIB4 $dlib/intel/libg2_v3.1.0_4.a
-setenv ${bname}_LIBd $dlib/intel/libg2_v3.1.0_d.a
-setenv ${bname}_VER v3.1.0
+#setenv ${bname}_SRC  $dlib/src
+#setenv ${bname}_INC4 $dlib/intel/include/g2_v3.1.0_4
+#setenv ${bname}_INCd $dlib/intel/include/g2_v3.1.0_d
+#setenv ${bname}_LIB4 $dlib/intel/libg2_v3.1.0_4.a
+#setenv ${bname}_LIBd $dlib/intel/libg2_v3.1.0_d.a
+#setenv ${bname}_VER v3.1.0
 
 #setenv WRFPATH /mnt/lfs3/projects/hfv3gfs/nwprod/wrf_shared.v1.1.0/ 
 setenv myFC mpiifort

diff --git a/parm/hafs.xml b/parm/hafs.xml
@@ -13,7 +13,7 @@
     <gen_proc_type>fcst</gen_proc_type>
     <time_range_unit>hour</time_range_unit>
     <orig_center>nws_ncep</orig_center>
-    <gen_proc>hur_hafs</gen_proc>
+    <gen_proc>hur_weather_res_and_fcst</gen_proc>
     <packing_method>complex_packing_spatial_diff</packing_method>
     <order_of_sptdiff>2nd_ord_sptdiff</order_of_sptdiff>
     <field_datatype>fltng_pnt</field_datatype>