ufs-community · GeorgeGayno-NOAA · Oct 15, 2020 · Jan 6, 2020 · Jan 6, 2020 · Jan 7, 2020
diff --git a/CMakeModules b/CMakeModules
diff --git a/build_all.sh b/build_all.sh
@@ -3,20 +3,22 @@ set -eux
 
 target=${target:-"NULL"}
 
-if [[ "$target" == "linux.gnu" || "$target" == "linux.intel" ]]; then
+export MOD_PATH
+
+if [[ "$target" == "linux" || "$target" == "macosx" ]]; then
  unset -f module
+ set +x
+ source ./modulefiles/build.$target
+ set -x
 else
  set +x
- source ./sorc/machine-setup.sh > /dev/null 2>&1
+ source ./sorc/machine-setup.sh
+ module use ./modulefiles
+ module load build.$target
+ module list
  set -x
 fi
 
-export MOD_PATH
-set +x
-source ./modulefiles/build.$target             > /dev/null 2>&1
-module list
-set -x
-
 # --- Build all programs.
 #
 
@@ -26,7 +28,7 @@ cd ./build
 
 CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON"
 
-if [[ "$target" != "wcoss_cray" ]]; then
+if [[ "$target" != "wcoss_cray" && "$target" != "odin" ]]; then
   CMAKE_FLAGS+=" -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_C_COMPILER=icc"
 fi
 

diff --git a/modulefiles/build.cheyenne b/modulefiles/build.cheyenne
@@ -0,0 +1,30 @@
+#%Module#####################################################
+## Build and run module for Cheyenne
+#############################################################
+
+module purge
+module load ncarenv/1.3
+module load intel/19.1.1
+module load mpt/2.19
+module load ncarcompilers/0.5.0
+module load cmake/3.16.4
+
+module use -a /glade/p/ral/jntp/GMTB/tools/NCEPLIBS-ufs-v2.0.0/intel-19.1.1/mpt-2.19/modules
+
+module load bacio/2.4.1
+module load g2/3.4.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load sigio/2.3.2
+
+module load sfcio/1.4.1
+module load gfsio/1.4.1
+module load nemsiogfs/2.5.3
+module load landsfcutil/2.4.1
+module load wgrib2/2.0.8
+module load netcdf/4.7.4
+
+setenv ESMFMKFILE /glade/p/ral/jntp/GMTB/tools/NCEPLIBS-ufs-v2.0.0/intel-19.1.1/mpt-2.19/lib64/esmf.mk
diff --git a/modulefiles/build.jet b/modulefiles/build.jet
@@ -8,12 +8,12 @@ module load szip/2.1
 module load hdf5/1.10.5
 module load netcdf/4.7.0
 
-export CC=icc
-export FC=ifort
-export CXX=icpc
+setenv CC icc
+setenv FC ifort
+setenv CXX icpc
 
-export ESMFMKFILE=/lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0beta01/intel-18.0.5.274/impi-2018.4.274/lib64/esmf.mk
-export Jasper_ROOT=/lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0beta01/intel-18.0.5.274/impi-2018.4.274
+setenv ESMFMKFILE /lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0beta01/intel-18.0.5.274/impi-2018.4.274/lib64/esmf.mk
+setenv Jasper_ROOT /lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0beta01/intel-18.0.5.274/impi-2018.4.274
 
 module use /lfs4/HFIP/hfv3gfs/software/NCEPLIBS-ufs-v2.0.0beta01/intel-18.0.5.274/impi-2018.4.274/modules
 module load w3nco/2.4.1
@@ -29,6 +29,3 @@ module load gfsio/1.4.1
 module load landsfcutil/2.4.1
 module load g2/3.4.1
 module load wgrib2/2.0.8
-
-
-
diff --git a/modulefiles/build.odin b/modulefiles/build.odin
@@ -0,0 +1,41 @@
+#%Module#####################################################
+## Build and run module for Odin
+#############################################################
+
+module load craype/2.6.2
+module load craype-ivybridge
+module load PrgEnv-intel
+module swap intel/19.0.5.281
+module load cray-mpich/7.7.10
+module load cray-libsci
+module load cray-netcdf-hdf5parallel
+module load cray-parallel-netcdf
+module load cray-hdf5-parallel
+
+setenv NETCDF /opt/cray/pe/netcdf-hdf5parallel/4.6.3.2/INTEL/19.0
+
+#module use -a /oldscratch/ywang/external/modulefiles
+#module use /oldscratch/ywang/external/NCEPLIBS_SRW/modules
+module use /oldscratch/ywang/external/NCEPLIBS_SRWv2.0/modules
+module load w3nco
+module load w3emc
+module load sp
+module load ip
+module load bacio
+module load sigio
+module load sfcio
+module load nemsio
+module load nemsiogfs
+module load gfsio
+module load landsfcutil
+module load g2
+module load wgrib2
+
+#module load esmf/8.0.0
+#setenv ESMFMKFILE /oldscratch/ywang/external/NCEPLIBS_SRW/lib64/esmf.mk
+setenv ESMFMKFILE /oldscratch/ywang/external/NCEPLIBS_SRWv2.0/lib64/esmf.mk
+
+setenv CMAKE_Fortran_COMPILER ftn
+setenv CMAKE_C_COMPILER cc
+
+#setenv WGRIB2_ROOT /oldscratch/ywang/external/NCEPLIBS_SRWv2.0/wgrib2-2.0.8
diff --git a/modulefiles/build.orion b/modulefiles/build.orion
@@ -1,4 +1,4 @@
-#############################################################
+#%Module#####################################################
 ## Build module for Orion
 #############################################################
 
@@ -21,7 +21,7 @@ module load nemsiogfs/2.5.3
 module load landsfcutil/2.4.1
 module load wgrib2/2.0.8
 
-export Jasper_ROOT="/apps/jasper-1.900.1"
+setenv Jasper_ROOT /apps/jasper-1.900.1
 
 module use -a /apps/contrib/NCEPLIBS/lib/modulefiles
 module load netcdfp/4.7.4.release

diff --git a/modulefiles/build.stampede b/modulefiles/build.stampede
@@ -0,0 +1,41 @@
+#%Module#####################################################
+## Build and run module for Stampede
+#############################################################
+
+module purge
+
+module load libfabric/1.7.0
+module load git/2.24.1
+module load autotools/1.1
+module load xalt/2.8
+module load TACC
+
+module load python3/3.7.0
+module load intel/18.0.2
+module load cmake/3.16.1
+module load impi/18.0.2
+module load pnetcdf/1.11.0
+module load netcdf/4.6.2
+module li
+
+setenv NETCDF /opt/apps/intel18/netcdf/4.6.2/x86_64
+
+#module use /work/00315/tg455890/stampede2/regional_fv3/ufs_testing/INSTALL/modules
+module use /work/00315/tg455890/stampede2/regional_fv3/NCEPLIBS_SRWv2.0/modules
+module load esmf/8.0.0
+
+module load w3nco
+module load w3emc
+module load sp
+module load ip
+module load bacio
+module load sigio
+module load sfcio
+module load nemsio
+module load nemsiogfs
+module load gfsio
+module load landsfcutil
+module load g2
+module load wgrib2
+
+#setenv ESMFMKFILE /work/00315/tg455890/stampede2/regional_fv3/NCEPLIBS_SRWv2.0/lib64/esmf.mk
diff --git a/modulefiles/build.wcoss_cray b/modulefiles/build.wcoss_cray
@@ -31,14 +31,13 @@ module load nemsiogfs/2.5.3
 module load landsfcutil/2.4.1
 module load wgrib2/2.0.8
 
-export ZLIB_ROOT=/usrx/local/prod/zlib/1.2.7/intel/haswell
-export PNG_ROOT=/usrx/local/prod//png/1.2.49/intel/haswell
-export Jasper_ROOT=/usrx/local/prod/jasper/1.900.1/intel/haswell
+setenv ZLIB_ROOT /usrx/local/prod/zlib/1.2.7/intel/haswell
+setenv PNG_ROOT /usrx/local/prod/png/1.2.49/intel/haswell
+setenv Jasper_ROOT /usrx/local/prod/jasper/1.900.1/intel/haswell
 
 module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module load esmf/8.0.0
-export ESMFMKFILE=/gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/esmf/8.0.0/lib/esmf.mk
-export NETCDF=/opt/cray/netcdf/4.3.3.1/INTEL/14.0
+#module load esmf/8.0.0
+setenv ESMFMKFILE /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/esmf/8.0.0/lib/esmf.mk
+setenv NETCDF /opt/cray/netcdf/4.3.3.1/INTEL/14.0
 module rm gcc
 module load gcc/6.3.0
-
diff --git a/modulefiles/build.wcoss_dell_p3 b/modulefiles/build.wcoss_dell_p3
@@ -8,9 +8,8 @@ module load cmake/3.16.2
 module load ips/18.0.1.163
 module load impi/18.0.1
 
-
 module load jasper/1.900.29
-export Jasper_ROOT="/usrx/local/prod/packages/gnu/4.8.5/jasper/1.900.29"
+setenv Jasper_ROOT /usrx/local/prod/packages/gnu/4.8.5/jasper/1.900.29
 
 module use /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
 module load netcdf_parallel/4.7.4

diff --git a/parm/varmap_tables/GSDphys_var_map.txt b/parm/varmap_tables/GSDphys_var_map.txt
@@ -0,0 +1,27 @@
+dzdt                dzdt      set_to_fill   0         D
+delta_p             delp      skip          0         D
+sphum               sphum     set_to_fill   1E-7      T
+liq_wat             liq_wat   set_to_fill   0         T
+o3mr                o3mr      set_to_fill   1E-7      T
+rainwat             rainwat   set_to_fill   0         T
+ice_wat             ice_wat   set_to_fill   0         T
+snowwat             snowwat   set_to_fill   0         T
+graupel             graupel   set_to_fill   0         T
+ice_nc              ice_nc    set_to_fill   -1.0      T
+rain_nc             rain_nc   set_to_fill   -1.0      T
+water_nc            water_nc  set_to_fill   -1.0      T
+liq_aero            liq_aero  set_to_fill   0         T
+ice_aero            ice_aero  set_to_fill   0         T
+sgs_tke             sgs_tke   set_to_fill   0         T
+vtype               vtype     skip          0         S
+sotype              stype     skip          0         S
+vfrac               vfrac     skip          0         S
+fricv               uustar    skip          0         S
+sfcr                zorl      set_to_fill   0.01      S
+soilw               smc       stop          0         S
+soilt               stc       stop          0         S
+cnwat               cnwat     set_to_fill   0.0       S
+icetk               icetk     set_to_fill   265.0     S
+weasd               weasd     set_to_fill   0.0       S
+snod                snod      set_to_fill   0.0       S
+tprcp               tprcp     set_to_fill   0.0       S       	
diff --git a/sorc/chgres_cube.fd/atmosphere.F90 b/sorc/chgres_cube.fd/atmosphere.F90
@@ -164,7 +164,7 @@ subroutine atmosphere_driver(localpet)
  real(esmf_kind_r8), parameter      :: exponent = rd*lapse/grav
  real(esmf_kind_r8), parameter      :: one_over_exponent = 1.0 / exponent
 
- real(esmf_kind_r8), pointer        :: psptr(:,:)
+ real(esmf_kind_r8), pointer        :: psptr(:,:), tempptr(:,:,:)
 
 !-----------------------------------------------------------------------------------
 ! Read atmospheric fields on the input grid.
@@ -212,7 +212,6 @@ subroutine atmosphere_driver(localpet)
                               temp_b4adj_target_grid, &
                               polemethod=ESMF_POLEMETHOD_ALLAVG, &
                               srctermprocessing=isrctermprocessing, &
-                              extrapmethod=ESMF_EXTRAPMETHOD_NEAREST_STOD, &
                               routehandle=regrid_bl, &
                               regridmethod=method, rc=rc)
    if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
@@ -256,7 +255,25 @@ subroutine atmosphere_driver(localpet)
                        termorderflag=ESMF_TERMORDER_SRCSEQ, rc=rc)
  if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
     call error_handler("IN FieldRegrid", rc)
+
+ nullify(tempptr)
+ print*,"- CALL FieldGet FOR INPUT GRID VERTICAL VEL."
+ call ESMF_FieldGet(dzdt_input_grid, &
+                    farrayPtr=tempptr, rc=rc)
+ if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
+    call error_handler("IN FieldGet", rc)
+
+ print*, "MIN MAX W INPUT = ", minval(tempptr), maxval(tempptr)
 
+ nullify(tempptr)
+ print*,"- CALL FieldGet FOR VERTICAL VEL B4ADJ."
+ call ESMF_FieldGet(dzdt_b4adj_target_grid, &
+                    farrayPtr=tempptr, rc=rc)
+ if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
+    call error_handler("IN FieldGet", rc)
+
+ print*, "MIN MAX W B4ADJ = ", minval(tempptr), maxval(tempptr)
+
  nullify(psptr)
  print*,"- CALL FieldGet FOR INPUT SURFACE PRESSURE."
  call ESMF_FieldGet(ps_input_grid, &
@@ -364,8 +381,8 @@ subroutine atmosphere_driver(localpet)
                             wind_w_target_grid, &
                             polemethod=ESMF_POLEMETHOD_ALLAVG, &
                             srctermprocessing=isrctermprocessing, &
-                            extrapMethod=ESMF_EXTRAPMETHOD_NEAREST_STOD, &
                             routehandle=regrid_bl, &
+                            extrapMethod=ESMF_EXTRAPMETHOD_NEAREST_STOD, &
                             regridmethod=method, rc=rc)
  if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
     call error_handler("IN FieldRegridStore", rc)
@@ -391,8 +408,8 @@ subroutine atmosphere_driver(localpet)
                             wind_s_target_grid, &
                             polemethod=ESMF_POLEMETHOD_ALLAVG, &
                             srctermprocessing=isrctermprocessing, &
-                            extrapMethod=ESMF_EXTRAPMETHOD_NEAREST_STOD, &
                             routehandle=regrid_bl, &
+                            extrapMethod=ESMF_EXTRAPMETHOD_NEAREST_STOD, &
                             regridmethod=method, rc=rc)
  if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
     call error_handler("IN FieldRegridStore", rc)
@@ -722,6 +739,7 @@ subroutine convert_winds
      enddo
    enddo
  enddo
+
 
  print*,"- CALL FieldGet FOR 3-D WIND_W."
  call ESMF_FieldGet(wind_w_target_grid, &
@@ -1221,7 +1239,6 @@ subroutine horiz_interp_thomp_mp_climo
                             qnifa_climo_b4adj_target_grid, &
                             polemethod=ESMF_POLEMETHOD_ALLAVG, &
                             srctermprocessing=isrctermprocessing, &
-                            extrapmethod=ESMF_EXTRAPMETHOD_NEAREST_STOD, &
                             routehandle=regrid_bl, &
                             regridmethod=method, rc=rc)
  if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
@@ -1478,14 +1495,15 @@ SUBROUTINE VINTG
  C1(:,:,:,1) =  WIND1PTR(:,:,:,1)
  C1(:,:,:,2) =  WIND1PTR(:,:,:,2)
  C1(:,:,:,3) =  WIND1PTR(:,:,:,3)
-
+ 
  print*,"- CALL FieldGet FOR VERTICAL VELOCITY."
  call ESMF_FieldGet(dzdt_b4adj_target_grid, &
                     farrayPtr=DZDT1PTR, rc=rc)
  if(ESMF_logFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)) &
          call error_handler("IN FieldGet", rc)
 
  C1(:,:,:,4) =  DZDT1PTR(:,:,:)
+ print*,"MIN MAX W TARGETB4 IN VINTG = ", minval(DZDT1PTR(:,:,:)), maxval(DZDT1PTR(:,:,:))
 
  print*,"- CALL FieldGet FOR 3-D TEMP."
  call ESMF_FieldGet(temp_b4adj_target_grid, &

diff --git a/sorc/chgres_cube.fd/grib2_util.F90 b/sorc/chgres_cube.fd/grib2_util.F90
@@ -74,4 +74,25 @@ subroutine convert_omega(omega,p,t,q,clb,cub)
 
 end subroutine convert_omega
 
+function to_upper(strIn) result(strOut)
+! Adapted from http://www.star.le.ac.uk/~cgp/fortran.html (25 May 2012)
+! Original author: Clive Page
+
+     implicit none
+
+     character(len=*), intent(in) :: strIn
+     character(len=len(strIn)) :: strOut
+     integer :: i,j
+
+     do i = 1, len(strIn)
+          j = iachar(strIn(i:i))
+          if (j>= iachar("a") .and. j<=iachar("z") ) then
+               strOut(i:i) = achar(iachar(strIn(i:i))-32)
+          else
+               strOut(i:i) = strIn(i:i)
+          end if
+     end do
+
+end function to_upper
+
  end module grib2_util