diff --git a/.github/scripts/appimage/AppRun b/.github/scripts/appimage/AppRun new file mode 100755 index 000000000..175c78d38 --- /dev/null +++ b/.github/scripts/appimage/AppRun @@ -0,0 +1,139 @@ +#!/bin/bash + +SELF=$(readlink -f "${0}") +HERE=${SELF%/*} + +LISF_LIBS_OPENJPEG=${HERE}/usr/lib/openjpeg/2.4.0_gnu-11.2.0 +LISF_LIBS_ECCODES=${HERE}/usr/lib/eccodes/2.22.0_gnu-11.2.0 +LISF_LIBS_NETCDF=${HERE}/usr/lib/netcdf/4.7.4_gnu-11.2.0 +LISF_LIBS_HDF4=${HERE}/usr/lib/hdf4/4.2.15_gnu-11.2.0 +LISF_LIBS_HDFEOS=${HERE}/usr/lib/hdfeos2/3.0_gnu-11.2.0 +LISF_LIBS_HDF5=${HERE}/usr/lib/hdf5/1.12.0_gnu-11.2.0 +LISF_LIBS_ESMF=${HERE}/usr/lib/esmf/8.1.1_gnu-11.2.0_mpich-3.4 +LISF_LIBS_GDAL=${HERE}/usr/lib/gdal/3.5.2_gnu-11.2.0 +LISF_LIBS_FORTRANGIS=${HERE}/usr/lib/fortrangis/2.6-6_gnu-11.2.0 +LISF_LIBS_LIBGEOTIFF=${HERE}/usr/lib/geotiff/1.7.0_gnu-11.2.0 +LISF_LIBS_PROJ=${HERE}/usr/lib/proj/9.1.0_gnu-11.2.0 +LISF_LIBS_TIFF=${HERE}/usr/lib/tiff/4.0.9_gnu-11.2.0 + +LISF_LIBS_PATH="" +LISF_LIBS_PATH+=":${LISF_LIBS_ECCODES}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_NETCDF}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_ESMF}/lib/libO/Linux.gfortran.64.mpich3.default" +LISF_LIBS_PATH+=":${LISF_LIBS_HDF5}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_HDF4}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_GDAL}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_LIBGEOTIFF}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_FORTRANGIS}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_OPENJPEG}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_PROJ}/lib" +LISF_LIBS_PATH+=":${LISF_LIBS_TIFF}/lib" +export LISF_LIBS_PATH + +export LANG=C +export LD_LIBRARY_PATH=${LISF_LIBS_PATH}:${LD_LIBRARY_PATH} +export ECCODES_DEFINITION_PATH=${LISF_LIBS_ECCODES}/share/eccodes/definitions +export ECCODES_SAMPLES_PATH=${LISF_LIBS_ECCODES}/share/eccodes/samples + +export PATH=${HERE}/usr/bin:${PATH} + +function lisf_usage { + NAME="LISF-x86_64.AppImage" + echo "Usage: $NAME [options] [-- LISF options]" + echo "" + echo " where [options] are:" + echo " -h show this help message" + echo " -v show revision info about LISF" + echo " -i show configuration info about LISF" + echo " -a specify which app to run" + echo "" + echo " where [LISF options] are options to pass to LISF;" + echo " these must be preceeded by --" + echo "" + echo " Examples:" + echo " $NAME -a LDT ldt.config" + echo " mpirun -n N $NAME -a LIS -- --file lis.config" + echo " $NAME -a LVT lvt.config" +} + +function lisf_version { + echo "## Revision info" + echo "" + cat "${HERE}/info/revision.log" +} + +function lisf_info { + lisf_version + echo "" + echo "## LDT info" + echo "" + echo "### LDT_NetCDF_inc.h" + cat "${HERE}/info/ldt/LDT_NetCDF_inc.h" + echo "" + echo "### LDT_misc.h" + cat "${HERE}/info/ldt/LDT_misc.h" + echo "" + echo "### configure.ldt" + cat "${HERE}/info/ldt/configure.ldt" + echo "" + echo "## LIS info" + echo "" + echo "### LIS_NetCDF_inc.h" + cat "${HERE}/info/lis/LIS_NetCDF_inc.h" + echo "" + echo "### LIS_misc.h" + cat "${HERE}/info/lis/LIS_misc.h" + echo "" + echo "### LIS_plugins.h" + cat "${HERE}/info/lis/LIS_plugins.h" + echo "" + echo "### configure.lis" + cat "${HERE}/info/lis/configure.lis" + echo "" + echo "## LVT info" + echo "" + echo "### LVT_misc.h" + cat "${HERE}/info/lvt/LVT_NetCDF_inc.h" + echo "" + echo "### LVT_misc.h" + cat "${HERE}/info/lvt/LVT_misc.h" + echo "" + echo "### configure.lvt" + cat "${HERE}/info/lvt/configure.lvt" +} + +if [[ ${#} -eq 0 ]] +then + lisf_usage +fi + +optstring=":hvia:" +while getopts ${optstring} arg +do + case ${arg} in + h) + lisf_usage + exit 0 + ;; + v) + lisf_version + exit 0 + ;; + i) + lisf_info + exit 0 + ;; + a) + APP="${OPTARG}" + ;; + ?) + echo "Invalid option: -${OPTARG}" + echo "" + lisf_usage + exit 1 + ;; + esac +done + +shift $((${OPTIND} - 1)) +exec "${HERE}/usr/bin/${APP}" "${@}" diff --git a/.github/scripts/appimage/Dockerfile b/.github/scripts/appimage/Dockerfile new file mode 100644 index 000000000..1bf04a709 --- /dev/null +++ b/.github/scripts/appimage/Dockerfile @@ -0,0 +1,18 @@ +FROM lisf_libraries + +# LISF {{{ +WORKDIR /home/workdir +COPY LISF ./LISF +RUN cp ./LISF/.github/scripts/appimage/lisf.env . +RUN cp ./LISF/.github/scripts/appimage/compile_lisf . +RUN ./compile_lisf +# }}} + +# AppImage {{{ +WORKDIR /home/workdir +COPY ./LISF/.github/scripts/appimage/AppRun . +COPY ./LISF/.github/scripts/appimage/LISF.png . +COPY ./LISF/.github/scripts/appimage/LISF.desktop . +COPY ./LISF/.github/scripts/appimage/prep_appdir . +RUN ./prep_appdir +# }}} diff --git a/.github/scripts/appimage/LISF.desktop b/.github/scripts/appimage/LISF.desktop new file mode 100644 index 000000000..94bd62a76 --- /dev/null +++ b/.github/scripts/appimage/LISF.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=LISF +Exec=LISF +Icon=LISF +Type=Application +Categories=Utility; diff --git a/.github/scripts/appimage/LISF.png b/.github/scripts/appimage/LISF.png new file mode 100644 index 000000000..1c56f5b5a Binary files /dev/null and b/.github/scripts/appimage/LISF.png differ diff --git a/.github/scripts/appimage/compile_lisf b/.github/scripts/appimage/compile_lisf new file mode 100755 index 000000000..e67a9d9fc --- /dev/null +++ b/.github/scripts/appimage/compile_lisf @@ -0,0 +1,83 @@ +#!/usr/bin/env bash + +source lisf.env +cd LISF + +# +# Revision +# + +git log -n 1 --oneline --decorate >revision.log + +# +# LDT +# + +# Parallelism (0-serial, 1-dmpar, default=0): 0 +# Optimization level (-3=strict checks with warnings, -2=strict checks, -1=debug, 0,1,2,3, default=2): 2 +# Assume little/big_endian data format (1-little, 2-big, default=2): 2 +# Use GRIBAPI/ECCODES? (0-neither, 1-gribapi, 2-eccodes, default=2): 2 +# NETCDF version (3 or 4, default=4)?: 4 +# NETCDF use shuffle filter? (1-yes, 0-no, default = 1): 1 +# NETCDF use deflate filter? (1-yes, 0-no, default = 1): 1 +# NETCDF use deflate level? (1 to 9-yes, 0-no, default = 9): 1 +# Use HDF4? (1-yes, 0-no, default=1): 1 +# Use HDF5? (1-yes, 0-no, default=1): 1 +# Use HDFEOS? (1-yes, 0-no, default=1): 1 +# Enable GeoTIFF support? (1-yes, 0-no, default=1): 1 +# Enable LIBGEOTIFF support? (1-yes, 0-no, default=1): 1 +# Include date/time stamp history? (1-yes, 0-no, default=1): 1 + +cd ldt +printf '%s\n' "0" "2" "2" "2" "4" "1" "1" "1" "1" "1" "1" "1" "1" "1" | ./configure +./compile -j 2 + +# +# LIS +# + +# Parallelism (0-serial, 1-dmpar, default=1): 1 +# Optimization level (-3=strict checks with warnings, -2=strict checks, -1=debug, 0,1,2,3, default=2): 2 +# Assume little/big_endian data format (1-little, 2-big, default=2): 2 +# Use GRIBAPI/ECCODES? (0-neither, 1-gribapi, 2-eccodes, default=2): 2 +# Enable AFWA-specific grib configuration settings? (1-yes, 0-no, default=0): 0 +# Use NETCDF? (1-yes, 0-no, default=1): 1 +# NETCDF version (3 or 4, default=4): 4 +# NETCDF use shuffle filter? (1-yes, 0-no, default = 1): 1 +# NETCDF use deflate filter? (1-yes, 0-no, default = 1): 1 +# NETCDF use deflate level? (1 to 9-yes, 0-no, default = 9): 1 +# Use HDF4? (1-yes, 0-no, default=1): 1 +# Use HDF5? (1-yes, 0-no, default=1): 1 +# Use HDFEOS? (1-yes, 0-no, default=1): 1 +# Use MINPACK? (1-yes, 0-no, default=0): 0 +# Use LIS-CRTM? (1-yes, 0-no, default=0): 0 +# Use LIS-CMEM? (1-yes, 0-no, default=0): 0 +# Use LIS-LAPACK? (0-no, 1-mkl, 2-lapack/blas, 3-lapack/refblas, default=0): 0 +# Use PETSc? (1-yes, 0-no, default=0): 0 + +cd ../lis +printf '%s\n' "1" "2" "2" "2" "0" "1" "4" "1" "1" "1" "1" "1" "1" "0" "0" "0" "0" "0" | ./configure +./compile -j 2 + +# +# LVT +# + +# Optimization level (-3=strict checks with warnings, -2=strict checks, -1=debug, 0,1,2,3, default=2): 2 +# Assume little/big_endian data format (1-little, 2-big, default=2): 2 +# Use GRIBAPI/ECCODES? (1-gribapi, 2-eccodes, default=2): 2 +# Use NETCDF? (1-yes, 0-no, default=1): 1 +# NETCDF version (3 or 4, default=4): 4 +# NETCDF use shuffle filter? (1-yes, 0-no, default = 1): 1 +# NETCDF use deflate filter? (1-yes, 0-no, default = 1): 1 +# NETCDF use deflate level? (1 to 9-yes, 0-no, default = 9): 1 +# Use HDF4? (1-yes, 0-no, default=1): 1 +# Use HDF5? (1-yes, 0-no, default=1): 1 +# Use HDFEOS? (1-yes, 0-no, default=1): 1 +# Enable AFWA-specific grib configuration settings? (1-yes, 0-no, default=0): 0 +# Enable GeoTIFF support? (1-yes, 0-no, default=1): 1 +# Use MATLAB support? (1-yes, 0-no, default=0): 0 + +cd ../lvt +printf '%s\n' "2" "2" "2" "1" "4" "1" "1" "1" "1" "1" "1" "0" "1" "0" | ./configure +./compile -j 2 diff --git a/.github/scripts/appimage/lisf.env b/.github/scripts/appimage/lisf.env new file mode 100644 index 000000000..dfcecec32 --- /dev/null +++ b/.github/scripts/appimage/lisf.env @@ -0,0 +1,139 @@ +LISF_LIBS_MPICH=/home/workdir/lib/mpich/3.4_gnu-11.2.0 +LISF_LIBS_OPENJPEG=/home/workdir/lib/openjpeg/2.4.0_gnu-11.2.0 +LISF_LIBS_ECCODES=/home/workdir/lib/eccodes/2.22.0_gnu-11.2.0 +LISF_LIBS_NETCDF=/home/workdir/lib/netcdf/4.7.4_gnu-11.2.0 +LISF_LIBS_HDF4=/home/workdir/lib/hdf4/4.2.15_gnu-11.2.0 +LISF_LIBS_HDFEOS=/home/workdir/lib/hdfeos2/3.0_gnu-11.2.0 +LISF_LIBS_HDF5=/home/workdir/lib/hdf5/1.12.0_gnu-11.2.0 +LISF_LIBS_ESMF=/home/workdir/lib/esmf/8.1.1_gnu-11.2.0_mpich-3.4 +LISF_LIBS_PROJ=/home/workdir/lib/proj/9.1.0_gnu-11.2.0 +LISF_LIBS_GDAL=/home/workdir/lib/gdal/3.5.2_gnu-11.2.0 +LISF_LIBS_FORTRANGIS=/home/workdir/lib/fortrangis/2.6-6_gnu-11.2.0 +LISF_LIBS_LIBGEOTIFF=/home/workdir/lib/geotiff/1.7.0_gnu-11.2.0 +LISF_LIBS_TIFF=/home/workdir/lib/tiff/4.0.9_gnu-11.2.0 +LISF_LIBS_LAPACK=/home/workdir/lib/blaslapack/3.11.0_gnu-11.2.0 +LISF_LIBS_PETSC=/home/workdir/lib/petsc/3.16.1_gnu-11.2.0 + +LISF_LIBS_PATH="$LISF_LIBS_MPICH/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_ECCODES/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_NETCDF/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_ESMF/lib/libO/Linux.gfortran.64.mpich3.default" +LISF_LIBS_PATH+=":$LISF_LIBS_HDF5/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_HDF4/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_PROJ/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_GDAL/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_LIBGEOTIFF/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_OPENJPEG/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_TIFF/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_LAPACK/lib" +LISF_LIBS_PATH+=":$LISF_LIBS_PETSC/lib" +export LISF_LIBS_PATH + +def_lis_jpeg="" +def_lis_openjpeg=$LISF_LIBS_OPENJPEG +def_lis_eccodes=$LISF_LIBS_ECCODES +def_lis_netcdf=$LISF_LIBS_NETCDF +def_lis_hdf4=$LISF_LIBS_HDF4 +def_lis_hdfeos=$LISF_LIBS_HDFEOS +def_lis_hdf5=$LISF_LIBS_HDF5 +def_lis_modesmf=$LISF_LIBS_ESMF/mod/modO/Linux.gfortran.64.mpich3.default +def_lis_libesmf=$LISF_LIBS_ESMF/lib/libO/Linux.gfortran.64.mpich3.default +def_lis_minpack="" +def_lis_crtm="" +def_lis_crtm_prof="" +def_lis_cmem="" +def_lis_lapack=$LISF_LIBS_LAPACK/lib +def_lis_petsc=$LISF_LIBS_PETSC +def_lvt_gdal=$LISF_LIBS_GDAL +def_lvt_fortrangis=$LISF_LIBS_FORTRANGIS +def_ldt_libgeotiff=$LISF_LIBS_LIBGEOTIFF + +export LIS_ARCH=linux_gfortran +export LIS_SPMD=parallel +export LIS_FC=mpif90 +export LIS_CC=mpicc +export LIS_CPPC=mpiCC +export LIS_JPEG=$def_lis_jpeg +export LIS_OPENJPEG=$def_lis_openjpeg +export LIS_ECCODES=$def_lis_eccodes +export LIS_NETCDF=$def_lis_netcdf +export LIS_HDF4=$def_lis_hdf4 +export LIS_HDFEOS=$def_lis_hdfeos +export LIS_HDF5=$def_lis_hdf5 +export LIS_MODESMF=$def_lis_modesmf +export LIS_LIBESMF=$def_lis_libesmf +export LIS_MINPACK=$def_lis_minpack +export LIS_CRTM=$def_lis_crtm +export LIS_CRTM_PROF=$def_lis_crtm_prof +export LIS_CMEM=$def_lis_cmem +export LIS_PETSC=$def_lis_petsc +export LIS_LAPACK=$def_lis_lapack + +export LDT_ARCH=linux_gfortran +export LDT_FC=mpif90 +export LDT_CC=mpicc +export LDT_JPEG=$def_lis_jpeg +export LDT_OPENJPEG=$def_lis_openjpeg +export LDT_ECCODES=$def_lis_eccodes +export LDT_NETCDF=$def_lis_netcdf +export LDT_HDF4=$def_lis_hdf4 +export LDT_HDFEOS=$def_lis_hdfeos +export LDT_HDF5=$def_lis_hdf5 +export LDT_MODESMF=$def_lis_modesmf +export LDT_LIBESMF=$def_lis_libesmf +export LDT_GDAL=$def_lvt_gdal +export LDT_FORTRANGIS=$def_lvt_fortrangis +export LDT_LIBGEOTIFF=$def_ldt_libgeotiff + +export LVT_ARCH=linux_gfortran +export LVT_FC=mpif90 +export LVT_CC=mpicc +export LVT_JPEG=$def_lis_jpeg +export LVT_OPENJPEG=$def_lis_openjpeg +export LVT_ECCODES=$def_lis_eccodes +export LVT_NETCDF=$def_lis_netcdf +export LVT_HDF4=$def_lis_hdf4 +export LVT_HDFEOS=$def_lis_hdfeos +export LVT_HDF5=$def_lis_hdf5 +export LVT_MODESMF=$def_lis_modesmf +export LVT_LIBESMF=$def_lis_libesmf +export LVT_GDAL=$def_lvt_gdal +export LVT_FORTRANGIS=$def_lvt_fortrangis + +export LANG=C +export PATH=$LISF_LIBS_MPICH/bin:$PATH +export LD_LIBRARY_PATH=$LISF_LIBS_PATH:$LD_LIBRARY_PATH + +unset def_lis_jpeg +unset def_lis_openjpeg +unset def_lis_eccodes +unset def_lis_netcdf +unset def_lis_hdf4 +unset def_lis_hdfeos +unset def_lis_hdf5 +unset def_lis_modesmf +unset def_lis_libesmf +unset def_lis_minpack +unset def_lis_crtm +unset def_lis_crtm_prof +unset def_lis_cmem +unset def_lis_lapack +unset def_lis_petsc +unset def_lvt_gdal +unset def_lvt_fortrangis +unset def_ldt_libgeotiff +unset LISF_LIBS_MPICH +unset LISF_LIBS_OPENJPEG +unset LISF_LIBS_ECCODES +unset LISF_LIBS_NETCDF +unset LISF_LIBS_HDF4 +unset LISF_LIBS_HDFEOS +unset LISF_LIBS_HDF5 +unset LISF_LIBS_ESMF +unset LISF_LIBS_PROJ +unset LISF_LIBS_GDAL +unset LISF_LIBS_FORTRANGIS +unset LISF_LIBS_LIBGEOTIFF +unset LISF_LIBS_TIFF +unset LISF_LIBS_LAPACK +unset LISF_LIBS_PETSC diff --git a/.github/scripts/appimage/make_appimage b/.github/scripts/appimage/make_appimage new file mode 100755 index 000000000..8a757fb48 --- /dev/null +++ b/.github/scripts/appimage/make_appimage @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +sudo docker create --name dummy lisf_appdir +sudo docker cp dummy:/home/workdir/LISF.AppDir . +sudo docker rm -f dummy + +sudo appimagetool LISF.AppDir diff --git a/.github/scripts/appimage/prep_appdir b/.github/scripts/appimage/prep_appdir new file mode 100755 index 000000000..04deec23a --- /dev/null +++ b/.github/scripts/appimage/prep_appdir @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +mkdir -p LISF.AppDir/usr/bin +mkdir -p LISF.AppDir/usr/lib +mkdir -p LISF.AppDir/info/ldt +mkdir -p LISF.AppDir/info/lis +mkdir -p LISF.AppDir/info/lvt +cd LISF.AppDir +cp /home/workdir/AppRun . +cp /home/workdir/LISF.png . +cp /home/workdir/LISF.desktop . +cp /home/workdir/LISF/ldt/LDT usr/bin +cp /home/workdir/LISF/lis/LIS usr/bin +cp /home/workdir/LISF/lvt/LVT usr/bin +cp /home/workdir/LISF/revision.log info +cp /home/workdir/LISF/ldt/make/LDT_NetCDF_inc.h info/ldt +cp /home/workdir/LISF/ldt/make/LDT_misc.h info/ldt +cp /home/workdir/LISF/ldt/make/configure.ldt info/ldt +cp /home/workdir/LISF/lis/make/LIS_NetCDF_inc.h info/lis +cp /home/workdir/LISF/lis/make/LIS_misc.h info/lis +cp /home/workdir/LISF/lis/make/LIS_plugins.h info/lis +cp /home/workdir/LISF/lis/make/configure.lis info/lis +cp /home/workdir/LISF/lvt/make/LVT_NetCDF_inc.h info/lvt +cp /home/workdir/LISF/lvt/make/LVT_misc.h info/lvt +cp /home/workdir/LISF/lvt/make/configure.lvt info/lvt +cd usr/lib +cp -R /home/workdir/lib/* . +rm -rf mpich + +cd /home/workdir/LISF.AppDir +patchelf --clear-symbol-version expf --clear-symbol-version logf --clear-symbol-version powf usr/bin/LDT +patchelf --clear-symbol-version expf --clear-symbol-version glob --clear-symbol-version logf --clear-symbol-version powf --clear-symbol-version lgamma usr/bin/LIS +patchelf --clear-symbol-version expf --clear-symbol-version logf --clear-symbol-version powf usr/bin/LVT +patchelf --clear-symbol-version powf usr/lib/hdf5/1.12.0_gnu-11.2.0/lib/libhdf5.so +patchelf --clear-symbol-version logf usr/lib/esmf/8.1.1_gnu-11.2.0_mpich-3.4/lib/libO/Linux.gfortran.64.mpich3.default/libesmf.so +patchelf --clear-symbol-version logf usr/lib/gdal/3.5.2_gnu-11.2.0/lib/libgdal.so diff --git a/.github/workflows/build-appimage.yaml b/.github/workflows/build-appimage.yaml new file mode 100644 index 000000000..162d99ce7 --- /dev/null +++ b/.github/workflows/build-appimage.yaml @@ -0,0 +1,84 @@ +name: LISF AppImage +on: + push: + branches: + - master + release: + types: + - published + #workflow_dispatch: + +jobs: + build_and_publish: + name: Build and publish AppImage + runs-on: ubuntu-22.04 + if: ${{ !contains(github.ref_name, 'support/lisf-557ww') }} + steps: + - if: github.event_name == 'release' + run: echo "DEV_IMAGE=${{ github.event.release.target_commitish }}" >>$GITHUB_ENV + - if: github.event_name == 'push' #|| github.event_name == 'workflow_dispatch' + run: echo "DEV_IMAGE=master" >>$GITHUB_ENV + - name: Get LISF libraries image + run: curl --insecure --no-progress-meter -O https://portal.nccs.nasa.gov/lisdata_pub/TESTING/dev-images/$DEV_IMAGE/lisf_libraries.tar.gz + - name: Load LISF libraries image + run: docker image load --input lisf_libraries.tar.gz + - name: Checkout LISF source code + uses: actions/checkout@v3 + - name: Compile LISF + run: docker build --build-arg LISF_SOURCE=$GITHUB_WORKSPACE --tag lisf_appdir --file ./.github/scripts/appimage/Dockerfile $GITHUB_WORKSPACE/.. + - name: Make AppImage + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends fuse + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage + chmod 755 appimagetool-x86_64.AppImage + mv appimagetool-x86_64.AppImage /usr/local/bin/appimagetool + ./.github/scripts/appimage/make_appimage + - name: Prepare release notes (if necessary) + if: github.event_name == 'push' #|| github.event_name == 'workflow_dispatch' + run: | + cat <$RUNNER_TEMP/notes.md + This AppImage is compatible with: + + * Linux: x86_64 machines (as reported by \`uname -s -m\`) + * GLIBC: 2.22 or newer (as reported by \`ldd --version\`) + * MPI: MPICH, Intel MPI, or Cray MPI + + After downloading the AppImage, run: + + \`\`\` + chmod 755 ./LISF-x86_64.AppImage + \`\`\` + + To get started with the AppImage, run: + + \`\`\` + ./LISF-x86_64.AppImage -h + \`\`\` + + Note: + + This AppImage requires FUSE to run. If you get an error, then try: + \`\`\` + mkdir LISF-x86_64 + cd LISF-x86_64 + ../LISF-x86_64.AppImage --appimage-extract + cd .. + ./LISF-x86_64/squashfs-root/AppRun -h + \`\`\` + EOB + - name: Create pre-release (if necessary) + if: github.event_name == 'push' #|| github.event_name == 'workflow_dispatch' + env: + GH_TOKEN: ${{ github.token }} + LISF_TAG: master-latest + TITLE: "LISF master (pre-release) image" + run: | + gh release delete $LISF_TAG --yes || true + git push origin :$LISF_TAG || true + gh release create $LISF_TAG --prerelease --notes-file "$RUNNER_TEMP/notes.md" --title "$TITLE" --target $GITHUB_SHA ./LISF-x86_64.AppImage + - name: Upload asset (if necessary) + if: github.event_name == 'release' + env: + GH_TOKEN: ${{ github.token }} + run: gh release upload ${{ github.event.release.tag_name }} ./LISF-x86_64.AppImage diff --git a/.github/workflows/build-release-docs.yaml b/.github/workflows/build-release-docs.yaml index 47af82907..cf12fffa9 100644 --- a/.github/workflows/build-release-docs.yaml +++ b/.github/workflows/build-release-docs.yaml @@ -19,21 +19,26 @@ jobs: - name: Install Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.6 # Not needed with a .ruby-version file - bundler-cache: true # runs 'bundle install' and caches installed gems automatically + ruby-version: 2.7 # Not needed with a .ruby-version file + + - name: Configure Bundler + run: bundle config --local path .bundle/gems - name: Install Asciidoctor-Mathematical dependencies run: | # below command from: https://github.com/asciidoctor/asciidoctor-mathematical/#installation - sudo apt-get -qq -y install bison flex libffi-dev libxml2-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev fonts-lyx cmake + sudo apt-get update -y + sudo apt-get -qq -y install bison flex libffi-dev libxml2-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev libwebp-dev fonts-lyx cmake - name: Install Asciidoctor-PDF run: | gem install asciidoctor-pdf - gem install asciidoctor-mathematical - asciidoctor-pdf --version + - name: Install asciidoctor-mathematical + run: | + gem install asciidoctor-mathematical + - name: Store tag in environment run : echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 283c1b4ef..720b40330 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,6 +58,8 @@ Please use descriptive commit messages. See [this post](https://chris.beams.io/p If you are contributing a new feature, we will need a testcase so we can reproduce the result before the pull request is merged. Please read the [How to Create a Testcase](https://github.com/NASA-LIS/LISF/blob/master/docs/howto_create_lis_testcases/howto_create_lis_testcases.adoc) document. +**IMPORTANT:** Please **do not** commit your testcase into the Pull Request/repository. We will make arrangements to obtain your input/output files and configuration files. + ### Documentation If you are adding or modifying config entries, please update the appropriate config documentation file (e.g., `lis/configs/lis.config.adoc`) to reflect these changes. Our Users' Guides are written in the [AsciiDoc markup language](https://docs.asciidoctor.org/asciidoc/latest/). If you require assistance with documentation, please ask in the Issue thread. diff --git a/docs/LDT_users_guide/LDT_users_guide.adoc b/docs/LDT_users_guide/LDT_users_guide.adoc index eff676390..4352114ed 100644 --- a/docs/LDT_users_guide/LDT_users_guide.adoc +++ b/docs/LDT_users_guide/LDT_users_guide.adoc @@ -1,6 +1,6 @@ -= Land Data Toolkit (LDT): LDT {lisfrevision} Users`' Guide -:revnumber: 2.3 -:revdate: 05 Jul 2023 += Land Data Toolkit (LDT): LDT {lisfrevision} Users Guide +:revnumber: 3.0 +:revdate: 10 Jan 2024 :doctype: book :sectnums: :toc: @@ -10,23 +10,23 @@ :stem: latexmath :data-uri: :devonly: -:lisfrevision: 7.4 +:lisfrevision: 7.5 :lisfurl: https://lis.gsfc.nasa.gov :nasalisf: https://github.com/NASA-LIS/LISF :githuburl: https://github.com :nasalisfpages: https://nasa-lis.github.io/LISF/ :apachelicense: https://www.apache.org/licenses/LICENSE-2.0 -:ldttarball: LISF_public_release_7.4.0.tar.gz +:ldttarball: LISF_public_release_7.5.0.tar.gz :emdash: — :endash: – :vertellipsis: ⋮ -// Set :devonly: when compiling the developers' version of the Users' Guide. -// Set :devonly!: when compiling the public version of the Users' Guide. +// Set :devonly: when compiling the developers version of the Users Guide. +// Set :devonly!: when compiling the public version of the Users Guide. // -// The ifdef::devonly[] command allows one to include text for the developers' -// version of the Users' Guide. +// The ifdef::devonly[] command allows one to include text for the developers +// version of the Users Guide. // Usage: // ifdef::devonly[] // line one diff --git a/docs/LDT_users_guide/build.adoc b/docs/LDT_users_guide/build.adoc index 0995c7649..f8fdb558e 100644 --- a/docs/LDT_users_guide/build.adoc +++ b/docs/LDT_users_guide/build.adoc @@ -89,13 +89,17 @@ This script will prompt the user with a series of questions regarding support to | `LDT_OPENJPEG` | path to openJPEG library | required | `LDT_ECCODES` | path to ecCodes library | required | `LDT_NETCDF` | path to NetCDF library | required -| `LDT_HDF4` | path to HDF4 library | optional +| `LDT_HDF4` | path to HDF4 library | optional (required to use HDFEOS2) | `LDT_HDF5` | path to HDF5 library | optional | `LDT_HDFEOS` | path to HDFEOS2 library | optional | `LDT_GDAL` | path to GDAL library | optional | `LDT_FORTRANGIS` | path to FortranGIS library | optional (required to use GDAL) | `LDT_LIBGEOTIFF` | path to GeoTIFF library | optional | `LDT_JPEG` | path to JPEG library | optional (use system libjpeg by default) +| `LDT_LIBTIFF` | path to TIFF library | optional (use system libtiff by default) +| `LDT_LIBJBIG` | path to JBIG library | optional (use system libjbig by default) +| `LDT_LIBLZMA` | path to LZMA library | optional (use system liblzma by default) +| `LDT_RPC` | path to RPC library | optional (use system RPC library by default) |=== //{cpp} is C++ diff --git a/docs/LDT_users_guide/intro.adoc b/docs/LDT_users_guide/intro.adoc index 8f19e8d36..fc13561c8 100644 --- a/docs/LDT_users_guide/intro.adoc +++ b/docs/LDT_users_guide/intro.adoc @@ -2,7 +2,7 @@ [[sec-intro]] == Introduction -This is the Users`' Guide for the Land surface Data Toolkit (LDT). This document describes how to download and install the LDT software. It also describes LDT`'s run-time configuration options (the _ldt.config_ file). +This is the Users Guide for the Land surface Data Toolkit (LDT). This document describes how to download and install the LDT software. It also describes LDT`'s run-time configuration options (the _ldt.config_ file). This document consists of 7 sections, described as follows: @@ -31,6 +31,20 @@ This document consists of 7 sections, described as follows: //\attention{See \file{RELEASE\_NOTES} found in the \file{source.tar.gz} file for more //details. (See Section~\ref{sec:obtain-src}.)} +==== Version 7.5 + +. Includes new runmode +* Operation Enhanced (9-km) SMAP soil moisture (SMAP_E_OPL) +. Supports additional data assimilation observations +* CDFS green vegetation fraction (CDFS_GVF) +* GEOS-FP effective soil temperature (GEOS_FP_TEFFobs) +* Precipitation output from a LIS run (LISlsmPrecipobs) +* Soil temperature output from a LIS run (LISlsmTEFFobs) +* Operational 9-km enhanced SMAP soil moisture retrieval (SMAP_E_OPLsm) +* VIIRS green vegetation fraction (VIIRS_GVF) +. Supports additional parameters +* SnowModel parameters + ==== Version 7.4 . Includes new runmode diff --git a/docs/LDT_users_guide/revision_table.adoc b/docs/LDT_users_guide/revision_table.adoc index 4a75992f0..fa9bbc46e 100644 --- a/docs/LDT_users_guide/revision_table.adoc +++ b/docs/LDT_users_guide/revision_table.adoc @@ -2,6 +2,8 @@ |==== | Revision | Summary of Changes | Date +| 3.0 | LISF Public 7.5.0 release | Jan 10, 2024 +| 2.4 | LISF Public 7.4.3 release | Oct 03, 2023 | 2.3 | LISF 557WW 7.5.9 release | Jul 05, 2023 | 2.2 | LISF 557WW 7.5.8 release | Jun 30, 2023 | 2.1 | LISF 557WW 7.5.0 release | Nov 30, 2022 diff --git a/docs/LISF_installation_guide/LISF_installation_guide.adoc b/docs/LISF_installation_guide/LISF_installation_guide.adoc index bb7ec1305..07e28d7fa 100644 --- a/docs/LISF_installation_guide/LISF_installation_guide.adoc +++ b/docs/LISF_installation_guide/LISF_installation_guide.adoc @@ -1,6 +1,6 @@ = LISF Installation Guide -:revnumber: 1.1 -:revdate: 30 Nov 2022 +:revnumber: 2.0 +:revdate: 11 Jan 2024 :doctype: book :sectnums: :toc: diff --git a/docs/LISF_installation_guide/additional_platforms.adoc b/docs/LISF_installation_guide/additional_platforms.adoc index baed71df7..9649b5bf5 100644 --- a/docs/LISF_installation_guide/additional_platforms.adoc +++ b/docs/LISF_installation_guide/additional_platforms.adoc @@ -2,6 +2,53 @@ [[sec_additional_platforms,Additional platforms]] == Additional platforms +// discover +.SUSE Linux Enterprise Server 12.3 +|==== +| Library | Version + +| GNU compiler | 11.2.0 +| Intel compiler | 2021.4.0 +| Intel MPI | 2021.4.0 +| HDF 5 | 1.12.1 +| NetCDF | 4.8.1 +| NetCDF-Fortran | 4.5.3 +| openJPEG | 2.4.0 +| ecCodes | 2.23.0 +| ESMF | 8.1.1 +| HDF 4 | 4.2.15 +| HDF-EOS2 | 2.20v.1.00 +| SQLite3 | 3.35.0 +| PROJ | 7.1.1 +| GeoTIFF | 1.7.0 +| GDAL | 2.4.4 +| FortranGIS | 2.6 +| JPEG | 8d +|==== + +// discover +.SUSE Linux Enterprise Server 12.3 +|==== +| Library | Version + +| GNU compiler | 11.2.0 +| Intel MPI | 2021.4.0 +| HDF 5 | 1.12.1 +| NetCDF | 4.8.1 +| NetCDF-Fortran | 4.5.3 +| openJPEG | 2.4.0 +| ecCodes | 2.23.0 +| ESMF | 8.1.1 +| HDF 4 | 4.2.15 +| HDF-EOS2 | 2.20v.1.00 [red]#Not installed; failed make check# +| SQLite3 | 3.35.0 +| PROJ | 7.1.1 +| GeoTIFF | 1.7.0 +| GDAL | 2.4.4 +| FortranGIS | 2.6 +| JPEG | 8d +|==== + // koehr .Red Hat Enterprise Linux Server 7.8 |==== diff --git a/docs/LISF_installation_guide/dependencies.adoc b/docs/LISF_installation_guide/dependencies.adoc index 105c6ecae..4a8412c69 100644 --- a/docs/LISF_installation_guide/dependencies.adoc +++ b/docs/LISF_installation_guide/dependencies.adoc @@ -133,7 +133,7 @@ NOTE: LDT-only dependency NOTE: LIS-only dependency -If you wish to enable LIS' RTM support, then you must install the CRTM library from the Joint Centers for Satellite Data Assimilation (JCSDA). First go to http://ftp.emc.ncep.noaa.gov/jcsda/CRTM/Repository/ and fill out the CRTM.Subversion_Account_Request.pdf form. Once you have access to their Subversion repository, checkout revision 9604 of the trunk. +If you wish to enable LIS`' RTM support, then you must install the CRTM library from the Joint Centers for Satellite Data Assimilation (JCSDA). First go to http://ftp.emc.ncep.noaa.gov/jcsda/CRTM/Repository/ and fill out the CRTM.Subversion_Account_Request.pdf form. Once you have access to their Subversion repository, checkout revision 9604 of the trunk. Please create a directory outside of the LIS source code to checkout the CRTM library into. Then, within that new directory, run: @@ -159,25 +159,33 @@ Next compile and install the CRTM library: NOTE: LIS-only dependency -If you wish to enable LIS' RTM support, then you must manually compile an included library. +If you wish to enable LIS`' RTM support, then you must manually compile an included library. .... % cd $WORKING/lib/lis-cmem3 -% gmake +% LIS_ARCH=linux_ifc make .... +NOTE: If using the GNU compilers, set `LIS_ARCH` to linux_gfortran. + +IMPORTANT: linux_ifc and linux_gfortran are the only supported architectures. + ==== LIS-CRTM-PROFILE-UTILITY library NOTE: LIS-only dependency -If you wish to enable LIS' RTM support, then you must manually compile an included library. +If you wish to enable LIS`' RTM support, then you must manually compile an included library. .... % cd $WORKING/lib/lis-crtm-profile-utility -% gmake -% gmake install +% LIS_ARCH=linux_ifc make +% LIS_ARCH=linux_ifc make install .... +NOTE: If using the GNU compilers, set `LIS_ARCH` to linux_gfortran. + +IMPORTANT: linux_ifc and linux_gfortran are the only supported architectures. + === Second order dependencies ==== OpenJPEG version 2.4.0 (or higher) @@ -204,6 +212,12 @@ NOTE: Required by PROJ. NOTE: Required by GeoTIFF and GDAL. +==== PETSc 3.16.1 + +*URL*: https://petsc.org/ + +NOTE: Required by RAPID router + === Notes To install these libraries, follow the instructions provided at the various URL listed above. These libraries have their own dependencies, which should be documented in their respective documentation. @@ -234,6 +248,8 @@ If you wish to install all the libraries (required and optional, excluding JCSDA . GDAL (optional) . FortranGIS (optional) + Required to use GDAL +. PETSc (optional) + + Required to use RAPID router //If not, review the appropriate _$WORKING/arch/configure.lis.*_ file //for some hints regarding additional low level libraries needed for diff --git a/docs/LISF_installation_guide/devenv.adoc b/docs/LISF_installation_guide/devenv.adoc index 16cfc07af..9c1f34c0a 100644 --- a/docs/LISF_installation_guide/devenv.adoc +++ b/docs/LISF_installation_guide/devenv.adoc @@ -16,16 +16,16 @@ These instructions expect that you are using such a system. In particular you n ===== Compilers -* Intel Fortran Compiler versions 18, 19, 20, or 21 with corresponding Intel C Compiler along with GNU`'s Compiler Collection version 9.2.0 or 11.2.0. -* or GNU`'s Compiler Collection version 9.2.0 or 11.2.0, both gfortran and gcc. +* Intel Fortran Compiler versions 2021 or 2022 with corresponding Intel C Compiler along with GNU`'s Compiler Collection version 11.2.0 or 12.1.0. +* or GNU`'s Compiler Collection version 11.2.0, both gfortran and gcc. ===== Tools * GNU`'s make, gmake, version 3.77 or 3.81 * Perl, version 5.10 -* Python, version 2.7 or 3.8 +* Python, version 3.6 -IMPORTANT: Support for Python 2.7 is now deprecated. Future releases will depend on Python 3. +IMPORTANT: The use of Python 2.7 for building LISF is now deprecated. See Section <>. // // *** or Absoft's Pro Fortran Software Developement Kit, version 10.0 @@ -39,17 +39,16 @@ IMPORTANT: Support for Python 2.7 is now deprecated. Future releases will depen ===== Compilers -* Intel Fortran Compiler version 18 or 19 with corresponding Intel C Compiler, along with GNU`'s Compiler Collection version 7.3.0 -* or Intel Fortran Compiler version 21 with corresponding Intel C Compiler, along with GNU`'s Compiler Collection version 7.5.0 -* or Cray Compiler Environment (cce) version 12.0.3 or 13.0.0, along with GNU`'s Compiler Collection version 11.2.0 +* Intel Fortran Compiler version 2021 or 2022 with corresponding Intel C Compiler, along with GNU`'s Compiler Collection version 11.2.0 or 12.1.0. +* or Cray Compiler Environment (cce) version 14.0.0, along with GNU`'s Compiler Collection version 11.2.0. ===== Tools * GNU`'s make, gmake, version 3.77 or 3.81 * Perl, version 5.10 -* Python, version 2.7 or 3.8 +* Python, version 3.6 -IMPORTANT: Support for Python 2.7 is now deprecated. Future releases will depend on Python 3. +IMPORTANT: The use of Python 2.7 for building LISF is now deprecated. See Section <>. ==== IBM/Linux @@ -61,9 +60,9 @@ IMPORTANT: Support for Python 2.7 is now deprecated. Future releases will depen * GNU`'s make, gmake, version 3.77 or 3.81 * Perl, version 5.10 -* Python, version 2.7 or 3.8 +* Python, version 3.6 -IMPORTANT: Support for Python 2.7 is now deprecated. Future releases will depend on Python 3. +IMPORTANT: The use of Python 2.7 for building LISF is now deprecated. See Section <>. // // * IBM @@ -74,3 +73,26 @@ IMPORTANT: Support for Python 2.7 is now deprecated. Future releases will depen // ** Intel Fortran Compiler version 12 // ** GNU`'s make, gmake, version 3.77 +==== Python support + +The use of Python 2.7 for building LISF is now deprecated. If you only have Python 2.7, then edit the following four files + +* ldt/make/makedep.py +* lis/make/makedep.py +* lis/make/plugins.py +* lvt/make/makedep.py + +changing + +``` +#!/usr/bin/env python3 +``` + +to + +``` +#!/usr/bin/env python +``` + +Future releases will depend on Python 3 only. + diff --git a/docs/LISF_installation_guide/platforms.adoc b/docs/LISF_installation_guide/platforms.adoc index a5b32800c..9f25915fb 100644 --- a/docs/LISF_installation_guide/platforms.adoc +++ b/docs/LISF_installation_guide/platforms.adoc @@ -19,10 +19,11 @@ The following tables provide some specific platforms with compiler and library v | HDF 4 | 4.2.15 | HDF-EOS2 | 2.20v.1.00 | SQLite3 | 3.35.0 -| PROJ | 7.1.1 +| PROJ | 9.1.0 | GeoTIFF | 1.7.0 -| GDAL | 2.4.4 +| GDAL | 3.5.2 | FortranGIS | 2.6 +| PETSc | 3.16.1 | JPEG | 8d |==== @@ -40,12 +41,13 @@ The following tables provide some specific platforms with compiler and library v | ecCodes | 2.23.0 | ESMF | 8.1.1 | HDF 4 | 4.2.15 -| HDF-EOS2 | 2.20v.1.00 [red]#Not installed; failed make check# +| HDF-EOS2 | 3.0 | SQLite3 | 3.35.0 -| PROJ | 7.1.1 +| PROJ | 9.1.0 | GeoTIFF | 1.7.0 -| GDAL | 2.4.4 +| GDAL | 3.5.2 | FortranGIS | 2.6 +| PETSc | 3.16.1 | JPEG | 8d |==== diff --git a/docs/LISF_installation_guide/revision_table.adoc b/docs/LISF_installation_guide/revision_table.adoc index a5ef49849..46934f422 100644 --- a/docs/LISF_installation_guide/revision_table.adoc +++ b/docs/LISF_installation_guide/revision_table.adoc @@ -2,6 +2,7 @@ |==== |Revision | Summary of Changes | Date +|2.0 | LISF Public 7.5.0 release | Jan 11, 2024 |1.1 | LISF 557WW 7.5.0 release | Nov 30, 2022 |1.0 | LISF Public 7.4.0 release | Jun 14, 2022 |==== diff --git a/docs/LIS_users_guide/LIS_users_guide.adoc b/docs/LIS_users_guide/LIS_users_guide.adoc index 0a53e6f1a..06e9f950e 100644 --- a/docs/LIS_users_guide/LIS_users_guide.adoc +++ b/docs/LIS_users_guide/LIS_users_guide.adoc @@ -1,6 +1,6 @@ -= Land Information System (LIS): LIS {lisfrevision} Users`' Guide -:revnumber: 2.5 -:revdate: 05 Jul 2023 += Land Information System (LIS): LIS {lisfrevision} Users Guide +:revnumber: 3.0 +:revdate: 11 Jan 2024 :doctype: book :sectnums: :toc: @@ -9,25 +9,25 @@ :imagesoutdir: images :stem: latexmath :devonly: -:lisfrevision: 7.4 +:lisfrevision: 7.5 :lisfurl: https://lis.gsfc.nasa.gov :listesturl: https://lis.gsfc.nasa.gov/lis-testcases :nasalisf: https://github.com/NASA-LIS/LISF :githuburl: https://github.com :nasalisfpages: https://nasa-lis.github.io/LISF/ :apachelicense: https://www.apache.org/licenses/LICENSE-2.0 -:listarball: LISF_public_release_7.4.0.tar.gz -:lispublicna: Not available in the {listarball} public release of LISF 7.4. +:listarball: LISF_public_release_7.5.0.tar.gz +:lispublicna: Not available in the {listarball} public release of LISF 7.5. :emdash: — :endash: – :vertellipsis: ⋮ -// Set :devonly: when compiling the developers' version of the Users' Guide. -// Set :devonly!: when compiling the public version of the Users' Guide. +// Set :devonly: when compiling the developers' version of the Users Guide. +// Set :devonly!: when compiling the public version of the Users Guide. // // The ifdef::devonly[] command allows one to include text for the developers' -// version of the Users' Guide. +// version of the Users Guide. // Usage: // ifdef::devonly[] // line one diff --git a/docs/LIS_users_guide/build.adoc b/docs/LIS_users_guide/build.adoc index 14c9273d7..5b2663c41 100644 --- a/docs/LIS_users_guide/build.adoc +++ b/docs/LIS_users_guide/build.adoc @@ -88,7 +88,7 @@ This script will prompt the user with a series of questions regarding support to | `LIS_OPENJPEG` | path to openJPEG library | required | `LIS_ECCODES` | path to ecCodes library | required | `LIS_NETCDF` | path to NetCDF library | required -| `LIS_HDF4` | path to HDF4 library | optional +| `LIS_HDF4` | path to HDF4 library | optional (required to use HDFEOS2) | `LIS_HDF5` | path to HDF5 library | optional | `LIS_HDFEOS` | path to HDFEOS2 library | optional | `LIS_MINPACK` | path to MINPACK library | optional @@ -96,7 +96,9 @@ This script will prompt the user with a series of questions regarding support to | `LIS_CRTM_PROF` | path to LIS-CRTM Profile library | optional | `LIS_CMEM` | path to LIS-CMEM library | optional | `LIS_LAPACK` | path to LAPACK library | optional +| `LIS_PETSC` | path to PETSc library | optional | `LIS_JPEG` | path to JPEG library | optional (use system libjpeg by default) +| `LIS_RPC` | path to RPC library | optional (use system RPC library by default) |==== //{cpp} is C++ @@ -137,8 +139,7 @@ Use HDFEOS? (1-yes, 0-no, default=1): Use MINPACK? (1-yes, 0-no, default=0): Use LIS-CRTM? (1-yes, 0-no, default=0): Use LIS-CMEM? (1-yes, 0-no, default=0): -Use LIS-LAPACK? (1-yes, 0-no, default=0): -Use LIS-MKL-LAPACK? (1-yes, 0-no, default=0): +Use LIS-LAPACK? (0-no, 1-mkl, 2-lapack/blas, 3-lapack/refblas, default=0): Use PETSc? (1-yes, 0-no, default=0): ----------------------------------------------------- configure.lis file generated successfully @@ -175,6 +176,20 @@ if you wish to enable LIS-CRTM2EM support, then you must also enable LIS-CMEM su * for `Use LIS-CMEM? (1-yes, 0-no, default=0):`, if you wish to enable LIS-CMEM support, then you must also enable LIS-CRTM. So for `Use LIS-CRTM? (1-yes, 0-no, default=0):`, you must also select 1. +* for `Use LIS-LAPACK? (0-no, 1-mkl, 2-lapack/blas, 3-lapack/refblas, default=0):`, +select the type of LAPACK library that you have installed. This is used with `Use PETSc? (1-yes, 0-no, default=0):`. If you select 0 for `Use PETSc?`, then select 0 for `Use LIS-LAPACK?`. If you select 1 for `Use PETSc?`, then select `Use LIS-LAPACK?` according to the following table: ++ +|==== +| Selection | Description + +| 0 | No LAPACK needed / Use system LAPACK +| 1 | LAPACK in Intel MKL +| 2 | liblapack / libblas +| 3 | liblapack / librefblas +|==== ++ +For example, on a Cray system using the Cray compilers, select 0 because the linker will find Cray's LAPACK libraries. + Note that due to an issue involving multiple definitions within the NetCDF 3 and HDF 4 libraries, you cannot compile LIS with support for both NetCDF 3 and HDF 4 together. Note that if you compiled NetCDF 4 without compression, then when specifying `NETCDF version (3 or 4, default=4):`, select 3. Then you must manually append `-lnetcdff` to the `LDFLAGS` variable in the _make/configure.lis_ file. diff --git a/docs/LIS_users_guide/intro.adoc b/docs/LIS_users_guide/intro.adoc index 7944a5133..04ffdc381 100644 --- a/docs/LIS_users_guide/intro.adoc +++ b/docs/LIS_users_guide/intro.adoc @@ -46,6 +46,20 @@ This document consists of 12 sections, described as follows: === What's New //\attention{See _RELEASE_NOTES_ found in the _source.tar.gz_ file for more details. (See Section <>.)} +==== Version 7.5 + +. Supports additional metforcing datasets +* GALWEM 17km or 0.25deg deterministic forecast reader (galwem) +* GALWEM-GE forecast reader (galwem_ge) +* GEOS-IT (geos_it) +. Supports additional data assimilation observation datasets +* CDFS green vegetation fraction (CDFS_GVF) +* CDF_Transfer_NASA_SMAPsm +* Operation Enhanced (9-km) SMAP soil moisture (SMAP_E_OPLsm) +* VIIRS green vegetation fraction (VIIRS_GVF) +* Margulis Western US Snow Reanalysis dataset (WUS_UCLAsnow) +. Includes RAPID router + ==== Version 7.4 . Includes new runmodes diff --git a/docs/LIS_users_guide/obtain-source.adoc b/docs/LIS_users_guide/obtain-source.adoc index bc9417480..d83036ba6 100644 --- a/docs/LIS_users_guide/obtain-source.adoc +++ b/docs/LIS_users_guide/obtain-source.adoc @@ -197,6 +197,14 @@ ASCAT (TU Wein) soil moisture + [red]##specifies what?## +*** _CDFS_GVF_ ++ +CDFS green vegetation fraction + +*** _CDF_Transfer_NASA_SMAPsm_ ++ +[red]##specifies what?## + *** _ESACCI_sm_ + ESACCI Essential Climate Variable product @@ -261,6 +269,10 @@ NASA SMAP vegetation optical depth retrievals + PMW snow +*** _SMAP_E_OPLsm_ ++ +Operation Enhanced (9-km) SMAP soil moisture + *** _SMAP_NRTsm_ + SMAP near-real time soil moisture retrievals @@ -321,6 +333,14 @@ Thermal hydraulic disaggregation of soil moisture (THySM) + USAF Snow and Ice Analysis +*** _VIIRS_GVF_ ++ +VIIRS green vegetation fraction + +*** _WUS_UCLAsnow_ ++ +Margulis Western US Snow Reanalysis dataset + *** _WindSat_Cband_sm_ + C-band soil moisture retrievals from WindSat @@ -531,6 +551,14 @@ ECMWF meteorological forcing data + [red]##specifies what?## +** _galwem_ ++ +GALWEM 17km or 0.25deg deterministic forecast reader + +** _galwem_ge_ ++ +GALWEM-GE forecast reader + ** _gdas_ + NCEP GDAS meteorological forcing data @@ -559,6 +587,10 @@ LDT-generated meteorological forcing data + NASA GEOS 5 meteorological forecast forcing data +** _geos_it_ ++ +GEOS-IT + ** _gfs_ + NCEP GFS meteorological forcing data @@ -824,6 +856,7 @@ Directory containing routing models ** _HYMAP_router_ ** _HYMAP2_router_ ** _NLDAS_router_ +** _RAPID_router_ * _rtms_ + diff --git a/docs/LIS_users_guide/plugins.adoc b/docs/LIS_users_guide/plugins.adoc index 8e9bb59c9..d0e28d367 100644 --- a/docs/LIS_users_guide/plugins.adoc +++ b/docs/LIS_users_guide/plugins.adoc @@ -41,5 +41,22 @@ After creating a _user.cfg_ file you must recompile the LIS source code. First % cd .. .... -Re-run the _configure_ script to process your _user.cfg_ file. Then compile the LIS source code accordingly. +//Re-run the _configure_ script to process your _user.cfg_ file. Then compile the LIS source code accordingly. + +Now you may recompile LIS. + +.... +% ./compile +.... + +[NOTE] +==== +If you enable the SnowModel by adding + +.... +SNOWMODEL: On +.... + +to your _user.cfg_ file, then you must modify the _make/configure.lis_ file by adding `-mcmodel=medium` to the `FFLAGS77` and `FFLAGS` variables. +==== diff --git a/docs/LIS_users_guide/revision_table.adoc b/docs/LIS_users_guide/revision_table.adoc index 8671fe499..9f9e0fe32 100644 --- a/docs/LIS_users_guide/revision_table.adoc +++ b/docs/LIS_users_guide/revision_table.adoc @@ -2,6 +2,7 @@ |==== |Revision | Summary of Changes | Date +|3.0 | LISF Public 7.5.0 release | Jan 11, 2024 |2.5 | LISF 557WW 7.5.9 release | Jul 05, 2023 |2.4 | LISF 557WW 7.5.8 release | Jun 30, 2023 |2.3 | LISF 557WW 7.5.5 release | Jun 20, 2023 diff --git a/docs/LIS_users_guide/user_cfg_table.adoc b/docs/LIS_users_guide/user_cfg_table.adoc index e6a0acb33..63962d576 100644 --- a/docs/LIS_users_guide/user_cfg_table.adoc +++ b/docs/LIS_users_guide/user_cfg_table.adoc @@ -35,6 +35,7 @@ | GLDAS | On | GFS | On | MERRA2 | On +| GEOS-IT | On | ERA5 | On | CMAP | On | CHIRPS2 | On @@ -173,6 +174,7 @@ | DA OBS NRT_SMAPsm | On | DA OBS pildas | On | DA OBS GRACE | On +| DA CDF TRANSFER NASA SMAPSM | On |==== .Bias estimation @@ -255,9 +257,10 @@ | FASST | Off | CLSM F2.5 | On | GeoWRSI.2 | On -| LSM RDHM.3.5.6 | On +| LSM RDHM.3.5.6 | Off | SUMMA.1.0 | Off | Crocus.8.1 | Off +| SNOWMODEL | Off | Flake.1.0 | Off | NoahMP-GL.3.9.1.1 | On | template glacier | On diff --git a/docs/LVT_users_guide/LVT_users_guide.adoc b/docs/LVT_users_guide/LVT_users_guide.adoc index b4198240b..0d6ecb004 100644 --- a/docs/LVT_users_guide/LVT_users_guide.adoc +++ b/docs/LVT_users_guide/LVT_users_guide.adoc @@ -1,6 +1,6 @@ -= Land surface Verification Toolkit (LVT): LVT {lisfrevision} Users`' Guide -:revnumber: 2.4 -:revdate: 05 Jul 2023 += Land surface Verification Toolkit (LVT): LVT {lisfrevision} Users Guide +:revnumber: 3.0 +:revdate: 10 Jan 2024 :doctype: book :sectnums: :toc: @@ -9,13 +9,13 @@ :imagesoutdir: images :stem: latexmath :devonly: -:lisfrevision: 7.4 +:lisfrevision: 7.5 :lisfurl: https://lis.gsfc.nasa.gov :nasalisf: https://github.com/NASA-LIS/LISF :githuburl: https://github.com :nasalisfpages: https://nasa-lis.github.io/LISF/ :apachelicense: https://www.apache.org/licenses/LICENSE-2.0 -:lvttarball: LISF_public_release_7.4.0.tar.gz +:lvttarball: LISF_public_release_7.5.0.tar.gz :emdash: — :endash: – :vertellipsis: ⋮ diff --git a/docs/LVT_users_guide/build.adoc b/docs/LVT_users_guide/build.adoc index 5c73eca15..4d164db4a 100644 --- a/docs/LVT_users_guide/build.adoc +++ b/docs/LVT_users_guide/build.adoc @@ -89,12 +89,13 @@ This script will prompt the user with a series of questions regarding support to | `LVT_OPENJPEG` | path to openJPEG library | required | `LVT_ECCODES` | path to ecCodes library | required | `LVT_NETCDF` | path to NETCDF library | optional -| `LVT_HDF4` | path to HDF4 library | optional +| `LVT_HDF4` | path to HDF4 library | optional (required to use HDFEOS2) | `LVT_HDF5` | path to HDF5 library | optional | `LVT_HDFEOS` | path to HDFEOS2 library | optional | `LVT_GDAL` | path to GDAL library | optional | `LVT_FORTRANGIS` | path to FortranGIS library | optional (required to use GDAL) | `LVT_JPEG` | path to JPEG library | optional (use system libjpeg by default) +| `LVT_RPC` | path to RPC library | optional (use system RPC library by default) |=== //{cpp} is C++ diff --git a/docs/LVT_users_guide/intro.adoc b/docs/LVT_users_guide/intro.adoc index 8c4a645b8..4b37797be 100644 --- a/docs/LVT_users_guide/intro.adoc +++ b/docs/LVT_users_guide/intro.adoc @@ -2,7 +2,7 @@ [[sec-intro]] == Introduction -This is the Users`' Guide for Land surface Verification Toolkit (LVT; <>). +This is the Users Guide for Land surface Verification Toolkit (LVT; <>). This document describes how to download and install the LVT software. It also describes LVT`'s run-time configuration options (the _lvt.config_ file). This document consists of 9 sections, described as follows: @@ -37,10 +37,13 @@ This document consists of 9 sections, described as follows: === What's New //\attention{See \file{RELEASE\_NOTES} found in the \file{source.tar.gz} file for more details. (See Section~\ref{sec-obtain-src}.)} -//==== Version 7.5 -//. utils -//* s2smetric/ -//* s2spost/ +==== Version 7.5 + +. Supports additional data streams +* COAMPS forcing data (COAMPSout) +* GRUN runoff data (GRUNrunoff) +* GPM IMERG Monthly precipitation data (IMERG_monthly) +* Operational enhanced SMAP soil moisture retrieval data (SMAP_E_OPL) ==== Version 7.4 diff --git a/docs/LVT_users_guide/revision_table.adoc b/docs/LVT_users_guide/revision_table.adoc index 39edd94a6..44dd257f5 100644 --- a/docs/LVT_users_guide/revision_table.adoc +++ b/docs/LVT_users_guide/revision_table.adoc @@ -2,6 +2,7 @@ |=== | Revision | Summary of Changes | Date +| 3.0 | LISF Public 7.5.0 release | Jan 10, 2024 | 2.4 | LISF 557WW 7.5.9 release | Jul 05, 2023 | 2.3 | LISF 557WW 7.5.8 release | Jun 30, 2023 | 2.2 | LISF 557WW 7.5.4 release | May 5, 2023 diff --git a/docs/public_testcase_walkthrough/public_testcase_walkthrough.adoc b/docs/public_testcase_walkthrough/public_testcase_walkthrough.adoc index df3727b17..82b143fe5 100644 --- a/docs/public_testcase_walkthrough/public_testcase_walkthrough.adoc +++ b/docs/public_testcase_walkthrough/public_testcase_walkthrough.adoc @@ -1,6 +1,6 @@ = LIS Public Testcase Walkthrough -:revnumber: 1.0 -:revdate: September 23, 2022 +:revnumber: 1.1 +:revdate: June 26, 2023 :revremark: Updated for LISF Public 7.4 release :imagesdir: ./images :title-page: @@ -12,7 +12,7 @@ :figure-caption!: // disable figure captions // github commit known to be compatible with this walkthrough -:compatible-lisf-branch: support/lisf-public-7.3 +:compatible-lisf-branch: support/lisf-public-7.4 // urls :url-lis-website: https://lis.gsfc.nasa.gov @@ -20,7 +20,8 @@ :url-lis-testcases-data: https://portal.nccs.nasa.gov/lisdata_pub/Tutorials/Web_Version/ :url-lisf-docs: https://github.com/NASA-LIS/LISF/tree/master/docs :url-lisf-github: https://github.com/NASA-LIS/LISF -:ssh-lisf-github: git@github.com:NASA-LIS/LISF.git +:url-nccs-discover-jobs-page: https://www.nccs.nasa.gov/nccs-users/instructional/using-slurm/submit-jobs +:ssh-lisf-github: github:NASA-LIS/LISF.git // begin document diff --git a/docs/public_testcase_walkthrough/running_ldt.adoc b/docs/public_testcase_walkthrough/running_ldt.adoc index 223551a16..f0793bdd5 100644 --- a/docs/public_testcase_walkthrough/running_ldt.adoc +++ b/docs/public_testcase_walkthrough/running_ldt.adoc @@ -8,7 +8,9 @@ You're now ready to run LDT: % ./LDT {ldt-config-filename} ---- -The run should take a few minutes to complete. If the run aborts, troubleshoot the issue by reviewing any errors printed to the terminal and by viewing the contents of `ldtlog.0000`. If no errors print to the terminal, verify that the run completed successfully by checking for the following confirmation at the end of the `ldtlog.0000`: +The run should take a few minutes to complete. If the run aborts, troubleshoot the issue by reviewing any errors printed to the terminal and by viewing the contents of `ldtlog.0000`. If no errors print to the terminal, verify that the run completed successfully by checking for the following confirmation at the end of the `ldtlog.0000`. + +NOTE: If the terminal reports the error "./LDT: symbol lookup error:", this may be due extraneous modules loaded into your environement that do not allow lis to run properly. View your modules using the command `module list`. If extraneous modules are loaded, run `module purge` to clear your environment and then `module load [lisf module file]` to load an environment suitable to running LISF. See the "discover_quick_start" document in the {url-lisf-docs}[LISF Users' Guides,window=_blank] for more information. [source,shell] ---- @@ -17,4 +19,4 @@ The run should take a few minutes to complete. If the run aborts, troubleshoot t -------------------------------- Finished LDT run -------------------------------- ----- \ No newline at end of file +---- diff --git a/docs/public_testcase_walkthrough/setup.adoc b/docs/public_testcase_walkthrough/setup.adoc index 9942ee45a..297108947 100644 --- a/docs/public_testcase_walkthrough/setup.adoc +++ b/docs/public_testcase_walkthrough/setup.adoc @@ -37,12 +37,14 @@ IMPORTANT: The `{compatible-lisf-branch}` branch is known to be compatible with For information about configuration settings and detailed compilation instructions, see the {url-lisf-docs}[LISF Users' Guides,window=_blank]. In general, the compilation process for each component is as follows: +NOTE: As you run these testcases, you will have the opportunity to compare your output to TARGET_OUTPUT files or "solutions". The TARGET_OUTPUT files were created by running ldt, lis, and lvt compiled with *default* compile configuration settings. For this walkthrough, it is recommended that you also use default compiler configuration settings. + [#compile-example] [source,shell,subs="attributes"] ---- % cd ldt % ./configure -> # Select compile configuration settings (see Docs)... +> # Select compile configuration settings (Default settings recommended.) % ./compile > # Compilation output... % mv LDT ../../ # move executable up into $WORKING_DIR @@ -52,3 +54,5 @@ For information about configuration settings and detailed compilation instructio Repeat the above process in the `lis/` and `lvt/` directories to generate the _LIS_ and _LVT_ executables. Change directories back into your `$WORKING_DIR` which should now contain three executable files: `LDT`, `LIS`, `LVT`. + +If you ever wish to generate new executable files, `cd` into `/LISF/l??/make` and run `gmake realclean`. This will clear all dependency files and allow you to cleanly define new compile configuration settings and recompile. diff --git a/docs/public_testcase_walkthrough/step_1.adoc b/docs/public_testcase_walkthrough/step_1.adoc index 81852abf6..891765ce2 100644 --- a/docs/public_testcase_walkthrough/step_1.adoc +++ b/docs/public_testcase_walkthrough/step_1.adoc @@ -1,9 +1,10 @@ = Step 1: LSM Parameter Processing Run (LDT) :step-label: Step 1 -:download-filename: testcase1_ldt_parms_2020.tar.gz +:download-filename: testcase1_ldt_parms_2023.tar.gz +:download-batch-scripts-filename: testcase_batch_scripts.tar.gz :input-filesize-compressed: 350MB -:input-filesize-unpacked: 4.1GB +:input-filesize-unpacked: 4.2GB :ldt-run-dir: :ldt-config-filename: ldt.config.noah36_params @@ -81,7 +82,7 @@ Landcover spatial transform: tile [NOTE] -- -LISF configuration files use relative paths to describe file locations. Keep this in mind if you encounter any file not found errors. +LISF configuration files use relative paths to describe file locations. Keep this in mind if you encounter any "file not found" errors. -- === Noah Land Surface Model Parameters @@ -114,6 +115,21 @@ image::step_1_domain_radar.jpeg[align=center] include::running_ldt.adoc[] +[NOTE] +-- +ldt, lis, and lvt can also be run by submitting batch jobs using SLURM (**S**imple **L**inux **U**tility for **R**esource **M**anagement). If you are running this tutorial on Discover, you can download example batch scripts for all steps from the {url-lis-testcases-page}[LIS Testcase website] using the following command: + +[source,shell,subs="attributes"] +---- +% curl -O {url-lis-testcases-data}{download-batch-scripts-filename} +% tar -xzf {download-batch-scripts-filename} -C . +---- + +The batch scripts (`step*.job`) will unpack into the appropriate directories. To submit a job to discover using a batch script, use the command `sbatch [BATCH SCRIPT]` from the same directory as the job you wish to run. The command `squeue -u [YOUR USER ID]` will provide updates on your job. If the job crashes, troubleshoot using any `slurm.out` files. + +See the {url-nccs-discover-jobs-page}[NCCS Discover Jobs Users' Guide] for more information. +-- + == LDT Output Files The following files are typically generated by an LDT parameter processing run: @@ -122,15 +138,15 @@ The following files are typically generated by an LDT parameter processing run: [%autowidth] |=== |`lis_input.nldas.noah36.d01.nc` |The NetCDF-formatted model parameter file which LIS reads at runtime. `d01` refers to the indexed domain, typically used as "nests" for NASA-Unified WRF simulations. -|`ldtlog.0000` |The runtime configuration file read by LDT in this stepThe output diagnostic file that provides runtime messages, including warnings and error messages. This file is useful for verifying successful run completion and troubleshooting unsuccessful runs. -|`MaskParamFill.log` |The "target" NetCDF file generated by LDT in this step. This diagnostic file informs of any disagreements between an LSM-based parameter and the landmask, and whether any parameter gridcells were "filled" to agree with the landmask. +|`ldtlog.0000` |The output diagnostic file that provides runtime messages, including warnings and error messages. This file is useful for verifying successful run completion and troubleshooting unsuccessful runs. +|`MaskParamFill.log` |This diagnostic file informs of any disagreements between an LSM-based parameter and the landmask, and whether any parameter gridcells were "filled" to agree with the landmask. |=== NOTE: The output filenames for `lis_input.nldas.noah36.d01.nc` and `ldtlog.0000` can be defined in the `ldt.config` file, but the filename of `MaskParamFill.log` cannot be modified. === The LIS Parameter File -The contents of the LIS parameter input file produced by LDT can be examined visually using a command-line program such as http://meteora.ucsd.edu/~pierce/ncview_home_page.html[`ncview`,window=_blank] or a desktop application like NASA's https://www.giss.nasa.gov/tools/panoply/[Panoply,window=_blank]. For this walkthrough we will be using `ncview`. +The contents of the LIS parameter input file produced by LDT can be examined visually using a command-line program such as http://meteora.ucsd.edu/~pierce/ncview_home_page.html[`ncview`,window=_blank] or a desktop application like NASA's https://www.giss.nasa.gov/tools/panoply/[Panoply,window=_blank]. For this walkthrough we will be using `ncview`. If needed, add `ncview` to your environment by running, `module load ncview`. Open the LIS input file using `ncview`: @@ -249,7 +265,7 @@ Where the flags `d`, `f`, and `s` enable the following options: * `f`: force comparison to continue after differences found * `s`: report identical files to terminal (by default `nccmp` runs silently if files are identical) -NOTE: The `nccmp` command will be used in future steps. Going forward, some files may not be identical, but any differences reported _should_ be small. +NOTE: The `nccmp` command will be used in future steps. Going forward, some files may not be identical, but any differences reported _should_ be small. Also note: in this step, the target lis input file was generated using `Soil texture spatial transform: mode` == Wrap-up diff --git a/docs/public_testcase_walkthrough/step_2.adoc b/docs/public_testcase_walkthrough/step_2.adoc index 82198409b..941506a75 100644 --- a/docs/public_testcase_walkthrough/step_2.adoc +++ b/docs/public_testcase_walkthrough/step_2.adoc @@ -1,9 +1,9 @@ = Step 2: LSM "Open-loop" (OL) Experiment (LIS) :step-label: Step 2 -:download-filename: testcase2_lis_ol_2020.tar.gz -:input-filesize-compressed: 67MB -:input-filesize-unpacked: 250MB +:download-filename: testcase2_lis_ol_2023.tar.gz +:input-filesize-compressed: 65MB +:input-filesize-unpacked: 343MB == Overview @@ -53,9 +53,9 @@ Jump to the <>. ==== Before running the download script: -. If needed, install `wget`. -. Create a link:https://urs.earthdata.nasa.gov/users/new[NASA Earthdata] account if you do not already have one. -. Follow steps 1-4 in link:https://disc.gsfc.nasa.gov/data-access#mac_linux_wget[these instructions] to save your NASA Earthdata login credentials locally. +. If needed, install `wget` +. Create a link:https://urs.earthdata.nasa.gov/users/new[NASA Earthdata] account if you do not already have one +. Follow steps 1-3 in link:https://disc.gsfc.nasa.gov/data-access#mac_linux_wget[these instructions] to save your NASA Earthdata login credentials locally ==== When you are ready to run the script, change directories into `INPUT/` and run the following command: @@ -98,7 +98,7 @@ In your `$WORKING_DIR`, execute the following command: LIS can also be run in parallel. The examples in this walkthrough, however, demonstrate how to run LIS on a single processor. See Chapter 6 in link:{url-lisf-docs}[the LIS Users' Guide] for instructions for running LIS in parallel. ==== -With a single processor the run should take approximately 20 minutes to complete. If the run fails, diagnose the issue by reviewing any errors that have printed to the terminal and by viewing the contents of `lislog` files (if any are present). If no errors appear and the run appears to have completed successfully, examine the end of any `lislog` files present to check for a confirmation message: +With a single processor the run should take approximately 20 minutes to complete. If the run fails, diagnose the issue by reviewing any errors that have printed to the terminal and by viewing the contents of `lislog` files (located in the `log` directory as defined by line 42 of `lis.config_noah36_ol`). If no errors appear and the run appears to have completed successfully, examine the end of any `lislog` files present to check for a confirmation message: [source,shell] ---- diff --git a/docs/public_testcase_walkthrough/step_3.adoc b/docs/public_testcase_walkthrough/step_3.adoc index 4c72c490c..88b729624 100644 --- a/docs/public_testcase_walkthrough/step_3.adoc +++ b/docs/public_testcase_walkthrough/step_3.adoc @@ -1,9 +1,9 @@ = Step 3: Ensemble Restart File Generation (LDT) :step-label: Step 3 -:download-filename: testcase3_ldt_ensrst_2020.tar.gz -:input-filesize-compressed: 77KB -:input-filesize-unpacked: 180KB +:download-filename: testcase3_ldt_ensrst_2023.tar.gz +:input-filesize-compressed: 97KB +:input-filesize-unpacked: 100KB :ldt-run-dir: DA_ensrst :ldt-config-filename: ldt.config @@ -85,6 +85,6 @@ include::running_ldt.adoc[] During this run, LDT produced one output file named `LIS_EnRST_NOAH36_201801010000.d01.nc` and placed it into the `$WORKING_DIR/DA_ensrst` directory. -Use `ncview`, Panoply, Matlab or any other viewing package that supports NetCDF files. Compare what you see with the _target_ version of this output file, also located in `$WORKING_DIR/D_ensrst`. Additionally, you can use `nccmp` to directly compare the contents of the file created by your LDT run and the target. +Use `ncview`, Panoply, Matlab or any other viewing package that supports NetCDF files. Compare what you see with the _target_ version of this output file, also located in `$WORKING_DIR/DA_ensrst`. Additionally, you can use `nccmp` to directly compare the contents of the file created by your LDT run and the target. If there are differences between your file and the target file, you can use `ncdiff` to create a new NetCDF file to visualize the differences. // TODO: ADD EXAMPLES HERE diff --git a/docs/public_testcase_walkthrough/step_4.adoc b/docs/public_testcase_walkthrough/step_4.adoc index 8eeda6484..80463dae4 100644 --- a/docs/public_testcase_walkthrough/step_4.adoc +++ b/docs/public_testcase_walkthrough/step_4.adoc @@ -1,9 +1,9 @@ = Step 4: Generate LSM OL Cumulative Density Function-based Files (LDT) :step-label: Step 4 -:download-filename: testcase4_ldt_lsmcdf_2020.tar.gz -:input-filesize-compressed: 362KB -:input-filesize-unpacked: 815KB +:download-filename: testcase4_ldt_lsmcdf_2023.tar.gz +:input-filesize-compressed: 384KB +:input-filesize-unpacked: 803KB :ldt-run-dir: DA_proc_LSM :ldt-config-filename: ldt.config.noah36_cdf diff --git a/docs/public_testcase_walkthrough/step_5.adoc b/docs/public_testcase_walkthrough/step_5.adoc index 2f711612b..60bb72bdb 100644 --- a/docs/public_testcase_walkthrough/step_5.adoc +++ b/docs/public_testcase_walkthrough/step_5.adoc @@ -1,9 +1,9 @@ = Step 5: Generate Observations CDF-based Files (LDT) :step-label: Step 5 -:download-filename: testcase5_ldt_obscdf_2020.tar.gz -:input-filesize-compressed: 4.5GB -:input-filesize-unpacked: 5.3GB +:download-filename: testcase5_ldt_obscdf_2023.tar.gz +:input-filesize-compressed: 4.6GB +:input-filesize-unpacked: 9.1GB :ldt-run-dir: DA_proc_SMAP :ldt-config-filename: ldt.config.smapobs_cdf @@ -83,7 +83,7 @@ SMAP(NASA) soil moisture Composite Release ID (e.g., R16): R16 <8> <1> _DA preprocessing_ mode is used to generate the observation domain and scaling parameters. <2> Prefix of output files (e.g., `cdf_smapobs_domain.nc`). <3> Temporal resolution of resultant CDF. Specifies whether to generate lumped (i.e., considering all years and all seasons) CDFs or to stratify CDFs for each calendar month. -<4> Averaging interval used while computing CDF. In this case, one day. +<4> Averaging interval used while computing the CDF. In this case, one day. <5> Relative path to the directory containing SMAP observation data. <6> Specifies which SMAP data product is being used. <7> Specifies the radius in which LDT searches to detect open water. Then removes all pixels within the radius in the CDF calculations. diff --git a/docs/public_testcase_walkthrough/step_6.adoc b/docs/public_testcase_walkthrough/step_6.adoc index a04e366c6..89c56f481 100644 --- a/docs/public_testcase_walkthrough/step_6.adoc +++ b/docs/public_testcase_walkthrough/step_6.adoc @@ -1,9 +1,9 @@ = Step 6: LSM Data Assimilation (DA) Experiment (LIS) :step-label: Step 6 -:download-filename: testcase6_lis_da_2020.tar.gz +:download-filename: testcase6_lis_da_2023.tar.gz :input-filesize-compressed: 80MB -:input-filesize-unpacked: 220MB +:input-filesize-unpacked: 327MB == Overview @@ -61,7 +61,7 @@ This step relies on files downloaded or generated in the previous steps. In addi Review the contents of `lis.config_noah36_smapda` to view the configuration settings used for the DA run: -.Restart options +.Restart options: [source,shell] ---- ... @@ -72,11 +72,11 @@ Number of ensembles per tile: 12 <2> Noah.3.6 restart file: ./DA_ensrst/LIS_EnRST_NOAH36_201801010000.d01.nc <3> ... ---- -<1> Select "restart" mode to use a restart file (compare with coldstart mode). +<1> Select "restart" mode to use a restart file (as opposed to "coldstart" mode). <2> # of ensemble members to use (matches ensemble restart file). <3> Filepath of the 12 member ensemble restart file generated in Step 3. -.Data assimilation options +.Data assimilation options: [source,shell] ---- ... @@ -96,7 +96,7 @@ Data assimilation output innovations: 1 ... ---- -.Scaling strategy options +.Scaling strategy options: [source,shell] ---- ... @@ -111,7 +111,7 @@ Bias estimation restart file: ... ---- -.Perturbation options +.Perturbation options: [source,shell] ---- ... @@ -139,7 +139,7 @@ Observation perturbation attributes file: ./DA_INPUT/smap_pertattribs.txt <2> State perturbation options <3> Observation perturbation options -.Observation data options +.Observation data options: [source,shell] ---- SMAP(NASA) soil moisture data designation: SPL3SMP @@ -283,6 +283,7 @@ View the output of the run using `GrADS`, `ncview`, Matlab, or other software. C // TODO: ADD VISUALIZATION OF OUTPUT +.`SoilMoist_tavg` variable in `LIS_HIST_201701010600.d01.nc` image::step_6_output_example.png[pdfwidth=50%,align="center"] == Wrap Up diff --git a/docs/public_testcase_walkthrough/step_7.adoc b/docs/public_testcase_walkthrough/step_7.adoc index 8d64cec7d..53d4fc0a9 100644 --- a/docs/public_testcase_walkthrough/step_7.adoc +++ b/docs/public_testcase_walkthrough/step_7.adoc @@ -1,9 +1,9 @@ = Step 7: Comparison of OL and DA Experiments (LVT) :step-label: Step 7 -:download-filename: testcase7_lvt_expcomp_2020.tar.gz -:input-filesize-compressed: 150KB -:input-filesize-unpacked: 700KB +:download-filename: testcase7_lvt_expcomp_2023.tar.gz +:input-filesize-compressed: 481KB +:input-filesize-unpacked: 7.2MB == Overview diff --git a/docs/working_with_github/working_with_github.adoc b/docs/working_with_github/working_with_github.adoc index 230c7fe5f..6597b2f1f 100644 --- a/docs/working_with_github/working_with_github.adoc +++ b/docs/working_with_github/working_with_github.adoc @@ -14,6 +14,7 @@ :lisf: LISF :lisf_git: LISF.git :lisf_test_git: lisf-test.git +:emdash: — == General notes @@ -942,12 +943,12 @@ Again, the specific command will depend on which private repository you need to Now you have a repository (for the restricted-access component) within a repository (for LISF). To carry out your work for the restricted-access component, follow the instructions in <> and/or <>. -Yes, you may two sets of commits and two sets of pull requests for your work. +Yes, you may have two sets of commits and two sets of pull requests for your work. [WARNING] ==== -In general, do not run `git add --all`; this always ends up adding files to your commit that do not belong. And, in particular, do not run `git add --all` when working with private/restricted repositories. If you accidentally do, then you will see the following warning. Follow the hint for running `git rm`. +In general, do not run `git add --all`; this always ends up adding files to your commit that do not belong. (See Section <>.) And, in particular, do not run `git add --all` when working with private/restricted repositories. If you accidentally do, then you will see the following warning. Follow the hint for running `git rm`. .Accidental `git add --all` .... @@ -972,6 +973,19 @@ add 'RESTRICTED/restricted-ua-lsm/' ==== +== Explicitly add files + +Do not run commands like `git add .` or `git add --all`. These commands will add files to your commit that do not belong. For example, you may end up adding restricted code, backup files, temporary build scripts, and executables {emdash} files that do not belong in the repository. + +Add files to a commit explicitly. For example, you added a new output variable to NoahMP 4.0.1: + +.... +% git add core/LIS_histDataMod.F90 surfacemodels/land/noahmp.4.0.1/NoahMP401_main.F90 +.... + +See `git help add` for more information about adding files to a commit. + + == Useful commands .... diff --git a/env/discover/sles12/lisf_7.5_gnu_11.2.0_impi_2021.4.0 b/env/discover/sles12/lisf_7.5_gnu_11.2.0_impi_2021.4.0 new file mode 100644 index 000000000..56a3efae1 --- /dev/null +++ b/env/discover/sles12/lisf_7.5_gnu_11.2.0_impi_2021.4.0 @@ -0,0 +1,171 @@ +#%Module1.0################################################################### + +proc ModulesHelp { } { + puts stderr "\t[module-info name] - loads the LISF_7_5_GNU_11_2_0_IMPI_2021_4_0 env" + puts stderr "" + puts stderr "This is for use on NCCS' discover system running SLES 12.3." + puts stderr "" + puts stderr "\tThe following env variables are set:" + puts stderr "\t\tDEV_ENV" + puts stderr "\t\tLIS_ARCH" + puts stderr "\t\tLIS_SPMD" + puts stderr "\t\tLIS_FC" + puts stderr "\t\tLIS_CC" + puts stderr "\t\tLIS_JPEG" + puts stderr "\t\tLIS_OPENJPEG" + puts stderr "\t\tLIS_ECCODES" + puts stderr "\t\tLIS_NETCDF" + puts stderr "\t\tLIS_HDF4" + puts stderr "\t\tLIS_HDFEOS" + puts stderr "\t\tLIS_HDF5" + puts stderr "\t\tLIS_MODESMF" + puts stderr "\t\tLIS_LIBESMF" + puts stderr "\t\tLIS_MINPACK" + puts stderr "\t\tLIS_CRTM" + puts stderr "\t\tLIS_CRTM_PROF" + puts stderr "\t\tLIS_CMEM" + puts stderr "\t\tLIS_LAPACK" + puts stderr "\t\tLIS_PETSC" + puts stderr "\t\tLDT_ARCH" + puts stderr "\t\tLDT_FC" + puts stderr "\t\tLDT_CC" + puts stderr "\t\tLDT_JPEG" + puts stderr "\t\tLDT_OPENJPEG" + puts stderr "\t\tLDT_ECCODES" + puts stderr "\t\tLDT_NETCDF" + puts stderr "\t\tLDT_HDF4" + puts stderr "\t\tLDT_HDFEOS" + puts stderr "\t\tLDT_HDF5" + puts stderr "\t\tLDT_MODESMF" + puts stderr "\t\tLDT_LIBESMF" + puts stderr "\t\tLDT_GDAL" + puts stderr "\t\tLDT_FORTRANGIS" + puts stderr "\t\tLDT_LIBGEOTIFF" + puts stderr "\t\tLVT_ARCH" + puts stderr "\t\tLVT_FC" + puts stderr "\t\tLVT_CC" + puts stderr "\t\tLVT_JPEG" + puts stderr "\t\tLVT_OPENJPEG" + puts stderr "\t\tLVT_ECCODES" + puts stderr "\t\tLVT_NETCDF" + puts stderr "\t\tLVT_HDF4" + puts stderr "\t\tLVT_HDFEOS" + puts stderr "\t\tLVT_HDF5" + puts stderr "\t\tLVT_MODESMF" + puts stderr "\t\tLVT_LIBESMF" + puts stderr "\t\tLVT_GDAL" + puts stderr "\t\tLVT_FORTRANGIS" + puts stderr "" + puts stderr "\tThe following modules are loaded:" + puts stderr "\t\tcomp/gcc/11.2.0" + puts stderr "\t\tmpi/impi/2021.4.0" + puts stderr "\t\ttview/2019.0.4" + puts stderr "\t\tgit/2.40.1" + puts stderr "" +} + + +conflict comp mpi + + +module-whatis "loads the [module-info name] environment" + + +set modname [module-info name] +set modmode [module-info mode] + + +module load comp/gcc/11.2.0 +module load mpi/impi/2021.4.0 + +module load tview/2019.0.4 +module load git/2.40.1 + + +set def_lis_jpeg /discover/nobackup/projects/lis/libs/sles-12.3/jpeg/8d +set def_lis_hdf5 /discover/nobackup/projects/lis/libs/sles-12.3/hdf5/1.12.1_gnu-11.2.0 +set def_lis_netcdf /discover/nobackup/projects/lis/libs/sles-12.3/netcdf/4.8.1_gnu-11.2.0 +set def_lis_openjpeg /discover/nobackup/projects/lis/libs/sles-12.3/openjpeg/2.4.0_gnu-11.2.0 +set def_lis_eccodes /discover/nobackup/projects/lis/libs/sles-12.3/ecCodes/2.23.0_gnu-11.2.0 +set def_lis_hdf4 /discover/nobackup/projects/lis/libs/sles-12.3/hdf4/4.2.15_gnu-11.2.0 +set def_lis_hdfeos /discover/nobackup/projects/lis/libs/sles-12.3/hdfeos2/3.0_gnu-11.2.0 +set def_lis_modesmf /discover/nobackup/projects/lis/libs/sles-12.3/esmf/8.1.1_gnu-11.2.0_impi-2021.4.0/mod/modO/Linux.gfortran.64.intelmpi.default +set def_lis_libesmf /discover/nobackup/projects/lis/libs/sles-12.3/esmf/8.1.1_gnu-11.2.0_impi-2021.4.0/lib/libO/Linux.gfortran.64.intelmpi.default +#set def_lis_minpack /discover/nobackup/projects/lis/libs/minpack/intel_11_1_038 +#set def_lis_crtm /discover/nobackup/projects/lis/libs/JCSDA_CRTM/REL-2.0.2.Surface-rev_intel_18_0_3_222 +#set def_lis_crtm_prof /discover/nobackup/projects/lis/libs/CRTM_Profile_Utility/intel_18_0_3_222 +#set def_lis_cmem /discover/nobackup/projects/lis/libs/LIS-MEM/intel_18_0_3_222 +set def_lis_lapack /discover/nobackup/projects/lis/libs/sles-12.3/blaslapack/3.11.0_gnu-11.2.0/lib +set def_lvt_proj /discover/nobackup/projects/lis/libs/sles-12.3/proj/9.1.0_gnu-11.2.0 +set def_lvt_gdal /discover/nobackup/projects/lis/libs/sles-12.3/gdal/3.5.2_gnu-11.2.0 +set def_lvt_fortrangis /discover/nobackup/projects/lis/libs/sles-12.3/fortrangis/2.6_gdal-3.5.2_gnu-11.2.0 +set def_ldt_libgeotiff /discover/nobackup/projects/lis/libs/sles-12.3/geotiff/1.7.0_proj-9.1.0_gnu-11.2.0 +set def_lis_petsc /discover/nobackup/projects/lis/libs/sles-12.3/petsc/3.16.1_gnu-11.2.0 + +setenv DEV_ENV LISF_7_5_GNU_11_2_0_IMPI_2021_4_0 +setenv LIS_ARCH linux_gfortran +setenv LIS_SPMD parallel +setenv LIS_FC mpif90 +setenv LIS_CC mpicc +setenv LIS_JPEG $def_lis_jpeg +setenv LIS_OPENJPEG $def_lis_openjpeg +setenv LIS_ECCODES $def_lis_eccodes +setenv LIS_NETCDF $def_lis_netcdf +setenv LIS_HDF4 $def_lis_hdf4 +setenv LIS_HDFEOS $def_lis_hdfeos +setenv LIS_HDF5 $def_lis_hdf5 +setenv LIS_MODESMF $def_lis_modesmf +setenv LIS_LIBESMF $def_lis_libesmf +#setenv LIS_MINPACK $def_lis_minpack +#setenv LIS_CRTM $def_lis_crtm +#setenv LIS_CRTM_PROF $def_lis_crtm_prof +#setenv LIS_CMEM $def_lis_cmem +setenv LIS_LAPACK $def_lis_lapack +setenv LIS_PETSC $def_lis_petsc + + +setenv LDT_ARCH linux_gfortran +setenv LDT_FC mpif90 +setenv LDT_CC mpicc +setenv LDT_JPEG $def_lis_jpeg +setenv LDT_OPENJPEG $def_lis_openjpeg +setenv LDT_ECCODES $def_lis_eccodes +setenv LDT_NETCDF $def_lis_netcdf +setenv LDT_HDF4 $def_lis_hdf4 +setenv LDT_HDFEOS $def_lis_hdfeos +setenv LDT_HDF5 $def_lis_hdf5 +setenv LDT_MODESMF $def_lis_modesmf +setenv LDT_LIBESMF $def_lis_libesmf +setenv LDT_GDAL $def_lvt_gdal +setenv LDT_FORTRANGIS $def_lvt_fortrangis +setenv LDT_LIBGEOTIFF $def_ldt_libgeotiff + + +setenv LVT_ARCH linux_gfortran +setenv LVT_FC mpif90 +setenv LVT_CC mpicc +setenv LVT_JPEG $def_lis_jpeg +setenv LVT_OPENJPEG $def_lis_openjpeg +setenv LVT_ECCODES $def_lis_eccodes +setenv LVT_NETCDF $def_lis_netcdf +setenv LVT_HDF4 $def_lis_hdf4 +setenv LVT_HDFEOS $def_lis_hdfeos +setenv LVT_HDF5 $def_lis_hdf5 +setenv LVT_MODESMF $def_lis_modesmf +setenv LVT_LIBESMF $def_lis_libesmf +setenv LVT_GDAL $def_lvt_gdal +setenv LVT_FORTRANGIS $def_lvt_fortrangis + + +prepend-path LD_LIBRARY_PATH "$def_lis_jpeg/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_openjpeg/lib" +prepend-path LD_LIBRARY_PATH "$def_ldt_libgeotiff/lib" +prepend-path LD_LIBRARY_PATH "$def_lvt_proj/lib" +prepend-path LD_LIBRARY_PATH "$def_lvt_gdal/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_hdf4/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_hdf5/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_libesmf" +prepend-path LD_LIBRARY_PATH "$def_lis_netcdf/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_eccodes/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_petsc/lib" +prepend-path PATH "$def_lis_netcdf/bin:$def_lis_eccodes/bin" diff --git a/env/discover/lisf_7.5_intel_2021.4.0 b/env/discover/sles12/lisf_7.5_intel_2021.4.0 similarity index 100% rename from env/discover/lisf_7.5_intel_2021.4.0 rename to env/discover/sles12/lisf_7.5_intel_2021.4.0 diff --git a/env/discover/lisf_7.5_intel_2021.4.0_s2s b/env/discover/sles12/lisf_7.5_intel_2021.4.0_s2s similarity index 100% rename from env/discover/lisf_7.5_intel_2021.4.0_s2s rename to env/discover/sles12/lisf_7.5_intel_2021.4.0_s2s diff --git a/env/discover/lisf_7_gnu_11.2.0_impi_2021.4.0 b/env/discover/sles12/lisf_7_gnu_11.2.0_impi_2021.4.0 similarity index 100% rename from env/discover/lisf_7_gnu_11.2.0_impi_2021.4.0 rename to env/discover/sles12/lisf_7_gnu_11.2.0_impi_2021.4.0 diff --git a/env/discover/lisf_7_gnu_9.3.0_gmao_openmpi_4.0.4 b/env/discover/sles12/lisf_7_gnu_9.3.0_gmao_openmpi_4.0.4 similarity index 100% rename from env/discover/lisf_7_gnu_9.3.0_gmao_openmpi_4.0.4 rename to env/discover/sles12/lisf_7_gnu_9.3.0_gmao_openmpi_4.0.4 diff --git a/env/discover/lisf_7_intel_18_0_3_222 b/env/discover/sles12/lisf_7_intel_18_0_3_222 similarity index 100% rename from env/discover/lisf_7_intel_18_0_3_222 rename to env/discover/sles12/lisf_7_intel_18_0_3_222 diff --git a/env/discover/lisf_7_intel_19_1_0_166 b/env/discover/sles12/lisf_7_intel_19_1_0_166 similarity index 100% rename from env/discover/lisf_7_intel_19_1_0_166 rename to env/discover/sles12/lisf_7_intel_19_1_0_166 diff --git a/env/discover/lisf_7_intel_19_1_0_166_traceback-work-around b/env/discover/sles12/lisf_7_intel_19_1_0_166_traceback-work-around similarity index 100% rename from env/discover/lisf_7_intel_19_1_0_166_traceback-work-around rename to env/discover/sles12/lisf_7_intel_19_1_0_166_traceback-work-around diff --git a/env/discover/lisf_7_intel_19_1_3_304 b/env/discover/sles12/lisf_7_intel_19_1_3_304 similarity index 100% rename from env/discover/lisf_7_intel_19_1_3_304 rename to env/discover/sles12/lisf_7_intel_19_1_3_304 diff --git a/env/discover/lisf_7_intel_2021.4.0 b/env/discover/sles12/lisf_7_intel_2021.4.0 similarity index 100% rename from env/discover/lisf_7_intel_2021.4.0 rename to env/discover/sles12/lisf_7_intel_2021.4.0 diff --git a/env/discover/lisf_7_intel_2021.4.0_petsc b/env/discover/sles12/lisf_7_intel_2021.4.0_petsc similarity index 100% rename from env/discover/lisf_7_intel_2021.4.0_petsc rename to env/discover/sles12/lisf_7_intel_2021.4.0_petsc diff --git a/env/discover/lisf_7_intel_2021.4.0_s2s b/env/discover/sles12/lisf_7_intel_2021.4.0_s2s similarity index 100% rename from env/discover/lisf_7_intel_2021.4.0_s2s rename to env/discover/sles12/lisf_7_intel_2021.4.0_s2s diff --git a/env/discover/sles15/lisf_7.5_intel_2023.2.1 b/env/discover/sles15/lisf_7.5_intel_2023.2.1 new file mode 100644 index 000000000..9a7999312 --- /dev/null +++ b/env/discover/sles15/lisf_7.5_intel_2023.2.1 @@ -0,0 +1,163 @@ +#%Module1.0################################################################### + +proc ModulesHelp { } { + puts stderr "\t[module-info name] - loads the LISF_7_5_INTEL_2023_2_1 env" + puts stderr "" + puts stderr "This is for use on NCCS' discover system running SLES 15.4." + puts stderr "" + puts stderr "\tThe following env variables are set:" + puts stderr "\t\tDEV_ENV" + puts stderr "\t\tLIS_ARCH" + puts stderr "\t\tLIS_SPMD" + puts stderr "\t\tLIS_FC" + puts stderr "\t\tLIS_CC" + puts stderr "\t\tLIS_RPC" + puts stderr "\t\tLIS_OPENJPEG" + puts stderr "\t\tLIS_ECCODES" + puts stderr "\t\tLIS_NETCDF" + puts stderr "\t\tLIS_HDF4" + puts stderr "\t\tLIS_HDFEOS" + puts stderr "\t\tLIS_HDF5" + puts stderr "\t\tLIS_MODESMF" + puts stderr "\t\tLIS_LIBESMF" + puts stderr "\t\tLIS_MINPACK" + puts stderr "\t\tLIS_CRTM" + puts stderr "\t\tLIS_CRTM_PROF" + puts stderr "\t\tLIS_CMEM" + puts stderr "\t\tLIS_LAPACK" + puts stderr "\t\tLIS_PETSC" + puts stderr "\t\tLDT_ARCH" + puts stderr "\t\tLDT_FC" + puts stderr "\t\tLDT_CC" + puts stderr "\t\tLDT_RPC" + puts stderr "\t\tLDT_OPENJPEG" + puts stderr "\t\tLDT_ECCODES" + puts stderr "\t\tLDT_NETCDF" + puts stderr "\t\tLDT_HDF4" + puts stderr "\t\tLDT_HDFEOS" + puts stderr "\t\tLDT_HDF5" + puts stderr "\t\tLDT_MODESMF" + puts stderr "\t\tLDT_LIBESMF" + puts stderr "\t\tLDT_GDAL" + puts stderr "\t\tLDT_FORTRANGIS" + puts stderr "\t\tLDT_LIBGEOTIFF" + puts stderr "\t\tLVT_ARCH" + puts stderr "\t\tLVT_FC" + puts stderr "\t\tLVT_CC" + puts stderr "\t\tLVT_RPC" + puts stderr "\t\tLVT_OPENJPEG" + puts stderr "\t\tLVT_ECCODES" + puts stderr "\t\tLVT_NETCDF" + puts stderr "\t\tLVT_HDF4" + puts stderr "\t\tLVT_HDFEOS" + puts stderr "\t\tLVT_HDF5" + puts stderr "\t\tLVT_MODESMF" + puts stderr "\t\tLVT_LIBESMF" + puts stderr "\t\tLVT_GDAL" + puts stderr "\t\tLVT_FORTRANGIS" + puts stderr "" + puts stderr "\tThe following modules are loaded:" + puts stderr "\t\tcomp/gcc/13.2.0" + puts stderr "\t\tcomp/intel/2023.2.1" + puts stderr "\t\tmpi/impi/2021.11" + puts stderr "\t\tgit/2.42.0" + puts stderr "" +} + +conflict comp mpi + +module-whatis "loads the [module-info name] environment" + +set modname [module-info name] +set modmode [module-info mode] + +module load comp/gcc/13.2.0 +module load comp/intel/2023.2.1 +module load mpi/impi/2021.11 +module load git/2.42.0 + +set def_lis_rpc /usr/lib64/libtirpc.so +set def_lis_hdf5 /discover/nobackup/projects/lis/libs/sles-15.4/hdf5/1.14.2_intel-2023.2.1 +set def_lis_netcdf /discover/nobackup/projects/lis/libs/sles-15.4/netcdf/4.9.2_intel-2023.2.1 +set def_lis_openjpeg /discover/nobackup/projects/lis/libs/sles-15.4/openjpeg/2.3.0-150000.3.13.1.x86_64/usr +set def_lis_eccodes /discover/nobackup/projects/lis/libs/sles-15.4/eccodes/2.32.0_intel-2023.2.1 +set def_lis_hdf4 /discover/nobackup/projects/lis/libs/sles-15.4/hdf4/4.2.16-2_intel-2023.2.1 +set def_lis_hdfeos /discover/nobackup/projects/lis/libs/sles-15.4/hdfeos2/3.0_intel-2023.2.1 +set def_lis_modesmf /discover/nobackup/projects/lis/libs/sles-15.4/esmf/8.5.0_intel-2023.2.1_impi-2021.11/mod/modO/Linux.intel.64.intelmpi.default +set def_lis_libesmf /discover/nobackup/projects/lis/libs/sles-15.4/esmf/8.5.0_intel-2023.2.1_impi-2021.11/lib/libO/Linux.intel.64.intelmpi.default +set def_lvt_proj /discover/nobackup/projects/lis/libs/sles-15.4/proj/9.3.0_intel-2023.2.1 +set def_ldt_libgeotiff /discover/nobackup/projects/lis/libs/sles-15.4/geotiff/1.7.1_intel-2023.2.1 +set def_lvt_gdal /discover/nobackup/projects/lis/libs/sles-15.4/gdal/3.7.2_intel-2023.2.1 +set def_lvt_fortrangis /discover/nobackup/projects/lis/libs/sles-15.4/fortrangis/3.0-1_intel-2023.2.1 +set def_lis_petsc /discover/nobackup/projects/lis/libs/sles-15.4/petsc/3.20.0_intel-2023.2.1_impi-2021.11 +set def_lis_minpack /discover/nobackup/projects/lis/libs/minpack/intel_11_1_038 +set def_lis_crtm /discover/nobackup/projects/lis/libs/JCSDA_CRTM/REL-2.0.2.Surface-rev_intel_18_0_3_222 +set def_lis_crtm_prof /discover/nobackup/projects/lis/libs/CRTM_Profile_Utility/intel_18_0_3_222 +set def_lis_cmem /discover/nobackup/projects/lis/libs/LIS-MEM/intel_18_0_3_222 +set def_lis_lapack /discover/nobackup/projects/lis/libs/lapack/3.6.0_intel_14_0_3_174 + +setenv DEV_ENV LISF_7_5_INTEL_2023_2_1 +setenv LIS_ARCH linux_ifc +setenv LIS_SPMD parallel +setenv LIS_FC mpiifort +setenv LIS_CC mpicc +setenv LIS_RPC $def_lis_rpc +setenv LIS_OPENJPEG $def_lis_openjpeg +setenv LIS_ECCODES $def_lis_eccodes +setenv LIS_NETCDF $def_lis_netcdf +setenv LIS_HDF4 $def_lis_hdf4 +setenv LIS_HDFEOS $def_lis_hdfeos +setenv LIS_HDF5 $def_lis_hdf5 +setenv LIS_MODESMF $def_lis_modesmf +setenv LIS_LIBESMF $def_lis_libesmf +setenv LIS_MINPACK $def_lis_minpack +setenv LIS_CRTM $def_lis_crtm +setenv LIS_CRTM_PROF $def_lis_crtm_prof +setenv LIS_CMEM $def_lis_cmem +setenv LIS_LAPACK $def_lis_lapack +setenv LIS_PETSC $def_lis_petsc + +setenv LDT_ARCH linux_ifc +setenv LDT_FC mpiifort +setenv LDT_CC mpicc +setenv LDT_RPC $def_lis_rpc +setenv LDT_OPENJPEG $def_lis_openjpeg +setenv LDT_ECCODES $def_lis_eccodes +setenv LDT_NETCDF $def_lis_netcdf +setenv LDT_HDF4 $def_lis_hdf4 +setenv LDT_HDFEOS $def_lis_hdfeos +setenv LDT_HDF5 $def_lis_hdf5 +setenv LDT_MODESMF $def_lis_modesmf +setenv LDT_LIBESMF $def_lis_libesmf +setenv LDT_GDAL $def_lvt_gdal +setenv LDT_FORTRANGIS $def_lvt_fortrangis +setenv LDT_LIBGEOTIFF $def_ldt_libgeotiff + + +setenv LVT_ARCH linux_ifc +setenv LVT_FC mpiifort +setenv LVT_CC mpicc +setenv LVT_RPC $def_lis_rpc +setenv LVT_OPENJPEG $def_lis_openjpeg +setenv LVT_ECCODES $def_lis_eccodes +setenv LVT_NETCDF $def_lis_netcdf +setenv LVT_HDF4 $def_lis_hdf4 +setenv LVT_HDFEOS $def_lis_hdfeos +setenv LVT_HDF5 $def_lis_hdf5 +setenv LVT_MODESMF $def_lis_modesmf +setenv LVT_LIBESMF $def_lis_libesmf +setenv LVT_GDAL $def_lvt_gdal +setenv LVT_FORTRANGIS $def_lvt_fortrangis + + +prepend-path LD_LIBRARY_PATH "$def_lis_openjpeg/lib" +prepend-path LD_LIBRARY_PATH "$def_ldt_libgeotiff/lib" +prepend-path LD_LIBRARY_PATH "$def_lvt_proj/lib" +prepend-path LD_LIBRARY_PATH "$def_lvt_gdal/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_hdf4/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_hdf5/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_libesmf" +prepend-path LD_LIBRARY_PATH "$def_lis_netcdf/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_eccodes/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_petsc/lib" +prepend-path PATH "$def_lis_netcdf/bin:$def_lis_eccodes/bin" diff --git a/env/discover/sles15/lisf_7.5_intel_2023.2.1_openmpi_5.0.0 b/env/discover/sles15/lisf_7.5_intel_2023.2.1_openmpi_5.0.0 new file mode 100644 index 000000000..495afba37 --- /dev/null +++ b/env/discover/sles15/lisf_7.5_intel_2023.2.1_openmpi_5.0.0 @@ -0,0 +1,164 @@ +#%Module1.0################################################################### + +proc ModulesHelp { } { + puts stderr "\t[module-info name] - loads the LISF_7_5_INTEL_2023_2_1_OPENMPI_5_0_0 env" + puts stderr "" + puts stderr "This is for use on NCCS' discover system running SLES 15.4." + puts stderr "" + puts stderr "\tThe following env variables are set:" + puts stderr "\t\tDEV_ENV" + puts stderr "\t\tLIS_ARCH" + puts stderr "\t\tLIS_SPMD" + puts stderr "\t\tLIS_FC" + puts stderr "\t\tLIS_CC" + puts stderr "\t\tLIS_RPC" + puts stderr "\t\tLIS_OPENJPEG" + puts stderr "\t\tLIS_ECCODES" + puts stderr "\t\tLIS_NETCDF" + puts stderr "\t\tLIS_HDF4" + puts stderr "\t\tLIS_HDFEOS" + puts stderr "\t\tLIS_HDF5" + puts stderr "\t\tLIS_MODESMF" + puts stderr "\t\tLIS_LIBESMF" + puts stderr "\t\tLIS_MINPACK" + puts stderr "\t\tLIS_CRTM" + puts stderr "\t\tLIS_CRTM_PROF" + puts stderr "\t\tLIS_CMEM" + puts stderr "\t\tLIS_LAPACK" + puts stderr "\t\tLIS_PETSC" + puts stderr "\t\tLDT_ARCH" + puts stderr "\t\tLDT_FC" + puts stderr "\t\tLDT_CC" + puts stderr "\t\tLDT_RPC" + puts stderr "\t\tLDT_OPENJPEG" + puts stderr "\t\tLDT_ECCODES" + puts stderr "\t\tLDT_NETCDF" + puts stderr "\t\tLDT_HDF4" + puts stderr "\t\tLDT_HDFEOS" + puts stderr "\t\tLDT_HDF5" + puts stderr "\t\tLDT_MODESMF" + puts stderr "\t\tLDT_LIBESMF" + puts stderr "\t\tLDT_GDAL" + puts stderr "\t\tLDT_FORTRANGIS" + puts stderr "\t\tLDT_LIBGEOTIFF" + puts stderr "\t\tLVT_ARCH" + puts stderr "\t\tLVT_FC" + puts stderr "\t\tLVT_CC" + puts stderr "\t\tLVT_RPC" + puts stderr "\t\tLVT_OPENJPEG" + puts stderr "\t\tLVT_ECCODES" + puts stderr "\t\tLVT_NETCDF" + puts stderr "\t\tLVT_HDF4" + puts stderr "\t\tLVT_HDFEOS" + puts stderr "\t\tLVT_HDF5" + puts stderr "\t\tLVT_MODESMF" + puts stderr "\t\tLVT_LIBESMF" + puts stderr "\t\tLVT_GDAL" + puts stderr "\t\tLVT_FORTRANGIS" + puts stderr "" + puts stderr "\tThe following modules are loaded:" + puts stderr "\t\tcomp/gcc/12.3.0" + puts stderr "\t\tcomp/intel/2023.2.1" + puts stderr "\t\tgit/2.42.0" + puts stderr "\t\tmpi/openmpi/5.0.0/intel-2023.2.1 (GMAO)" + puts stderr "" +} + +conflict comp mpi + +module-whatis "loads the [module-info name] environment" + +set modname [module-info name] +set modmode [module-info mode] + +module load comp/gcc/12.3.0 +module load comp/intel/2023.2.1 +module load git/2.42.0 +module use -a /discover/swdev/gmao_SIteam/modulefiles-SLES15 +module load mpi/openmpi/5.0.0/intel-2023.2.1 + +set def_lis_rpc /usr/lib64/libtirpc.so +set def_lis_hdf5 /discover/nobackup/projects/lis/libs/sles-15.4/hdf5/1.14.2_gnu-12.3.0_intel-2023.2.1 +set def_lis_netcdf /discover/nobackup/projects/lis/libs/sles-15.4/netcdf/4.9.2_gnu-12.3.0_intel-2023.2.1 +set def_lis_openjpeg /discover/nobackup/projects/lis/libs/sles-15.4/openjpeg/2.3.0-150000.3.13.1.x86_64/usr +set def_lis_eccodes /discover/nobackup/projects/lis/libs/sles-15.4/eccodes/2.32.0_gnu-12.3.0_intel-2023.2.1 +set def_lis_hdf4 /discover/nobackup/projects/lis/libs/sles-15.4/hdf4/4.2.16-2_gnu-12.3.0_intel-2023.2.1 +set def_lis_hdfeos /discover/nobackup/projects/lis/libs/sles-15.4/hdfeos2/3.0_gnu-12.3.0_intel-2023.2.1 +set def_lis_modesmf /discover/nobackup/projects/lis/libs/sles-15.4/esmf/8.5.0_gnu-12.3.0_intel-2023.2.1_openmpi-5.0.0/mod/modO/Linux.intel.64.openmpi.default +set def_lis_libesmf /discover/nobackup/projects/lis/libs/sles-15.4/esmf/8.5.0_gnu-12.3.0_intel-2023.2.1_openmpi-5.0.0/lib/libO/Linux.intel.64.openmpi.default +set def_lvt_proj /discover/nobackup/projects/lis/libs/sles-15.4/proj/9.3.0_gnu-12.3.0_intel-2023.2.1 +set def_ldt_libgeotiff /discover/nobackup/projects/lis/libs/sles-15.4/geotiff/1.7.1_gnu-12.3.0_intel-2023.2.1 +set def_lvt_gdal /discover/nobackup/projects/lis/libs/sles-15.4/gdal/3.7.2_gnu-12.3.0_intel-2023.2.1 +set def_lvt_fortrangis /discover/nobackup/projects/lis/libs/sles-15.4/fortrangis/3.0-1_gnu-12.3.0_intel-2023.2.1 +set def_lis_petsc /discover/nobackup/projects/lis/libs/sles-15.4/petsc/3.20.0_gnu-12.3.0_intel-2023.2.1_openmpi-5.0.0 +set def_lis_minpack /discover/nobackup/projects/lis/libs/minpack/intel_11_1_038 +set def_lis_crtm /discover/nobackup/projects/lis/libs/JCSDA_CRTM/REL-2.0.2.Surface-rev_intel_18_0_3_222 +set def_lis_crtm_prof /discover/nobackup/projects/lis/libs/CRTM_Profile_Utility/intel_18_0_3_222 +set def_lis_cmem /discover/nobackup/projects/lis/libs/LIS-MEM/intel_18_0_3_222 +set def_lis_lapack /discover/nobackup/projects/lis/libs/lapack/3.6.0_intel_14_0_3_174 + +setenv DEV_ENV LISF_7_5_INTEL_2023_2_1_OPENMPI_5_0_0 +setenv LIS_ARCH linux_ifc +setenv LIS_SPMD parallel +setenv LIS_FC mpif90 +setenv LIS_CC mpicc +setenv LIS_RPC $def_lis_rpc +setenv LIS_OPENJPEG $def_lis_openjpeg +setenv LIS_ECCODES $def_lis_eccodes +setenv LIS_NETCDF $def_lis_netcdf +setenv LIS_HDF4 $def_lis_hdf4 +setenv LIS_HDFEOS $def_lis_hdfeos +setenv LIS_HDF5 $def_lis_hdf5 +setenv LIS_MODESMF $def_lis_modesmf +setenv LIS_LIBESMF $def_lis_libesmf +setenv LIS_MINPACK $def_lis_minpack +setenv LIS_CRTM $def_lis_crtm +setenv LIS_CRTM_PROF $def_lis_crtm_prof +setenv LIS_CMEM $def_lis_cmem +setenv LIS_LAPACK $def_lis_lapack +setenv LIS_PETSC $def_lis_petsc + +setenv LDT_ARCH linux_ifc +setenv LDT_FC mpif90 +setenv LDT_CC mpicc +setenv LDT_RPC $def_lis_rpc +setenv LDT_OPENJPEG $def_lis_openjpeg +setenv LDT_ECCODES $def_lis_eccodes +setenv LDT_NETCDF $def_lis_netcdf +setenv LDT_HDF4 $def_lis_hdf4 +setenv LDT_HDFEOS $def_lis_hdfeos +setenv LDT_HDF5 $def_lis_hdf5 +setenv LDT_MODESMF $def_lis_modesmf +setenv LDT_LIBESMF $def_lis_libesmf +setenv LDT_GDAL $def_lvt_gdal +setenv LDT_FORTRANGIS $def_lvt_fortrangis +setenv LDT_LIBGEOTIFF $def_ldt_libgeotiff + + +setenv LVT_ARCH linux_ifc +setenv LVT_FC mpif90 +setenv LVT_CC mpicc +setenv LVT_RPC $def_lis_rpc +setenv LVT_OPENJPEG $def_lis_openjpeg +setenv LVT_ECCODES $def_lis_eccodes +setenv LVT_NETCDF $def_lis_netcdf +setenv LVT_HDF4 $def_lis_hdf4 +setenv LVT_HDFEOS $def_lis_hdfeos +setenv LVT_HDF5 $def_lis_hdf5 +setenv LVT_MODESMF $def_lis_modesmf +setenv LVT_LIBESMF $def_lis_libesmf +setenv LVT_GDAL $def_lvt_gdal +setenv LVT_FORTRANGIS $def_lvt_fortrangis + + +prepend-path LD_LIBRARY_PATH "$def_lis_openjpeg/lib" +prepend-path LD_LIBRARY_PATH "$def_ldt_libgeotiff/lib" +prepend-path LD_LIBRARY_PATH "$def_lvt_proj/lib" +prepend-path LD_LIBRARY_PATH "$def_lvt_gdal/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_hdf4/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_hdf5/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_libesmf" +prepend-path LD_LIBRARY_PATH "$def_lis_netcdf/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_eccodes/lib" +prepend-path LD_LIBRARY_PATH "$def_lis_petsc/lib" +prepend-path PATH "$def_lis_netcdf/bin:$def_lis_eccodes/bin" diff --git a/env/narwhal/lisf_7.5_prgenv_intel_8.3.3 b/env/narwhal/lisf_7.5_prgenv_intel_8.3.3 index a2a7cf09a..63d463f9f 100644 --- a/env/narwhal/lisf_7.5_prgenv_intel_8.3.3 +++ b/env/narwhal/lisf_7.5_prgenv_intel_8.3.3 @@ -121,8 +121,8 @@ set def_lis_hdf4 /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_202 set def_lis_hdfeos /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/hdfeos2/3.0_intel-2022.2.1 set def_ldt_libgeotiff /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/geotiff/1.7.1_intel-2022.2.1 set def_lvt_proj /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/proj/9.3.0_intel-2022.2.1 -set def_lvt_gdal /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/gdal/3.5.2_intel-2022.2.1 -set def_lvt_fortrangis /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/fortrangis/2.6_intel-2022.2.1 +set def_lvt_gdal /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/gdal/3.7.2_intel-2022.2.1 +set def_lvt_fortrangis /p/home/jim/local/lib/sles-15.4/prgenv-intel-8.3.3_2022.2.1/fortrangis/3.0-1_intel-2022.2.1 set def_lis_minpack "" set def_lis_crtm "" set def_lis_crtm_prof "" diff --git a/ldt/ANNdata/GCOMW_AMSR2_TB/GCOMWAMSR2TB_ANNdataMod.F90 b/ldt/ANNdata/GCOMW_AMSR2_TB/GCOMWAMSR2TB_ANNdataMod.F90 index 33bcc6cc5..2379c0f0f 100644 --- a/ldt/ANNdata/GCOMW_AMSR2_TB/GCOMWAMSR2TB_ANNdataMod.F90 +++ b/ldt/ANNdata/GCOMW_AMSR2_TB/GCOMWAMSR2TB_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/GCOMW_AMSR2_TB/readGCOMWAMSR2TbANNdata.F90 b/ldt/ANNdata/GCOMW_AMSR2_TB/readGCOMWAMSR2TbANNdata.F90 index 0da8d96c1..13a756126 100644 --- a/ldt/ANNdata/GCOMW_AMSR2_TB/readGCOMWAMSR2TbANNdata.F90 +++ b/ldt/ANNdata/GCOMW_AMSR2_TB/readGCOMWAMSR2TbANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/GHCNsnwd/GHCN_ANNdataMod.F90 b/ldt/ANNdata/GHCNsnwd/GHCN_ANNdataMod.F90 index 35373b18c..c51b5d418 100644 --- a/ldt/ANNdata/GHCNsnwd/GHCN_ANNdataMod.F90 +++ b/ldt/ANNdata/GHCNsnwd/GHCN_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/GHCNsnwd/readGHCNANNdata.F90 b/ldt/ANNdata/GHCNsnwd/readGHCNANNdata.F90 index 5b7986f3a..38e89220f 100644 --- a/ldt/ANNdata/GHCNsnwd/readGHCNANNdata.F90 +++ b/ldt/ANNdata/GHCNsnwd/readGHCNANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/LISlsmSM/LISlsmSM_ANNdataMod.F90 b/ldt/ANNdata/LISlsmSM/LISlsmSM_ANNdataMod.F90 index e5c5b1205..3c2f9a113 100644 --- a/ldt/ANNdata/LISlsmSM/LISlsmSM_ANNdataMod.F90 +++ b/ldt/ANNdata/LISlsmSM/LISlsmSM_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/LISlsmSM/readLISlsmSMANNdata.F90 b/ldt/ANNdata/LISlsmSM/readLISlsmSMANNdata.F90 index ae35c7c65..bc9b1f3ea 100644 --- a/ldt/ANNdata/LISlsmSM/readLISlsmSMANNdata.F90 +++ b/ldt/ANNdata/LISlsmSM/readLISlsmSMANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/LPRM_AMSREsm/LPRM_AMSREsm_ANNdataMod.F90 b/ldt/ANNdata/LPRM_AMSREsm/LPRM_AMSREsm_ANNdataMod.F90 index a0b967a2e..907f46570 100644 --- a/ldt/ANNdata/LPRM_AMSREsm/LPRM_AMSREsm_ANNdataMod.F90 +++ b/ldt/ANNdata/LPRM_AMSREsm/LPRM_AMSREsm_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/LPRM_AMSREsm/readLPRM_AMSRE_ANNdata.F90 b/ldt/ANNdata/LPRM_AMSREsm/readLPRM_AMSRE_ANNdata.F90 index ab46126ea..21f137cb6 100644 --- a/ldt/ANNdata/LPRM_AMSREsm/readLPRM_AMSRE_ANNdata.F90 +++ b/ldt/ANNdata/LPRM_AMSREsm/readLPRM_AMSRE_ANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/MOD10A1/MOD10A1_ANNdataMod.F90 b/ldt/ANNdata/MOD10A1/MOD10A1_ANNdataMod.F90 index dc84c639b..d8220701f 100644 --- a/ldt/ANNdata/MOD10A1/MOD10A1_ANNdataMod.F90 +++ b/ldt/ANNdata/MOD10A1/MOD10A1_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/MOD10A1/readMOD10A1ANNdata.F90 b/ldt/ANNdata/MOD10A1/readMOD10A1ANNdata.F90 index 8b1d2d07d..dd29ccd77 100644 --- a/ldt/ANNdata/MOD10A1/readMOD10A1ANNdata.F90 +++ b/ldt/ANNdata/MOD10A1/readMOD10A1ANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/MODIS_LST/MODISlst_ANNdataMod.F90 b/ldt/ANNdata/MODIS_LST/MODISlst_ANNdataMod.F90 index 0469a5372..03a166c95 100644 --- a/ldt/ANNdata/MODIS_LST/MODISlst_ANNdataMod.F90 +++ b/ldt/ANNdata/MODIS_LST/MODISlst_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/MODIS_LST/readMODISlstANNdata.F90 b/ldt/ANNdata/MODIS_LST/readMODISlstANNdata.F90 index 6034d2098..bebaec9fb 100644 --- a/ldt/ANNdata/MODIS_LST/readMODISlstANNdata.F90 +++ b/ldt/ANNdata/MODIS_LST/readMODISlstANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/synthetic_sm/readsyntheticsmANNdata.F90 b/ldt/ANNdata/synthetic_sm/readsyntheticsmANNdata.F90 index 439e15a98..2d124c060 100644 --- a/ldt/ANNdata/synthetic_sm/readsyntheticsmANNdata.F90 +++ b/ldt/ANNdata/synthetic_sm/readsyntheticsmANNdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/ANNdata/synthetic_sm/syntheticsm_ANNdataMod.F90 b/ldt/ANNdata/synthetic_sm/syntheticsm_ANNdataMod.F90 index 41cc13b2a..7534f3af8 100644 --- a/ldt/ANNdata/synthetic_sm/syntheticsm_ANNdataMod.F90 +++ b/ldt/ANNdata/synthetic_sm/syntheticsm_ANNdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/ANSA_SNWD/ANSASNWDsnow_obsMod.F90 b/ldt/DAobs/ANSA_SNWD/ANSASNWDsnow_obsMod.F90 index fa69e776d..ed003993f 100644 --- a/ldt/DAobs/ANSA_SNWD/ANSASNWDsnow_obsMod.F90 +++ b/ldt/DAobs/ANSA_SNWD/ANSASNWDsnow_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/ANSA_SNWD/readANSASNWDsnowObs.F90 b/ldt/DAobs/ANSA_SNWD/readANSASNWDsnowObs.F90 index 582596eff..4f61765df 100644 --- a/ldt/DAobs/ANSA_SNWD/readANSASNWDsnowObs.F90 +++ b/ldt/DAobs/ANSA_SNWD/readANSASNWDsnowObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/ASCAT_TUW/ASCATTUWsm_obsMod.F90 b/ldt/DAobs/ASCAT_TUW/ASCATTUWsm_obsMod.F90 index d08522e69..df4995100 100644 --- a/ldt/DAobs/ASCAT_TUW/ASCATTUWsm_obsMod.F90 +++ b/ldt/DAobs/ASCAT_TUW/ASCATTUWsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/ASCAT_TUW/readASCATTUWsmObs.F90 b/ldt/DAobs/ASCAT_TUW/readASCATTUWsmObs.F90 index 53ae7ba48..445d401e1 100644 --- a/ldt/DAobs/ASCAT_TUW/readASCATTUWsmObs.F90 +++ b/ldt/DAobs/ASCAT_TUW/readASCATTUWsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/Aquarius_L2sm/AquariusL2sm_obsMod.F90 b/ldt/DAobs/Aquarius_L2sm/AquariusL2sm_obsMod.F90 index dcc724a95..2bd9dd181 100644 --- a/ldt/DAobs/Aquarius_L2sm/AquariusL2sm_obsMod.F90 +++ b/ldt/DAobs/Aquarius_L2sm/AquariusL2sm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/Aquarius_L2sm/readAquariusL2smObs.F90 b/ldt/DAobs/Aquarius_L2sm/readAquariusL2smObs.F90 index cade86622..f749b44bd 100644 --- a/ldt/DAobs/Aquarius_L2sm/readAquariusL2smObs.F90 +++ b/ldt/DAobs/Aquarius_L2sm/readAquariusL2smObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/CDFS_GVF/CDFS_GVF_obsMod.F90 b/ldt/DAobs/CDFS_GVF/CDFS_GVF_obsMod.F90 index 6050948b7..a99cef84a 100644 --- a/ldt/DAobs/CDFS_GVF/CDFS_GVF_obsMod.F90 +++ b/ldt/DAobs/CDFS_GVF/CDFS_GVF_obsMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/CDFS_GVF/readCDFS_GVFObs.F90 b/ldt/DAobs/CDFS_GVF/readCDFS_GVFObs.F90 index 013c3a0f4..0c56f8720 100644 --- a/ldt/DAobs/CDFS_GVF/readCDFS_GVFObs.F90 +++ b/ldt/DAobs/CDFS_GVF/readCDFS_GVFObs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/ESACCI_sm/ESACCIsm_obsMod.F90 b/ldt/DAobs/ESACCI_sm/ESACCIsm_obsMod.F90 index da1cd462a..54e729daa 100644 --- a/ldt/DAobs/ESACCI_sm/ESACCIsm_obsMod.F90 +++ b/ldt/DAobs/ESACCI_sm/ESACCIsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/ESACCI_sm/readESACCIsmObs.F90 b/ldt/DAobs/ESACCI_sm/readESACCIsmObs.F90 index 5d9ad5176..d8fe70188 100644 --- a/ldt/DAobs/ESACCI_sm/readESACCIsmObs.F90 +++ b/ldt/DAobs/ESACCI_sm/readESACCIsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 b/ldt/DAobs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 index a90c62a13..f21034e01 100644 --- a/ldt/DAobs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 +++ b/ldt/DAobs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 b/ldt/DAobs/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 index d04a649d4..c43f6232a 100644 --- a/ldt/DAobs/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 +++ b/ldt/DAobs/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 b/ldt/DAobs/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 index f5eb4cb25..f4c2b9909 100644 --- a/ldt/DAobs/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 +++ b/ldt/DAobs/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 b/ldt/DAobs/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 index 8587e5407..a103a7357 100644 --- a/ldt/DAobs/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 +++ b/ldt/DAobs/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GEOS_FP_TEFFobs/GEOSTEFF_obsMod.F90 b/ldt/DAobs/GEOS_FP_TEFFobs/GEOSTEFF_obsMod.F90 index c04f20d29..0d58f2891 100644 --- a/ldt/DAobs/GEOS_FP_TEFFobs/GEOSTEFF_obsMod.F90 +++ b/ldt/DAobs/GEOS_FP_TEFFobs/GEOSTEFF_obsMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GEOS_FP_TEFFobs/readGEOSTEFFObs.F90 b/ldt/DAobs/GEOS_FP_TEFFobs/readGEOSTEFFObs.F90 index 4b6519a81..e7a91f891 100644 --- a/ldt/DAobs/GEOS_FP_TEFFobs/readGEOSTEFFObs.F90 +++ b/ldt/DAobs/GEOS_FP_TEFFobs/readGEOSTEFFObs.F90 @@ -3,10 +3,10 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. -!-------------------------END NOTICE -- DO NOT EDIT---------------------- +!-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" !BOP ! diff --git a/ldt/DAobs/GLASSlai/GLASSlai_obsMod.F90 b/ldt/DAobs/GLASSlai/GLASSlai_obsMod.F90 index 957f7539d..37a91275d 100644 --- a/ldt/DAobs/GLASSlai/GLASSlai_obsMod.F90 +++ b/ldt/DAobs/GLASSlai/GLASSlai_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GLASSlai/readGLASSlaiObs.F90 b/ldt/DAobs/GLASSlai/readGLASSlaiObs.F90 index ad24763d8..bbee904a4 100644 --- a/ldt/DAobs/GLASSlai/readGLASSlaiObs.F90 +++ b/ldt/DAobs/GLASSlai/readGLASSlaiObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GRACEQL_tws/GRACEQLtws_obsMod.F90 b/ldt/DAobs/GRACEQL_tws/GRACEQLtws_obsMod.F90 index 97fcd4692..ecc4c2929 100755 --- a/ldt/DAobs/GRACEQL_tws/GRACEQLtws_obsMod.F90 +++ b/ldt/DAobs/GRACEQL_tws/GRACEQLtws_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GRACEQL_tws/readGRACEQLtwsObs.F90 b/ldt/DAobs/GRACEQL_tws/readGRACEQLtwsObs.F90 index db340569e..b373fac92 100755 --- a/ldt/DAobs/GRACEQL_tws/readGRACEQLtwsObs.F90 +++ b/ldt/DAobs/GRACEQL_tws/readGRACEQLtwsObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GRACE_tws/GRACEtws_obsMod.F90 b/ldt/DAobs/GRACE_tws/GRACEtws_obsMod.F90 index bc1c6c85d..4906a21ef 100644 --- a/ldt/DAobs/GRACE_tws/GRACEtws_obsMod.F90 +++ b/ldt/DAobs/GRACE_tws/GRACEtws_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/GRACE_tws/readGRACEtwsObs.F90 b/ldt/DAobs/GRACE_tws/readGRACEtwsObs.F90 index 240f60972..16acf7321 100644 --- a/ldt/DAobs/GRACE_tws/readGRACEtwsObs.F90 +++ b/ldt/DAobs/GRACE_tws/readGRACEtwsObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/LISlsmPrecipobs/LISlsmPrecip_obsMod.F90 b/ldt/DAobs/LISlsmPrecipobs/LISlsmPrecip_obsMod.F90 new file mode 100644 index 000000000..e4cd01de1 --- /dev/null +++ b/ldt/DAobs/LISlsmPrecipobs/LISlsmPrecip_obsMod.F90 @@ -0,0 +1,340 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +module LISlsmPrecip_obsMod +!BOP +! +! !MODULE: LISlsmPrecip_obsMod +! +! !DESCRIPTION: +! This module handles the use of a LIS model simulation +! output as "observations" for data assimilation. This +! plugin is typically used to handle the computations of +! scaling factors such as cumulative distribution function +! (CDF) for use in DA +! +! !REVISION HISTORY: +! 16 Nov 2021 Mahdi Navari Initial Specification (based on LISlsmSM_obsMod) +! + + PRIVATE +!----------------------------------------------------------------------------- +! !PUBLIC MEMBER FUNCTIONS: +!----------------------------------------------------------------------------- + PUBLIC :: LISlsmPrecip_obsInit +!----------------------------------------------------------------------------- +! !PUBLIC TYPES: +!----------------------------------------------------------------------------- + PUBLIC :: lsmprecipobs +! +!EOP + + type, public :: lsmprecipobsdec + integer :: nvars + integer :: nest + integer :: nc,nr + real :: datares + real :: run_dd(8) + character*50 :: map_proj + character*50 :: format + character*50 :: wstyle + character*50 :: wopt + character*100 :: odir + character*20 :: security_class + character*20 :: distribution_class + character*20 :: data_category + character*20 :: area_of_data + character*20 :: write_interval +!-------------------------------------------------------- +! interpolation/upscaling weights +!-------------------------------------------------------- + integer, allocatable :: n11(:) + integer, allocatable :: n12(:) + integer, allocatable :: n21(:) + integer, allocatable :: n22(:) + real, allocatable :: w11(:) + real, allocatable :: w12(:) + real, allocatable :: w21(:) + real, allocatable :: w22(:) + + end type lsmprecipobsdec + + type(lsmprecipobsdec) :: lsmprecipobs + +contains + +!BOP +! !ROUTINE: LISlsmPrecip_obsInit +! \label{LISlsmPrecip_obsInit} +! +! !INTERFACE: + subroutine LISlsmPrecip_obsInit() +! !USES: + use ESMF + use LDT_coreMod + use LDT_DAobsDataMod + use LDT_logMod + + implicit none +! +! !DESCRIPTION: +! This routine initializes the structures required for the handling of a +! land surface model output (from a LIS simulation) as observations. +! +!EOP + integer :: n + integer :: rc + real :: gridDesci(20) + + n = 1 + + lsmprecipobs%run_dd = LDT_rc%udef + + lsmprecipobs%security_class = '' + lsmprecipobs%distribution_class = '' + lsmprecipobs%data_category = '' + lsmprecipobs%area_of_data = '' + lsmprecipobs%write_interval = '' + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%format, & + label="LIS precipitation output format:",rc=rc) + call LDT_verify(rc,'LIS precipitation output format: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%wopt, & + label="LIS precipitation output methodology:",rc=rc) + call LDT_verify(rc,'LIS precipitation output methodology: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%wstyle, & + label="LIS precipitation output naming style:",rc=rc) + call LDT_verify(rc,'LIS precipitation output naming style: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%map_proj, & + label="LIS precipitation output map projection:",rc=rc) + call LDT_verify(rc,'LIS precipitation output map projection: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%nest, & + label="LIS precipitation output nest index:",rc=rc) + call LDT_verify(rc,'LIS precipitation output nest index: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%odir, & + label="LIS precipitation output directory:",rc=rc) + call LDT_verify(rc,'LIS precipitation output directory: not defined') + + ! WMO-convention specific identifiers + if ( lsmprecipobs%wstyle == "WMO convention") then + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%security_class, & + label="LIS precipitation security class:",rc=rc) + call LDT_verify(rc,'LIS precipitation security class: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%distribution_class, & + label="LIS precipitation distribution class:",rc=rc) + call LDT_verify(rc,'LIS precipitation distribution class: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%data_category, & + label="LIS precipitation data category:",rc=rc) + call LDT_verify(rc,'LIS precipitation data category: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%area_of_data, & + label="LIS precipitation area of data:",rc=rc) + call LDT_verify(rc,'LIS precipitation area of data: not defined') + + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%write_interval, & + label="LIS precipitation write interval:",rc=rc) + call LDT_verify(rc,'LIS precipitation write interval: not defined') + endif + + if(lsmprecipobs%map_proj.eq."latlon") then + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain lower left lat:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(1),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain lower left lon:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(2),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain upper right lat:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(3),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain upper right lon:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(4),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain resolution (dx):",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(5),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain resolution (dy):",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(6),rc=rc) + + lsmprecipobs%datares = min(lsmprecipobs%run_dd(5),lsmprecipobs%run_dd(6)) + + lsmprecipobs%nc = (nint((lsmprecipobs%run_dd(4)-lsmprecipobs%run_dd(2))/& + lsmprecipobs%run_dd(5))) + 1 + lsmprecipobs%nr = (nint((lsmprecipobs%run_dd(3)-lsmprecipobs%run_dd(1))/& + lsmprecipobs%run_dd(6))) + 1 + + gridDesci = 0 + gridDesci(1) = 0 + gridDesci(2) = lsmprecipobs%nc + gridDesci(3) = lsmprecipobs%nr + gridDesci(4) = lsmprecipobs%run_dd(1) + gridDesci(5) = lsmprecipobs%run_dd(2) + gridDesci(6) = 128 + gridDesci(7) = lsmprecipobs%run_dd(3) + gridDesci(8) = lsmprecipobs%run_dd(4) + gridDesci(9) = lsmprecipobs%run_dd(5) + gridDesci(10) = lsmprecipobs%run_dd(6) + gridDesci(20) = 64 + + elseif(lsmprecipobs%map_proj.eq."lambert") then + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain lower left lat:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(1),rc=rc) + call LDT_verify(rc,'LIS precipitation domain lower left lat: not defined') + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain lower left lon:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(2),rc=rc) + call LDT_verify(rc,'LIS precipitation domain lower left lon: not defined') + + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain true lat1:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(3),rc=rc) + call LDT_verify(rc,'LIS precipitation domain true lat1: not defined') + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain true lat2:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(4),rc=rc) + call LDT_verify(rc,'LIS precipitation domain true lat2: not defined') + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain standard lon:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(5),rc=rc) + call LDT_verify(rc,'LIS precipitation domain standard lon: not defined') + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain resolution:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(6),rc=rc) + call LDT_verify(rc,'LIS precipitation domain resolution: not defined') + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain x-dimension size:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(7),rc=rc) + call LDT_verify(rc,'LIS precipitation domain x-dimension size: not defined') + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain y-dimension size:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(8),rc=rc) + call LDT_verify(rc,'LIS precipitation domain y-dimension size: not defined') + + lsmprecipobs%datares = lsmprecipobs%run_dd(6)/100.0 + + lsmprecipobs%nc = lsmprecipobs%run_dd(7) + lsmprecipobs%nr = lsmprecipobs%run_dd(8) + + gridDesci = 0 + gridDesci(1) = 3 + gridDesci(2) = lsmprecipobs%nc + gridDesci(3) = lsmprecipobs%nr + gridDesci(4) = lsmprecipobs%run_dd(1) + gridDesci(5) = lsmprecipobs%run_dd(2) + gridDesci(6) = 8 + gridDesci(7) = lsmprecipobs%run_dd(4) + gridDesci(8) = lsmprecipobs%run_dd(6) + gridDesci(9) = lsmprecipobs%run_dd(6) + gridDesci(10) = lsmprecipobs%run_dd(3) + gridDesci(11) = lsmprecipobs%run_dd(5) + gridDesci(20) = 64 + + elseif(lsmprecipobs%map_proj.eq."polar") then + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain lower left lat:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(1),rc=rc) + + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain lower left lon:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(2),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain true lat1:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(3),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain true lat2:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(4),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain standard lon:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(5),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain resolution:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(6),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain x-dimension size:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(7),rc=rc) + + call ESMF_ConfigFindLabel(LDT_config,& + "LIS precipitation domain y-dimension size:",rc=rc) + call ESMF_ConfigGetAttribute(LDT_config,lsmprecipobs%run_dd(8),rc=rc) + + endif + +!------------------------------------------------------------------- +! if the LIS output (obs) is at a coarser resolution than the +! LDT grid, then setup the weights for interpolation. Else +! setup the weights for upscaling. +!------------------------------------------------------------------- + if(LDT_isLDTatAfinerResolution(n,lsmprecipobs%datares)) then + + allocate(lsmprecipobs%n11(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + allocate(lsmprecipobs%n12(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + allocate(lsmprecipobs%n21(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + allocate(lsmprecipobs%n22(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + + allocate(lsmprecipobs%w11(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + allocate(lsmprecipobs%w12(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + allocate(lsmprecipobs%w21(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + allocate(lsmprecipobs%w22(LDT_rc%lnc(n)*LDT_rc%lnr(n))) + + call bilinear_interp_input(n, gridDesci, & + lsmprecipobs%n11, & + lsmprecipobs%n12, lsmprecipobs%n21, & + lsmprecipobs%n22, lsmprecipobs%w11, & + lsmprecipobs%w12, lsmprecipobs%w21, & + lsmprecipobs%w22) + + else + + allocate(lsmprecipobs%n11(& + lsmprecipobs%nc*& + lsmprecipobs%nr)) + + call upscaleByAveraging_input(& + gridDesci,& + LDT_rc%gridDesc(n,:),& + lsmprecipobs%nc*lsmprecipobs%nr,& + LDT_rc%lnc(n)*LDT_rc%lnr(n),& + lsmprecipobs%n11) + + endif + +! which variable we want in the DA obs computations. + call LDT_initializeDAobsEntry(LDT_DAobsData(1)%totalprecip_obs, "kg m-2",1,1) + LDT_DAobsData(1)%totalprecip_obs%selectStats = 1 + + end subroutine LISlsmPrecip_obsInit + +end module LISlsmPrecip_obsMod diff --git a/ldt/DAobs/LISlsmPrecipobs/readLISlsmPrecipobs.F90 b/ldt/DAobs/LISlsmPrecipobs/readLISlsmPrecipobs.F90 new file mode 100644 index 000000000..71e38a895 --- /dev/null +++ b/ldt/DAobs/LISlsmPrecipobs/readLISlsmPrecipobs.F90 @@ -0,0 +1,579 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LDT_misc.h" +!BOP +! +! !ROUTINE: readLISlsmPrecipobs +! \label{readLISlsmPrecipobs} +! +! !INTERFACE: +! !REVISION HISTORY: +! 2Dec2021: Mahdi Navari ; Initial Specification (based on readLISlsmSM) +subroutine readLISlsmPrecipobs(n) +! !USES: +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif +#if (defined USE_GRIBAPI) + use grib_api +#endif + use LDT_coreMod + use LDT_DAobsDataMod + use LDT_historyMod + use LDT_logMod + use LISlsmPrecip_obsMod, only : lsmprecipobs +! +! !DESCRIPTION: +! This routine reads the total precipitation fields from a LIS model +! simulation. +! +!EOP + implicit none + + integer, intent(in) :: n + + character*200 :: fname + logical :: file_exists + real :: precip_data(LDT_rc%lnc(n),LDT_rc%lnr(n)) + + integer :: t, index + integer :: ftn + integer :: iret + real :: topLev,botLev,param_num,trange + integer :: igrib,nvars + real :: precipvalue1d(lsmprecipobs%nc*lsmprecipobs%nr) + real :: precipvalue2d(lsmprecipobs%nc, lsmprecipobs%nr) + integer :: c,r + character*20 :: vname + integer :: varid + + interface + subroutine create_lsm_output_fname(n, form, fname, odir, wstyle, wopt, & + run_dd, map_proj, security_class, & + distribution_class, data_category, & + area_of_data, write_interval) + integer, intent(IN) :: n + character(len=*) :: fname + character(len=*) :: form + character(len=*) :: odir + character(len=*) :: wstyle + character(len=*) :: wopt + real, dimension(8), optional :: run_dd + character(len=*), optional :: map_proj + character(len=*), optional :: security_class + character(len=*), optional :: distribution_class + character(len=*), optional :: data_category + character(len=*), optional :: area_of_data + character(len=*), optional :: write_interval + end subroutine create_lsm_output_fname + end interface + + +#if (defined USE_GRIBAPI) + precip_data = LDT_rc%udef + + call create_lsm_output_fname(lsmprecipobs%nest, & + lsmprecipobs%format, & + fname, & + lsmprecipobs%odir, & + lsmprecipobs%wstyle, & + lsmprecipobs%wopt, & + lsmprecipobs%run_dd, & + lsmprecipobs%map_proj, & + lsmprecipobs%security_class, & + lsmprecipobs%distribution_class, & + lsmprecipobs%data_category, & + lsmprecipobs%area_of_data, & + lsmprecipobs%write_interval) + + inquire(file=trim(fname),exist=file_exists) + + if(file_exists) then + write(LDT_logunit,*) '[INFO] reading LSM output ',trim(fname) + if(lsmprecipobs%format.eq."binary") then + write(LDT_logunit,*) '[ERR] DA preprocessing on the binary format is not ' + write(LDT_logunit,*) '[ERR] currently supported. Program stopping....' + call LDT_endrun() + + elseif(lsmprecipobs%format.eq."grib1") then + if(lsmprecipobs%wstyle.ne."WMO convention") then + write(LDT_logunit,*) '[ERR] LDT currently does not support this style of grib output' + call LDT_endrun + endif + + call grib_open_file(ftn,trim(fname),'r',iret) + if(iret.ne.0) then + write(LDT_logunit,*) '[ERR] Could not open file: ',trim(fname) + call LDT_endrun() + endif + call grib_multi_support_on + + do + call grib_new_from_file(ftn,igrib,iret) + if(iret==GRIB_END_OF_FILE) then + exit + endif + + call grib_get(igrib, 'indicatorOfParameter',param_num, iret) + call LDT_verify(iret, & + 'grib_get: indicatorOfParameter failed in readLISlsmPrecipObs') + + call grib_get(igrib, 'topLevel',topLev, iret) + call LDT_verify(iret, & + 'grib_get: topLevel failed in readLISlsmPrecipObs') + + call grib_get(igrib, 'bottomLevel',botLev, iret) + call LDT_verify(iret, & + 'grib_get: bottomLevel failed in readLISlsmPrecipObs') + + call grib_get(igrib, 'timeRangeIndicator',trange, iret) + call LDT_verify(iret, & + 'grib_get: timeRangeIndicator failed in readLISlsmPrecipObs') + +!right now specifically geared for AFWA outputs. + if(param_num.eq.201.and.topLev.eq.0.and.botlev.eq.10.and.& + trange.eq.1) then + + call grib_get(igrib,'values',precipvalue1d,iret) + call LDT_verify(iret,& + 'grib_get: values failed in readLISlsmSMobs') + + call transformPrecipDataToLDTgrid(n,precipvalue1d,precip_data) + + endif + + call grib_release(igrib,iret) + call LDT_verify(iret, 'error in grib_release in readLISlsmSMObs') + enddo + + call grib_close_file(ftn) + + elseif(lsmprecipobs%format.eq."netcdf") then +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + + iret = nf90_open(path=trim(fname),mode=nf90_nowrite, ncid=ftn) + call LDT_verify(iret, 'Error opening file '//trim(fname)) + +! The code looks for instantaneous variables. If it doesn't exist, +! the time averaged data fields will be read in. + + iret = nf90_inq_varid(ftn, 'TotalPrecip_inst', varid) + vname = 'TotalPrecip_inst' + if(iret.ne.0) then + vname = 'TotalPrecip_tavg' + endif + + if(lsmprecipobs%datares.eq.LDT_rc%gridDesc(n,10)) then + call LDT_readLISSingleNetcdfVar(n,ftn, vname,& + 1,lsmprecipobs%nc, lsmprecipobs%nr, precipvalue2d) + else + call LDT_readLISSingleNetcdfVar(n,ftn, vname,& + 1,lsmprecipobs%nc, lsmprecipobs%nr, precipvalue2d) + endif + + iret = nf90_close(ftn) + call LDT_verify(iret,'Error in nf90_close') + + do r=1,lsmprecipobs%nr + do c=1, lsmprecipobs%nc + precipvalue1d(c+(r-1)*lsmprecipobs%nc) = precipvalue2d(c,r) + enddo + enddo + + call transformPrecipDataToLDTgrid(n,precipvalue1d,precip_data) + +#endif + endif + else + write(LDT_logunit,*) '[WARN] LIS file '//trim(fname) + write(LDT_logunit,*) '[WARN] not found ...' + precip_data = LDT_rc%udef + endif + + call LDT_logSingleDAobs(n,LDT_DAobsData(1)%totalprecip_obs,& + precip_data,vlevel=1) + +#endif +end subroutine readLISlsmPrecipobs + + +!BOP +! +! !ROUTINE: create_lsm_output_fname +! \label{create_lsm_output_fname} +! +! !INTERFACE: +subroutine create_lsm_output_fname(n, form, fname, odir, wstyle, wopt, & + run_dd, map_proj, security_class, & + distribution_class, data_category, & + area_of_data, write_interval) +! !USES: + use LDT_coreMod, only : LDT_rc + use LDT_logMod + + implicit none +! !ARGUMENTS: + integer, intent(IN) :: n + character(len=*) :: fname + character(len=*) :: form + character(len=*) :: odir + character(len=*) :: wstyle + character(len=*) :: wopt + real, dimension(8), optional :: run_dd + character(len=*), optional :: map_proj + character(len=*), optional :: security_class + character(len=*), optional :: distribution_class + character(len=*), optional :: data_category + character(len=*), optional :: area_of_data + character(len=*), optional :: write_interval +! +! !DESCRIPTION: +! Create the file name for the output data files. It creates both the GSWP +! style of output filenames and the standard LIS style. The convention used +! in LIS creates a filename in a hierarchical style (output directory, +! model name, date, file extention) +! +! 2 level hierarchy +! \begin{verbatim} +! //LIS_HIST_. +! \end{verbatim} +! 3 level hierarchy +! \begin{verbatim} +! ///LIS_HIST_. +! \end{verbatim} +! 4 level hierarchy +! \begin{verbatim} +! ////LIS_HIST_. +! \end{verbatim} +! WMO convention +! \begin{verbatim} +! / +! \end{verbatim} +! A filename in the convention of weather products (such as): \newline +! {\small +! PS.AFWA\_SC.U\_DI.C\_DC.ANLYS\_GP.LIS\_GR.C0P25DEG\_AR.GLOBAL\_PA.03-HR-SUM\_DD.YYYYMMDD\_DT.HH00\_DF.GR1 \newline +! } +! where \newline +! PS = Product source \newline +! SC = security classification \newline +! DI = distribution classification \newline +! DC = data category \newline +! GP = generating process \newline +! GR = grid \newline +! AR = area of data \newline +! PA = parameter \newline +! DD = date \newline +! DT = data time \newline +! DF = data format \newline +! +! The arguments are: +! \begin{description} +! \item [n] +! index of the domain or nest +! \item [fname] +! the created file name. +! \item [model\_name] +! string describing the name of the model +! \item [writeint] +! output writing interval of the model +! \item [style] +! style option as described above +! \end{description} +!EOP + character(len=8) :: date + character(len=10) :: time + character(len=5) :: zone + integer, dimension(8) :: values + character(len=20) :: mname + character(len=10) :: cdate + character(len=14) :: cdate1 + character(len=2) :: fint + character(len=10) :: fres + character(len=10) :: fres2 + character(len=10) :: fres3 + character*1 :: fres1(10) + character(len=1) :: fproj + integer :: curr_mo = 0 + character(len=200) :: dname + character(len=200), save :: out_fname + integer :: i, c + + mname = 'SURFACEMODEL' + if(wstyle.eq."4 level hierarchy") then + write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & + LDT_rc%yr, LDT_rc%mo, & + LDT_rc%da, LDT_rc%hr,LDT_rc%mn + + dname = trim(odir)//'/' + dname = trim(dname)//trim(mname)//'/' + + write(unit=cdate, fmt='(i4.4)') LDT_rc%yr + dname = trim(dname)//trim(cdate)//'/' + + write(unit=cdate, fmt='(i4.4, i2.2, i2.2)') LDT_rc%yr, LDT_rc%mo, LDT_rc%da + dname = trim(dname)//trim(cdate) + + out_fname = trim(dname)//'/LIS_HIST_'//trim(cdate1) + + write(unit=cdate, fmt='(a2,i2.2)') '.d',n + out_fname = trim(out_fname)//trim(cdate) + + select case ( form ) + case ( "binary" ) + if(wopt.eq."1d tilespace") then + out_fname = trim(out_fname)//'.ts4r' + elseif(wopt.eq."2d gridspace") then + out_fname = trim(out_fname)//'.gs4r' + elseif(wopt.eq."1d gridspace") then + out_fname = trim(out_fname)//'.gs4r' + endif + case ("grib1") + out_fname = trim(out_fname)//'.grb' + case ("netcdf") + out_fname = trim(out_fname)//'.nc' + case ("grib2") + out_fname = trim(out_fname)//'.gr2' + case default + call ldt_log_msg('ERR: create_lsm_output_fname -- '// & + 'Unrecognized output format') + call LDT_endrun + endselect + elseif(wstyle.eq."3 level hierarchy") then + write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & + LDT_rc%yr, LDT_rc%mo, & + LDT_rc%da, LDT_rc%hr,LDT_rc%mn + + dname = trim(odir)//'/' + dname = trim(dname)//trim(mname)//'/' + + write(unit=cdate, fmt='(i4.4, i2.2)') LDT_rc%yr, LDT_rc%mo + dname = trim(dname)//trim(cdate)//'/' + + out_fname = trim(dname)//'LIS_HIST_'//trim(cdate1) + + write(unit=cdate, fmt='(a2,i2.2)') '.d',n + out_fname = trim(out_fname)//trim(cdate) + + select case ( form ) + case ("binary") + if(wopt.eq."1d tilespace") then + out_fname = trim(out_fname)//'.ts4r' + elseif(wopt.eq."2d gridspace") then + out_fname = trim(out_fname)//'.gs4r' + elseif(wopt.eq."1d gridspace") then + out_fname = trim(out_fname)//'.gs4r' + endif + case ("grib1") + out_fname = trim(out_fname)//'.grb' + case ("netcdf") + out_fname = trim(out_fname)//'.nc' + case ("grib2") + out_fname = trim(out_fname)//'.gr2' + case default + call ldt_log_msg('ERR: create_lsm_output_fname -- '// & + 'Unrecognized form value') + call LDT_endrun + endselect + elseif(wstyle.eq."2 level hierarchy") then + write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & + LDT_rc%yr, LDT_rc%mo, & + LDT_rc%da, LDT_rc%hr,LDT_rc%mn + + dname = trim(odir)//'/' + dname = trim(dname)//trim(mname)//'/' + + out_fname = trim(dname)//'LIS_HIST_'//trim(cdate1) + + write(unit=cdate, fmt='(a2,i2.2)') '.d',n + out_fname = trim(out_fname)//trim(cdate) + + select case ( form ) + case ("binary") + if(wopt.eq."1d tilespace") then + out_fname = trim(out_fname)//'.ts4r' + elseif(wopt.eq."2d gridspace") then + out_fname = trim(out_fname)//'.gs4r' + elseif(wopt.eq."1d gridspace") then + out_fname = trim(out_fname)//'.gs4r' + endif + case ("grib1") + out_fname = trim(out_fname)//'.grb' + case ("netcdf") + out_fname = trim(out_fname)//'.nc' + case ("grib2") + out_fname = trim(out_fname)//'.gr2' + case default + call ldt_log_msg('ERR: create_lsm_output_fname -- '// & + 'Unrecognized form value') + call LDT_endrun + endselect + elseif(wstyle.eq."WMO convention") then + if ( .not. present(run_dd) .or. & + .not. present(security_class) .or. & + .not. present(distribution_class) .or. & + .not. present(data_category) .or. & + .not. present(area_of_data) .or. & + .not. present(write_interval) ) then + call ldt_log_msg('ERR: create_lsm_output_fname -- '// & + 'missing WMO convention identifiers') + call LDT_endrun + endif + + write(unit=cdate1, fmt='(i4.4, i2.2, i2.2)') & + LDT_rc%yr, LDT_rc%mo, LDT_rc%da + + write(unit=cdate, fmt='(i2.2, i2.2)') LDT_rc%hr, LDT_rc%mn + + if(map_proj.eq."polar") then + fproj = 'P' + print *,"fres ",run_dd(6) + if (run_dd(6) .ge. 10.) then + write(unit=fres, fmt='(i2)') nint(run_dd(6)) + else + write(unit=fres, fmt='(i1)') nint(run_dd(6)) + endif + fres2 = trim(fres)//'KM' + elseif(map_proj.eq."lambert") then + fproj = 'L' + print *,"fres ",run_dd(6) +! write(unit=fres, fmt='(f2.0)') run_dd(6) + write(unit=fres, fmt='(f3.0)') run_dd(6) + if (run_dd(6) .ge. 10.) then + write(unit=fres, fmt='(i2)') nint(run_dd(6)) + else + write(unit=fres, fmt='(i1)') nint(run_dd(6)) + endif + fres2 = trim(fres)//'KM' + elseif(map_proj.eq."mercator") then + fproj = 'M' + write(unit=fres, fmt='(i2.2)') run_dd(6) + fres = trim(fres)//'KM' + elseif(map_proj.eq."gaussian") then + fproj = 'G' + write(unit=fres, fmt='(i2.2)') run_dd(5)*100 + fres2 = '0P'//trim(fres)//'DEG' + else + fproj = 'C' + write(unit=fres, fmt='(i10)') nint(run_dd(6)*100) + read(unit=fres,fmt='(10a1)') (fres1(i),i=1,10) + c = 0 + do i=1,10 + if(fres1(i).ne.' '.and.c==0) c = i + enddo + if (run_dd(6) .lt. 0.1) then + fres3 = '0P0' + else + fres3 = '0P' + end if + fres2 = fres3 + do i=c,10 + fres2 = trim(fres2)//trim(fres1(i)) + enddo + fres2 = trim(fres2)//'DEG' + endif + + out_fname = trim(odir)//'/'//& + '/PS.AFWA_SC.'//trim(security_class)//& + '_DI.'//trim(distribution_class)//& + '_DC.'//trim(data_category)//& + '_GP.LIS_GR.'//& + trim(fproj)//trim(fres2)//& + '_AR.'//trim(area_of_data)//& + '_PA.'//trim(write_interval)//'-HR-SUM_DD.'//& + trim(cdate1)//'_DT.'//trim(cdate)//'_DF.GR1' + endif + fname = out_fname + end subroutine create_lsm_output_fname + +!BOP +! +! !ROUTINE: transformPrecipDataToLDTgrid +! \label{trasnformDataToLDTgrid} +! +! !INTERFACE: + subroutine transformPrecipDataToLDTgrid(n, precip_inp, precip_out) +! !USES: + use LDT_coreMod + use LISlsmPrecip_obsMod + + implicit none +! !ARGUMENTS: + integer :: n + real :: precip_inp(lsmprecipobs%nc*lsmprecipobs%nr) + real :: precip_out(LDT_rc%lnc(n),LDT_rc%lnr(n)) +! +! !DESCRIPTION: +! This routine interpolates or upscales the input data to +! the LDT grid. If the input data is finer than the LDT +! grid, the input data is upscaled. If the input data is +! coarser, then it is interpolated to the LDT grid. +! +!EOP + integer :: ios + integer :: c,r + logical*1 :: precip_data_b(lsmprecipobs%nc*lsmprecipobs%nr) + real :: precipobs_ip(LDT_rc%lnc(n)*LDT_rc%lnr(n)) + logical*1 :: precipobs_b_ip(lsmprecipobs%nc*lsmprecipobs%nr) + + do r=1,lsmprecipobs%nr + do c=1, lsmprecipobs%nc + if(precip_inp(c+(r-1)*lsmprecipobs%nc).ne.LDT_rc%udef) then + precip_data_b(c+(r-1)*lsmprecipobs%nc) = .true. + else + precip_data_b(c+(r-1)*lsmprecipobs%nc) = .false. + endif + if(precip_inp(c+(r-1)*lsmprecipobs%nc).gt.1) then + precip_inp(c+(r-1)*lsmprecipobs%nc) = LDT_rc%udef + precip_data_b(c+(r-1)*lsmprecipobs%nc) = .false. + endif + enddo + enddo + + if(LDT_isLDTatAfinerResolution(n,lsmprecipobs%datares)) then + +!-------------------------------------------------------------------------- +! Interpolate to the LDT running domain +!-------------------------------------------------------------------------- + call bilinear_interp(LDT_rc%gridDesc(n,:),& + precip_data_b, precip_inp, precipobs_b_ip, precipobs_ip, & + lsmprecipobs%nc*lsmprecipobs%nr, & + LDT_rc%lnc(n)*LDT_rc%lnr(n), & + LDT_domain(n)%lat, LDT_domain(n)%lon,& + lsmprecipobs%w11, lsmprecipobs%w12, & + lsmprecipobs%w21, lsmprecipobs%w22, & + lsmprecipobs%n11, lsmprecipobs%n12, & + lsmprecipobs%n21, lsmprecipobs%n22, & + LDT_rc%udef, ios) + + call neighbor_interp(LDT_rc%gridDesc(n,:),& + precip_data_b, precip_inp, precipobs_b_ip, precipobs_ip, & + lsmprecipobs%nc*lsmprecipobs%nr, & + LDT_rc%lnc(n)*LDT_rc%lnr(n), & + LDT_domain(n)%lat, LDT_domain(n)%lon,& + lsmprecipobs%n11, LDT_rc%udef, ios) + else + call upscaleByAveraging(& + lsmprecipobs%nc*lsmprecipobs%nr,& + LDT_rc%lnc(n)*LDT_rc%lnr(n),LDT_rc%udef, & + lsmprecipobs%n11,precip_data_b, precip_inp, precipobs_b_ip,precipobs_ip) + + endif + + do r=1,LDT_rc%lnr(n) + do c=1,LDT_rc%lnc(n) + if(precipobs_b_ip(c+(r-1)*LDT_rc%lnc(n))) then + precip_out(c,r) = precipobs_ip(c+(r-1)*LDT_rc%lnc(n)) + else + precip_out(c,r) = LDT_rc%udef + endif + enddo + enddo + + end subroutine transformPrecipDataToLDTgrid diff --git a/ldt/DAobs/LISlsmPrecipobs/read_Drange.F90 b/ldt/DAobs/LISlsmPrecipobs/read_Drange.F90 new file mode 100644 index 000000000..23a21bb0b --- /dev/null +++ b/ldt/DAobs/LISlsmPrecipobs/read_Drange.F90 @@ -0,0 +1,112 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LDT_misc.h" +#include "LDT_NetCDF_inc.h" +!BOP +! !ROUTINE: read_Drange +! \label{read_Drange} + +! !REVISION HISTORY: +! 2Dec2021: Mahdi Navari ; Initial Specification +! +! !INTERFACE: +subroutine read_Drange(ngrid, filename, varname, xrange) + + use LDT_coreMod + use LDT_logMod + use LDT_historyMod +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: ngrid + character(len=*) :: filename + character(len=*) :: varname + real :: xrange(ngrid,2) + +! +! !DESCRIPTION: +! This routine reads the input CDF file (generated by LDT in NETCDF format) +! The xrange values and the corresponding CDFs are read for each grid point. +! Both these fields are expected to be in the 1-d grid vector dimension. +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[nbins] number of bins used to compute the model and obs CDFs +! \item[filename] name of the CDF file +! \item[varname] name of the variable being extracted. +! \item[xrange] x-axis values corresponding to the CDF +! \item[cdf] y-axis (CDF) values corresponding to the CDF +! \end{description} +!EOP + integer :: j,kk + integer :: ngridId, nbinsId, nlevsId,ntimesId + integer :: ngrid_file, nbins_file, nlevs_file, ntimes_file + integer :: xid, cdfid + real, allocatable :: xrange_file(:,:,:) + integer :: nid + +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + write(LDT_logunit,*) '[INFO] Reading Drange form CDF file ',trim(filename) + call LDT_verify(nf90_open(path=trim(filename),mode=NF90_NOWRITE,& + ncid=nid),'failed to open file '//trim(filename)) + + call LDT_verify(nf90_inq_dimid(nid,"ngrid",ngridId), & + 'nf90_inq_dimid failed for ngrid') + call LDT_verify(nf90_inq_dimid(nid,"nbins",nbinsId), & + 'nf90_inq_dimid failed for nbins') + call LDT_verify(nf90_inq_dimid(nid,trim(varname)//"_levels",nlevsId), & + 'nf90_inq_dimid failed for '//trim(varname)//"_levels") + call LDT_verify(nf90_inq_dimid(nid,"ntimes",ntimesId), & + 'nf90_inq_dimid failed for ntimes') + + call LDT_verify(nf90_inquire_dimension(nid,ngridId, len=ngrid_file),& + 'nf90_inquire_dimension failed for ngrid') + call LDT_verify(nf90_inquire_dimension(nid,nbinsId, len=nbins_file),& + 'nf90_inquire_dimension failed for nbins') + call LDT_verify(nf90_inquire_dimension(nid,nlevsId, len=nlevs_file),& + 'nf90_inquire_dimension failed for nbins') + call LDT_verify(nf90_inquire_dimension(nid,ntimesId, len=ntimes_file),& + 'nf90_inquire_dimension failed for ntimes') + + if (ntimes_file .gt. 1) then + write(LDT_logunit,*) '[ERR] The number of times specified in the file '//& + trim(filename) + write(LDT_logunit,*) '[ERR] (',ntimes_file, & + ') should be 1 set the Temporal resolution of precipitation CDFs to "yearly" ' + call LDT_endrun() + endif + + allocate(xrange_file(ngrid_file,nlevs_file, nbins_file)) + + do j=1,ntimes_file + call LDT_verify(nf90_inq_varid(nid,trim(varname)//'_xrange',xid),& + 'nf90_inq_varid failed for for '//trim(varname)//'_xrange') + + call LDT_verify(nf90_get_var(nid,xid,xrange_file, & + start=(/1,j,1,1/), count=(/ngrid_file,1,nlevs_file,nbins_file/)),& + 'nf90_get_var failed for '//trim(varname)//'_xrange') + enddo + + xrange(:,1) = xrange_file(:,1,1) ! min value for each gridcell + xrange(:,2) = xrange_file(:,1,nbins_file) ! max value for each gridcell + + deallocate(xrange_file) + + call LDT_verify(nf90_close(nid),& + 'failed to close file '//trim(filename)) + write(LDT_logunit,*) '[INFO] Successfully read CDF file ',trim(filename) +#endif + +end subroutine read_Drange + diff --git a/ldt/DAobs/LISlsmPrecipobs/read_Precip_climo.F90 b/ldt/DAobs/LISlsmPrecipobs/read_Precip_climo.F90 new file mode 100644 index 000000000..0bb3edc03 --- /dev/null +++ b/ldt/DAobs/LISlsmPrecipobs/read_Precip_climo.F90 @@ -0,0 +1,116 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LDT_misc.h" +#include "LDT_NetCDF_inc.h" +!BOP +! !ROUTINE: read_Precip_climo +! \label{read_Precip_climo} + +! !REVISION HISTORY: +! 19Jan2022: Mahdi Navari ; Initial Specification +! +! !INTERFACE: +subroutine read_Precip_climo(ncol, nrow, filename, precip) + + use LDT_coreMod + use LDT_logMod + use LDT_historyMod +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none + ! !ARGUMENTS: + integer, intent(in) :: ncol, nrow + character(len=*), intent(in) :: filename + real :: precip(ncol,nrow,12) + logical :: file_exists +! +! !DESCRIPTION: +! This routine reads the input CDF file (generated by LDT in NETCDF format) +! The xrange values and the corresponding CDFs are read for each grid point. +! Both these fields are expected to be in the 1-d grid vector dimension. +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[nbins] number of bins used to compute the model and obs CDFs +! \item[filename] name of the CDF file +! \item[varname] name of the variable being extracted. +! \item[xrange] x-axis values corresponding to the CDF +! \item[cdf] y-axis (CDF) values corresponding to the CDF +! \end{description} +!EOP + real, allocatable :: precip_climo(:,:,:) + integer :: ios,nid,ncId,nrId,varId + integer :: nc,nr,i,c,r + character*3 :: month_name(12) + + month_name = (/"JAN","FEB","MAR","APR","MAY","JUN",& + "JUL","AUG","SEP","OCT","NOV","DEC"/) + +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + inquire(file=trim(filename), exist=file_exists) + + if (.not. file_exists) then + write(LDT_logunit,*) '[ERR] (',filename, & + ') does not exist. Please provide a monthly precipitation climatology in CDF format ' + call LDT_endrun() + end if + + + write(LDT_logunit,*) '[INFO] Reading Precipitation climatology from CDF file ',trim(filename) + call LDT_verify(nf90_open(path=trim(filename),mode=NF90_NOWRITE,& + ncid=nid),'failed to open file '//trim(filename)) + + ios = nf90_inq_dimid(nid,"east_west",ncId) + call LDT_verify(ios,'Error in nf90_inq_dimid in read_precip_climo') + + ios = nf90_inq_dimid(nid,"north_south",nrId) + call LDT_verify(ios,'Error in nf90_inq_dimid in read_precip_climo') + + ios = nf90_inquire_dimension(nid,ncId, len=nc) + call LDT_verify(ios,'Error in nf90_inquire_dimension in read_precip_climo') + + ios = nf90_inquire_dimension(nid,nrId, len=nr) + call LDT_verify(ios,'Error in nf90_inquire_dimension in read_precip_climo') + + if (ncol .ne. nc .or. nrow .ne.nr) then + write(LDT_logunit,*) & + '[ERR] The number of columns or rows specified in the file '//& + trim(filename) + write(LDT_logunit,*) '[ERR] (', nc, nr, & + ') is different from the number of columns and rows specified' + write(LDT_logunit,*) '[ERR] in the ldt.config file (', ncol, nrow, ')' + call LDT_endrun() + endif + + allocate(precip_climo(nc,nr,12)) + + do i=1,12 + ios = nf90_inq_varid(nid,'TotalPrecip_'//trim(month_name(i)),varId) + call LDT_verify(ios,'Precipitation climo field not found in the file') + + ios = nf90_get_var(nid,varId,precip_climo(:,:,i)) + call LDT_verify(ios,'Error in nf90_get_var in LDT_procDataForREAL') + enddo + + ios = nf90_close(nid) + call LDT_verify(ios,'Error in nf90_close in readldtparam_real_2d') + write(LDT_logunit,*) '[INFO] Successfully read Precipitation climo file ',trim(filename) + + precip = precip_climo + deallocate(precip_climo) + +! end USE_NETCDF4 +#endif + +end subroutine read_Precip_climo + diff --git a/ldt/DAobs/LISlsmSMobs/LISlsmSM_obsMod.F90 b/ldt/DAobs/LISlsmSMobs/LISlsmSM_obsMod.F90 index c21338b13..bfaa12b65 100644 --- a/ldt/DAobs/LISlsmSMobs/LISlsmSM_obsMod.F90 +++ b/ldt/DAobs/LISlsmSMobs/LISlsmSM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/LISlsmSMobs/readLISlsmSMObs.F90 b/ldt/DAobs/LISlsmSMobs/readLISlsmSMObs.F90 index d08186e49..68aadff9e 100644 --- a/ldt/DAobs/LISlsmSMobs/readLISlsmSMObs.F90 +++ b/ldt/DAobs/LISlsmSMobs/readLISlsmSMObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/LISlsmTEFFobs/LISlsmTEFF_obsMod.F90 b/ldt/DAobs/LISlsmTEFFobs/LISlsmTEFF_obsMod.F90 index 5d171a908..5057275fb 100644 --- a/ldt/DAobs/LISlsmTEFFobs/LISlsmTEFF_obsMod.F90 +++ b/ldt/DAobs/LISlsmTEFFobs/LISlsmTEFF_obsMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -52,6 +52,10 @@ module LISlsmTEFF_obsMod character*20 :: data_category character*20 :: area_of_data character*20 :: write_interval + ! EMK + integer :: num_ens + integer :: num_tiles + integer :: ntiles_pergrid !-------------------------------------------------------- ! interpolation/upscaling weights !-------------------------------------------------------- @@ -127,6 +131,38 @@ subroutine LISlsmTEFF_obsInit() label="LIS soil temperature output directory:",rc=rc) call LDT_verify(rc,'LIS soil temperature output directory: not defined') + ! EMK Add LIS ensemble information + call ESMF_ConfigGetAttribute(LDT_config, lsmteffobs%num_ens, & + label="LIS ensemble size:", rc=rc) + call LDT_verify(rc,'LIS ensemble size: not defined') + if (lsmteffobs%num_ens < 1) then + write(LDT_logunit,*)'[ERR] LIS ensemble size must be at least 1!' + write(LDT_logunit,*)'[ERR] Read in ', lsmteffobs%num_ens + call LDT_endrun() + end if + + call ESMF_ConfigGetAttribute(LDT_config, lsmteffobs%num_tiles, & + label="LIS total number of tiles (including ensembles):", rc=rc) + call LDT_verify(rc,'LIS total number of tiles (including ensembles): ' // & + 'not defined') + if (lsmteffobs%num_tiles < 1) then + write(LDT_logunit,*) & + '[ERR] LIS total number of tiles (including ensembles) must be' & + //'at least 1!' + write(LDT_logunit,*)'[ERR] Read in ', lsmteffobs%num_tiles + call LDT_endrun() + end if + + call ESMF_ConfigGetAttribute(LDT_config, lsmteffobs%ntiles_pergrid, & + label="LIS number of tiles per grid point:", rc=rc) + call LDT_verify(rc,'LIS number of tiles per grid point: not defined') + if (lsmteffobs%num_tiles < 1) then + write(LDT_logunit,*) & + '[ERR] LIS number of tiles per grid point must be at least 1!' + write(LDT_logunit,*)'[ERR] Read in ', lsmteffobs%ntiles_pergrid + call LDT_endrun() + end if + ! WMO-convention specific identifiers if ( lsmteffobs%wstyle == "WMO convention") then call ESMF_ConfigGetAttribute(LDT_config,lsmteffobs%security_class, & diff --git a/ldt/DAobs/LISlsmTEFFobs/readLISlsmTEFFObs.F90 b/ldt/DAobs/LISlsmTEFFobs/readLISlsmTEFFObs.F90 index 4cd00b183..71a8da85a 100644 --- a/ldt/DAobs/LISlsmTEFFobs/readLISlsmTEFFObs.F90 +++ b/ldt/DAobs/LISlsmTEFFobs/readLISlsmTEFFObs.F90 @@ -3,17 +3,17 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" !BOP -! +! ! !ROUTINE: readLISlsmTEFFobs ! \label{readLISlsmTEFFobs} ! -! !INTERFACE: +! !INTERFACE: subroutine readLISlsmTEFFobs(n) ! !USES: #if(defined USE_NETCDF3 || defined USE_NETCDF4) @@ -29,19 +29,19 @@ subroutine readLISlsmTEFFobs(n) use LISlsmTEFF_obsMod, only : lsmteffobs use LDT_timeMgrMod ! -! !DESCRIPTION: -! This routine reads the soil temperature fields from a LIS model -! simulation. +! !DESCRIPTION: +! This routine reads the soil temperature fields from a LIS model +! simulation. ! !EOP implicit none integer, intent(in) :: n - character*200 :: fname + character*200 :: fname logical :: file_exists real :: teff_data(LDT_rc%lnc(n),LDT_rc%lnr(n)) - + integer :: t, index integer :: ftn integer :: iret @@ -50,6 +50,8 @@ subroutine readLISlsmTEFFobs(n) real :: teffvalue1d(lsmteffobs%nc*lsmteffobs%nr) real :: Tsoil01value2d(lsmteffobs%nc, lsmteffobs%nr) real :: Tsoil02value2d(lsmteffobs%nc, lsmteffobs%nr) + real :: tsoil(lsmteffobs%nc, lsmteffobs%nr, 4) + integer :: rc1 integer :: c,r character*20 :: vname integer :: varid @@ -59,6 +61,9 @@ subroutine readLISlsmTEFFobs(n) real :: gmt real :: lhour integer :: zone + integer, allocatable :: ntiles_pergrid(:) + integer, allocatable :: str_tind(:) + integer :: gid interface subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & @@ -101,80 +106,67 @@ end subroutine create_lsm_teff_output_filename inquire(file=trim(fname),exist=file_exists) - if(file_exists) then + if(file_exists) then write(LDT_logunit,*) '[INFO] reading LSM output ',trim(fname) - if(lsmteffobs%format.eq."binary") then + if(lsmteffobs%format.eq."binary") then write(LDT_logunit,*) '[ERR] DA preprocessing on the binary format is not ' write(LDT_logunit,*) '[ERR] currently supported. Program stopping....' call LDT_endrun() - -#if 0 - ftn = LDT_getNextUnitNumber() - open(ftn,file=trim(fname), form='unformatted') - if(file_exists) then - do index=1,LDT_MOC_COUNT - call LDT_readLISSingleBinaryVar(n,ftn,LDT_DAobsDataPtr(n,index)%dataEntryPtr) - enddo - else - print*, 'LSM file ',trim(fname),' does not exist' - print*, 'Program stopping.. ' - stop - endif - call LDT_releaseUnitNumber(ftn) -#endif - elseif(lsmteffobs%format.eq."grib1") then + + elseif(lsmteffobs%format.eq."grib1") then write(LDT_logunit,*) '[ERR] DA preprocessing on the grib1 format is not ' write(LDT_logunit,*) '[ERR] currently supported. Program stopping....' call LDT_endrun() -#if 0 - ftn = LDT_getNextUnitNumber() - open(ftn,file=trim(fname), form='unformatted') - if(file_exists) then - do index=1,LDT_MOC_COUNT - call LDT_readLISSingleBinaryVar(n,ftn,LDT_DAobsDataPtr(n,index)%dataEntryPtr) - enddo - else - print*, 'LSM file ',trim(fname),' does not exist' - print*, 'Program stopping.. ' - stop - endif - call LDT_releaseUnitNumber(ftn) -#endif + elseif(lsmteffobs%format.eq."netcdf") then +#if(defined USE_NETCDF3 || defined USE_NETCDF4) - elseif(lsmteffobs%format.eq."netcdf") then -#if(defined USE_NETCDF3 || defined USE_NETCDF4) - iret = nf90_open(path=trim(fname),mode=nf90_nowrite, ncid=ftn) call LDT_verify(iret, 'Error opening file '//trim(fname)) - -! The code looks for instantaneous variables. If it doesn't exist, -! the time averaged data fields will be read in. + +! The code looks for instantaneous variables. If it doesn't exist, +! the time averaged data fields will be read in. iret = nf90_inq_varid(ftn, 'SoilTemp_inst', varid) vname = 'SoilTemp_inst' - if(iret.ne.0) then + if(iret.ne.0) then vname = 'SoilTemp_tavg' endif - - if(lsmteffobs%datares.eq.LDT_rc%gridDesc(n,10)) then - call LDT_readLISSingleNetcdfVar(n,ftn, vname,& - 1,lsmteffobs%nc, lsmteffobs%nr, Tsoil01value2d) - call LDT_readLISSingleNetcdfVar(n,ftn, vname,& - 2,lsmteffobs%nc, lsmteffobs%nr, Tsoil02value2d) - else - call LDT_readLISSingleNetcdfVar(n,ftn, vname,& - 1,lsmteffobs%nc, lsmteffobs%nr, Tsoil01value2d) - call LDT_readLISSingleNetcdfVar(n,ftn, vname,& - 2,lsmteffobs%nc, lsmteffobs%nr, Tsoil02value2d) - endif - iret = nf90_close(ftn) call LDT_verify(iret,'Error in nf90_close') + if ((LDT_rc%lnc(n) .ne. lsmteffobs%nc) .or. & + (LDT_rc%lnr(n) .ne. lsmteffobs%nr)) then + write(LDT_logunit,*)'[ERR] Dimension mismatch for LIS data!' + write(LDT_logunit,*)'[ERR] LDT_rc%lnc, LDT_rc%lnr = ', & + LDT_rc%lnc(n), LDT_rc%lnr(n) + write(LDT_Logunit,*)'[ERR] lsmteffobs%nc, lsmteffobs%nr = ', & + lsmteffobs%nc, lsmteffobs%nr + call LDT_endrun() + end if + tsoil = 0 + allocate(ntiles_pergrid(lsmteffobs%nc * lsmteffobs%nr)) + ntiles_pergrid = lsmteffobs%ntiles_pergrid ! Copy scalar to array + allocate(str_tind(lsmteffobs%nc * lsmteffobs%nr)) + do gid = 1, lsmteffobs%nc * lsmteffobs%nr + str_tind(gid) = ((gid - 1) * lsmteffobs%num_ens) + 1 + end do + call read_LIStsoil_data_usaf(n, lsmteffobs%num_tiles, str_tind, & + ntiles_pergrid, & + lsmteffobs%num_ens, & + fname, tsoil, rc1) + if (rc1 .ne. 0) then + write(LDT_logunit,*) '[ERR] Cannot read from ', trim(fname) + call LDT_endrun() + end if + tsoil01value2d = tsoil(:,:,1) + tsoil02value2d = tsoil(:,:,2) + deallocate(ntiles_pergrid) + deallocate(str_tind) + kk = 1.007 - cc_6am = 0.246; !Descending - cc_6pm = 1.000; !Ascending + cc_6am = 0.246; !Descending + cc_6pm = 1.000; !Ascending do r=1,lsmteffobs%nr do c=1, lsmteffobs%nc @@ -183,14 +175,18 @@ end subroutine create_lsm_teff_output_filename gmt = LDT_rc%hr call LDT_gmt2localtime(gmt, lon, lhour, zone) - if(lhour.eq.6) then + !if(lhour.eq.6) then ! Orig + if(lhour > 4 .and. lhour < 8) then ! EMK for 3-hrly data + if (Tsoil01value2d(c,r).gt.273.15.and.Tsoil02value2d(c,r).gt.273.15) then teffvalue1d(c+(r-1)*lsmteffobs%nc) = & kk * (cc_6am * Tsoil01value2d(c,r) + (1 - cc_6am) * Tsoil02value2d(c,r)) else teffvalue1d(c+(r-1)*lsmteffobs%nc) = LDT_rc%udef endif - elseif(lhour.eq.18) then + !elseif(lhour.eq.18) then ! Orig + elseif (lhour > 16 .and. lhour < 20) then ! EMK for 3-hrly data + if (Tsoil01value2d(c,r).gt.273.15.and.Tsoil02value2d(c,r).gt.273.15) then teffvalue1d(c+(r-1)*lsmteffobs%nc) = & kk * (cc_6pm * Tsoil01value2d(c,r) + (1 - cc_6pm) * Tsoil02value2d(c,r)) @@ -200,9 +196,10 @@ end subroutine create_lsm_teff_output_filename else teffvalue1d(c+(r-1)*lsmteffobs%nc) = LDT_rc%udef endif + enddo enddo - + call transformDataToLDTgrid_teff(n,teffvalue1d,teff_data) #endif @@ -234,7 +231,7 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & use LDT_coreMod, only : LDT_rc use LDT_logMod - implicit none + implicit none ! !ARGUMENTS: integer, intent(IN) :: n character(len=*) :: fname @@ -249,11 +246,11 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & character(len=*), optional :: data_category character(len=*), optional :: area_of_data character(len=*), optional :: write_interval -! -! !DESCRIPTION: +! +! !DESCRIPTION: ! Create the file name for the output data files. It creates both the GSWP ! style of output filenames and the standard LIS style. The convention used -! in LIS creates a filename in a hierarchical style (output directory, +! in LIS creates a filename in a hierarchical style (output directory, ! model name, date, file extention) ! ! 2 level hierarchy @@ -288,15 +285,15 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & ! DD = date \newline ! DT = data time \newline ! DF = data format \newline -! -! The arguments are: +! +! The arguments are: ! \begin{description} ! \item [n] ! index of the domain or nest ! \item [fname] -! the created file name. +! the created file name. ! \item [model\_name] -! string describing the name of the model +! string describing the name of the model ! \item [writeint] ! output writing interval of the model ! \item [style] @@ -307,7 +304,7 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & character(len=10) :: time character(len=5) :: zone integer, dimension(8) :: values - character(len=20) :: mname + character(len=20) :: mname character(len=10) :: cdate character(len=14) :: cdate1 character(len=2) :: fint @@ -322,32 +319,32 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & integer :: i, c mname = 'SURFACEMODEL' - if(wstyle.eq."4 level hierarchy") then + if(wstyle.eq."4 level hierarchy") then write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & LDT_rc%yr, LDT_rc%mo, & LDT_rc%da, LDT_rc%hr,LDT_rc%mn - + dname = trim(odir)//'/' dname = trim(dname)//trim(mname)//'/' - + write(unit=cdate, fmt='(i4.4)') LDT_rc%yr dname = trim(dname)//trim(cdate)//'/' - + write(unit=cdate, fmt='(i4.4, i2.2, i2.2)') LDT_rc%yr, LDT_rc%mo, LDT_rc%da dname = trim(dname)//trim(cdate) - + out_fname = trim(dname)//'/LIS_HIST_'//trim(cdate1) - - write(unit=cdate, fmt='(a2,i2.2)') '.d',n + + write(unit=cdate, fmt='(a2,i2.2)') '.d',n out_fname = trim(out_fname)//trim(cdate) - + select case ( form ) case ( "binary" ) - if(wopt.eq."1d tilespace") then + if(wopt.eq."1d tilespace") then out_fname = trim(out_fname)//'.ts4r' - elseif(wopt.eq."2d gridspace") then + elseif(wopt.eq."2d gridspace") then out_fname = trim(out_fname)//'.gs4r' - elseif(wopt.eq."1d gridspace") then + elseif(wopt.eq."1d gridspace") then out_fname = trim(out_fname)//'.gs4r' endif case ("grib1") @@ -359,31 +356,31 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & case default call ldt_log_msg('ERR: create_lsm_teff_output_filename -- '// & 'Unrecognized output format') - call LDT_endrun + call LDT_endrun endselect elseif(wstyle.eq."3 level hierarchy") then write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & LDT_rc%yr, LDT_rc%mo, & LDT_rc%da, LDT_rc%hr,LDT_rc%mn - + dname = trim(odir)//'/' dname = trim(dname)//trim(mname)//'/' - + write(unit=cdate, fmt='(i4.4, i2.2)') LDT_rc%yr, LDT_rc%mo dname = trim(dname)//trim(cdate)//'/' out_fname = trim(dname)//'LIS_HIST_'//trim(cdate1) - - write(unit=cdate, fmt='(a2,i2.2)') '.d',n + + write(unit=cdate, fmt='(a2,i2.2)') '.d',n out_fname = trim(out_fname)//trim(cdate) - + select case ( form ) case ("binary") - if(wopt.eq."1d tilespace") then + if(wopt.eq."1d tilespace") then out_fname = trim(out_fname)//'.ts4r' - elseif(wopt.eq."2d gridspace") then + elseif(wopt.eq."2d gridspace") then out_fname = trim(out_fname)//'.gs4r' - elseif(wopt.eq."1d gridspace") then + elseif(wopt.eq."1d gridspace") then out_fname = trim(out_fname)//'.gs4r' endif case ("grib1") @@ -395,28 +392,28 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & case default call ldt_log_msg('ERR: create_lsm_teff_output_filename -- '// & 'Unrecognized form value') - call LDT_endrun + call LDT_endrun endselect elseif(wstyle.eq."2 level hierarchy") then write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & LDT_rc%yr, LDT_rc%mo, & LDT_rc%da, LDT_rc%hr,LDT_rc%mn - + dname = trim(odir)//'/' dname = trim(dname)//trim(mname)//'/' - + out_fname = trim(dname)//'LIS_HIST_'//trim(cdate1) - - write(unit=cdate, fmt='(a2,i2.2)') '.d',n + + write(unit=cdate, fmt='(a2,i2.2)') '.d',n out_fname = trim(out_fname)//trim(cdate) - + select case ( form ) case ("binary") - if(wopt.eq."1d tilespace") then + if(wopt.eq."1d tilespace") then out_fname = trim(out_fname)//'.ts4r' - elseif(wopt.eq."2d gridspace") then + elseif(wopt.eq."2d gridspace") then out_fname = trim(out_fname)//'.gs4r' - elseif(wopt.eq."1d gridspace") then + elseif(wopt.eq."1d gridspace") then out_fname = trim(out_fname)//'.gs4r' endif case ("grib1") @@ -428,9 +425,9 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & case default call ldt_log_msg('ERR: create_lsm_teff_output_filename -- '// & 'Unrecognized form value') - call LDT_endrun + call LDT_endrun endselect - elseif(wstyle.eq."WMO convention") then + elseif(wstyle.eq."WMO convention") then if ( .not. present(run_dd) .or. & .not. present(security_class) .or. & .not. present(distribution_class) .or. & @@ -439,15 +436,15 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & .not. present(write_interval) ) then call ldt_log_msg('ERR: create_lsm_teff_output_filename -- '// & 'missing WMO convention identifiers') - call LDT_endrun + call LDT_endrun endif write(unit=cdate1, fmt='(i4.4, i2.2, i2.2)') & LDT_rc%yr, LDT_rc%mo, LDT_rc%da - + write(unit=cdate, fmt='(i2.2, i2.2)') LDT_rc%hr, LDT_rc%mn - - if(map_proj.eq."polar") then + + if(map_proj.eq."polar") then fproj = 'P' print *,"fres ",run_dd(6) if (run_dd(6) .ge. 10.) then @@ -456,10 +453,9 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & write(unit=fres, fmt='(i1)') nint(run_dd(6)) endif fres2 = trim(fres)//'KM' - elseif(map_proj.eq."lambert") then + elseif(map_proj.eq."lambert") then fproj = 'L' print *,"fres ",run_dd(6) -! write(unit=fres, fmt='(f2.0)') run_dd(6) write(unit=fres, fmt='(f3.0)') run_dd(6) if (run_dd(6) .ge. 10.) then write(unit=fres, fmt='(i2)') nint(run_dd(6)) @@ -467,19 +463,19 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & write(unit=fres, fmt='(i1)') nint(run_dd(6)) endif fres2 = trim(fres)//'KM' - elseif(map_proj.eq."mercator") then + elseif(map_proj.eq."mercator") then fproj = 'M' write(unit=fres, fmt='(i2.2)') run_dd(6) fres = trim(fres)//'KM' - elseif(map_proj.eq."gaussian") then + elseif(map_proj.eq."gaussian") then fproj = 'G' - write(unit=fres, fmt='(i2.2)') run_dd(5)*100 + write(unit=fres, fmt='(i2.2)') run_dd(5)*100 fres2 = '0P'//trim(fres)//'DEG' else fproj = 'C' write(unit=fres, fmt='(i10)') nint(run_dd(6)*100) read(unit=fres,fmt='(10a1)') (fres1(i),i=1,10) - c = 0 + c = 0 do i=1,10 if(fres1(i).ne.' '.and.c==0) c = i enddo @@ -503,33 +499,44 @@ subroutine create_lsm_teff_output_filename(n, form, fname, odir, wstyle, wopt, & trim(fproj)//trim(fres2)//& '_AR.'//trim(area_of_data)//& '_PA.'//trim(write_interval)//'-HR-SUM_DD.'//& - trim(cdate1)//'_DT.'//trim(cdate)//'_DF.GR1' + trim(cdate1)//'_DT.'//trim(cdate)//'_DF' + if (form == "netcdf") then + out_fname = trim(out_fname) // ".nc" + else if (form == "grib1") then + out_fname = trim(out_fname) // ".GR1" + else if (form == "grib2") then + out_fname = trim(out_fname) // ".GR2" + else + write(LDT_logunit,*)'[ERR] Invalid LIS file format ', trim(form) + call LDT_endrun() + end if + endif fname = out_fname end subroutine create_lsm_teff_output_filename !BOP -! +! ! !ROUTINE: transformDataToLDTgrid_teff ! \label{transformDataToLDTgrid_teff} ! -! !INTERFACE: +! !INTERFACE: subroutine transformDataToLDTgrid_teff(n, teff_inp, teff_out) -! !USES: +! !USES: use LDT_coreMod use LISlsmTEFF_obsMod implicit none -! !ARGUMENTS: - integer :: n +! !ARGUMENTS: + integer :: n real :: teff_inp(lsmteffobs%nc*lsmteffobs%nr) real :: teff_out(LDT_rc%lnc(n),LDT_rc%lnr(n)) ! -! !DESCRIPTION: -! This routine interpolates or upscales the input data to +! !DESCRIPTION: +! This routine interpolates or upscales the input data to ! the LDT grid. If the input data is finer than the LDT ! grid, the input data is upscaled. If the input data is -! coarser, then it is interpolated to the LDT grid. +! coarser, then it is interpolated to the LDT grid. ! !EOP integer :: ios @@ -540,23 +547,23 @@ subroutine transformDataToLDTgrid_teff(n, teff_inp, teff_out) do r=1,lsmteffobs%nr do c=1, lsmteffobs%nc - if(teff_inp(c+(r-1)*lsmteffobs%nc).ne.LDT_rc%udef) then - teff_data_b(c+(r-1)*lsmteffobs%nc) = .true. + if(teff_inp(c+(r-1)*lsmteffobs%nc).ne.LDT_rc%udef) then + teff_data_b(c+(r-1)*lsmteffobs%nc) = .true. else teff_data_b(c+(r-1)*lsmteffobs%nc) = .false. endif - if(teff_inp(c+(r-1)*lsmteffobs%nc).lt.0) then + if(teff_inp(c+(r-1)*lsmteffobs%nc).lt.0) then teff_inp(c+(r-1)*lsmteffobs%nc) = LDT_rc%udef teff_data_b(c+(r-1)*lsmteffobs%nc) = .false. endif enddo enddo - if(LDT_isLDTatAfinerResolution(n,lsmteffobs%datares)) then + if(LDT_isLDTatAfinerResolution(n,lsmteffobs%datares)) then !-------------------------------------------------------------------------- ! Interpolate to the LDT running domain -!-------------------------------------------------------------------------- +!-------------------------------------------------------------------------- call bilinear_interp(LDT_rc%gridDesc(n,:),& teff_data_b, teff_inp, teffobs_b_ip, teffobs_ip, & lsmteffobs%nc*lsmteffobs%nr, & @@ -579,17 +586,17 @@ subroutine transformDataToLDTgrid_teff(n, teff_inp, teff_out) lsmteffobs%nc*lsmteffobs%nr,& LDT_rc%lnc(n)*LDT_rc%lnr(n),LDT_rc%udef, & lsmteffobs%n11,teff_data_b, teff_inp, teffobs_b_ip,teffobs_ip) - + endif - + do r=1,LDT_rc%lnr(n) do c=1,LDT_rc%lnc(n) - if(teffobs_b_ip(c+(r-1)*LDT_rc%lnc(n))) then + if(teffobs_b_ip(c+(r-1)*LDT_rc%lnc(n))) then teff_out(c,r) = teffobs_ip(c+(r-1)*LDT_rc%lnc(n)) else teff_out(c,r) = LDT_rc%udef endif enddo enddo - + end subroutine transformDataToLDTgrid_teff diff --git a/ldt/DAobs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 b/ldt/DAobs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 index e5efa1a7c..c928f3917 100644 --- a/ldt/DAobs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 +++ b/ldt/DAobs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/LPRM_AMSREsm/readLPRM_AMSREsmObs.F90 b/ldt/DAobs/LPRM_AMSREsm/readLPRM_AMSREsmObs.F90 index 1e061a4f8..6a5267645 100644 --- a/ldt/DAobs/LPRM_AMSREsm/readLPRM_AMSREsmObs.F90 +++ b/ldt/DAobs/LPRM_AMSREsm/readLPRM_AMSREsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/LPRMvod/LPRMvod_obsMod.F90 b/ldt/DAobs/LPRMvod/LPRMvod_obsMod.F90 index 3f8a9befd..e2b4928d2 100644 --- a/ldt/DAobs/LPRMvod/LPRMvod_obsMod.F90 +++ b/ldt/DAobs/LPRMvod/LPRMvod_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/LPRMvod/readLPRMvodObs.F90 b/ldt/DAobs/LPRMvod/readLPRMvodObs.F90 index a98b7ad7a..38b3cf613 100644 --- a/ldt/DAobs/LPRMvod/readLPRMvodObs.F90 +++ b/ldt/DAobs/LPRMvod/readLPRMvodObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/MCD15A2H_LAI/MCD15A2Hlai_obsMod.F90 b/ldt/DAobs/MCD15A2H_LAI/MCD15A2Hlai_obsMod.F90 index 30890b465..4aafa1e55 100644 --- a/ldt/DAobs/MCD15A2H_LAI/MCD15A2Hlai_obsMod.F90 +++ b/ldt/DAobs/MCD15A2H_LAI/MCD15A2Hlai_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/MCD15A2H_LAI/readMCD15A2HlaiObs.F90 b/ldt/DAobs/MCD15A2H_LAI/readMCD15A2HlaiObs.F90 index 2071f1951..8f8202b38 100644 --- a/ldt/DAobs/MCD15A2H_LAI/readMCD15A2HlaiObs.F90 +++ b/ldt/DAobs/MCD15A2H_LAI/readMCD15A2HlaiObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 b/ldt/DAobs/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 index 88b44997c..b1e9b947a 100644 --- a/ldt/DAobs/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 +++ b/ldt/DAobs/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 b/ldt/DAobs/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 index 7d8acfbdb..2f9551303 100644 --- a/ldt/DAobs/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 +++ b/ldt/DAobs/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/NASA_SMAPsm/NASASMAPsm_obsMod.F90 b/ldt/DAobs/NASA_SMAPsm/NASASMAPsm_obsMod.F90 index 41b25aee7..976808124 100644 --- a/ldt/DAobs/NASA_SMAPsm/NASASMAPsm_obsMod.F90 +++ b/ldt/DAobs/NASA_SMAPsm/NASASMAPsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/NASA_SMAPsm/readNASASMAPsmObs.F90 b/ldt/DAobs/NASA_SMAPsm/readNASASMAPsmObs.F90 index 8431d30e9..eca37bcf7 100644 --- a/ldt/DAobs/NASA_SMAPsm/readNASASMAPsmObs.F90 +++ b/ldt/DAobs/NASA_SMAPsm/readNASASMAPsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/NASA_SMAPvod/NASASMAPvod_obsMod.F90 b/ldt/DAobs/NASA_SMAPvod/NASASMAPvod_obsMod.F90 index 00a0f6065..c5684b3af 100644 --- a/ldt/DAobs/NASA_SMAPvod/NASASMAPvod_obsMod.F90 +++ b/ldt/DAobs/NASA_SMAPvod/NASASMAPvod_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/NASA_SMAPvod/readNASASMAPvodObs.F90 b/ldt/DAobs/NASA_SMAPvod/readNASASMAPvodObs.F90 index f4b42b502..f892bfc06 100644 --- a/ldt/DAobs/NASA_SMAPvod/readNASASMAPvodObs.F90 +++ b/ldt/DAobs/NASA_SMAPvod/readNASASMAPvodObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMAP_E_OPLsm/SMAPEOPL_SM_obsMod.F90 b/ldt/DAobs/SMAP_E_OPLsm/SMAPEOPL_SM_obsMod.F90 index 9b8d3c3a6..b08c69b6d 100644 --- a/ldt/DAobs/SMAP_E_OPLsm/SMAPEOPL_SM_obsMod.F90 +++ b/ldt/DAobs/SMAP_E_OPLsm/SMAPEOPL_SM_obsMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMAP_E_OPLsm/readSMAPEOPL_SMObs.F90 b/ldt/DAobs/SMAP_E_OPLsm/readSMAPEOPL_SMObs.F90 index 605fe35a3..1dd82949a 100644 --- a/ldt/DAobs/SMAP_E_OPLsm/readSMAPEOPL_SMObs.F90 +++ b/ldt/DAobs/SMAP_E_OPLsm/readSMAPEOPL_SMObs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMMR_SNWD/SMMRSNWDsnow_obsMod.F90 b/ldt/DAobs/SMMR_SNWD/SMMRSNWDsnow_obsMod.F90 index 5b04bb3ba..d4c5872d1 100644 --- a/ldt/DAobs/SMMR_SNWD/SMMRSNWDsnow_obsMod.F90 +++ b/ldt/DAobs/SMMR_SNWD/SMMRSNWDsnow_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMMR_SNWD/readSMMRSNWDsnowObs.F90 b/ldt/DAobs/SMMR_SNWD/readSMMRSNWDsnowObs.F90 index f8c3fc4e1..c9b784e04 100644 --- a/ldt/DAobs/SMMR_SNWD/readSMMRSNWDsnowObs.F90 +++ b/ldt/DAobs/SMMR_SNWD/readSMMRSNWDsnowObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOPS/SMOPSsm_obsMod.F90 b/ldt/DAobs/SMOPS/SMOPSsm_obsMod.F90 index 45a63e0a4..a05f6e98f 100644 --- a/ldt/DAobs/SMOPS/SMOPSsm_obsMod.F90 +++ b/ldt/DAobs/SMOPS/SMOPSsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOPS/readSMOPSsmObs.F90 b/ldt/DAobs/SMOPS/readSMOPSsmObs.F90 index 84b28265f..67446edc7 100644 --- a/ldt/DAobs/SMOPS/readSMOPSsmObs.F90 +++ b/ldt/DAobs/SMOPS/readSMOPSsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_L2sm/SMOSL2sm_obsMod.F90 b/ldt/DAobs/SMOS_L2sm/SMOSL2sm_obsMod.F90 index 3298a7ac4..c94075b18 100644 --- a/ldt/DAobs/SMOS_L2sm/SMOSL2sm_obsMod.F90 +++ b/ldt/DAobs/SMOS_L2sm/SMOSL2sm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_L2sm/readSMOSL2smObs.F90 b/ldt/DAobs/SMOS_L2sm/readSMOSL2smObs.F90 index be9d2ac3d..6d2b198fd 100644 --- a/ldt/DAobs/SMOS_L2sm/readSMOSL2smObs.F90 +++ b/ldt/DAobs/SMOS_L2sm/readSMOSL2smObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_NESDIS/SMOSNESDISsm_obsMod.F90 b/ldt/DAobs/SMOS_NESDIS/SMOSNESDISsm_obsMod.F90 index ec340800e..2ab1b799d 100644 --- a/ldt/DAobs/SMOS_NESDIS/SMOSNESDISsm_obsMod.F90 +++ b/ldt/DAobs/SMOS_NESDIS/SMOSNESDISsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_NESDIS/readSMOSNESDISsmObs.F90 b/ldt/DAobs/SMOS_NESDIS/readSMOSNESDISsmObs.F90 index 80c0e1727..fe1be1ce3 100644 --- a/ldt/DAobs/SMOS_NESDIS/readSMOSNESDISsmObs.F90 +++ b/ldt/DAobs/SMOS_NESDIS/readSMOSNESDISsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_obsMod.F90 b/ldt/DAobs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_obsMod.F90 index fea83fcea..d879060ad 100644 --- a/ldt/DAobs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_obsMod.F90 +++ b/ldt/DAobs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_NRTNN_L2sm/readSMOSNRTNNL2smObs.F90 b/ldt/DAobs/SMOS_NRTNN_L2sm/readSMOSNRTNNL2smObs.F90 index 15e9cf570..f202348eb 100644 --- a/ldt/DAobs/SMOS_NRTNN_L2sm/readSMOSNRTNNL2smObs.F90 +++ b/ldt/DAobs/SMOS_NRTNN_L2sm/readSMOSNRTNNL2smObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SMOS_NRTNN_L2sm/write_lookup_table.F90 b/ldt/DAobs/SMOS_NRTNN_L2sm/write_lookup_table.F90 index be97e9726..88af470b6 100644 --- a/ldt/DAobs/SMOS_NRTNN_L2sm/write_lookup_table.F90 +++ b/ldt/DAobs/SMOS_NRTNN_L2sm/write_lookup_table.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SSMI_SNWD/SSMISNWDsnow_obsMod.F90 b/ldt/DAobs/SSMI_SNWD/SSMISNWDsnow_obsMod.F90 index acd1e9710..91d3fc487 100644 --- a/ldt/DAobs/SSMI_SNWD/SSMISNWDsnow_obsMod.F90 +++ b/ldt/DAobs/SSMI_SNWD/SSMISNWDsnow_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/SSMI_SNWD/readSSMISNWDsnowObs.F90 b/ldt/DAobs/SSMI_SNWD/readSSMISNWDsnowObs.F90 index ce5995b4b..002455348 100644 --- a/ldt/DAobs/SSMI_SNWD/readSSMISNWDsnowObs.F90 +++ b/ldt/DAobs/SSMI_SNWD/readSSMISNWDsnowObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/THySM/THySM_obsMod.F90 b/ldt/DAobs/THySM/THySM_obsMod.F90 index 569792f9d..2195f64ff 100644 --- a/ldt/DAobs/THySM/THySM_obsMod.F90 +++ b/ldt/DAobs/THySM/THySM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/THySM/readTHySMobs.F90 b/ldt/DAobs/THySM/readTHySMobs.F90 index 33fdf3e9c..abaf99085 100644 --- a/ldt/DAobs/THySM/readTHySMobs.F90 +++ b/ldt/DAobs/THySM/readTHySMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/VIIRS_GVF/VIIRS_GVF_obsMod.F90 b/ldt/DAobs/VIIRS_GVF/VIIRS_GVF_obsMod.F90 index de9fcbb35..01dc43f22 100644 --- a/ldt/DAobs/VIIRS_GVF/VIIRS_GVF_obsMod.F90 +++ b/ldt/DAobs/VIIRS_GVF/VIIRS_GVF_obsMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/VIIRS_GVF/readVIIRS_GVFObs.F90 b/ldt/DAobs/VIIRS_GVF/readVIIRS_GVFObs.F90 index 61b26439d..5842ad0fb 100644 --- a/ldt/DAobs/VIIRS_GVF/readVIIRS_GVFObs.F90 +++ b/ldt/DAobs/VIIRS_GVF/readVIIRS_GVFObs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/WindSat_sm/WindSatsm_obsMod.F90 b/ldt/DAobs/WindSat_sm/WindSatsm_obsMod.F90 index 438695ac1..9fcd7a2ad 100644 --- a/ldt/DAobs/WindSat_sm/WindSatsm_obsMod.F90 +++ b/ldt/DAobs/WindSat_sm/WindSatsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/WindSat_sm/readWindSatsmObs.F90 b/ldt/DAobs/WindSat_sm/readWindSatsmObs.F90 index 0a1f40d50..60d168992 100644 --- a/ldt/DAobs/WindSat_sm/readWindSatsmObs.F90 +++ b/ldt/DAobs/WindSat_sm/readWindSatsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/simGRACE_JPL/readsimGRACEJPLObs.F90 b/ldt/DAobs/simGRACE_JPL/readsimGRACEJPLObs.F90 index 346215755..4ec0015a1 100644 --- a/ldt/DAobs/simGRACE_JPL/readsimGRACEJPLObs.F90 +++ b/ldt/DAobs/simGRACE_JPL/readsimGRACEJPLObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/simGRACE_JPL/simGRACEJPL_obsMod.F90 b/ldt/DAobs/simGRACE_JPL/simGRACEJPL_obsMod.F90 index 5b55999cc..3afe2b5d0 100644 --- a/ldt/DAobs/simGRACE_JPL/simGRACEJPL_obsMod.F90 +++ b/ldt/DAobs/simGRACE_JPL/simGRACEJPL_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/synthetic_sm/readsyntheticsmObs.F90 b/ldt/DAobs/synthetic_sm/readsyntheticsmObs.F90 index f7189aba0..965c19bea 100644 --- a/ldt/DAobs/synthetic_sm/readsyntheticsmObs.F90 +++ b/ldt/DAobs/synthetic_sm/readsyntheticsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/DAobs/synthetic_sm/syntheticsm_obsMod.F90 b/ldt/DAobs/synthetic_sm/syntheticsm_obsMod.F90 index d54f5b99f..10b4332da 100644 --- a/ldt/DAobs/synthetic_sm/syntheticsm_obsMod.F90 +++ b/ldt/DAobs/synthetic_sm/syntheticsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/LICENSES/geogrid-WRF_WPS_License.docx b/ldt/LICENSES/geogrid-WRF_WPS_License.docx new file mode 100644 index 000000000..5d1138e5a Binary files /dev/null and b/ldt/LICENSES/geogrid-WRF_WPS_License.docx differ diff --git a/ldt/MetforcScale/LDT_SimpleWeight_TdscaleMod.F90 b/ldt/MetforcScale/LDT_SimpleWeight_TdscaleMod.F90 index d6b989c87..10d5f4b7c 100644 --- a/ldt/MetforcScale/LDT_SimpleWeight_TdscaleMod.F90 +++ b/ldt/MetforcScale/LDT_SimpleWeight_TdscaleMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/SMAP_E_OPL/ARFSSMRETRIEVAL.F90 b/ldt/SMAP_E_OPL/ARFSSMRETRIEVAL.F90 index 137324b4f..2f7584c7d 100644 --- a/ldt/SMAP_E_OPL/ARFSSMRETRIEVAL.F90 +++ b/ldt/SMAP_E_OPL/ARFSSMRETRIEVAL.F90 @@ -1,5 +1,11 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- -! NASA GSFC Land Data Toolkit (LDT) +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- ! ! SUBROUTINE: ARFSSMRETRIEVAL @@ -7,17 +13,21 @@ ! REVISION HISTORY: ! 22 Feb 2022: P.W.LIU; Initial implemetation ! 22 Feb 2022: Yonghwan Kwon; modified for LDT +! 10 Feb 2023: Eric Kemp, modified to output retrievals in netCDF. +! 21 Feb 2023: Eric Kemp, added third LIS time level. ! ! DESCRIPTION: RETRIEVE SMAP SM FOR ARFS -! INPUT : SMAP - L1B Brightness Temperature +! INPUT : SMAP - L1B Brightness Temperature ! OUTPUT: SMAPTB_ARFSGRIDE_ddmmyyy.dat ! NOTES : Inverse Distance Squared with 0.4 deg serching window !------------------------------------------------------------------------- - subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& - ARFS_SNOW,DOY,UTChr) +subroutine ARFSSMRETRIEVAL(SMAPFILE, & + TS_bfresample_01, TS_bfresample_02, TS_bfresample_03, & + ARFS_SNOW, DOY, UTChr, firsttime, secondtime, thirdtime) - !USE HDF5 + !USE HDF5 + use esmf USE VARIABLES USE DATADOMAIN USE FUNCTIONS @@ -25,15 +35,20 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& USE invdist_temp2smap USE varsio_m USE algo_vpol_m - use LDT_logMod + use LDT_ARFSSM_netcdfMod, only: LDT_ARFSSM_write_netcdf + use LDT_logMod, only: LDT_logunit USE LDT_smap_e_oplMod - + IMPLICIT NONE ! !ARGUMENTS: CHARACTER (len=100) :: SMAPFILE - REAL*4, DIMENSION(2560,1920) :: TS_bfresample_01, TS_bfresample_02 + REAL*4, DIMENSION(2560,1920), intent(in) :: TS_bfresample_01, & + TS_bfresample_02, TS_bfresample_03 REAL*4, DIMENSION(2560,1920) :: ARFS_SNOW, UTChr INTEGER :: DOY + type(ESMF_Time), intent(in) :: firsttime + type(ESMF_Time), intent(in) :: secondtime + type(ESMF_Time), intent(in) :: thirdtime !EOP INTEGER :: i, j, nrow, mcol CHARACTER (len=100) :: fname_TAU @@ -43,7 +58,7 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& REAL*4, DIMENSION(2560,1920) :: ARFS_TAU, ARFS_CLAY, ARFS_BD, ARFS_OMEGA, ARFS_H INTEGER*1, DIMENSION(2560,1920) :: ARFS_LC, ARFS_SM_FLAG INTEGER*1 :: retrieval_flag - REAL*4, DIMENSION(2560,1920) :: ARFS_TS_01, ARFS_TS_02, ARFS_SM + REAL*4, DIMENSION(2560,1920) :: ARFS_TS_01, ARFS_TS_02, ARFS_TS_03, ARFS_SM REAL*8 ,DIMENSION(:), ALLOCATABLE :: ARFS_FINE_LAT, ARFS_FINE_LON REAL*8 ,DIMENSION(:), ALLOCATABLE :: ARFS_LAT, ARFS_LON REAL :: T1, T2 @@ -55,6 +70,16 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& integer :: L1B_dir_len,L1B_fname_len real :: utc_check + ! EMK + character(8) :: yyyymmdd + character(6) :: hhmmss + real :: deltasec, wgt + integer :: firstUTCyr, firstUTCmo, firstUTCdy, firstUTChr + integer :: secondUTCyr, secondUTCmo, secondUTCdy, secondUTChr + integer :: thirdUTCyr, thirdUTCmo, thirdUTCdy, thirdUTChr + + real :: TS_A, TS_B + nrow=2560 mcol=1920 @@ -70,6 +95,7 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& ARFS_FINE_LON = LON(arfs_geo_lon_lf,arfs_geo_lon_rt,arfs_lon_3km_space) CALL RESAMPLETEMP(TS_bfresample_01,ARFS_LAT,ARFS_LON,ARFS_FINE_LAT,ARFS_FINE_LON,ARFS_TS_01) CALL RESAMPLETEMP(TS_bfresample_02,ARFS_LAT,ARFS_LON,ARFS_FINE_LAT,ARFS_FINE_LON,ARFS_TS_02) + CALL RESAMPLETEMP(TS_bfresample_03,ARFS_LAT,ARFS_LON,ARFS_FINE_LAT,ARFS_FINE_LON,ARFS_TS_03) ! IF EVENTUALLY THE RESAMPLING DOES NOT CHANGE TEFF MUCH WE COULD SIMPLELY USE ARFS_TS=TS_bfresample ! UP TO HERE TAKES 38 SECS write (LDT_logunit,*) '[INFO] Finished resampling effective soil temperature' @@ -121,22 +147,56 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& write (LDT_logunit,*) '[INFO] Finished reading landcover' !generate soil moisture retrievals - write (LDT_logunit,*) '[INFO] Generating soil moisture retrievals' + write (LDT_logunit,*) '[INFO] Generating soil moisture retrievals' ARFS_SM=-9999 ARFS_SM_FLAG=-1 - DO i=1,nrow !ROW LON - DO j=1,mcol !COL LAT - tbv = ARFS_TB(i,j) - if(UTChr(i,j).ge.0) then - utc_check = UTChr(i,j) - floor(UTChr(i,j)) + call ESMF_TimeGet(firsttime, yy=firstUTCyr, mm=firstUTCmo, dd=firstUTCdy, & + h=firstUTChr) + call ESMF_TimeGet(secondtime, yy=secondUTCyr, mm=secondUTCmo, & + dd=secondUTCdy, & + h=secondUTChr) + call ESMF_TimeGet(thirdtime, yy=thirdUTCyr, mm=thirdUTCmo, dd=thirdUTCdy, & + h=thirdUTChr) - if(utc_check.le.0.5) then - Ts = ARFS_TS_01(i,j) - else - Ts = ARFS_TS_02(i,j) - endif - endif + DO j=1,mcol !COL LAT + DO i=1,nrow !ROW LON + + tbv = ARFS_TB(i,j) + + if (UTChr(i,j) < 0) cycle + + if (UTChr(i,j) == firstUTChr) then + TS_A = ARFS_TS_01(i,j) + TS_B = ARFS_TS_02(i,j) + wgt = 1 + else if (UTChr(i,j) > firstUTChr .and. & + UTChr(i,j) < secondUTChr) then + TS_A = ARFS_TS_01(i,j) + TS_B = ARFS_TS_02(i,j) + deltasec = ( UTChr(i,j) - firstUTChr ) * 3600 + wgt = (10800. - deltasec) / 10800. + else if (UTChr(i,j) > firstUTChr .and. & + firstUTChr == 21 .and. secondUTChr == 0) then + TS_A = ARFS_TS_01(i,j) + TS_B = ARFS_TS_02(i,j) + deltasec = ( UTChr(i,j) - firstUTChr ) * 3600 + wgt = (10800. - deltasec) / 10800. + else if (UTChr(i,j) == secondUTChr) then + TS_A = ARFS_TS_02(i,j) + TS_B = ARFS_TS_03(i,j) + wgt = 1 + else + TS_A = ARFS_TS_02(i,j) + TS_B = ARFS_TS_03(i,j) + deltasec = ( UTChr(i,j) - secondUTChr ) * 3600 + wgt = (10800. - deltasec) / 10800. + end if + if (TS_A > 0 .and. TS_B > 0) then + TS = ((wgt)*TS_A) + ((1. - wgt)*TS_B) + else + cycle + end if IF (tbv.GT.0.0.AND.Ts.GT.0.AND.ARFS_SNOW(i,j).LE.SMAPeOPL%SD_thold.AND.ARFS_BD(i,j).NE.-9999.AND.ARFS_LC(i,j).NE.0.AND.& UTChr(i,j).GE.0) THEN @@ -150,11 +210,10 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& CALL algo_vpol(real(i),real(j),sm_retrieval, tau_return, retrieval_flag) ARFS_SM(i,j)=sm_retrieval ARFS_SM_FLAG(i,j)=retrieval_flag - ELSE - !PRINT*,i, j, "NO RETRIEVAL" + END IF - END DO !jj=1,mcol !COL LAT - END DO !ii=1,nrow !ROW LON + END DO !ii=1,nrow !ROW LON + END DO !jj=1,mcol !COL LAT !write soil moisture retrieval outputs L1B_dir_len = len_trim(SMAPeOPL%L1Bdir) @@ -162,16 +221,22 @@ subroutine ARFSSMRETRIEVAL(SMAPFILE,TS_bfresample_01,TS_bfresample_02,& if(SMAPeOPL%L1Btype.eq.1) then !NRT retrieval_fname = trim(SMAPeOPL%SMoutdir)//"/"//"ARFS_SM_V_"//& - trim(SMAPFILE(L1B_dir_len+18:L1B_fname_len-3))//".dat" + trim(SMAPFILE(L1B_dir_len+18:L1B_fname_len-3))//".nc" + yyyymmdd = trim(SMAPFILE(L1B_fname_len-28:L1B_fname_len-20)) + hhmmss = trim(SMAPFILE(L1B_fname_len-19:L1B_fname_len-13)) elseif(SMAPeOPL%L1Btype.eq.2) then !Historical retrieval_fname = trim(SMAPeOPL%SMoutdir)//"/"//"ARFS_SM_V_"//& - trim(SMAPFILE(L1B_dir_len+14:L1B_fname_len-3))//".dat" + trim(SMAPFILE(L1B_dir_len+14:L1B_fname_len-3))//".nc" + yyyymmdd = trim(SMAPFILE(L1B_fname_len-28:L1B_fname_len-20)) + hhmmss = trim(SMAPFILE(L1B_fname_len-19:L1B_fname_len-13)) endif write (LDT_logunit,*) '[INFO] Writing soil moisture retrieval file ', trim(retrieval_fname) - OPEN(UNIT=151, FILE=retrieval_fname,FORM='UNFORMATTED',ACCESS='DIRECT', RECL=nrow*mcol*4) - WRITE(UNIT=151, REC = 1) ARFS_SM - CLOSE(151) + + ! NOTE: nrow is actually number of columns, mcol is actually number of + ! rows + call LDT_ARFSSM_write_netcdf(nrow, mcol, arfs_sm, retrieval_fname, & + yyyymmdd, hhmmss) write (LDT_logunit,*) '[INFO] Successfully wrote soil moisture retrieval file ', trim(retrieval_fname) write (LDT_logunit,*) '[INFO] Finished generating soil moisture retrievals' diff --git a/ldt/SMAP_E_OPL/DATADOMAIN.F90 b/ldt/SMAP_E_OPL/DATADOMAIN.F90 index 3fb9e9a24..bd21fdc53 100644 --- a/ldt/SMAP_E_OPL/DATADOMAIN.F90 +++ b/ldt/SMAP_E_OPL/DATADOMAIN.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- MODULE DATADOMAIN USE VARIABLES IMPLICIT NONE diff --git a/ldt/SMAP_E_OPL/FUNCTIONS.F90 b/ldt/SMAP_E_OPL/FUNCTIONS.F90 index bd1e93708..c7ffbc8b1 100644 --- a/ldt/SMAP_E_OPL/FUNCTIONS.F90 +++ b/ldt/SMAP_E_OPL/FUNCTIONS.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- MODULE FUNCTIONS CONTAINS diff --git a/ldt/SMAP_E_OPL/LDT_ARFSSM_netcdfMod.F90 b/ldt/SMAP_E_OPL/LDT_ARFSSM_netcdfMod.F90 new file mode 100644 index 000000000..c91f9314a --- /dev/null +++ b/ldt/SMAP_E_OPL/LDT_ARFSSM_netcdfMod.F90 @@ -0,0 +1,318 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +! MODULE: LDT_ARFSSM_netcdfMod +! +! REVISION HISTORY: +! 10 Feb 2023: Eric Kemp. Initial implementation. +! +! DESCRIPTION: Outputs SMAP based soil moisture retrieval in netCDF format. +! +!------------------------------------------------------------------------------ + +#include "LDT_misc.h" +#include "LDT_NetCDF_inc.h" + +module LDT_ARFSSM_netcdfMod + + ! Defaults + implicit none + private + + ! Public routines + public :: LDT_ARFSSM_write_netcdf + +contains + +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + ! Subroutine for writing ARFS SM retrieval to netCDF + subroutine LDT_ARFSSM_write_netcdf(nc, nr, arfs_sm, retrieval_fname, & + yyyymmdd, hhmmss) + + ! Imports + use LDT_coreMod, only: LDT_rc, LDT_masterproc + use LDT_logMod, only: LDT_logunit, LDT_endrun, LDT_verify +#if ( defined SPMD) + use mpi +#endif +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + ! Arguments + integer, intent(in) :: nc + integer, intent(in) :: nr + real*4, intent(in) :: arfs_sm(nc,nr) + character(*), intent(in) :: retrieval_fname + character(8), intent(in) :: yyyymmdd + character(6), intent(in) :: hhmmss + + ! Locals + integer :: shuffle, deflate, deflate_level + integer :: iret + integer :: ncid + integer :: dim_ids(3) + real :: dlat, dlon + real :: swlat, swlon + real :: nelat, nelon + integer :: lon_varid, lat_varid, time_varid, sm_varid + character(120) :: time_units + character(8) :: date + character(10) :: time + character(5) :: zone + integer :: values(8) + real, allocatable :: lats(:) + real, allocatable :: lons(:) + integer :: ierr + integer :: i, j + + ! Only the master process handles the file output + if (LDT_masterproc) then + write(LDT_logunit,*)'[INFO] Creating NETCDF file ', & + trim(retrieval_fname) + + ! Copy netCDF compression settings + shuffle = NETCDF_shuffle + deflate = NETCDF_deflate + deflate_level = NETCDF_deflate_level + + ! Create the output file +#if(defined USE_NETCDF3) + iret=nf90_create(path=trim(retrieval_fname),& + cmode=NF90_CLOBBER, ncid=ncid) + call LDT_verify(iret,& + '[ERR] nf90_create failed') +#endif +#if(defined USE_NETCDF4) + iret=nf90_create(path=trim(retrieval_fname),& + cmode=NF90_NETCDF4, ncid=ncid) + call LDT_verify(iret, & + '[ERR] nf90_create failed') +#endif + + ! Write out dimensions headers + call LDT_verify(nf90_def_dim(ncid, 'time', 1, dim_ids(3)), & + '[ERR] nf90_def_dim failed') + call LDT_verify(nf90_def_dim(ncid, 'lat', nr, dim_ids(2)), & + '[ERR] nf90_def_dim failed') + call LDT_verify(nf90_def_dim(ncid, 'lon', nc, dim_ids(1)), & + '[ERR] nf90_def_dim failed') + + ! Map projection + !FIXME: Allow map projections other than lat/lon + select case("latlon") + case ("latlon") + dlon = LDT_rc%gridDesc(1,9) + dlat = LDT_rc%gridDesc(1,10) + swlat = LDT_rc%gridDesc(1,4) + swlon = LDT_rc%gridDesc(1,5) + nelat = LDT_rc%gridDesc(1,7) + nelon = LDT_rc%gridDesc(1,8) + + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL,& + "MAP_PROJECTION", "EQUIDISTANT CYLINDRICAL"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL,& + "SOUTH_WEST_CORNER_LAT", swlat), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL,& + "SOUTH_WEST_CORNER_LON", swlon), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, & + "NORTH_EAST_CORNER_LAT", nelat), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, & + "NORTH_EAST_CORNER_LON", nelon), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, & + "DX", dlon),& + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, & + "DY", dlat), & + '[ERR] nf90_put_att failed') + + case default + write(LDT_logunit,*) & + '[ERR] Only latlon map projection supported for SMAP_E_OPL' + call LDT_endrun() + end select + + ! Include the water points + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, & + "INC_WATER_PTS", "true"), & + '[ERR] nf90_put_att failed') + + ! Construct the longitudes + ! FIXME: Add support for other map projections + call LDT_verify(nf90_def_var(ncid, "lon", NF90_FLOAT, dim_ids(1), & + lon_varid),'[ERR] nf90_def_var failed') +#if(defined USE_NETCDF4) + call LDT_verify(nf90_def_var_deflate(ncid, & + lon_varid, shuffle, deflate, deflate_level),& + '[ERR] nf90_def_var_deflate') +#endif + call LDT_verify(nf90_put_att(ncid, lon_varid, & + "units", "degrees_east"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, lon_varid, & + "long_name", "longitude"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, lon_varid, & + "standard_name", "longitude"), & + '[ERR] nf90_put_att failed') + + ! Construct the latitudes + ! FIXME: Add support for other map projections + call LDT_verify(nf90_def_var(ncid, "lat", NF90_FLOAT, dim_ids(2), & + lat_varid), '[ERR] nf90_def_var failed') +#if(defined USE_NETCDF4) + call LDT_verify(nf90_def_var_deflate(ncid, & + lat_varid, shuffle, deflate, deflate_level),& + '[ERR] nf90_def_var_deflate') + call LDT_verify(nf90_put_att(ncid, lat_varid, & + "units", "degrees_north"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, lat_varid, & + "long_name", "latitude"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, lat_varid, & + "standard_name", "latitude"), & + '[ERR] nf90_put_att failed') +#endif + + ! Define the time array. The valid time will be written as an + ! attribute. + call LDT_verify(nf90_def_var(ncid, 'time', NF90_DOUBLE, & + dimids=dim_ids(3), varid=time_varid), & + '[ERR] nf90_def_var failed') + write(time_units,'(A)') & + "seconds since "//yyyymmdd(1:4)//"-" & + //yyyymmdd(5:6)//"-" & + //yyyymmdd(7:8)//" " & + //hhmmss(1:2)//":"//hhmmss(3:4)//":"//hhmmss(5:6) + call LDT_verify(nf90_put_att(ncid, time_varid, & + "units", trim(time_units)), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, time_varid, & + "long_name", "time"), & + '[ERR] nf90_put_att failed') + + ! Define the soil moisture retrieval + call LDT_verify(nf90_def_var(ncid, "arfs_sm", NF90_FLOAT, & + dimids=dim_ids, & + varid=sm_varid), '[ERR] nf90_def_var failed') +#if (defined USE_NETCDF4) + call LDT_verify(nf90_def_var_deflate(ncid, & + sm_varid, shuffle, deflate, deflate_level), & + '[ERR] nf90_def_var_deflate failed') +#endif + call LDT_verify(nf90_put_att(ncid, sm_varid, & + "units", "m^3/m^3"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, sm_varid, & + "long_name","soil moisture"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, sm_varid, & + '_FillValue', -9999.), & + '[ERR] nf90_put_att failed') + + ! Miscellaneous header information + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "Conventions", & + "CF-1.10"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "title", & + "LDT SMAP_E_OPL retrieval"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "institution", & + "NASA GSFC Hydrological Sciences Laboratory"), & + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "source", & + "Land Data Toolkit (LDT)"), & + '[ERR] nf90_put_att failed') + call date_and_time(date, time, zone, values) +#ifndef LDT_SKIP_HISTORY + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "history", & + "created on date: "//date(1:4)//"-"//date(5:6)//"-"//& + date(7:8)//"T"//time(1:2)//":"//time(3:4)//":"//time(5:10)), & + '[ERR] nf90_put_att failed') +#endif + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "references", & + "Arsenault_etal_GMD_2018, Kumar_etal_EMS_2006"),& + '[ERR] nf90_put_att failed') + call LDT_verify(nf90_put_att(ncid, NF90_GLOBAL, "comment", & + "website: http://lis.gsfc.nasa.gov/"), & + '[ERR] nf90_put_att failed') + + ! We are ready to write the actual data. This requires taking NETCDF + ! out of define mode. + call LDT_verify(nf90_enddef(ncid), & + '[ERR] ncf90_enddef failed') + + ! Write the latitude data + allocate(lats(nr)) + do j = 1, nr + lats(j) = swlat + (j-1)*(dlat) + end do + call LDT_verify(nf90_put_var(ncid, lat_varid, & + lats(:), (/1/), (/nr/)), & + '[ERR] nf90_put_var failed for lats') + deallocate(lats) + + ! Write the longitude data + allocate(lons(nc)) + do i = 1, nc + lons(i) = swlon + (i-1)*(dlon) + end do + call LDT_verify(nf90_put_var(ncid, lon_varid, lons(:),& + (/1/), (/nc/)), & + '[ERR] nf90_put_var failed for lon') + deallocate(lons) + + ! Write the time data + call LDT_verify(nf90_put_var(ncid, time_varid, 0.0), & + '[ERR] nf90_put_var failed for time') + + ! Write the ARFS SM field + call LDT_verify(nf90_put_var(ncid, sm_varid, & + arfs_sm(:,:), & + (/1,1/), (/nc,nr/)), & + '[ERR] nf90_put_var failed for sm') + + ! Close the file and clean up + call LDT_verify(nf90_close(ncid), & + '[ERR] nf90_close failed!') + endif + + ierr = 0 +#if (defined SPMD) + call mpi_barrier(MPI_COMM_WORLD, ierr) +#endif + end subroutine LDT_ARFSSM_write_netcdf +#else + ! Dummy version + subroutine LDT_ARFSSM_write_netcdf(nc, nr, arfs_sm, retrieval_fname, & + yyyymmdd, hhmmss) + use LDT_logMod, only: LDT_logunit, LDT_endrun + implicit none + integer, intent(in) :: nc + integer, intent(in) :: nr + real*4, intent(in) :: arfs_sm(nc,nr) + character(*), intent(in) :: retrieval_fname + character(8), intent(in) :: yyyymmdd + character(6), intent(in) :: hhmmss + write(LDT_logunit,*)'[ERR] LDT not compiled with NETCDF support!' + write(LDT_logunit,*)'Cannot write ARFS SM retrieval in NETCDF format!' + write(LDT_logunit,*)'Recompile with NETCDF support and try again!' + call LDT_endrun() + end subroutine LDT_ARFSSM_write_netcdf +#endif + +end module LDT_ARFSSM_netcdfMod + diff --git a/ldt/SMAP_E_OPL/LDT_smap_e_oplMod.F90 b/ldt/SMAP_E_OPL/LDT_smap_e_oplMod.F90 index d32c497fe..90ad7b676 100644 --- a/ldt/SMAP_E_OPL/LDT_smap_e_oplMod.F90 +++ b/ldt/SMAP_E_OPL/LDT_smap_e_oplMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -15,6 +15,12 @@ ! ! !REVISION HISTORY: ! 14 Dec 2021: Yonghwan Kwon, Initial Specification +! 06 Feb 2023: Eric Kemp, now process subset of SMAP fields. +! 14 Feb 2023: Eric Kemp, now uses USAFSI and USAF LIS output. +! 22 Feb 2023: Eric Kemp, ensemble size now in ldt.config file. +! 01 Jul 2023: Mahdi Navari,This edit generates a separate SMAP_filelist +! for each LDT job based on user input. +! Now we can run several LDT jobs in the same directory. ! #include "LDT_misc.h" #include "LDT_NetCDF_inc.h" @@ -38,7 +44,7 @@ module LDT_smap_e_oplMod CLAYfile, Hfile, LCfile character*100 :: dailystats_ref, dailystats_lis character*10 :: date_curr - integer :: L1BresampWriteOpt, L1Btype + integer :: L1BresampWriteOpt, L1Btype, SMAPfilelistSuffixNumber integer :: Teffscale integer :: ntimes,ngrid real, allocatable :: mu_6am_ref(:), mu_6pm_ref(:) !(ngrid) @@ -48,7 +54,9 @@ module LDT_smap_e_oplMod integer, allocatable :: grid_col(:), grid_row(:) !(ngrid) real, allocatable :: ARFS_TBV_COR(:,:) real :: SD_thold - + integer :: num_ens ! Number of ensemble members in LIS USAF file. + integer :: num_tiles ! Total number of tiles in LIS USAF file. + integer :: ntiles_pergrid ! Number of tiles per grid point end type smap_e_opl_dec type(smap_e_opl_dec), public :: SMAPeOPL @@ -61,7 +69,7 @@ subroutine LDT_smap_e_oplInit() ! Imports use ESMF use LDT_coreMod, only: LDT_config - use LDT_logMod, only: LDT_verify + use LDT_logMod, only: LDT_logunit, LDT_endrun, LDT_verify ! Defaults implicit none @@ -103,6 +111,12 @@ subroutine LDT_smap_e_oplInit() call ESMF_ConfigGetAttribute(LDT_config, SMAPeOPL%L1BresampWriteOpt, rc=rc) call LDT_verify(rc, trim(cfg_entry)//" not specified") + cfg_entry = "SMAP_E_OPL filelist suffix number:" + call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + call ESMF_ConfigGetAttribute(LDT_config, SMAPeOPL%SMAPfilelistSuffixNumber, rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + if(SMAPeOPL%L1BresampWriteOpt.eq.1) then cfg_entry = "SMAP_E_OPL L1B resampled output directory:" call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) @@ -143,6 +157,42 @@ subroutine LDT_smap_e_oplInit() call ESMF_ConfigGetAttribute(LDT_config, SMAPeOPL%LISsnowdir, rc=rc) call LDT_verify(rc, trim(cfg_entry)//" not specified") + cfg_entry = "SMAP_E_OPL LIS ensemble size:" + call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + call ESMF_ConfigGetAttribute(LDT_config, SMAPeOPL%num_ens, rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + if (SMAPeOPL%num_ens < 1) then + write(LDT_logunit,*)'[ERR] LIS ensemble size must be at least 1!' + write(LDT_logunit,*)'[ERR] Read in ', SMAPeOPL%num_ens + call LDT_endrun() + end if + + cfg_entry = "SMAP_E_OPL LIS total number of tiles (including ensembles):" + call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + call ESMF_ConfigGetAttribute(LDT_config, SMAPeOPL%num_tiles, rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + if (SMAPeOPL%num_tiles < 1) then + write(LDT_logunit,*) & + '[ERR] LIS total number of tiles (including ensembles) must be' & + //'at least 1!' + write(LDT_logunit,*)'[ERR] Read in ', SMAPeOPL%num_tiles + call LDT_endrun() + end if + + cfg_entry = "SMAP_E_OPL LIS number of tiles per grid point:" + call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + call ESMF_ConfigGetAttribute(LDT_config, SMAPeOPL%ntiles_pergrid, rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + if (SMAPeOPL%num_tiles < 1) then + write(LDT_logunit,*) & + '[ERR] LIS number of tiles per grid point must be at least 1!' + write(LDT_logunit,*)'[ERR] Read in ', SMAPeOPL%ntiles_pergrid + call LDT_endrun() + end if + cfg_entry = "SMAP_E_OPL snow depth threshold:" call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) call LDT_verify(rc, trim(cfg_entry)//" not specified") @@ -192,8 +242,9 @@ subroutine LDT_smap_e_oplRun(n) ! This calls the actual SMAP_E_OPL driver ! !USES: - use LDT_logMod + use esmf use LDT_coreMod + use LDT_logMod implicit none ! !ARGUMENTS: @@ -205,28 +256,42 @@ subroutine LDT_smap_e_oplRun(n) integer :: ftn, ierr character*100 :: fname character*100 :: smap_L1B_filename(10) - character*8 :: yyyymmdd, yyyymmdd_01, yyyymmdd_02 + character*8 :: yyyymmdd, yyyymmdd_01, yyyymmdd_02, yyyymmdd_03 character*6 :: hhmmss(10) - character*4 :: yyyy, yyyy_01, yyyy_02 + character*4 :: yyyy, yyyy_01, yyyy_02, yyyy_03 character*2 :: hh, mm, dd - character*2 :: hh_01, mm_01, dd_01 + character*2 :: hh_01, mm_01, dd_01 character*2 :: hh_02, mm_02, dd_02 + character*2 :: hh_03, mm_03, dd_03 + character*2 :: tmp character*1 :: Orbit integer :: yr, mo, da, hr - integer :: yr_pre, mo_pre, da_pre + integer :: yr_pre, mo_pre, da_pre, hh_pre integer :: yr_02, mo_02, da_02, hr_02 + integer :: yr_03, mo_03, da_03, hr_03 logical :: dir_exists, read_L1Bdata real :: teff_01(LDT_rc%lnc(n),LDT_rc%lnr(n)) real :: teff_02(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: teff_03(LDT_rc%lnc(n),LDT_rc%lnr(n)) real :: SnowDepth(LDT_rc%lnc(n),LDT_rc%lnr(n)) - real :: TIMEsec(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real*8 :: TIMEsec(LDT_rc%lnc(n),LDT_rc%lnr(n)) real :: UTChr(LDT_rc%lnc(n),LDT_rc%lnr(n)) integer :: L1B_dir_len integer :: doy_pre, doy_curr + type(ESMF_Calendar) :: calendar + type(ESMF_Time) :: firsttime, secondtime, thirdtime, curtime, prevdaytime + type(ESMF_TimeInterval) :: deltatime + integer :: deltahr + integer :: rc + integer :: col, row + external :: readUSAFSI + external :: readLIS_Teff_usaf - ! Resample SMAP L1B to L1C + allocate(LDT_rc%nensem(LDT_rc%nnest)) + + ! Resample SMAP L1B to L1C call search_SMAPL1B_files(SMAPeOPL%L1Bdir,SMAPeOPL%date_curr,& - SMAPeOPL%L1Btype) + SMAPeOPL%L1Btype, SMAPeOPL%SMAPfilelistSuffixNumber) yyyymmdd = SMAPeOPL%date_curr(1:8) yyyy = SMAPeOPL%date_curr(1:4) @@ -242,10 +307,11 @@ subroutine LDT_smap_e_oplRun(n) trim(SMAPeOPL%L1Bresampledir_02)) endif + write (tmp,'(I2.2)') SMAPeOPL%SMAPfilelistSuffixNumber + ftn = LDT_getNextUnitNumber() - open(unit=ftn, file='./SMAP_L1B_filelist.dat',& + open(unit=ftn, file='./SMAP_L1B_filelist_'//tmp//'.dat',& status='old', iostat=ierr) - fi = 0 do while (ierr .eq. 0) read (ftn, '(a)', iostat=ierr) fname @@ -268,15 +334,29 @@ subroutine LDT_smap_e_oplRun(n) if(i == fi) then write (LDT_logunit,*) '[INFO] Resampling ', trim(smap_L1B_filename(i)) allocate(SMAPeOPL%ARFS_TBV_COR(LDT_rc%lnc(n),LDT_rc%lnr(n))) - call SMAPL1BRESAMPLE(smap_L1B_filename(i),SMAPeOPL%L1Bdir,Orbit,TIMEsec) - write (LDT_logunit,*) '[INFO] Finished resampling ', trim(smap_L1B_filename(i)) - read_L1Bdata = .true. + ! EMK...Process subset of fields. + call SMAPL1BRESAMPLE_subset(smap_L1B_filename(i), & + SMAPeOPL%L1Bdir, Orbit, TIMEsec, rc) + + if (rc == 0) then + write (LDT_logunit,*) '[INFO] Finished resampling ', trim(smap_L1B_filename(i)) + read_L1Bdata = .true. + else + deallocate(SMAPeOPL%ARFS_TBV_COR) + end if elseif(hhmmss(i) /= hhmmss(i+1)) then write (LDT_logunit,*) '[INFO] Resampling ', trim(smap_L1B_filename(i)) allocate(SMAPeOPL%ARFS_TBV_COR(LDT_rc%lnc(n),LDT_rc%lnr(n))) - call SMAPL1BRESAMPLE(smap_L1B_filename(i),SMAPeOPL%L1Bdir,Orbit,TIMEsec) - write (LDT_logunit,*) '[INFO] Finished resampling ', trim(smap_L1B_filename(i)) - read_L1Bdata = .true. + !EMK Process subset of fields. + call SMAPL1BRESAMPLE_subset(smap_L1B_filename(i), & + SMAPeOPL%L1Bdir, Orbit, TIMEsec, rc) + + if (rc == 0) then + write (LDT_logunit,*) '[INFO] Finished resampling ', trim(smap_L1B_filename(i)) + read_L1Bdata = .true. + else + deallocate(SMAPeOPL%ARFS_TBV_COR) + end if endif if(read_L1Bdata) then @@ -285,105 +365,94 @@ subroutine LDT_smap_e_oplRun(n) ! use LIS outputs from previous day read(yyyy,*,iostat=ierr) yr read(mm,*,iostat=ierr) mo - read(dd,*,iostat=ierr) da + read(dd,*,iostat=ierr) da read(hh,*,iostat=ierr) hr - yr_pre = yr - mo_pre = mo - da_pre = da - 1 - if(da_pre.eq.0) then - mo_pre = mo - 1 - - if(mo_pre.eq.0) then - yr_pre = yr - 1 - mo_pre = 12 - da_pre = 31 - else - if(mo_pre.eq.1.or.& - mo_pre.eq.3.or.& - mo_pre.eq.5.or.& - mo_pre.eq.7.or.& - mo_pre.eq.8.or.& - mo_pre.eq.10.or.& - mo_pre.eq.12) then - da_pre = 31 - elseif(mo_pre.eq.2) then - if(mod(yr,4).eq.0) then - da_pre = 29 - else - da_pre = 28 - endif - else - da_pre = 30 - endif - endif - endif + calendar = ESMF_CalendarCreate(ESMF_CALKIND_GREGORIAN, & + name="Gregorian", & + rc=rc) + + ! Set current time + call ESMF_TimeSet(curtime, yy=yr, mm=mo, dd=da, h=hr, m=0, s=0, & + calendar=calendar, rc=rc) + call LDT_verify(rc, '[ERR] in ESMF_TimeSet in LDT_smap_e_oplRun') + ! Go back 24 hours + call ESMF_TimeIntervalSet(deltatime, d=1, rc=rc) + call LDT_verify(rc, & + '[ERR] in ESMF_TimeIntervalSet in LDT_smap_e_oplRun') + prevdaytime = curtime - deltatime + + ! Now, find the nearest 3-hrly time (00Z, 03Z, ..., 21Z) prior + ! to prevdaytime + if (mod(hr, 3) == 0) then + deltahr = 0 + else + deltahr = hr - ((floor(real(hr)/3.))*3) + end if + call ESMF_TimeIntervalSet(deltatime, h=deltahr, rc=rc) + call LDT_verify(rc, & + '[ERR] in ESMF_TimeIntervalSet in LDT_smap_e_oplRun') + firsttime = prevdaytime - deltatime + + ! Now, find the next 3-hrly time (00Z, 03Z, ..., 21Z) after + ! firsttime + call ESMF_TimeIntervalSet(deltatime, h=3, rc=rc) + call LDT_verify(rc, & + '[ERR] in ESMF_TimeIntervalSet in LDT_smap_e_oplRun') + secondtime = firsttime + deltatime + + ! Now, find the next 3-hrly time (00Z, 03Z, ..., 21Z) after + ! secondtime + call ESMF_TimeIntervalSet(deltatime, h=3, rc=rc) + call LDT_verify(rc, & + '[ERR] in ESMF_TimeIntervalSet in LDT_smap_e_oplRun') + thirdtime = secondtime + deltatime + + ! Now, read the first time. + call ESMF_TimeGet(firsttime, yy=yr_pre, mm=mo_pre, dd=da_pre, & + h=hh_pre) write(unit=yyyy_01, fmt='(i4.4)') yr_pre write(unit=mm_01, fmt='(i2.2)') mo_pre write(unit=dd_01, fmt='(i2.2)') da_pre yyyymmdd_01 = trim(yyyy_01)//trim(mm_01)//trim(dd_01) - hh_01 = hh - - call readLIS_Teff(n,yyyymmdd_01,hh_01,Orbit,teff_01) - - yr_02 = yr_pre - mo_02 = mo_pre - da_02 = da_pre - hr_02 = hr + 1 - - if(hr_02.eq.24) then - hr_02 = 0 - da_02 = da_pre + 1 - - if(mo_pre.eq.1.or.& - mo_pre.eq.3.or.& - mo_pre.eq.5.or.& - mo_pre.eq.7.or.& - mo_pre.eq.8.or.& - mo_pre.eq.10.or.& - mo_pre.eq.12) then - if(da_02.gt.31) then - da_02 = 1 - mo_02 = mo_pre + 1 - endif - elseif(mo_pre.eq.2) then - if(mod(yr_02,4).eq.0) then - if(da_02.gt.29) then - da_02 = 1 - mo_02 = mo_pre + 1 - endif - else - if(da_02.gt.28) then - da_02 = 1 - mo_02 = mo_pre + 1 - endif - endif - else - if(da_02.gt.30) then - da_02 = 1 - mo_02 = mo_pre + 1 - endif - endif - - if(mo_02.gt.12) then - mo_02 = 1 - yr_02 = yr_pre + 1 - endif + write(unit=hh_01, fmt='(i2.2)') hh_pre + call readLIS_Teff_usaf(n, yyyymmdd_01, hh_01, Orbit, teff_01, rc) + if (rc .ne. 0) then + write(LDT_logunit,*)'[WARN] No Teff data available...' endif + ! Now, read the second time. + call ESMF_TimeGet(secondtime, yy=yr_02, mm=mo_02, dd=da_02, & + h=hr_02) + write(unit=yyyy_02, fmt='(i4.4)') yr_02 write(unit=mm_02, fmt='(i2.2)') mo_02 write(unit=dd_02, fmt='(i2.2)') da_02 write(unit=hh_02, fmt='(i2.2)') hr_02 yyyymmdd_02 = trim(yyyy_02)//trim(mm_02)//trim(dd_02) + call readLIS_Teff_usaf(n, yyyymmdd_02, hh_02, Orbit, teff_02, rc) + if (rc .ne. 0) then + write(LDT_logunit,*)'[WARN] No Teff data available...' + endif - call readLIS_Teff(n,yyyymmdd_02,hh_02,Orbit,teff_02) + ! Now read the third time. + call ESMF_TimeGet(thirdtime, yy=yr_03, mm=mo_03, dd=da_03, & + h=hr_03) + + write(unit=yyyy_03, fmt='(i4.4)') yr_03 + write(unit=mm_03, fmt='(i2.2)') mo_03 + write(unit=dd_03, fmt='(i2.2)') da_03 + write(unit=hh_03, fmt='(i2.2)') hr_03 + yyyymmdd_03 = trim(yyyy_03)//trim(mm_03)//trim(dd_03) + call readLIS_Teff_usaf(n, yyyymmdd_03, hh_03, Orbit, teff_03, rc) + if (rc .ne. 0) then + write(LDT_logunit,*)'[WARN] No Teff data available...' + endif - ! Scale LIS teff to GEOS teff climatology + ! Scale LIS teff to GEOS teff climatology ! get DOY call get_doy(mo_pre,da_pre,doy_pre) - if(SMAPeOPL%Teffscale.eq.1) then ! get getattributes call getattributes(SMAPeOPL%dailystats_ref,& @@ -402,10 +471,9 @@ subroutine LDT_smap_e_oplRun(n) allocate(SMAPeOPL%grid_row(SMAPeOPL%ngrid)) call read_DailyTeffStats(doy_pre) - ! scale write (LDT_logunit,*) '[INFO] Scaling LIS effective soil temperature' - call scale_teff(n,Orbit,teff_01,teff_02) + call scale_teff(n, Orbit, teff_01, teff_02, teff_03) write (LDT_logunit,*) '[INFO] Finished scaling LIS effective soil temperature' deallocate(SMAPeOPL%mu_6am_ref) @@ -419,25 +487,29 @@ subroutine LDT_smap_e_oplRun(n) deallocate(SMAPeOPL%grid_col) deallocate(SMAPeOPL%grid_row) endif - read_L1Bdata = .false. ! Get snow information from LIS outputs - call readLIS_snow(n,yyyymmdd,hh,SnowDepth) + call readUSAFSI(n, yyyymmdd, hh, SnowDepth, rc) + if (rc .ne. 0) then + write(LDT_logunit,*)'[WARN] No USAFSI data available!' + endif ! Retrieve SMAP soil moisture ! get DOY call get_doy(mo,da,doy_curr) ! get UTC - call get_UTC(n,TIMEsec,UTChr) + call get_UTC(n,TIMEsec,UTChr) + + !write(LDT_logunit,*)'EMK: UTChr = ', UTChr ! retrieve ierr = LDT_create_subdirs(len_trim(SMAPeOPL%SMoutdir), & trim(SMAPeOPL%SMoutdir)) - call ARFSSMRETRIEVAL(smap_L1B_filename(i),teff_01,teff_02,& - SnowDepth,doy_curr,UTChr) - + call ARFSSMRETRIEVAL(smap_L1B_filename(i), & + teff_01, teff_02, teff_03, & + SnowDepth, doy_curr, UTChr, firsttime, secondtime, thirdtime) deallocate(SMAPeOPL%ARFS_TBV_COR) endif enddo @@ -446,34 +518,37 @@ subroutine LDT_smap_e_oplRun(n) end subroutine LDT_smap_e_oplRun - subroutine search_SMAPL1B_files(ndir,date_curr,L1Btype) + subroutine search_SMAPL1B_files(ndir,date_curr,L1Btype,suffix) implicit none ! !ARGUMENTS: character (len=*) :: ndir character (len=*) :: date_curr - integer :: L1Btype + integer :: L1Btype,suffix ! !Local variables character*8 :: yyyymmdd character*2 :: hh + character*2 :: tmp character*200 :: list_files yyyymmdd = date_curr(1:8) hh = date_curr(9:10) + write (tmp,'(I2.2)') suffix if(L1Btype.eq.1) then !NRT list_files = 'ls '//trim(ndir)//'/SMAP_L1B_TB_NRT_*'//& trim(yyyymmdd)//'T'//trim(hh) & - //"*.h5 > SMAP_L1B_filelist.dat" + //'*.h5 > SMAP_L1B_filelist_'//trim(tmp)//'.dat' elseif(L1Btype.eq.2) then !Historical list_files = 'ls '//trim(ndir)//'/SMAP_L1B_TB_*'//& trim(yyyymmdd)//'T'//trim(hh) & - //"*.h5 > SMAP_L1B_filelist.dat" + //'*.h5 > SMAP_L1B_filelist_'//trim(tmp)//'.dat' endif call system(trim(list_files)) end subroutine search_SMAPL1B_files + end module LDT_smap_e_oplMod diff --git a/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS.F90 b/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS.F90 index 8c2b2caad..3f73ca329 100644 --- a/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS.F90 +++ b/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS.F90 @@ -1,5 +1,11 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- -! NASA GSFC Land Data Toolkit (LDT) +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- ! ! SUBROUTINE: SMAPL1BRESAMPLE diff --git a/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS_SUBSET.F90 b/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS_SUBSET.F90 new file mode 100644 index 000000000..57a4343a0 --- /dev/null +++ b/ldt/SMAP_E_OPL/SMAPL1BTOL1C_ARFS_SUBSET.F90 @@ -0,0 +1,117 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +! SUBROUTINE: SMAPL1BRESAMPLE +! +! REVISION HISTORY: +! 22 Oct 2021: P.W.LIU; Initial implemetation +! 18 Dec 2021: Yonghwan Kwon; modified for LDT +! 09 Feb 2023: Eric Kemp; now processes subset of fields, no output of +! data to separate binary files. +! 19 Apr 2024: Eric Kemp; changed pixel times to REAL*8. +! +! DESCRIPTION: RESAMPLE SMAPL1B TB TO AIR FORCE GRID +! INPUT : SMAP - L1B Brightness Temperature +! OUTPUT: SMAPTB_ARFSGRIDE_ddmmyyy.dat +! NOTES : Inverse Distance Squared with 0.4 deg serching window +!------------------------------------------------------------------------- + +subroutine SMAPL1BRESAMPLE_SUBSET(SMAPFILE,L1B_dir,Orbit,ARFS_TIME,rc) + + USE VARIABLES + USE DATADOMAIN + USE FUNCTIONS + USE TOOLSUBS + USE invdist_l1b2arfs + USE LDT_logMod + USE LDT_smap_e_oplMod + + IMPLICIT NONE + + INTEGER :: i, j, nrow, mcol + CHARACTER (len=100) :: SMAPFILE + character (len=100) :: L1B_dir + character (len=20) :: variable_name(13) + character (len=100) :: resample_filename(13) + character (len=1) :: Orbit + integer :: var_i + integer :: L1B_dir_len,L1B_fname_len + integer :: ierr + integer :: rc + + REAL*8,DIMENSION(:,:),ALLOCATABLE :: TIME_L1B + REAL*4,DIMENSION(:,:),ALLOCATABLE :: TBV_COR_L1B + REAL*4,DIMENSION(:,:),ALLOCATABLE :: LAT_L1B, LON_L1B, SCNANG_L1B + REAL*4,DIMENSION(:),ALLOCATABLE :: ANTSCN_L1B + INTEGER*4,DIMENSION(:,:),ALLOCATABLE :: TBVFLAG_L1B, TBHFLAG_L1B + REAL*8,DIMENSION(:), ALLOCATABLE :: ARFS_LAT, ARFS_LON + REAL*8,DIMENSION(2560,1920) :: ARFS_TIME + REAL*4,DIMENSION(2560,1920) :: ARFS_COR_TBV + + REAL :: T1, T2 + + rc = 0 + + CALL ARFS_GEO + ALLOCATE(ARFS_LAT(arfs_nrow_lat),ARFS_LON(arfs_mcol_lon)) + ARFS_LAT = LAT(arfs_geo_lat_lo,arfs_geo_lat_up,-arfs_lat_space) + ARFS_LON = LON(arfs_geo_lon_lf,arfs_geo_lon_rt,arfs_lon_space) + + !Input (Path/filename, datatypes, lat, lon) Return(DATA,LAT,LON,length of row and col) + ! READ SMAP_L1B DATA FROM HDF5 + + ! EMK...Try fault tolerant NRT version. + CALL GetSMAP_L1B_NRT_SUBSET(SMAPFILE, TIME_L1B, TBV_COR_L1B, & + LAT_L1B, LON_L1B, TBVFLAG_L1B, TBHFLAG_L1B, & + ANTSCN_L1B, SCNANG_L1B, nrow, mcol, ierr) + if (ierr == 1) then + if (nrow == 0 .and. mcol == 0) then + write(LDT_logunit,*)'[ERR] Problem reading ', trim(SMAPFILE) + rc = 1 + return + else + write(LDT_logunit,*)'[ERR] Unknown internal error!' + write(LDT_logunit,*)'[ERR] Aborting...' + call LDT_endrun() + end if + end if + + !Input (DATA,LAT,LON,length of row and col); Return(TB in ARFS GRID) + !CALL L1BTB2ARFS_INVDIS(TIME_L1B, TBV_COR_L1B, TBH_COR_L1B, TBV_L1B, TBH_L1B, SURWAT_V_L1B, SURWAT_H_L1B, & + ! NETD_V_L1B, NETD_H_L1B, LAT_L1B, LON_L1B, TBVFLAG_L1B, TBHFLAG_L1B, ANTSCN_L1B, SCNANG_L1B, nrow, mcol, & + ! ARFS_LAT, ARFS_LON, ARFS_TIME, ARFS_COR_TBV, ARFS_COR_TBH, ARFS_TBV, ARFS_TBH, ARFS_NEDTV, ARFS_NEDTH, & + ! ARFS_SURWAT_V, ARFS_SURWAT_H, ARFS_WTV, ARFS_WTH, ARFS_SAMPLE_V, ARFS_SAMPLE_H) + CALL L1BTB2ARFS_INVDIS_SUBSET(TIME_L1B, TBV_COR_L1B, & + LAT_L1B, LON_L1B, TBVFLAG_L1B, TBHFLAG_L1B, ANTSCN_L1B, SCNANG_L1B, & + nrow, mcol, & + ARFS_LAT, ARFS_LON, ARFS_TIME, ARFS_COR_TBV) + SMAPeOPL%ARFS_TBV_COR = ARFS_COR_TBV + + L1B_dir_len = len_trim(L1B_dir) + L1B_fname_len = len_trim(SMAPFILE) + + if(SMAPeOPL%L1Btype.eq.1) then !NRT + Orbit = trim(SMAPFILE(L1B_dir_len+24:L1B_dir_len+24)) + elseif(SMAPeOPL%L1Btype.eq.2) then !Historical + Orbit = trim(SMAPFILE(L1B_dir_len+20:L1B_dir_len+20)) + endif + + ! Cleanup + deallocate(TBV_COR_L1B) + deallocate(LAT_L1B) + deallocate(LON_L1B) + deallocate(SCNANG_L1B) + deallocate(ANTSCN_L1B) + deallocate(TBVFLAG_L1B) + deallocate(TBHFLAG_L1B) + deallocate(ARFS_LAT) + deallocate(ARFS_LON) + +end subroutine SMAPL1BRESAMPLE_SUBSET diff --git a/ldt/SMAP_E_OPL/TOOLSUBS.F90 b/ldt/SMAP_E_OPL/TOOLSUBS.F90 index 33bf25ce4..3bba00378 100644 --- a/ldt/SMAP_E_OPL/TOOLSUBS.F90 +++ b/ldt/SMAP_E_OPL/TOOLSUBS.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- !=============================i========================================== ! MODULE, TOOLSUBS P.W.LIU, 09/12/18 ! Contains subroutines that are necessry for downscaling program @@ -59,7 +68,7 @@ SUBROUTINE AVHRR_NDVI(ssid,lon_ind,lat_ind,avg_NDVI) !sd_id = sfstart(trim(filename),DFACC) !ssid = sfselect(sd_id, 0) -#if (defined USE_HDF5) +#if (defined USE_HDF4) status = sfrdata(ssid,start, stride,edges, data) #endif !PRINT *, "Filename", filename @@ -90,7 +99,7 @@ SUBROUTINE AVHRR_NDVI_MATRIX(ssid,lon_ind,lat_ind, NDVI_MAT) !DFACC=1 !Read Only Access !sd_id = sfstart(trim(filename),DFACC) !ssid = sfselect(sd_id, 0) -#if (defined USE_HDF5) +#if (defined USE_HDF4) status = sfrdata(ssid,start, stride,edges, data) #endif NDVI_MAT=-9999 @@ -181,6 +190,8 @@ END SUBROUTINE GetSMAP_L2 SUBROUTINE GetSMAP_L1B(filename, data1_out, data2_out, data3_out, data4_out, data5_out, data6_out, data7_out, data8_out, & data9_out, data10_out, data11_out, data12_out, data13_out, data14_out, data15_out, n, m) + use LDT_logMod, only: LDT_logunit ! EMK + CHARACTER (len=100) :: filename, dataset1, dataset2, dataset3, dataset4, dataset5, dataset6, dataset7 CHARACTER (len=100) :: dataset8, dataset9, dataset10, dataset11, dataset12, dataset13, dataset14, dataset15 #if (defined USE_HDF5) @@ -216,8 +227,9 @@ SUBROUTINE GetSMAP_L1B(filename, data1_out, data2_out, data3_out, data4_out, dat #if (defined USE_HDF5) CALL h5open_f(hdferr) !Initialize hdf5 CALL h5fopen_f (trim(filename),H5F_ACC_RDONLY_F,file_id,hdferr) !Open file -! PRINT*, 'sd_id, hdferr', file_id, hdferr + ! PRINT*, 'sd_id, hdferr', file_id, hdferr CALL h5dopen_f (file_id, trim(dataset1),dataset_id1, hdferr) !Open dataset + call h5dget_space_f(dataset_id1,dspace_id,hdferr) call h5sget_simple_extent_dims_f(dspace_id, dims, maxdims, hdferr) CALL h5dopen_f (file_id, trim(dataset2),dataset_id2, hdferr) !Open dataset @@ -235,7 +247,6 @@ SUBROUTINE GetSMAP_L1B(filename, data1_out, data2_out, data3_out, data4_out, dat CALL h5dopen_f (file_id, trim(dataset14),dataset_id14, hdferr) !Open dataset CALL h5dopen_f (file_id, trim(dataset15),dataset_id15, hdferr) !Open dataset - !PRINT*,'ds_id hdferr', dataset_id1, hdferr !PRINT*,'dims maxdims', dims, maxdims n=dims(1) @@ -285,6 +296,1125 @@ SUBROUTINE GetSMAP_L1B(filename, data1_out, data2_out, data3_out, data4_out, dat #endif END SUBROUTINE GetSMAP_L1B + ! Forked version of GetSMAP_L1B to SMAP files in operations, processing + ! a subset of the fields. Also with fault tolerance and some special + ! logic for older NRT files missing the tb_v_surface_corrected field. + ! Eric Kemp/SSAI. + SUBROUTINE GetSMAP_L1B_NRT_subset(filename, tb_time_seconds, & + tb_v_surface_corrected, & + tb_lat, tb_lon, tb_qual_flag_v, tb_qual_flag_h, sc_nadir_angle, & + antenna_scan_angle, n, m, ierr) + + ! Imports + use LDT_logMod, only: LDT_logunit, LDT_endrun ! EMK + + ! Arguments + character(*), intent(in) :: filename + real*8, allocatable, intent(out) :: tb_time_seconds(:,:) + real*4, allocatable, intent(out) :: tb_v_surface_corrected(:,:) + real*4, allocatable, intent(out) :: tb_lat(:,:), tb_lon(:,:) + integer*4, allocatable, intent(out) :: tb_qual_flag_v(:,:) + integer*4, allocatable, intent(out) :: tb_qual_flag_h(:,:) + real*4, allocatable, intent(out) :: sc_nadir_angle(:) + real*4, allocatable, intent(out) :: antenna_scan_angle(:,:) + integer, intent(out) :: m, n + integer, intent(out) :: ierr + +#if (defined USE_HDF5) + + ! Locals + character(100) :: dataset + integer(HID_T) :: file_id, dataset_id, dspace_id + integer(HSIZE_T) :: dims(2), maxdims(2) + integer :: rank + integer :: hdferr + logical :: exists, ishdf5, link_exists + + ierr = 0 + m = 0 + n = 0 + + ! Make sure file exists + inquire(file=trim(filename), exist=exists) + if (.not. exists) then + write(LDT_logunit,*)'[ERR] Cannot find file ', trim(filename) + ierr = 1 + return + end if + + ! Initialize HDF5 + call h5open_f(hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot initialize HDF5 Fortran interface!' + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Make sure the file is HDF5 + call h5fis_hdf5_f(trim(filename), ishdf5, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Problem checking if ', trim(filename), & + ' is HDF5' + call h5close_f(hdferr) + ierr = 1 + return + end if + if (.not. ishdf5) then + write(LDT_logunit,*)'[ERR] File ', trim(filename), ' is not HDF5!' + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Open the file + call h5fopen_f(trim(filename), H5F_ACC_RDONLY_F, file_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot open ', trim(filename) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the data + dataset = "/Brightness_Temperature/tb_lat/" + call get_dataset_real4_2d(file_id, dataset, n, m, tb_lat, ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + dataset = "/Brightness_Temperature/tb_lon/" + call get_dataset_real4_2d(file_id, dataset, n, m, tb_lon, ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + dataset = "/Brightness_Temperature/tb_time_seconds/" + call get_dataset_real8_2d(file_id, dataset, n, m, tb_time_seconds, & + ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + dataset = "/Brightness_Temperature/tb_qual_flag_v/" + call get_dataset_integer2_2d(file_id, dataset, n, m, & + tb_qual_flag_v, ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + dataset = "/Brightness_Temperature/tb_qual_flag_h/" + call get_dataset_integer2_2d(file_id, dataset, n, m, & + tb_qual_flag_h, ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + + dataset = "/Spacecraft_Data/sc_nadir_angle/" + call get_dataset_real4_1d(file_id, dataset, n, sc_nadir_angle, ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + dataset = "/Brightness_Temperature/antenna_scan_angle/" + call get_dataset_real4_2d(file_id, dataset, n, m, & + antenna_scan_angle, ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + + ! We will try to get tb_v_surface_corrected, but this is missing + ! in older NRT files. If absent, we will substitute tb_v. + dataset = "/Brightness_Temperature/tb_v_surface_corrected/" + call h5lexists_f(file_id, trim(dataset), link_exists, hdferr) + if (link_exists) then + call get_dataset_real4_2d(file_id, dataset, n, m, & + tb_v_surface_corrected, & + ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + else + dataset = "/Brightness_Temperature/tb_v/" + write(LDT_logunit,*)'[WARN] Will try substituting ', trim(dataset) + call get_dataset_real4_2d(file_id, dataset, n, m, & + tb_v_surface_corrected, & + ierr) + if (ierr == 1) then + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + call freeall(ierr) + return + end if + end if + + ! Clean up + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + + ierr = 0 + + return + + contains + + ! Internal subroutine + subroutine get_dataset_integer2_2d(file_id, dataset, n, m, var2d, & + ierr) + + ! Defaults + implicit none + + ! Arguments + integer(HID_T), intent(in) :: file_id + character(*), intent(in) :: dataset + integer, intent(out) :: n + integer, intent(out) :: m + integer*4, allocatable, intent(out) :: var2d(:,:) + integer, intent(out) :: ierr + + ! Locals + integer(HID_T) :: dataset_id, datatype_id + logical :: link_exists + integer :: hdferr + integer(HID_T) :: dspace_id + integer(HSIZE_T) :: dims(2), maxdims(2) + integer :: rank + integer :: class + integer(SIZE_T) :: size + integer :: sign + + ierr = 0 + + ! See if the dataset is in the file + call h5lexists_f(file_id, trim(dataset), link_exists, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Problem finding ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + if (.not. link_exists) then + write(LDT_logunit,*)'[ERR] Nonexistent dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Get the dataset id + call h5dopen_f(file_id, trim(dataset), dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot open dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the datatype id + call h5dget_type_f(dataset_id, datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the datatype class + call h5tget_class_f(datatype_id, class, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get class for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (class .ne. H5T_INTEGER_F) then + write(LDT_logunit,*)'[ERR] Bad class for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected ', H5T_INTEGER_F, & + ', found ', class + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the size of the datatype. + call h5tget_size_f(datatype_id, size, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get size for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (size .ne. 2) then + write(LDT_logunit,*)'[ERR] Wrong byte size found for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected 2, found ', size + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the sign type of the datatype. Should be unsigned. + call h5tget_sign_f(datatype_id, sign, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get sign type for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (sign .ne. H5T_SGN_NONE_F) then + write(LDT_logunit,*)'[ERR] Wrong sign type found for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected ', H5T_SGN_NONE_F, & + ', found ', sign + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close the datatype + call h5tclose_f(datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dspace id for the variable dimensions + call h5dget_space_f(dataset_id, dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot find dimensions for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the rank of the dataset in the file. + call h5sget_simple_extent_ndims_f(dspace_id, rank, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get rank for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check that the rank is 2. + if (rank .ne. 2) then + write(LDT_logunit,*) & + '[ERR] Wrong rank for ', trim(dataset), & + ', expected 2, found ', rank + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dimensions + call h5sget_simple_extent_dims_f(dspace_id, dims, maxdims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get dimensions for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close access to the dataspace. + call h5sclose_f(dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close access to dataspace for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Allocate and initialize the array + n = dims(1) + m = dims(2) + allocate(var2d(n,m)) + var2d = 0 + + ! Read the dataset. Fortran doesn't have unsigned integers, + ! so we save the 16-bit unsigned integer in a 32-bit signed + ! integer (should have the room). + call h5dread_f(dataset_id, H5T_NATIVE_INTEGER, var2d, dims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot read dataset ', trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Close access to the dataset + call h5dclose_f(dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_Logunit,*)'[ERR] Problem closing dataset ', & + trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + return + end subroutine get_dataset_integer2_2d + + ! Internal subroutine + subroutine get_dataset_real4_2d(file_id, dataset, n, m, var2d, ierr) + + ! Defaults + implicit none + + ! Arguments + integer(HID_T), intent(in) :: file_id + character(*), intent(in) :: dataset + integer, intent(out) :: n + integer, intent(out) :: m + real*4, allocatable, intent(out) :: var2d(:,:) + integer, intent(out) :: ierr + + ! Locals + integer(HID_T) :: dataset_id, datatype_id + logical :: link_exists + integer :: hdferr + integer(HID_T) :: dspace_id + integer(HSIZE_T) :: dims(2), maxdims(2) + integer :: rank + integer :: class + integer(SIZE_T) :: size + + ierr = 0 + + ! See if the dataset is in the file + call h5lexists_f(file_id, trim(dataset), link_exists, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Problem finding ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + if (.not. link_exists) then + write(LDT_logunit,*)'[ERR] Nonexistent dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Get the dataset id + call h5dopen_f(file_id, trim(dataset), dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot open dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the datatype id + call h5dget_type_f(dataset_id, datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the datatype class + call h5tget_class_f(datatype_id, class, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get class for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (class .ne. H5T_FLOAT_F) then + write(LDT_logunit,*)'[ERR] Bad class for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected ', H5T_FLOAT_F, & + ', found ', class + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the size of the datatype + call h5tget_size_f(datatype_id, size, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get size for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (size .ne. 4) then + write(LDT_logunit,*)'[ERR] Wrong byte size found for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected 4, found ', size + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close the datatype + call h5tclose_f(datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dspace id for the variable dimensions + call h5dget_space_f(dataset_id, dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot find dimensions for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the rank of the dataset in the file. + call h5sget_simple_extent_ndims_f(dspace_id, rank, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get rank for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check that the rank is 2. + if (rank .ne. 2) then + write(LDT_logunit,*) & + '[ERR] Wrong rank for ', trim(dataset), & + ', expected 2, found ', rank + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dimensions + call h5sget_simple_extent_dims_f(dspace_id, dims, maxdims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get dimensions for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close access to the dataspace. + call h5sclose_f(dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close access to dataspace for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Allocate and initialize the array + n = dims(1) + m = dims(2) + allocate(var2d(n,m)) + var2d = 0 + + ! Read the dataset + call h5dread_f(dataset_id, H5T_NATIVE_REAL, var2d, dims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot read dataset ', trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Close access to the dataset + call h5dclose_f(dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_Logunit,*)'[ERR] Problem closing dataset ', & + trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + return + end subroutine get_dataset_real4_2d + + ! Internal subroutine + subroutine get_dataset_real8_2d(file_id, dataset, n, m, var2d, ierr) + + ! Defaults + implicit none + + ! Arguments + integer(HID_T), intent(in) :: file_id + character(*), intent(in) :: dataset + integer, intent(out) :: n + integer, intent(out) :: m + real*8, allocatable, intent(out) :: var2d(:,:) + integer, intent(out) :: ierr + + ! Locals + integer(HID_T) :: dataset_id, datatype_id + logical :: link_exists + integer :: hdferr + integer(HID_T) :: dspace_id + integer(HSIZE_T) :: dims(2), maxdims(2) + integer :: rank + integer :: class + integer(SIZE_T) :: size + + ierr = 0 + + ! See if the dataset is in the file + call h5lexists_f(file_id, trim(dataset), link_exists, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Problem finding ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + if (.not. link_exists) then + write(LDT_logunit,*)'[ERR] Nonexistent dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Get the dataset id + call h5dopen_f(file_id, trim(dataset), dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot open dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the datatype id + call h5dget_type_f(dataset_id, datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the datatype class + call h5tget_class_f(datatype_id, class, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get class for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (class .ne. H5T_FLOAT_F) then + write(LDT_logunit,*)'[ERR] Bad class for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected ', H5T_FLOAT_F, & + ', found ', class + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the size of the datatype + call h5tget_size_f(datatype_id, size, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get size for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (size .ne. 8) then + write(LDT_logunit,*)'[ERR] Wrong byte size found for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected 8, found ', size + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close the datatype + call h5tclose_f(datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dspace id for the variable dimensions + call h5dget_space_f(dataset_id, dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot find dimensions for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the rank of the dataset in the file. + call h5sget_simple_extent_ndims_f(dspace_id, rank, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get rank for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check that the rank is 2. + if (rank .ne. 2) then + write(LDT_logunit,*) & + '[ERR] Wrong rank for ', trim(dataset), & + ', expected 2, found ', rank + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dimensions + call h5sget_simple_extent_dims_f(dspace_id, dims, maxdims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get dimensions for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close access to the dataspace. + call h5sclose_f(dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*) & + '[ERR] Cannot close access to dataspace for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Allocate and initialize the array + n = dims(1) + m = dims(2) + allocate(var2d(n,m)) + var2d = 0 + + ! Read the dataset + call h5dread_f(dataset_id, H5T_NATIVE_DOUBLE, var2d, dims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot read dataset ', trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Close access to the dataset + call h5dclose_f(dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_Logunit,*)'[ERR] Problem closing dataset ', & + trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + return + end subroutine get_dataset_real8_2d + + ! Internal subroutine + subroutine get_dataset_real4_1d(file_id, dataset, n, var1d, ierr) + + ! Defaults + implicit none + + ! Arguments + integer(HID_T), intent(in) :: file_id + character(*), intent(in) :: dataset + integer, intent(out) :: n + real*4, allocatable, intent(out) :: var1d(:) + integer, intent(out) :: ierr + + ! Locals + integer(HID_T) :: dataset_id, datatype_id + logical :: link_exists + integer :: hdferr + integer(HID_T) :: dspace_id + integer(HSIZE_T) :: dims(1), maxdims(1) + integer :: rank + integer :: class + integer(SIZE_T) :: size + + ierr = 0 + + ! See if the dataset is in the file + call h5lexists_f(file_id, trim(dataset), link_exists, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Problem finding ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + if (.not. link_exists) then + write(LDT_logunit,*)'[ERR] Nonexistent dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Get the dataset id + call h5dopen_f(file_id, trim(dataset), dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot open dataset ', trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the datatype id + call h5dget_type_f(dataset_id, datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the datatype class + call h5tget_class_f(datatype_id, class, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get class for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (class .ne. H5T_FLOAT_F) then + write(LDT_logunit,*)'[ERR] Bad class for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected ', H5T_FLOAT_F, & + ', found ', class + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check the size of the datatype + call h5tget_size_f(datatype_id, size, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get size for ', & + trim(dataset) + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + if (size .ne. 4) then + write(LDT_logunit,*)'[ERR] Wrong byte size found for ', & + trim(dataset) + write(LDT_logunit,*)'[ERR] Expected 4, found ', size + call h5tclose_f(datatype_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close the datatype + call h5tclose_f(datatype_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close datatype for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dspace id for the variable dimensions + call h5dget_space_f(dataset_id, dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot find dimensions for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the rank of the dataset in the file. + call h5sget_simple_extent_ndims_f(dspace_id, rank, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get rank for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Check that the rank is 1. + if (rank .ne. 1) then + write(LDT_logunit,*) & + '[ERR] Wrong rank for ', trim(dataset), & + ', expected 1, found ', rank + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Get the dimensions + call h5sget_simple_extent_dims_f(dspace_id, dims, maxdims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot get dimensions for ', & + trim(dataset) + call h5sclose_f(dspace_id, hdferr) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Close access to the dataspace. + call h5sclose_f(dspace_id, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot close access to dataspace for ', & + trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + ! Allocate and initialize the array + n = dims(1) + allocate(var1d(n)) + var1d = 0 + + ! Read the dataset + call h5dread_f(dataset_id, H5T_NATIVE_REAL, var1d, dims, hdferr) + if (hdferr == -1) then + write(LDT_logunit,*)'[ERR] Cannot read dataset ', trim(dataset) + call h5dclose_f(dataset_id, hdferr) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + endif + + ! Close access to the dataset + call h5dclose_f(dataset_id, hdferr) + if (hdferr == -1) then + write(LDT_Logunit,*)'[ERR] Problem closing dataset ', & + trim(dataset) + call h5fclose_f(file_id, hdferr) + call h5close_f(hdferr) + ierr = 1 + return + end if + + return + end subroutine get_dataset_real4_1d + + ! Internal subroutine. Warning -- deallocates memory in + ! parent subroutine and resets two variables. This is intended + ! for gracefully handling errors returned from HDF5. + subroutine freeall(ierr) + implicit none + integer, intent(out) :: ierr + if (allocated(tb_v_surface_corrected)) & + deallocate(tb_v_surface_corrected) + if (allocated(tb_lat)) deallocate(tb_lat) + if (allocated(tb_lon)) deallocate(tb_lon) + if (allocated(tb_time_seconds)) deallocate(tb_time_seconds) + if (allocated(tb_qual_flag_v)) deallocate(tb_qual_flag_v) + if (allocated(tb_qual_flag_h)) deallocate(tb_qual_flag_h) + if (allocated(sc_nadir_angle))deallocate(sc_nadir_angle) + if (allocated(antenna_scan_angle)) deallocate(antenna_scan_angle) + m = 0 + n = 0 + ierr = 1 + return + end subroutine freeall +#else + ! Dummy version if LDT was compiled w/o HDF5 support. + write(LDT_logunit,*) & + '[ERR] GetSMAP_L1B_NRT called without HDF5 support!' + write(LDT_logunit,*) & + '[ERR] Recompile LDT with HDF5 support and try again!' + call LDE_endrun() +#endif + end subroutine GetSMAP_L1B_NRT_Subset + SUBROUTINE NEAREST_1d ( nd, xd, yd, ni, xi, yi ) IMPLICIT NONE INTEGER :: i, j, k, nd, ni @@ -397,5 +1527,7 @@ SUBROUTINE LSQ_Linear(n, x, y, a, b, r, rmse) !PRINT*, " y-intercept b = ", b !PRINT*, " Correlation r = ", r END SUBROUTINE LSQ_Linear - + + + END MODULE TOOLSUBS diff --git a/ldt/SMAP_E_OPL/VARIABLES.F90 b/ldt/SMAP_E_OPL/VARIABLES.F90 index 0238e13a7..2058361b7 100644 --- a/ldt/SMAP_E_OPL/VARIABLES.F90 +++ b/ldt/SMAP_E_OPL/VARIABLES.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- MODULE VARIABLES IMPLICIT NONE diff --git a/ldt/SMAP_E_OPL/algo_vpol_m.F90 b/ldt/SMAP_E_OPL/algo_vpol_m.F90 index 6f28f96e6..106cd690e 100644 --- a/ldt/SMAP_E_OPL/algo_vpol_m.F90 +++ b/ldt/SMAP_E_OPL/algo_vpol_m.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- MODULE algo_vpol_m IMPLICIT NONE diff --git a/ldt/SMAP_E_OPL/invdist_l1b2arfs.F90 b/ldt/SMAP_E_OPL/invdist_l1b2arfs.F90 index 07f09bac5..5034a0717 100644 --- a/ldt/SMAP_E_OPL/invdist_l1b2arfs.F90 +++ b/ldt/SMAP_E_OPL/invdist_l1b2arfs.F90 @@ -1,5 +1,11 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- -! NASA GSFC Land Data Toolkit (LDT) +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- ! ! MODULE: invdist_l1b2arfs @@ -8,197 +14,328 @@ ! 26 Oct 2021: P.W.LIU; Initial implemetation ! 28 Jan 2022: P.W.LIU; CHNAGE OUTPUT COORDINATE TO COMPLY LIS OUTPUT ! 22 Feb 2022: Yonghwan Kwon; modified for LDT +! 10 Feb 2023: Eric Kemp; Added code to resample subset of variables. ! ! DESCRIPTION: SUBROUTINE TO RESAMPLE L1B TB ONTO AIR FORCE GRID !------------------------------------------------------------------------- MODULE invdist_l1b2arfs - IMPLICIT NONE - - CONTAINS - SUBROUTINE L1BTB2ARFS_INVDIS(tim, tbvl1b_cor, tbhl1b_cor, tbvl1b, tbhl1b, surwat_v_l1b, surwat_h_l1b, & - netd_v_l1b, netd_h_l1b, lat_l1b, lon_l1b, tbv_qual_flag, tbh_qual_flag, sc_nadir_angle, antenna_scan_angle, nrows_l1btb, ncols_l1btb, & - ref_lat, ref_lon, arfs_tim, arfs_tbv_cor, arfs_tbh_cor, arfs_tbv, arfs_tbh, arfs_nedtv, arfs_nedth, & - arfs_surwatv, arfs_surwath, arfs_wt_cor_tbv, arfs_wt_cor_tbh, arfs_samplenumv, arfs_samplenumh) - - - INTEGER(4) :: ii, jj, k, r, c, rr, rmin, rmax, cc, cmin, cmax, nrows_l1btb, ncols_l1btb - INTEGER(4), PARAMETER :: qualitybit = 0 - REAL(8), PARAMETER :: RE_KM = 6371.228, search_radius = 20.0, PI = 3.141592653589793238, d2r = PI/180.0 - REAL(8) :: gcdist, lat1, lon1, lat2, lon2 - REAL*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: tim, tbvl1b_cor, tbhl1b_cor, tbvl1b, tbhl1b, surwat_v_l1b, surwat_h_l1b, netd_v_l1b, netd_h_l1b - REAL*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: lat_l1b, lon_l1b, antenna_scan_angle - REAL*4,DIMENSION(ncols_l1btb) :: sc_nadir_angle - INTEGER*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: tbv_qual_flag, tbh_qual_flag - INTEGER(4),DIMENSION(:,:),ALLOCATABLE :: zerodistflag - REAL*8,DIMENSION(:),ALLOCATABLE :: ref_lat, ref_lon - REAL*4,DIMENSION(2560,1920) :: arfs_tim, arfs_tbv_cor, arfs_tbh_cor, arfs_tbv, arfs_tbh, arfs_nedtv, arfs_nedth, arfs_surwatv, arfs_surwath - REAL*4,DIMENSION(2560,1920) :: arfs_wt_tim, arfs_wt_cor_tbv, arfs_wt_cor_tbh, arfs_wt_tbv, arfs_wt_tbh, arfs_wt_nedtv, arfs_wt_nedth, arfs_wt_surwatv, arfs_wt_surwath - INTEGER*4,DIMENSION(2560,1920) :: arfs_samplenumv, arfs_samplenumh + IMPLICIT NONE + + CONTAINS + SUBROUTINE L1BTB2ARFS_INVDIS(tim, tbvl1b_cor, tbhl1b_cor, tbvl1b, tbhl1b, surwat_v_l1b, surwat_h_l1b, & + netd_v_l1b, netd_h_l1b, lat_l1b, lon_l1b, tbv_qual_flag, tbh_qual_flag, sc_nadir_angle, antenna_scan_angle, nrows_l1btb, ncols_l1btb, & + ref_lat, ref_lon, arfs_tim, arfs_tbv_cor, arfs_tbh_cor, arfs_tbv, arfs_tbh, arfs_nedtv, arfs_nedth, & + arfs_surwatv, arfs_surwath, arfs_wt_cor_tbv, arfs_wt_cor_tbh, arfs_samplenumv, arfs_samplenumh) + + + INTEGER(4) :: ii, jj, k, r, c, rr, rmin, rmax, cc, cmin, cmax, nrows_l1btb, ncols_l1btb + INTEGER(4), PARAMETER :: qualitybit = 0 + REAL(8), PARAMETER :: RE_KM = 6371.228, search_radius = 20.0, PI = 3.141592653589793238, d2r = PI/180.0 + REAL(8) :: gcdist, lat1, lon1, lat2, lon2 + REAL*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: tim, tbvl1b_cor, tbhl1b_cor, tbvl1b, tbhl1b, surwat_v_l1b, surwat_h_l1b, netd_v_l1b, netd_h_l1b + REAL*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: lat_l1b, lon_l1b, antenna_scan_angle + REAL*4,DIMENSION(ncols_l1btb) :: sc_nadir_angle + INTEGER*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: tbv_qual_flag, tbh_qual_flag + INTEGER(4),DIMENSION(:,:),ALLOCATABLE :: zerodistflag + REAL*8,DIMENSION(:),ALLOCATABLE :: ref_lat, ref_lon + REAL*4,DIMENSION(2560,1920) :: arfs_tim, arfs_tbv_cor, arfs_tbh_cor, arfs_tbv, arfs_tbh, arfs_nedtv, arfs_nedth, arfs_surwatv, arfs_surwath + REAL*4,DIMENSION(2560,1920) :: arfs_wt_tim, arfs_wt_cor_tbv, arfs_wt_cor_tbh, arfs_wt_tbv, arfs_wt_tbh, arfs_wt_nedtv, arfs_wt_nedth, arfs_wt_surwatv, arfs_wt_surwath + INTEGER*4,DIMENSION(2560,1920) :: arfs_samplenumv, arfs_samplenumh + + !ALLOCATE(zerodistflag(size(ref_lat),size(ref_lon))) + ALLOCATE(zerodistflag(size(ref_lon),size(ref_lat))) + !INITIAL THE OUTPUT VARIABLES + arfs_tim=0.0 + arfs_tbv_cor=0.0 + arfs_tbh_cor=0.0 + arfs_tbv=0.0 + arfs_tbh=0.0 + arfs_nedtv=0.0 + arfs_nedth=0.0 + arfs_surwatv=0.0 + arfs_surwath=0.0 + arfs_wt_tim=0.0 + arfs_wt_cor_tbv=0.0 + arfs_wt_cor_tbh=0.0 + arfs_wt_tbv=0.0 + arfs_wt_tbh=0.0 + arfs_wt_nedtv=0.0 + arfs_wt_nedth=0.0 + arfs_wt_surwatv=0.0 + arfs_wt_surwath=0.0 + arfs_samplenumv=0.0 + + DO ii = 1,ncols_l1btb + IF (ABS (sc_nadir_angle(ii)) <= 2.0) THEN + DO jj = 1,nrows_l1btb + IF (ABS (antenna_scan_angle(jj,ii)).LE.360.00) THEN + ! FIND ARFS_GRID (r,c) + c = MINLOC(ABS(lat_l1b(jj,ii)-ref_lat(:)),1) !Lat Direction + r = MINLOC(ABS(lon_l1b(jj,ii)-ref_lon(:)),1) !Lon Direction + rmin=r-5 ; IF (rmin < 1) rmin=1 + rmax=r+5 ; IF (rmax > size(ref_lon)) rmax=size(ref_lon) + cmin=c-5 ; IF (cmin < 1) cmin=1 + cmax=c+5 ; IF (cmax > size(ref_lat)) cmax=size(ref_lat) + IF (IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(jj,jj),qualitybit,1) == 0) THEN !RESAMPLE ONLY WHEN BOTH V and H MEET QUALITY + k=0 + DO rr = rmin,rmax !Lon direction + DO cc =cmin,cmax !Lat direction + lat1 = DBLE (lat_l1b(jj,ii)*d2r) + lon1 = DBLE (lon_l1b(jj,ii)*d2r) + lat2 = DBLE (ref_lat(cc)*d2r) + lon2 = DBLE (ref_lon(rr)*d2r) + + if(lat1.eq.lat2.and.lon1.eq.lon2) then + gcdist = 0. + else + gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) + endif + + IF (gcdist < search_radius) THEN !RESAMPLE ONLY WITHIN THE SEARCH RANGE + IF (gcdist < 0.0001D0) THEN !The TB is right on the grid center + zerodistflag (rr,cc) = 1 + IF ((ABS (tim(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tim(rr,cc) = tim(jj,ii) ; arfs_wt_tim(rr,cc) = 1.0 + END IF + IF ((ABS (surwat_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_surwatv(rr,cc) = surwat_v_l1b(jj,ii) ; arfs_wt_surwatv(rr,cc) = 1.0 + END IF + IF ((ABS (surwat_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_surwath(rr,cc) = surwat_h_l1b(jj,ii) ; arfs_wt_surwath(rr,cc) = 1.0 + END IF + IF ((ABS (netd_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_nedtv(rr,cc) = netd_v_l1b(jj,ii) ; arfs_wt_nedtv(rr,cc) = 1.0 + END IF + IF ((ABS (netd_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_nedth(rr,cc) = netd_h_l1b(jj,ii) ; arfs_wt_nedth(rr,cc) = 1.0 + END IF + IF ((ABS (tbvl1b_cor(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbv_cor(rr,cc) = tbvl1b_cor(jj,ii) ; arfs_wt_cor_tbv(rr,cc) = 1.0 + arfs_samplenumv(rr,cc)=1 !Sample number only calculate for correct tb + k=k+1; + END IF + IF ((ABS (tbhl1b_cor(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbh_cor(rr,cc) = tbhl1b_cor(jj,ii) ; arfs_wt_cor_tbh(rr,cc) = 1.0 + arfs_samplenumh(rr,cc)=1 !Sample number only calculate for correct tb + END IF + IF ((ABS (tbvl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbv(rr,cc) = tbvl1b(jj,ii) ; arfs_wt_tbv(rr,cc) = 1.0 + END IF + IF ((ABS (tbhl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbh(rr,cc) = tbhl1b(jj,ii) ; arfs_wt_tbh(rr,cc) = 1.0 + END IF + ELSE + IF (zerodistflag (rr,cc).EQ.0) THEN + + IF ((ABS (tim(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tim(rr,cc) = arfs_tim(rr,cc) + tim(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_tim(rr,cc) = arfs_wt_tim(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + IF ((ABS (surwat_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_surwatv(rr,cc) = arfs_surwatv(rr,cc) + surwat_v_l1b(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_surwatv(rr,cc) = arfs_wt_surwatv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + IF ((ABS (surwat_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_surwath(rr,cc) = arfs_surwath(rr,cc) + surwat_h_l1b(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_surwath(rr,cc) = arfs_wt_surwath(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + IF ((ABS (netd_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_nedtv(rr,cc) = arfs_nedtv(rr,cc) + netd_v_l1b(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_nedtv(rr,cc) = arfs_wt_nedtv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + IF ((ABS (netd_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_nedth(rr,cc) = arfs_nedth(rr,cc) + netd_h_l1b(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_nedth(rr,cc) = arfs_wt_nedth(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + IF ((ABS (tbvl1b_cor(jj,ii) - (-9999.0))).GT.1.0D-7) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbv_cor(rr,cc) = arfs_tbv_cor(rr,cc) + tbvl1b_cor(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_cor_tbv(rr,cc) = arfs_wt_cor_tbv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + arfs_samplenumv(rr,cc)=arfs_samplenumv(rr,cc)+1.0 !Sample number only calculate for correct tb + k=k+1; + END IF + IF ((ABS (tbhl1b_cor(jj,ii) - (-9999.0))).GT.1.0D-7) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbh_cor(rr,cc) = arfs_tbh_cor(rr,cc) + tbhl1b_cor(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_cor_tbh(rr,cc) = arfs_wt_cor_tbh(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + arfs_samplenumh(rr,cc)=arfs_samplenumh(rr,cc)+1.0 !Sample number only calculate for correct tb + END IF + IF ((ABS (tbvl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbv(rr,cc) = arfs_tbv(rr,cc) + tbvl1b(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_tbv(rr,cc) = arfs_wt_tbv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + IF ((ABS (tbhl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + arfs_tbh(rr,cc) = arfs_tbh(rr,cc) + tbhl1b(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_tbh(rr,cc) = arfs_wt_tbh(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + END IF + END IF !(zerodistflag (rr,cc) = 0) + END IF !(gcdist < 0.0001D0)! + END IF !(gcdist < search_radius) + END DO !cc =cmin,cmax + END DO !rr = rmin,rmax + END IF !(IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(ii,jj),qualitybit,1) == 0) + END IF !(ABS (antenna_scan_angle(ii,jj)) <= 360.00) + END DO !jj=1,2 + END IF !(ABS (sc_nadir_angle(ii)) <= 2.0) + END DO !ii=1,2 + + !APPLY WEIGHTING FUNCTION FOR RESAMPLING + WHERE(arfs_tim.NE.0.0.AND.arfs_wt_tim.NE.0.0) + arfs_tim = arfs_tim / arfs_wt_tim + END WHERE + WHERE(arfs_surwatv.NE.0.0.AND.arfs_wt_surwatv.NE.0.0) + arfs_surwatv = arfs_surwatv / arfs_wt_surwatv + END WHERE + WHERE(arfs_surwath.NE.0.0.AND.arfs_wt_surwath.NE.0.0) + arfs_surwath = arfs_surwath / arfs_wt_surwath + END WHERE + WHERE(arfs_nedtv.NE.0.0.AND.arfs_wt_nedtv.NE.0.0) + arfs_nedtv = arfs_nedtv / arfs_wt_nedtv + END WHERE + WHERE(arfs_nedth.NE.0.0.AND.arfs_wt_nedth.NE.0.0) + arfs_nedth = arfs_nedth / arfs_wt_nedth + END WHERE + WHERE(arfs_tbv_cor.NE.0.0.AND.arfs_wt_cor_tbv.NE.0.0) + arfs_tbv_cor = arfs_tbv_cor / arfs_wt_cor_tbv + END WHERE + WHERE(arfs_tbh_cor.NE.0.0.AND.arfs_wt_cor_tbh.NE.0.0) + arfs_tbh_cor = arfs_tbh_cor / arfs_wt_cor_tbh + END WHERE + WHERE(arfs_tbv.NE.0.0.AND.arfs_wt_tbv.NE.0.0) + arfs_tbv = arfs_tbv / arfs_wt_tbv + END WHERE + WHERE(arfs_tbh.NE.0.0.AND.arfs_wt_tbh.NE.0.0) + arfs_tbh = arfs_tbh / arfs_wt_tbh + END WHERE + + END SUBROUTINE L1BTB2ARFS_INVDIS + + ! EMK...Only process subset of SMAP L1B fields for NRT operations. + SUBROUTINE L1BTB2ARFS_INVDIS_SUBSET(tim, tbvl1b_cor, & + lat_l1b, lon_l1b, tbv_qual_flag, tbh_qual_flag, & + sc_nadir_angle, antenna_scan_angle, nrows_l1btb, ncols_l1btb, & + ref_lat, ref_lon, arfs_tim, arfs_tbv_cor) + + use LDT_logMod, only: LDT_logunit + + INTEGER(4) :: ii, jj, k, r, c, rr, rmin, rmax, cc, cmin, cmax, nrows_l1btb, ncols_l1btb + INTEGER(4), PARAMETER :: qualitybit = 0 + REAL(8), PARAMETER :: RE_KM = 6371.228, search_radius = 20.0, PI = 3.141592653589793238, d2r = PI/180.0 + REAL(8) :: gcdist, lat1, lon1, lat2, lon2 + REAL*8,DIMENSION(nrows_l1btb,ncols_l1btb) :: tim + REAL*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: tbvl1b_cor + REAL*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: lat_l1b, lon_l1b, antenna_scan_angle + REAL*4,DIMENSION(ncols_l1btb) :: sc_nadir_angle + INTEGER*4,DIMENSION(nrows_l1btb,ncols_l1btb) :: tbv_qual_flag, tbh_qual_flag + INTEGER(4),DIMENSION(:,:),ALLOCATABLE :: zerodistflag + REAL*8,DIMENSION(:),ALLOCATABLE :: ref_lat, ref_lon + REAL*8,DIMENSION(2560,1920) :: arfs_tim + REAL*4,DIMENSION(2560,1920) :: arfs_tbv_cor + REAL*8,DIMENSION(2560,1920) :: arfs_wt_tim + REAL*4,DIMENSION(2560,1920) :: arfs_wt_cor_tbv + INTEGER*4,DIMENSION(2560,1920) :: arfs_samplenumv + + ALLOCATE(zerodistflag(size(ref_lon),size(ref_lat))) + zerodistflag = 0 ! EMK Added initialization - !ALLOCATE(zerodistflag(size(ref_lat),size(ref_lon))) - ALLOCATE(zerodistflag(size(ref_lon),size(ref_lat))) - !INITIAL THE OUTPUT VARIABLES - arfs_tim=0.0 - arfs_tbv_cor=0.0 - arfs_tbh_cor=0.0 - arfs_tbv=0.0 - arfs_tbh=0.0 - arfs_nedtv=0.0 - arfs_nedth=0.0 - arfs_surwatv=0.0 - arfs_surwath=0.0 - arfs_wt_tim=0.0 - arfs_wt_cor_tbv=0.0 - arfs_wt_cor_tbh=0.0 - arfs_wt_tbv=0.0 - arfs_wt_tbh=0.0 - arfs_wt_nedtv=0.0 - arfs_wt_nedth=0.0 - arfs_wt_surwatv=0.0 - arfs_wt_surwath=0.0 - arfs_samplenumv=0.0 - - DO ii = 1,ncols_l1btb - IF (ABS (sc_nadir_angle(ii)) <= 2.0) THEN - DO jj = 1,nrows_l1btb - IF (ABS (antenna_scan_angle(jj,ii)).LE.360.00) THEN - ! FIND ARFS_GRID (r,c) - c = MINLOC(ABS(lat_l1b(jj,ii)-ref_lat(:)),1) !Lat Direction - r = MINLOC(ABS(lon_l1b(jj,ii)-ref_lon(:)),1) !Lon Direction - rmin=r-5 ; IF (rmin < 1) rmin=1 - rmax=r+5 ; IF (rmax > size(ref_lon)) rmax=size(ref_lon) - cmin=c-5 ; IF (cmin < 1) cmin=1 - cmax=c+5 ; IF (cmax > size(ref_lat)) cmax=size(ref_lat) - IF (IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(jj,jj),qualitybit,1) == 0) THEN !RESAMPLE ONLY WHEN BOTH V and H MEET QUALITY - k=0 - DO rr = rmin,rmax !Lon direction - DO cc =cmin,cmax !Lat direction - lat1 = DBLE (lat_l1b(jj,ii)*d2r) - lon1 = DBLE (lon_l1b(jj,ii)*d2r) - lat2 = DBLE (ref_lat(cc)*d2r) - lon2 = DBLE (ref_lon(rr)*d2r) - - if(lat1.eq.lat2.and.lon1.eq.lon2) then - gcdist = 0. - else - gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) - endif - - IF (gcdist < search_radius) THEN !RESAMPLE ONLY WITHIN THE SEARCH RANGE - IF (gcdist < 0.0001D0) THEN !The TB is right on the grid center - zerodistflag (rr,cc) = 1 - IF ((ABS (tim(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tim(rr,cc) = tim(jj,ii) ; arfs_wt_tim(rr,cc) = 1.0 - END IF - IF ((ABS (surwat_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_surwatv(rr,cc) = surwat_v_l1b(jj,ii) ; arfs_wt_surwatv(rr,cc) = 1.0 - END IF - IF ((ABS (surwat_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_surwath(rr,cc) = surwat_h_l1b(jj,ii) ; arfs_wt_surwath(rr,cc) = 1.0 - END IF - IF ((ABS (netd_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_nedtv(rr,cc) = netd_v_l1b(jj,ii) ; arfs_wt_nedtv(rr,cc) = 1.0 - END IF - IF ((ABS (netd_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_nedth(rr,cc) = netd_h_l1b(jj,ii) ; arfs_wt_nedth(rr,cc) = 1.0 - END IF - IF ((ABS (tbvl1b_cor(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbv_cor(rr,cc) = tbvl1b_cor(jj,ii) ; arfs_wt_cor_tbv(rr,cc) = 1.0 - arfs_samplenumv(rr,cc)=1 !Sample number only calculate for correct tb - k=k+1; - END IF - IF ((ABS (tbhl1b_cor(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbh_cor(rr,cc) = tbhl1b_cor(jj,ii) ; arfs_wt_cor_tbh(rr,cc) = 1.0 - arfs_samplenumh(rr,cc)=1 !Sample number only calculate for correct tb - END IF - IF ((ABS (tbvl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbv(rr,cc) = tbvl1b(jj,ii) ; arfs_wt_tbv(rr,cc) = 1.0 - END IF - IF ((ABS (tbhl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbh(rr,cc) = tbhl1b(jj,ii) ; arfs_wt_tbh(rr,cc) = 1.0 - END IF - ELSE - IF (zerodistflag (rr,cc).EQ.0) THEN - - IF ((ABS (tim(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tim(rr,cc) = arfs_tim(rr,cc) + tim(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_tim(rr,cc) = arfs_wt_tim(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - IF ((ABS (surwat_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_surwatv(rr,cc) = arfs_surwatv(rr,cc) + surwat_v_l1b(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_surwatv(rr,cc) = arfs_wt_surwatv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - IF ((ABS (surwat_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_surwath(rr,cc) = arfs_surwath(rr,cc) + surwat_h_l1b(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_surwath(rr,cc) = arfs_wt_surwath(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - IF ((ABS (netd_v_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_nedtv(rr,cc) = arfs_nedtv(rr,cc) + netd_v_l1b(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_nedtv(rr,cc) = arfs_wt_nedtv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - IF ((ABS (netd_h_l1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_nedth(rr,cc) = arfs_nedth(rr,cc) + netd_h_l1b(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_nedth(rr,cc) = arfs_wt_nedth(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - IF ((ABS (tbvl1b_cor(jj,ii) - (-9999.0))).GT.1.0D-7) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbv_cor(rr,cc) = arfs_tbv_cor(rr,cc) + tbvl1b_cor(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_cor_tbv(rr,cc) = arfs_wt_cor_tbv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - arfs_samplenumv(rr,cc)=arfs_samplenumv(rr,cc)+1.0 !Sample number only calculate for correct tb - k=k+1; - END IF - IF ((ABS (tbhl1b_cor(jj,ii) - (-9999.0))).GT.1.0D-7) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbh_cor(rr,cc) = arfs_tbh_cor(rr,cc) + tbhl1b_cor(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_cor_tbh(rr,cc) = arfs_wt_cor_tbh(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - arfs_samplenumh(rr,cc)=arfs_samplenumh(rr,cc)+1.0 !Sample number only calculate for correct tb - END IF - IF ((ABS (tbvl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbv(rr,cc) = arfs_tbv(rr,cc) + tbvl1b(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_tbv(rr,cc) = arfs_wt_tbv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - IF ((ABS (tbhl1b(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) - arfs_tbh(rr,cc) = arfs_tbh(rr,cc) + tbhl1b(jj,ii) / SNGL (gcdist*gcdist) - arfs_wt_tbh(rr,cc) = arfs_wt_tbh(rr,cc) + 1.0 / SNGL (gcdist*gcdist) - END IF - END IF !(zerodistflag (rr,cc) = 0) - END IF !(gcdist < 0.0001D0)! - END IF !(gcdist < search_radius) - END DO !cc =cmin,cmax - END DO !rr = rmin,rmax - END IF !(IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(ii,jj),qualitybit,1) == 0) - END IF !(ABS (antenna_scan_angle(ii,jj)) <= 360.00) - END DO !jj=1,2 - END IF !(ABS (sc_nadir_angle(ii)) <= 2.0) - END DO !ii=1,2 - - !APPLY WEIGHTING FUNCTION FOR RESAMPLING - WHERE(arfs_tim.NE.0.0.AND.arfs_wt_tim.NE.0.0) - arfs_tim = arfs_tim / arfs_wt_tim - END WHERE - WHERE(arfs_surwatv.NE.0.0.AND.arfs_wt_surwatv.NE.0.0) - arfs_surwatv = arfs_surwatv / arfs_wt_surwatv - END WHERE - WHERE(arfs_surwath.NE.0.0.AND.arfs_wt_surwath.NE.0.0) - arfs_surwath = arfs_surwath / arfs_wt_surwath - END WHERE - WHERE(arfs_nedtv.NE.0.0.AND.arfs_wt_nedtv.NE.0.0) - arfs_nedtv = arfs_nedtv / arfs_wt_nedtv - END WHERE - WHERE(arfs_nedth.NE.0.0.AND.arfs_wt_nedth.NE.0.0) - arfs_nedth = arfs_nedth / arfs_wt_nedth - END WHERE - WHERE(arfs_tbv_cor.NE.0.0.AND.arfs_wt_cor_tbv.NE.0.0) - arfs_tbv_cor = arfs_tbv_cor / arfs_wt_cor_tbv - END WHERE - WHERE(arfs_tbh_cor.NE.0.0.AND.arfs_wt_cor_tbh.NE.0.0) - arfs_tbh_cor = arfs_tbh_cor / arfs_wt_cor_tbh - END WHERE - WHERE(arfs_tbv.NE.0.0.AND.arfs_wt_tbv.NE.0.0) - arfs_tbv = arfs_tbv / arfs_wt_tbv - END WHERE - WHERE(arfs_tbh.NE.0.0.AND.arfs_wt_tbh.NE.0.0) - arfs_tbh = arfs_tbh / arfs_wt_tbh - END WHERE - - END SUBROUTINE L1BTB2ARFS_INVDIS + !INITIAL THE OUTPUT VARIABLES + arfs_tim=0.0 + arfs_tbv_cor=0.0 + arfs_wt_tim=0.0 + arfs_wt_cor_tbv=0.0 + arfs_samplenumv=0.0 + + DO ii = 1,ncols_l1btb + IF (ABS (sc_nadir_angle(ii)) <= 2.0) THEN + DO jj = 1,nrows_l1btb + + + IF (ABS (antenna_scan_angle(jj,ii)).LE.360.00) THEN + + lat1 = DBLE (lat_l1b(jj,ii)*d2r) + lon1 = DBLE (lon_l1b(jj,ii)*d2r) + ! FIND ARFS_GRID (r,c) + c = MINLOC(ABS(lat_l1b(jj,ii)-ref_lat(:)),1) !Lat Direction + r = MINLOC(ABS(lon_l1b(jj,ii)-ref_lon(:)),1) !Lon Direction + rmin=r-5 ; IF (rmin < 1) rmin=1 + rmax=r+5 ; IF (rmax > size(ref_lon)) rmax=size(ref_lon) + cmin=c-5 ; IF (cmin < 1) cmin=1 + cmax=c+5 ; IF (cmax > size(ref_lat)) cmax=size(ref_lat) +! IF (IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(jj,jj),qualitybit,1) == 0) THEN !RESAMPLE ONLY WHEN BOTH V and H MEET QUALITY + IF (IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(jj,ii),qualitybit,1) == 0) THEN !RESAMPLE ONLY WHEN BOTH V and H MEET QUALITY + + k=0 + ! DO rr = rmin,rmax !Lon direction + ! DO cc =cmin,cmax !Lat direction + DO cc =cmin,cmax !Lat direction + lat2 = DBLE (ref_lat(cc)*d2r) + DO rr = rmin,rmax !Lon direction + lon2 = DBLE (ref_lon(rr)*d2r) + + if(lat1.eq.lat2.and.lon1.eq.lon2) then + gcdist = 0. + else + gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) + endif + + IF (gcdist < search_radius) THEN !RESAMPLE ONLY WITHIN THE SEARCH RANGE + IF (gcdist < 0.0001D0) THEN !The TB is right on the grid center + zerodistflag (rr,cc) = 1 + !IF ((ABS (tim(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + IF ( .not. tim(jj,ii) < 0) THEN !DO IF NOT FILLVALUE(-9999) + + arfs_tim(rr,cc) = tim(jj,ii) ; arfs_wt_tim(rr,cc) = 1.0 + END IF + !IF ((ABS (tbvl1b_cor(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + IF ( .not. tbvl1b_cor(jj,ii) < 0 ) THEN !DO IF NOT FILLVALUE(-9999) + + arfs_tbv_cor(rr,cc) = tbvl1b_cor(jj,ii) ; arfs_wt_cor_tbv(rr,cc) = 1.0 + arfs_samplenumv(rr,cc)=1 !Sample number only calculate for correct tb + k=k+1; + END IF + ELSE + IF (zerodistflag (rr,cc).EQ.0) THEN + + !IF ((ABS (tim(jj,ii) - (-9999.0)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(-9999) + IF ( .not. tim(jj,ii) < 0 ) THEN !DO IF NOT FILLVALUE(-9999) + + !arfs_tim(rr,cc) = arfs_tim(rr,cc) + tim(jj,ii) / SNGL (gcdist*gcdist) + !arfs_wt_tim(rr,cc) = arfs_wt_tim(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + arfs_tim(rr,cc) = arfs_tim(rr,cc) + tim(jj,ii) / (gcdist*gcdist) + arfs_wt_tim(rr,cc) = arfs_wt_tim(rr,cc) + 1.0 / (gcdist*gcdist) + + END IF + !IF ((ABS (tbvl1b_cor(jj,ii) - (-9999.0))).GT.1.0D-7) THEN !DO IF NOT FILLVALUE(-9999) + IF ( .not. tbvl1b_cor(jj,ii) < 0 ) THEN !DO IF NOT FILLVALUE(-9999) + + arfs_tbv_cor(rr,cc) = arfs_tbv_cor(rr,cc) + tbvl1b_cor(jj,ii) / SNGL (gcdist*gcdist) + arfs_wt_cor_tbv(rr,cc) = arfs_wt_cor_tbv(rr,cc) + 1.0 / SNGL (gcdist*gcdist) + arfs_samplenumv(rr,cc)=arfs_samplenumv(rr,cc)+1.0 !Sample number only calculate for correct tb + k=k+1; + END IF + + END IF !(zerodistflag (rr,cc) = 0) + END IF !(gcdist < 0.0001D0)! + END IF !(gcdist < search_radius) + ! END DO !cc =cmin,cmax + ! END DO !rr = rmin,rmax + END DO !rr = rmin,rmax + END DO !cc =cmin,cmax + + END IF !(IBITS (tbv_qual_flag(jj,ii),qualitybit,1) == 0 .AND. IBITS (tbh_qual_flag(ii,jj),qualitybit,1) == 0) + END IF !(ABS (antenna_scan_angle(ii,jj)) <= 360.00) + END DO !jj=1,2 + END IF !(ABS (sc_nadir_angle(ii)) <= 2.0) + END DO !ii=1,2 + + !APPLY WEIGHTING FUNCTION FOR RESAMPLING + WHERE(arfs_tim.NE.0.0.AND.arfs_wt_tim.NE.0.0) + arfs_tim = arfs_tim / arfs_wt_tim + END WHERE + WHERE(arfs_tbv_cor.NE.0.0.AND.arfs_wt_cor_tbv.NE.0.0) + arfs_tbv_cor = arfs_tbv_cor / arfs_wt_cor_tbv + END WHERE + + deallocate(zerodistflag) ! EMK cleanup memory + END SUBROUTINE L1BTB2ARFS_INVDIS_SUBSET + END MODULE invdist_l1b2arfs diff --git a/ldt/SMAP_E_OPL/invdist_temp2smap.F90 b/ldt/SMAP_E_OPL/invdist_temp2smap.F90 index 0f7e9be14..6758abe03 100644 --- a/ldt/SMAP_E_OPL/invdist_temp2smap.F90 +++ b/ldt/SMAP_E_OPL/invdist_temp2smap.F90 @@ -1,115 +1,126 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- !======================================================================= ! MODULE, invdist_temp2smap P.W.LIU, 01/11/2022 ! SUBROUTINE TO RESAMPLE SOIL TEMPERATURE FROM NOAH 39 ON ARFS GRID TO ! SMAP RESOLUTIN AT ARFS GRID !======================================================================= MODULE invdist_temp2smap - IMPLICIT NONE + IMPLICIT NONE - CONTAINS - !SUBROUTINE RESAMPLETEMP(arfs_temp,arfs_lat,arfs_lon,arfs_fine_lat,arfs_fine_lon,arfs_fine_wt,arfs_fine_temp,arfs_wt,arfs_smap_temp) - SUBROUTINE RESAMPLETEMP(arfs_temp,arfs_lat,arfs_lon,arfs_fine_lat,arfs_fine_lon,arfs_smap_temp) + CONTAINS + !SUBROUTINE RESAMPLETEMP(arfs_temp,arfs_lat,arfs_lon,arfs_fine_lat,arfs_fine_lon,arfs_fine_wt,arfs_fine_temp,arfs_wt,arfs_smap_temp) + SUBROUTINE RESAMPLETEMP(arfs_temp,arfs_lat,arfs_lon,arfs_fine_lat,arfs_fine_lon,arfs_smap_temp) - INTEGER(4) :: ii, jj, k, r, c, rr, rmin, rmax, cc, cmin, cmax, nrows_l1btb, ncols_l1btb - REAL(8), PARAMETER :: RE_KM = 6371.228, search_radius = 20.0, PI = 3.141592653589793238, d2r = PI/180.0 - REAL(8) :: gcdist, lat1, lon1, lat2, lon2 - REAL*8 ,DIMENSION(:), ALLOCATABLE :: arfs_lat, arfs_lon - REAL*8 ,DIMENSION(:), ALLOCATABLE :: arfs_fine_lat, arfs_fine_lon - REAL*4,DIMENSION(2560,1920) :: arfs_temp, arfs_smap_temp, arfs_wt - REAL*4,DIMENSION(7680,5760) :: arfs_fine_temp, arfs_fine_wt - INTEGER(4),DIMENSION(2560,1920):: zerodistflag - INTEGER(4),DIMENSION(7680,5760):: zerodistflag_fine + INTEGER(4) :: ii, jj, k, r, c, rr, rmin, rmax, cc, cmin, cmax, nrows_l1btb, ncols_l1btb + REAL(8), PARAMETER :: RE_KM = 6371.228, search_radius = 20.0, PI = 3.141592653589793238, d2r = PI/180.0 + REAL(8) :: gcdist, lat1, lon1, lat2, lon2 + REAL*8 ,DIMENSION(:), ALLOCATABLE :: arfs_lat, arfs_lon + REAL*8 ,DIMENSION(:), ALLOCATABLE :: arfs_fine_lat, arfs_fine_lon + REAL*4,DIMENSION(2560,1920) :: arfs_temp, arfs_smap_temp, arfs_wt + REAL*4,DIMENSION(7680,5760) :: arfs_fine_temp, arfs_fine_wt + INTEGER(4),DIMENSION(2560,1920):: zerodistflag + INTEGER(4),DIMENSION(7680,5760):: zerodistflag_fine - !INITIAL THE OUTPUT VARIABLES - zerodistflag=0 - zerodistflag_fine=0 - arfs_smap_temp=0 - arfs_wt=0 - arfs_fine_temp=0 - arfs_fine_wt=0 - !DISAGGREGATE ARFS TEMP TO FINEER GRID (~3km) - DO ii=1,1920 + !INITIAL THE OUTPUT VARIABLES + zerodistflag=0 + zerodistflag_fine=0 + arfs_smap_temp=0 + arfs_wt=0 + arfs_fine_temp=0 + arfs_fine_wt=0 + !DISAGGREGATE ARFS TEMP TO FINEER GRID (~3km) + DO ii=1,1920 !DO ii=522,524 - c = MINLOC(ABS(arfs_lat(ii)-arfs_fine_lat(:)),1) !Lat Direction r: row in fine scale - !PRINT*, arfs_fine_lat(r), arfs_lat(ii) - DO jj=1,2560 + lat1 = DBLE (arfs_lat(ii)*d2r) + c = MINLOC(ABS(arfs_lat(ii)-arfs_fine_lat(:)),1) !Lat Direction r: row in fine scale + !PRINT*, arfs_fine_lat(r), arfs_lat(ii) + cmin=c-3 ; IF (cmin < 1) cmin=1 + cmax=c+3 ; IF (cmax > size(arfs_fine_lat)) cmax=size(arfs_fine_lat) + + DO jj=1,2560 !DO jj=82,84 - r = MINLOC(ABS(arfs_lon(jj)-arfs_fine_lon(:)),1) !Lat Direction c: colume in fine scale - !PRINT*, arfs_fine_lon(c), arfs_lon(jj) - cmin=c-3 ; IF (cmin < 1) cmin=1 - cmax=c+3 ; IF (cmax > size(arfs_fine_lat)) cmax=size(arfs_fine_lat) - rmin=r-3 ; IF (rmin < 1) rmin=1 - rmax=r+3 ; IF (rmax > size(arfs_fine_lon)) rmax=size(arfs_fine_lon) - !PRINT*,'cmin cmax', cmin, cmax, size(arfs_fine_lon) - DO rr=rmin,rmax - DO cc=cmin,cmax - lat1 = DBLE (arfs_lat(ii)*d2r) - lon1 = DBLE (arfs_lon(jj)*d2r) - lat2 = DBLE (arfs_fine_lat(cc)*d2r) - lon2 = DBLE (arfs_fine_lon(rr)*d2r) - !PRINT*, lat1, lon1, lat2, lon2 - !gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) !original - !---------------------------------------kyh - if(lat1.eq.lat2.and.lon1.eq.lon2) then - gcdist = 0. - else - gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) - endif - !---------------------------------------kyh - !PRINT*, lat1, lon1, lat2, lon2, gcdist - !PRINT*, arfs_temp(ii,jj) - IF (gcdist < search_radius) THEN !RESAMPLE ONLY WITHIN THE SEARCH RANGE - !PRINT*,'HERE 0' - IF (gcdist < 0.0001D0) THEN !The TB is right on the grid center - zerodistflag_fine(rr,cc) = 1 - !PRINT*,'HERE 01' - IF ((ABS (arfs_temp(jj,ii)-(-9999.000)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(0) - arfs_fine_temp(rr,cc) = arfs_temp(jj,ii) ; arfs_fine_wt(rr,cc) = 1.0 - !PRINT*,'Here 1' - ENDIF - ELSE - IF (zerodistflag_fine(rr,cc).EQ.0) THEN !To maintain the corresponding pixel has the same value - IF ((ABS (arfs_temp(jj,ii)-(-9999.000)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(0) - arfs_fine_temp(rr,cc) = arfs_fine_temp(rr,cc)+arfs_temp(jj,ii) / SNGL(gcdist) - arfs_fine_wt(rr,cc) = arfs_fine_wt(rr,cc) + 1.0 / SNGL(gcdist) - !PRINT*,'Here 2' - ENDIF - ENDIF !(zerodistflag_fine(rr,cc).NE.0) - ENDIF !IF (gcdist < 0.0001D0) - ENDIF !(gcdist < search_radius) - ENDDO !cc=cmin,cmax - ENDDO !rr=rmin,rmax - - ENDDO !jj=1:2560 - ENDDO !ii=1,1920 - WHERE(arfs_fine_temp.NE.0.0.AND.arfs_fine_wt.NE.0.0) - arfs_fine_temp=arfs_fine_temp/arfs_fine_wt - ENDWHERE - !UPSCALL ARFS FINE TEMP TO ARFS GRID (at ~33km) - DO ii=1,1920 - c=3*ii-1 !3x3 FINE GRID EQ TO A ARFS GRID - DO jj=1,2560 - r=3*jj-1 !3x3 FINE GRID EQ TO A ARFS GRID - cmin=c-5 ; IF (cmin < 1) cmin=1 - cmax=c+5 ; IF (cmax > size(arfs_fine_lat)) cmax=size(arfs_fine_lat) - rmin=r-5 ; IF (rmin < 1) rmin=1 - rmax=r+5 ; IF (rmax > size(arfs_fine_lon)) rmax=size(arfs_fine_lon) - DO rr=rmin,rmax - DO cc=cmin,cmax - IF (abs(arfs_fine_temp(rr,cc)).GT.1.0D-7) THEN !DO WHEN T ~0 (change to fillvalue) - arfs_smap_temp(jj,ii)=arfs_smap_temp(jj,ii)+arfs_fine_temp(rr,cc); arfs_wt(jj,ii)=arfs_wt(jj,ii)+1.0 !Weight the point 1 - ENDIF - ENDDO !cc=cmin,cmax - ENDDO !rr=rmin,rmax - ENDDO !jj=1:2560 - ENDDO !ii=1:1920 - WHERE(arfs_smap_temp.NE.0.0.AND.arfs_wt.NE.0.0) - arfs_smap_temp=arfs_smap_temp/arfs_wt - ENDWHERE - WHERE(arfs_smap_temp.EQ.0.0) - arfs_smap_temp=-9999 - ENDWHERE + lon1 = DBLE (arfs_lon(jj)*d2r) + r = MINLOC(ABS(arfs_lon(jj)-arfs_fine_lon(:)),1) !Lat Direction c: colume in fine scale + !PRINT*, arfs_fine_lon(c), arfs_lon(jj) + rmin=r-3 ; IF (rmin < 1) rmin=1 + rmax=r+3 ; IF (rmax > size(arfs_fine_lon)) rmax=size(arfs_fine_lon) + !PRINT*,'cmin cmax', cmin, cmax, size(arfs_fine_lon) + !DO rr=rmin,rmax + ! DO cc=cmin,cmax + DO cc=cmin,cmax + lat2 = DBLE (arfs_fine_lat(cc)*d2r) + DO rr=rmin,rmax + lon2 = DBLE (arfs_fine_lon(rr)*d2r) + !PRINT*, lat1, lon1, lat2, lon2 + !gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) !original + !---------------------------------------kyh + if(lat1.eq.lat2.and.lon1.eq.lon2) then + gcdist = 0. + else + gcdist = RE_KM * DACOS ( DSIN (lat1) * DSIN (lat2) + DCOS (lat1) * DCOS (lat2) * DCOS (lon1-lon2) ) + endif + !---------------------------------------kyh + !PRINT*, lat1, lon1, lat2, lon2, gcdist + !PRINT*, arfs_temp(ii,jj) + IF (gcdist < search_radius) THEN !RESAMPLE ONLY WITHIN THE SEARCH RANGE + !PRINT*,'HERE 0' + IF (gcdist < 0.0001D0) THEN !The TB is right on the grid center + zerodistflag_fine(rr,cc) = 1 + !PRINT*,'HERE 01' + IF ((ABS (arfs_temp(jj,ii)-(-9999.000)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(0) + arfs_fine_temp(rr,cc) = arfs_temp(jj,ii) ; arfs_fine_wt(rr,cc) = 1.0 + !PRINT*,'Here 1' + ENDIF + ELSE + IF (zerodistflag_fine(rr,cc).EQ.0) THEN !To maintain the corresponding pixel has the same value + IF ((ABS (arfs_temp(jj,ii)-(-9999.000)).GT.1.0D-7)) THEN !DO IF NOT FILLVALUE(0) + arfs_fine_temp(rr,cc) = arfs_fine_temp(rr,cc)+arfs_temp(jj,ii) / SNGL(gcdist) + arfs_fine_wt(rr,cc) = arfs_fine_wt(rr,cc) + 1.0 / SNGL(gcdist) + !PRINT*,'Here 2' + ENDIF + ENDIF !(zerodistflag_fine(rr,cc).NE.0) + ENDIF !IF (gcdist < 0.0001D0) + ENDIF !(gcdist < search_radius) + ENDDO !rr=rmin,rmax + ENDDO !cc=cmin,cmax + ENDDO !jj=1:2560 + ENDDO !ii=1,1920 + WHERE(arfs_fine_temp.NE.0.0.AND.arfs_fine_wt.NE.0.0) + arfs_fine_temp=arfs_fine_temp/arfs_fine_wt + ENDWHERE + !UPSCALL ARFS FINE TEMP TO ARFS GRID (at ~33km) + DO ii=1,1920 + c=3*ii-1 !3x3 FINE GRID EQ TO A ARFS GRID + cmin=c-5 ; IF (cmin < 1) cmin=1 + cmax=c+5 ; IF (cmax > size(arfs_fine_lat)) cmax=size(arfs_fine_lat) + DO jj=1,2560 + r=3*jj-1 !3x3 FINE GRID EQ TO A ARFS GRID + rmin=r-5 ; IF (rmin < 1) rmin=1 + rmax=r+5 ; IF (rmax > size(arfs_fine_lon)) rmax=size(arfs_fine_lon) + DO cc=cmin,cmax + DO rr=rmin,rmax + IF (abs(arfs_fine_temp(rr,cc)).GT.1.0D-7) THEN !DO WHEN T ~0 (change to fillvalue) + arfs_smap_temp(jj,ii)=arfs_smap_temp(jj,ii)+arfs_fine_temp(rr,cc); arfs_wt(jj,ii)=arfs_wt(jj,ii)+1.0 !Weight the point 1 + ENDIF + ENDDO !rr=rmin,rmax + ENDDO !cc=cmin,cmax + ENDDO !jj=1:2560 + ENDDO !ii=1:1920 + WHERE(arfs_smap_temp.NE.0.0.AND.arfs_wt.NE.0.0) + arfs_smap_temp=arfs_smap_temp/arfs_wt + ENDWHERE + WHERE(arfs_smap_temp.EQ.0.0) + arfs_smap_temp=-9999 + ENDWHERE - END SUBROUTINE RESAMPLETEMP + END SUBROUTINE RESAMPLETEMP END MODULE invdist_temp2smap diff --git a/ldt/SMAP_E_OPL/mironov.f90 b/ldt/SMAP_E_OPL/mironov.f90 index bfbe86885..fd116441f 100644 --- a/ldt/SMAP_E_OPL/mironov.f90 +++ b/ldt/SMAP_E_OPL/mironov.f90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- MODULE mironov_m IMPLICIT NONE diff --git a/ldt/SMAP_E_OPL/readLISTeff.F90 b/ldt/SMAP_E_OPL/readLISTeff.F90 index 9f33be780..362ad7c44 100644 --- a/ldt/SMAP_E_OPL/readLISTeff.F90 +++ b/ldt/SMAP_E_OPL/readLISTeff.F90 @@ -3,10 +3,10 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. -!-------------------------END NOTICE -- DO NOT EDIT---------------------- +!-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" !BOP ! diff --git a/ldt/SMAP_E_OPL/readLISTeff_usaf.F90 b/ldt/SMAP_E_OPL/readLISTeff_usaf.F90 new file mode 100644 index 000000000..4dc4c391c --- /dev/null +++ b/ldt/SMAP_E_OPL/readLISTeff_usaf.F90 @@ -0,0 +1,405 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- + +#include "LDT_misc.h" +#include "LDT_NetCDF_inc.h" + +!BOP +! +! !ROUTINE: readLIS_Teff_usaf +! \label{readLISTeff} +! +! !REVISION HISTORY: +! 14 FEB 2023: Eric Kemp, Initial Specification +! 1 July 2023: Mahdi Navari, Modified the code to read the unperturbed +! ensemble. This is a temporary fix to overcome the bias in +! soil temperature from a bug in SMAP soil moisture DA +! PR#1385 +! +! !INTERFACE: +subroutine readLIS_Teff_usaf(n, yyyymmdd, hh, Orbit, teff, rc) +! !USES: + use LDT_coreMod + use LDT_domainMod + use LDT_logMod + use LDT_smap_e_oplMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + character(8), intent(in) :: yyyymmdd + character(2), intent(in) :: hh + character(1), intent(in) :: Orbit + real, intent(out) :: teff(LDT_rc%lnc(n),LDT_rc%lnr(n)) + integer, intent(out) :: rc + +!EOP + integer :: c,r + real :: tsoil(LDT_rc%lnc(n),LDT_rc%lnr(n),4) + character(255) :: fname + logical :: file_exists + integer :: rc1 + integer :: gid + integer :: nens + integer, allocatable :: str_tind(:) + integer, allocatable :: ntiles_pergrid(:) + real, parameter :: kk = 1.007 + real, parameter :: cc_6am = 0.246 + real, parameter :: cc_6pm = 1.000 + + external :: create_LISsoilT_filename_usaf + external :: read_LIStsoil_data_usaf + + ! Initializations + teff = LDT_rc%udef + tsoil = LDT_rc%udef + rc = 1 ! Assume error by default, update below + + ! Set up basic info on Air Force product + nens = SMAPeOPL%num_ens + allocate(str_tind(LDT_rc%gnc(n) * LDT_rc%gnr(n))) + if (SMAPeOPL%ntiles_pergrid .ne. 1) then + write(LDT_logunit,*) & + '[ERR] Current SMAP_E_OPL code assumes ntiles_pergrid = 1' + write(LDT_logunit,*) & + '[ERR] Actual value is ', SMAPeOPL%ntiles_pergrid + call LDT_endrun() + end if + do gid = 1, (LDT_rc%gnc(n) * LDT_rc%gnr(n)) + str_tind(gid) = ((gid - 1) * nens) + 1 + end do + allocate(ntiles_pergrid(LDT_rc%gnc(n) * LDT_rc%gnr(n))) + ntiles_pergrid = SMAPeOPL%ntiles_pergrid + + call create_LISsoilT_filename_usaf(SMAPeOPL%LISdir, & + yyyymmdd, hh, fname) + + inquire(file=trim(fname), exist=file_exists) + if (file_exists) then + write(LDT_logunit,*) '[INFO] Reading ', trim(fname) + call read_LIStsoil_data_usaf(n, SMAPeOPL%num_tiles, str_tind, & + ntiles_pergrid, nens, & + fname, tsoil, rc1) + if (rc1 .ne. 0) then + write(LDT_logunit,*) '[ERR] Cannot read from ', trim(fname) + return + endif + write(LDT_logunit,*) '[INFO] Finished reading ', trim(fname) + + ! Calculate effective temperature + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + if (Orbit == "D") then + if (tsoil(c,r,1) > 273.15 .and. tsoil(c,r,2) > 273.15) then + teff(c,r) = kk * & + (cc_6am * tsoil(c,r,1) + (1 - cc_6am) * tsoil(c,r,2)) + endif + elseif (Orbit == "A") then + if (tsoil(c,r,1) > 273.15 .and. tsoil(c,r,2) > 273.15) then + teff(c,r) = kk * & + (cc_6pm * tsoil(c,r,1) + (1 - cc_6pm) * tsoil(c,r,2)) + endif + endif + end do + end do + rc = 0 + end if + + if (allocated(str_tind)) deallocate(str_tind) + if (allocated(ntiles_pergrid)) deallocate(ntiles_pergrid) + +end subroutine readLIS_Teff_usaf + +!BOP +! +! !ROUTINE: read_LIStsoil_data_usaf +! \label{read_LIStsoil_data_usaf} +! +! !INTERFACE: +subroutine read_LIStsoil_data_usaf(n, ntiles, str_tind, ntiles_pergrid, nens, & + fname, tsoil, rc) +! +! !USES: + use LDT_logMod + use LDT_coreMod + use LDT_smap_e_oplMod +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none + +! +! !INPUT PARAMETERS: +! + integer, intent(in) :: n + integer, intent(in) :: ntiles + integer, intent(in) :: str_tind(LDT_rc%gnc(n) * LDT_rc%gnc(n)) + integer, intent(in) :: ntiles_pergrid(LDT_rc%gnc(n) * LDT_rc%gnc(n)) + integer, intent(in) :: nens + character(*), intent(in) :: fname + real, intent(inout) :: tsoil(LDT_rc%lnc(n),LDT_rc%lnr(n),4) + integer, intent(out) :: rc +!EOP + + integer :: ios, ncid + integer :: ntiles_dimid, ntiles_local + integer :: SoilTemp_profiles_dimid, SoilTemp_profiles + integer :: SoilTemp_inst_id + real, allocatable :: SoilTemp_inst_tiles(:,:) + real :: SoilTemp_inst_ensmean_1layer(LDT_rc%gnc(n), LDT_rc%gnr(n)) + integer :: k, c, r + + external :: calc_gridded_ensmean_1layer + + rc = 1 ! Initialize as error, reset near bottom + + ! Sanity checks + if (LDT_rc%gnc(n) .ne. LDT_rc%lnc(n)) then + write(LDT_logunit,*)'[ERR] Mismatched dimensions!' + write(LDT_logunit,*)'[ERR] LDT_rc%gnc(n) = ', LDT_rc%gnc(n) + write(LDT_logunit,*)'[ERR] LDT_rc%lnc(n) = ', LDT_rc%lnc(n) + call LDT_endrun() + end if + if (LDT_rc%gnr(n) .ne. LDT_rc%lnr(n)) then + write(LDT_logunit,*)'[ERR] Mismatched dimensions!' + write(LDT_logunit,*)'[ERR] LDT_rc%gnr(n) = ', LDT_rc%gnr(n) + write(LDT_logunit,*)'[ERR] LDT_rc%lnr(n) = ', LDT_rc%lnr(n) + call LDT_endrun() + end if + +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + ios = nf90_open(path=trim(fname), mode=NF90_NOWRITE ,ncid=ncid) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Error opening file' // trim(fname) + return + end if + + ios = nf90_inq_dimid(ncid, "ntiles", ntiles_dimid) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot find ntiles in ' // trim(fname) + ios = nf90_close(ncid=ncid) + return + end if + + ios = nf90_inquire_dimension(ncid, ntiles_dimid, len=ntiles_local) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot get dimension ntiles in ' & + // trim(fname) + ios = nf90_close(ncid=ncid) + return + end if + + ! if (ntiles .ne. LDT_rc%glbntiles_red(n)) then + ! write(LDT_logunit,*)'[ERR] Dimension mismatch!' + ! write(LDT_logunit,*)'[ERR] ntiles = ', ntiles + ! write(LDT_logunit,*)'[ERR] LDT_rc%glbntiles_red(n) = ', & + ! LDT_rc%glbntiles_red(n) + ! call LDT_endrun() + ! end if + if (ntiles_local .ne. ntiles) then + write(LDT_logunit,*)'[ERR] Dimension mismatch!' + write(LDT_logunit,*)'[ERR] ntiles = ', ntiles_local + write(LDT_logunit,*)'[ERR] Expected ', ntiles + call LDT_endrun() + end if + + ios = nf90_inq_dimid(ncid, "SoilTemp_profiles", SoilTemp_profiles_dimid) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot find SoilTemp_profiles in ' & + // trim(fname) + ios = nf90_close(ncid=ncid) + return + end if + + ios = nf90_inquire_dimension(ncid, SoilTemp_profiles_dimid, & + len=SoilTemp_profiles) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot get dimension SoilTemp_profiles in ' & + // trim(fname) + ios = nf90_close(ncid=ncid) + return + end if + if (SoilTemp_profiles .ne. 4) then + write(LDT_logunit,*)'[ERR] Dimension mismatch!' + write(LDT_logunit,*)'[ERR] SoilTemp_profiles should be 4, but is ', & + SoilTemp_profiles + call LDT_endrun() + end if + + ios = nf90_inq_varid(ncid, 'SoilTemp_inst', SoilTemp_inst_id) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot find SoilTemp_inst in ' // trim(fname) + ios = nf90_close(ncid=ncid) + return + end if + + allocate(SoilTemp_inst_tiles(ntiles, SoilTemp_profiles)) + SoilTemp_inst_tiles = 0 + + ios = nf90_get_var(ncid, SoilTemp_inst_id, SoilTemp_inst_tiles, & + start=(/1, 1/), & + count=(/ntiles, SoilTemp_profiles/)) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot read SoilTemp_inst in ' // trim(fname) + deallocate(SoilTemp_inst_tiles) + ios = nf90_close(ncid=ncid) + return + end if + + ! Calculate ensemble mean in 2d grid space, for each soil layer + do k = 1, SoilTemp_profiles + !call calc_gridded_ensmean_1layer(n, ntiles, str_tind, ntiles_pergrid, & + ! nens, & + ! SoilTemp_inst_tiles(:,k), & + ! SoilTemp_inst_ensmean_1layer) + + call calc_gridded_lastens_1layer(n, ntiles, str_tind, ntiles_pergrid, & + nens, & + SoilTemp_inst_tiles(:,k), & + SoilTemp_inst_ensmean_1layer) ! Note to minimize the code chnage: SoilTemp_inst_ensmean_1layer is actually + ! SoilTemp_inst_lastens_1layer (ens #12) + + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + if (SoilTemp_inst_ensmean_1layer(c,r) > 0) then + tsoil(c,r,k) = SoilTemp_inst_ensmean_1layer(c,r) + end if + end do + end do + end do + + ! Clean up + deallocate(SoilTemp_inst_tiles) + + ios = nf90_close(ncid=ncid) + if (ios .ne. 0) then + write(LDT_logunit,*) '[WARN] Error closing ' // trim(fname) + return + end if + + rc = 0 ! No error detected + +#endif + +end subroutine read_LIStsoil_data_usaf + +! Subroutine for calculating 2d gridded ensemble mean for a single soil layer, +! from tiled data. +subroutine calc_gridded_ensmean_1layer(n, ntiles, str_tind, ntiles_pergrid, & + nens, gvar_tile, gvar) + + ! Imports + use LDT_coreMod, only: LDT_rc, LDT_domain, LDT_masterproc + use LDT_logMod, only: LDT_logunit + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: n + integer, intent(in) :: ntiles + integer, intent(in) :: str_tind(LDT_rc%gnc(n) * LDT_rc%gnr(n)) + integer, intent(in) :: ntiles_pergrid(LDT_rc%gnc(n) * LDT_rc%gnr(n)) + integer, intent(in) :: nens + real, intent(in) :: gvar_tile(ntiles) + real, intent(out) :: gvar(LDT_rc%gnc(n), LDT_rc%gnr(n)) + + ! Locals + integer :: m, r, c, gid, stid, tid + + gvar = 0 + if (LDT_masterproc) then + do r = 1, LDT_rc%gnr(n) + do c = 1, LDT_rc%gnc(n) + gid = c + ((r-1) * LDT_rc%gnc(n)) + stid = str_tind(gid) + if (ntiles_pergrid(gid) > 0) then + do m = 1, nens + tid = stid + m - 1 + gvar(c,r) = gvar(c,r) + gvar_tile(tid) + enddo + gvar(c,r) = gvar(c,r) / nens + end if + end do + end do + end if +end subroutine calc_gridded_ensmean_1layer + +! Subroutine for extracting last ensemble member for a single soil layer, +! from tiled data. + subroutine calc_gridded_lastens_1layer(n, ntiles, str_tind, ntiles_pergrid, & + nens, gvar_tile, gvar) + + ! Imports + use LDT_coreMod, only: LDT_rc, LDT_domain, LDT_masterproc + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: n + integer, intent(in) :: ntiles + !real, intent(in) :: gvar_tile(LDT_rc%glbntiles_red(n)) + integer, intent(in) :: str_tind(LDT_rc%gnc(n) * LDT_rc%gnr(n)) + integer, intent(in) :: ntiles_pergrid(LDT_rc%gnc(n) * LDT_rc%gnr(n)) + real, intent(out) :: gvar(LDT_rc%gnc(n), LDT_rc%gnr(n)) + real, intent(in) :: gvar_tile(ntiles) + integer, intent(in) :: nens + + ! Locals + integer :: m, r, c, gid, stid, tid + + if (LDT_masterproc) then + gvar = 0 + do r = 1, LDT_rc%gnr(n) + do c = 1, LDT_rc%gnc(n) + gid = c + ((r-1) * LDT_rc%gnc(n)) + stid = str_tind(gid) + if (ntiles_pergrid(gid) > 0) then + m = nens + tid = stid + m - 1 + gvar(c,r) = gvar_tile(tid) + end if + end do + end do + end if + end subroutine calc_gridded_lastens_1layer + +!BOP +! !ROUTINE: create_LISsoilT_filename_usaf +! \label{create_LISsoilT_filename_usaf} +! +! !INTERFACE: +subroutine create_LISsoilT_filename_usaf(LISdir, yyyymmdd, hh, filename) + !USES: + + implicit none + !ARGUMENTS: + character(*), intent(in) :: LISdir + character(8), intent(in) :: yyyymmdd + character(2), intent(in) :: hh + character(*), intent(out) :: filename +!EOP + + filename = trim(LISdir) & + // '/PS.AFWA' & + // '_SC.U' & + // '_DI.C' & + // '_DC.ANLYS' & + // '_GP.LIS' & + // '_GR.C0P09DEG' & + // '_AR.GLOBAL' & + // '_PA.03-HR-SUM' & + // '_DD.' // yyyymmdd & + // '_DT.' // hh // '00' & + // '_DF.nc' + +end subroutine create_LISsoilT_filename_usaf diff --git a/ldt/SMAP_E_OPL/readLISsnow.F90 b/ldt/SMAP_E_OPL/readLISsnow.F90 index 4b39842d8..3279073a1 100644 --- a/ldt/SMAP_E_OPL/readLISsnow.F90 +++ b/ldt/SMAP_E_OPL/readLISsnow.F90 @@ -3,10 +3,10 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. -!-------------------------END NOTICE -- DO NOT EDIT---------------------- +!-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" !BOP ! diff --git a/ldt/SMAP_E_OPL/readUSAFSI.F90 b/ldt/SMAP_E_OPL/readUSAFSI.F90 new file mode 100644 index 000000000..a1034c34b --- /dev/null +++ b/ldt/SMAP_E_OPL/readUSAFSI.F90 @@ -0,0 +1,215 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- + +#include "LDT_misc.h" +#include "LDT_NetCDF_inc.h" +!BOP +! +! !ROUTINE: readUSAFSI +! \label{readUSAFSI} +! +! !REVISION HISTORY: +! 13 Feb 2023: Eric Kemp, Initial Specification +! +! !INTERFACE: +subroutine readUSAFSI(n, yyyymmdd, hh, SnowDepth, rc) + +! !USES: + use LDT_coreMod + use LDT_logMod + use LDT_smap_e_oplMod + + implicit none + +! !ARGUMENTS: + integer, intent(in) :: n + character*8, intent(in) :: yyyymmdd + character*2, intent(in) :: hh + real, intent(out):: SnowDepth(LDT_rc%lnc(n),LDT_rc%lnr(n)) + integer, intent(out) :: rc + +!EOP + character*255 :: fname + character*8 :: yyyymmdd_snow + character*4 :: yyyy_snow + character*2 :: mm_snow, dd_snow, hh_snow + logical :: file_exists + integer :: yr, mo, da, hr + integer :: nn + integer :: ierr + integer :: rc1 + + external :: create_USAFSI_filename + external :: read_USAFSI_data + + rc = 1 ! Default to error, will update below if USAFSI file read in. + SnowDepth = LDT_rc%udef + + yyyymmdd_snow = yyyymmdd + yyyy_snow = yyyymmdd(1:4) + mm_snow = yyyymmdd(5:6) + dd_snow = yyyymmdd(7:8) + hh_snow = hh + + read(yyyy_snow, *, iostat=ierr) yr + read(mm_snow, *, iostat=ierr) mo + read(dd_snow, *, iostat=ierr) da + read(hh_snow, *, iostat=ierr) hr + + nn = 0 + do while (nn <= 24) + + call create_USAFSI_filename(SMAPeOPL%LISsnowdir, & + yyyymmdd_snow, hh_snow, fname) + inquire(file=trim(fname), exist=file_exists) + + if (file_exists) then + write(LDT_logunit,*) '[INFO] Reading snow depth from ', trim(fname) + call read_USAFSI_data(n, fname, SnowDepth, rc1) + if (rc1 == 0) then + write(LDT_logunit,*) '[INFO] Finished reading snow outputs from ', & + trim(fname) + rc = 0 + exit + end if + end if + + ! Go back one hour + hr = hr - 1 + if (hr < 0) then + da = da - 1 + hr = 23 + if (da == 0) then + mo = mo - 1 + if (mo == 0) then + yr = yr - 1 + mo = 12 + da = 31 + else + if (mo == 1 .or. & + mo == 3 .or. & + mo == 5 .or. & + mo == 7 .or. & + mo == 8 .or. & + mo == 10 .or. & + mo == 12) then + da = 31 + elseif (mo == 2) then + if (mod(yr,4) == 0) then + da = 29 + else + da = 28 + endif + else + da = 30 + endif + endif + endif + endif + + write(unit=yyyy_snow, fmt='(i4.4)') yr + write(unit=mm_snow, fmt='(i2.2)') mo + write(unit=dd_snow, fmt='(i2.2)') da + write(unit=hh_snow, fmt='(i2.2)') hr + yyyymmdd_snow = trim(yyyy_snow) // trim(mm_snow) // trim(dd_snow) + + nn = nn + 1 + + end do +end subroutine readUSAFSI + +!BOP +! +! !ROUTINE: read_USAFSI_data +! \label{read_USAFSI_data} +! +! !INTERFACE: +subroutine read_USAFSI_data(n, fname, SnowDepth, rc) +! +! !USES: + use LDT_logMod + use LDT_coreMod + use LDT_smap_e_oplMod +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none +! +! !INPUT PARAMETERS: +! + integer, intent(in) :: n + character(*), intent(in) :: fname + real, intent(inout) :: SnowDepth(LDT_rc%lnc(n),LDT_rc%lnr(n)) + integer, intent(out) :: rc +!EOP + + integer :: ios, nid + integer :: snowdepthid + + rc = 1 ! Initialize as error, reset near bottom + +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + ios = nf90_open(path=trim(fname), mode=NF90_NOWRITE, ncid=nid) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Error opening file' // trim(fname) + return + end if + + ios = nf90_inq_varid(nid, 'snoanl', snowdepthid) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot find snoanl in ' // trim(fname) + ios = nf90_close(ncid=nid) + return + end if + + ios = nf90_get_var(nid, snowdepthid, SnowDepth, & + start=(/1, 1/), & + count=(/LDT_rc%lnc(n), LDT_rc%lnr(n)/)) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Cannot read snoanl in ' // trim(fname) + ios = nf90_close(ncid=nid) + return + end if + + ios = nf90_close(ncid=nid) + if (ios .ne. 0) then + write(LDT_logunit,*)'[WARN] Error closing ' // trim(fname) + return + end if + + rc = 0 ! No error detected! + +#endif + +end subroutine read_USAFSI_data + +!BOP +! !ROUTINE: create_USAFSI_filename +! \label{create_USAFSI_filename} +! +! !INTERFACE: +subroutine create_USAFSI_filename(LISdir, yyyymmdd, hh, filename) +! !USES: + + implicit none + +! !ARGUMENTS: + character(*), intent(in) :: LISdir + character(8), intent(in) :: yyyymmdd + character(2), intent(in) :: hh + character(*), intent(out) :: filename +!EOP + + filename = trim(LISdir) // '/USAFSI_' // trim(yyyymmdd) & + // trim(hh) // '.nc' + +end subroutine create_USAFSI_filename + diff --git a/ldt/SMAP_E_OPL/read_DailyTeffStats.F90 b/ldt/SMAP_E_OPL/read_DailyTeffStats.F90 index 38215dc65..9757eda27 100644 --- a/ldt/SMAP_E_OPL/read_DailyTeffStats.F90 +++ b/ldt/SMAP_E_OPL/read_DailyTeffStats.F90 @@ -3,10 +3,10 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. -!-------------------------END NOTICE -- DO NOT EDIT---------------------- +!-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" !BOP ! @@ -251,17 +251,19 @@ subroutine get_UTC(n,TIMEsec,UTChr) ! ! !USES: use LDT_coreMod + use LDT_logMod, only: LDT_logunit implicit none ! !ARGUMENTS: integer, intent(in) :: n - real :: TIMEsec(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real*8 :: TIMEsec(LDT_rc%lnc(n),LDT_rc%lnr(n)) real :: UTChr(LDT_rc%lnc(n),LDT_rc%lnr(n)) !EOP integer :: ilat, ilon, imo, ida - real :: TIMEday, TIMEhr + real*8 :: TIMEday + real :: TIMEhr real :: UTCyr, UTCmo, UTCda integer :: count_yr, dayremove @@ -269,8 +271,10 @@ subroutine get_UTC(n,TIMEsec,UTChr) do ilon=1,LDT_rc%lnc(n) if (TIMEsec(ilon,ilat).gt.0) then - !write(*,*) 'TIMEsec= ', TIMEsec(ilon,ilat) - TIMEday = TIMEsec(ilon,ilat)/(60*60*24) + !write(LDT_logunit,*) 'EMK: ilon,ilat, TIMEsec= ', & + ! ilon, ilat, TIMEsec(ilon,ilat) + + TIMEday = TIMEsec(ilon,ilat)/DBLE(60*60*24) !write(*,*) 'TIMEday= ', TIMEday count_yr = 0 @@ -327,6 +331,10 @@ subroutine get_UTC(n,TIMEsec,UTChr) UTCda = UTCda + 1 UTChr(ilon,ilat) = UTChr(ilon,ilat) - 24 endif + + !write(LDT_logunit,*) 'EMK: ilon,ilat,TIMEsec,UTChr= ', & + ! ilon, ilat, TIMEsec(ilon,ilat), UTChr(ilon,ilat) + else UTChr(ilon,ilat) = LDT_rc%udef endif diff --git a/ldt/SMAP_E_OPL/scale_teff.F90 b/ldt/SMAP_E_OPL/scale_teff.F90 index 1691b59ee..e4e83dbe1 100644 --- a/ldt/SMAP_E_OPL/scale_teff.F90 +++ b/ldt/SMAP_E_OPL/scale_teff.F90 @@ -3,21 +3,22 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. -!-------------------------END NOTICE -- DO NOT EDIT---------------------- +!-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" !BOP ! ! !ROUTINE: scale_teff ! \label{scale_teff} -! -! !REVISION HISTORY: +! +! !REVISION HISTORY: ! 12 JAN 2022: Yonghwan Kwon, Initial Specification -! -! !INTERFACE: -subroutine scale_teff(n,Orbit,teff_01,teff_02) +! 21 Feb 2023: Eric Kemp, added third time level +! +! !INTERFACE: +subroutine scale_teff(n, Orbit, teff_01, teff_02, teff_03) ! !USES: use LDT_coreMod use LDT_smap_e_oplMod @@ -25,51 +26,52 @@ subroutine scale_teff(n,Orbit,teff_01,teff_02) implicit none ! !ARGUMENTS: integer, intent(in) :: n - character*1 :: Orbit + character*1, intent(in) :: Orbit real :: teff_01(LDT_rc%lnc(n),LDT_rc%lnr(n)) real :: teff_02(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: teff_03(LDT_rc%lnc(n),LDT_rc%lnr(n)) !EOP integer :: t integer :: col, row real :: mu_ref, mu_lis real :: sigma_ref, sigma_lis - real :: teff_01_tmp, teff_02_tmp + real :: teff_01_tmp, teff_02_tmp, teff_03_tmp - do t=1,SMAPeOPL%ngrid + do t = 1, SMAPeOPL%ngrid col = SMAPeOPL%grid_col(t) row = SMAPeOPL%grid_row(t) - if(Orbit.eq."D") then + if (Orbit.eq."D") then mu_ref = SMAPeOPL%mu_6am_ref(t) mu_lis = SMAPeOPL%mu_6am_lis(t) sigma_ref = SMAPeOPL%sigma_6am_ref(t) - sigma_lis = SMAPeOPL%sigma_6am_lis(t) - elseif(Orbit.eq."A") then + sigma_lis = SMAPeOPL%sigma_6am_lis(t) + elseif (Orbit.eq."A") then mu_ref = SMAPeOPL%mu_6pm_ref(t) mu_lis = SMAPeOPL%mu_6pm_lis(t) sigma_ref = SMAPeOPL%sigma_6pm_ref(t) sigma_lis = SMAPeOPL%sigma_6pm_lis(t) endif - if(teff_01(col,row).ne.-9999.0) then - if(mu_ref.gt.0.and.& - mu_lis.gt.0.and.& - sigma_ref.gt.0.and.& - sigma_lis.gt.0) then + if (teff_01(col,row).ne.-9999.0) then + if (mu_ref.gt.0.and.& + mu_lis.gt.0.and.& + sigma_ref.gt.0.and.& + sigma_lis.gt.0) then teff_01_tmp = (teff_01(col,row) - mu_lis) * & sigma_ref/sigma_lis + mu_ref - teff_01(col,row) = teff_01_tmp + teff_01(col,row) = teff_01_tmp endif endif - if(teff_02(col,row).ne.-9999.0) then - if(mu_ref.gt.0.and.& - mu_lis.gt.0.and.& - sigma_ref.gt.0.and.& - sigma_lis.gt.0) then + if (teff_02(col,row).ne.-9999.0) then + if (mu_ref.gt.0.and.& + mu_lis.gt.0.and.& + sigma_ref.gt.0.and.& + sigma_lis.gt.0) then teff_02_tmp = (teff_02(col,row) - mu_lis) * & sigma_ref/sigma_lis + mu_ref @@ -78,6 +80,19 @@ subroutine scale_teff(n,Orbit,teff_01,teff_02) endif endif + if (teff_03(col,row).ne.-9999.0) then + if (mu_ref.gt.0.and.& + mu_lis.gt.0.and.& + sigma_ref.gt.0.and.& + sigma_lis.gt.0) then + + teff_03_tmp = (teff_03(col,row) - mu_lis) * & + sigma_ref/sigma_lis + mu_ref + + teff_03(col,row) = teff_03_tmp + endif + endif + enddo end subroutine scale_teff diff --git a/ldt/SMAP_E_OPL/varsio_m.F90 b/ldt/SMAP_E_OPL/varsio_m.F90 index c22333e45..39c1de103 100644 --- a/ldt/SMAP_E_OPL/varsio_m.F90 +++ b/ldt/SMAP_E_OPL/varsio_m.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- MODULE varsio_m IMPLICIT NONE REAL*8, PARAMETER :: RE_KM = 6371.228, PI = acos(-1.0), d2r = PI/180.0 diff --git a/ldt/USAFSI/LDT_bratsethMod.F90 b/ldt/USAFSI/LDT_bratsethMod.F90 index 60046b249..f90fec770 100644 --- a/ldt/USAFSI/LDT_bratsethMod.F90 +++ b/ldt/USAFSI/LDT_bratsethMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -19,6 +19,8 @@ ! errors. Plus, added two new QC tests based on ! Brasnett. Plus, other bug fixes. ! 02 Nov 2020 Eric Kemp Removed blacklist at request of 557WW. +! 28 Jul 2023 Eric Kemp Expanded station ID to 31 characters. +! 24 Aug 2023 Eric Kemp Expanded station ID to 32 characters. ! ! DESCRIPTION: ! Source code for snow depth analysis using the Bratseth objective analysis @@ -78,7 +80,7 @@ module LDT_bratsethMod real :: back_err_v_corr_len ! Background error vert correlation length integer :: nobs ! Number of observations character*10, allocatable :: networks(:) ! Network name - character*10, allocatable :: platforms(:) ! Observation station ID + character*32, allocatable :: platforms(:) ! Observation station ID real, allocatable :: obs(:) ! Observed values real, allocatable :: lats(:) ! Latitude of observation (deg N) real, allocatable :: lons(:) ! Longitude of observation (deg E) @@ -229,8 +231,8 @@ end function LDT_bratseth_count_good_obs ! Append a single observation into a LDT_bratseth_t object. Value of ! interpolated background value is optional (useful for adding ! "superobservations") - subroutine LDT_bratseth_append_ob(this, network, platform, ob, lat, lon, & - elev, ob_err_var, back) + subroutine LDT_bratseth_append_ob(this, network, platform, ob, & + lat, lon, elev, ob_err_var, back) ! Imports use LDT_logmod, only : LDT_logunit @@ -241,7 +243,7 @@ subroutine LDT_bratseth_append_ob(this, network, platform, ob, lat, lon, & ! Arguments class(LDT_bratseth_t),intent(inout) :: this character(len=10), intent(in) :: network - character(len=10), intent(in) :: platform + character(len=32), intent(in) :: platform real, intent(in) :: ob real, intent(in) :: lat real, intent(in) :: lon @@ -838,7 +840,8 @@ subroutine LDT_bratseth_run_dup_qc(this) integer :: count_dups real :: mean, back, newlat, newlon, newelev real :: ob_err_var, ob_err_corr_len - character(len=10) :: network, platform + character(len=10) :: network + character(len=32) :: platform real :: diff integer :: i,j logical :: reject_all @@ -1239,8 +1242,8 @@ end subroutine LDT_bratseth_run_water_qc ! obs, and rejected if deviation is too high. Superobs are considered ! "close" if they are in the same LIS grid box. Based on Lespinas et al ! (2015). - subroutine LDT_bratseth_run_superstat_qc(this, n, new_name, ncols, nrows, & - silent_rejects) + subroutine LDT_bratseth_run_superstat_qc(this, n, new_name, & + ncols, nrows, silent_rejects) ! Imports use LDT_coreMod, only: LDT_domain, LDT_rc @@ -1253,7 +1256,7 @@ subroutine LDT_bratseth_run_superstat_qc(this, n, new_name, ncols, nrows, & ! Arguments class(LDT_bratseth_t), intent(inout) :: this integer, intent(in) :: n - character(len=10), intent(in) :: new_name + character(len=32), intent(in) :: new_name integer, intent(in) :: ncols integer, intent(in) :: nrows logical, optional, intent(in) :: silent_rejects @@ -1262,7 +1265,8 @@ subroutine LDT_bratseth_run_superstat_qc(this, n, new_name, ncols, nrows, & integer :: num_good_obs integer :: num_rejected_obs, num_merged_obs, num_superobs logical :: silent_rejects_local - character(len=10) :: network_new, platform_new + character(len=10) :: network_new + character(len=32) :: platform_new integer, allocatable :: actions(:) real, allocatable :: means(:,:) real, allocatable :: superobs(:,:), superbacks(:,:) @@ -1817,7 +1821,7 @@ subroutine LDT_bratseth_resort_bad_obs(this) integer :: iob,job logical :: found_replacement character*10 :: network - character*10 :: platform + character*32 :: platform real :: ob, lat, lon, elev, ob_err_var, back integer :: qc character*80 :: failed_qc_test @@ -2042,6 +2046,9 @@ end subroutine LDT_bratseth_run_missing_elev_qc ! See https://en.wikipedia.org/wiki/Comb_sort subroutine LDT_bratseth_sort_obs_by_id(this) + ! Imports + use LDT_logmod, only : LDT_logunit + ! Defaults implicit none @@ -2052,6 +2059,7 @@ subroutine LDT_bratseth_sort_obs_by_id(this) integer :: gap integer :: switch character*10 :: ctemp10 + character*32 :: ctemp32 character*80 :: ctemp80 real :: rtemp integer :: itemp @@ -2078,9 +2086,9 @@ subroutine LDT_bratseth_sort_obs_by_id(this) this%networks(i) = this%networks(j) this%networks(j) = ctemp10 - ctemp10 = this%platforms(i) + ctemp32 = this%platforms(i) this%platforms(i) = this%platforms(j) - this%platforms(j) = ctemp10 + this%platforms(j) = ctemp32 rtemp = this%obs(i) this%obs(i) = this%obs(j) @@ -2152,7 +2160,7 @@ subroutine LDT_bratseth_print_snowdepths(this,minprt) int(this%elevs(i)), this%obs(i), trim(this%reject_reasons(i)) end if end do ! i -7000 format (/,'[INFO] NETID = ',A5,' STATION ID = ',A9, & +7000 format (/,'[INFO] NETID = ',A5,' STATION ID = ',A32, & ' LAT = ',F6.2,' LON = ',F7.2, & ' ELEV(M) = ',I5,' DEPTH(M) = ', F7.5, & ' QC VERDICT = ',A) diff --git a/ldt/USAFSI/LDT_usafsiMod.F90 b/ldt/USAFSI/LDT_usafsiMod.F90 index 57451c4ea..71fff404f 100644 --- a/ldt/USAFSI/LDT_usafsiMod.F90 +++ b/ldt/USAFSI/LDT_usafsiMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -27,6 +27,7 @@ module LDT_usafsiMod character*10 :: date10 character*255 :: fracdir character*255 :: modif + integer :: sfcobsfmt ! EMK 20230727 character*255 :: sfcobs character*255 :: ssmis character*255 :: gmi !kyh20201118 @@ -139,11 +140,20 @@ subroutine LDT_usafsiInit() call ESMF_ConfigGetAttribute(LDT_config, usafsi_settings%modif, rc=rc) call LDT_verify(rc, trim(cfg_entry)//" not specified") + ! New sfcobs format...EMK 20230728 + cfg_entry = "USAFSI surface obs data format:" + call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + call ESMF_ConfigGetAttribute(LDT_config, usafsi_settings%sfcobsfmt, & + rc=rc) + call LDT_verify(rc, trim(cfg_entry)//" not specified") + ! Get sfcobs cfg_entry = "USAFSI surface obs data directory:" call ESMF_ConfigFindLabel(LDT_config, trim(cfg_entry), rc=rc) call LDT_verify(rc, trim(cfg_entry)//" not specified") - call ESMF_ConfigGetAttribute(LDT_config, usafsi_settings%sfcobs, rc=rc) + call ESMF_ConfigGetAttribute(LDT_config, usafsi_settings%sfcobs, & + rc=rc) call LDT_verify(rc, trim(cfg_entry)//" not specified") !------------------------------------------------------------------------------kyh20201118 diff --git a/ldt/USAFSI/USAFSI_amsr2Mod.F90 b/ldt/USAFSI/USAFSI_amsr2Mod.F90 index 85c29ffa5..a500d5895 100755 --- a/ldt/USAFSI/USAFSI_amsr2Mod.F90 +++ b/ldt/USAFSI/USAFSI_amsr2Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_analysisMod.F90 b/ldt/USAFSI/USAFSI_analysisMod.F90 index 89fdcb6ca..2c6ee313f 100644 --- a/ldt/USAFSI/USAFSI_analysisMod.F90 +++ b/ldt/USAFSI/USAFSI_analysisMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -17,6 +17,8 @@ ! 02 Nov 2020 Eric Kemp Removed blacklist code at request of 557WW. ! 22 Jan 2021 Yeosang Yoon Add subroutine for new 0.1 deg snow climatology ! 13 Jan 2022 Eric Kemp Added support for GRIB1 FNMOC SST file. +! 28 Jul 2023 Eric Kemp Added support for new sfcobs file format (longer +! station names. ! ! DESCRIPTION: ! Source code for Air Force snow depth analysis. @@ -676,7 +678,7 @@ subroutine getgeo (month, static, nc, nr, elevations) end subroutine getgeo subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & - stalat, stalon, staelv, stadep) + stalat, stalon, staelv, stadep, sfcobsfmt) !******************************************************************************* !******************************************************************************* @@ -741,6 +743,8 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & !** 21 Mar 19 Ported to LDT...Eric Kemp, NASA GSFC/SSAI !** 09 May 19 Renamed LDTSI...Eric Kemp, NASA GSFC/SSAI !** 13 Dec 19 Renamed USAFSI...Eric Kemp, NASA GSFC/SSAI + !** 27 Jul 23 Added new sfcobs file format...Eric Kemp, SSAI + !** 24 Aug 23 New global sfcsno file format...Eric Kemp, SSAI !** !******************************************************************************* !******************************************************************************* @@ -760,12 +764,14 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & integer, intent(in) :: month ! CURRENT MONTH (1-12) character*255, intent(in) :: sfcobs ! PATH TO DBPULL SNOW OBS DIRECTORY character*5, intent(out) :: netid (:) ! NETWORK ID OF AN OBSERVATION - character*9, intent(out) :: staid (:) ! STATION ID OF AN OBSERVATION + character*32, intent(out) :: staid (:) ! STATION ID OF AN OBSERVATION + integer, intent(out) :: stacnt ! TOTAL NUMBER OF OBSERVATIONS USED integer, intent(out) :: stalat (:) ! LATITUDE OF A STATION OBSERVATION integer, intent(out) :: stalon (:) ! LONGITUDE OF A STATION OBSERVATION integer, intent(out) :: staelv (:) ! ELEVATION OF A STATION OBSERVATION (METERS) real, intent(out) :: stadep (:) ! SNOW DEPTH REPORTED AT A STATION (METERS) + integer, intent(in) :: sfcobsfmt ! Format of sfcobs file ! Local variables character*7 :: access_type ! FILE ACCESS TYPE @@ -779,9 +785,10 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & character*90 :: message (msglns) ! ERROR MESSAGE character*255 :: obsfile ! NAME OF OBSERVATION TEXT FILE character*5 :: obsnet ! RETURNED OBS STATION NETWORK - character*9 :: obssta ! RETURNED OBS STATION ID + character*32 :: obssta ! RETURNED OBS STATION ID character*5, allocatable :: oldnet (:) ! ARRAY OF NETWORKS FOR OLDSTA - character*9, allocatable :: oldsta (:) ! ARRAY OF PROCESSED STATIONS WITH SNOW DEPTHS + character*32, allocatable :: oldsta (:) ! ARRAY OF PROCESSED STATIONS WITH SNOW DEPTHS + character*12 :: routine_name ! NAME OF THIS SUBROUTINE integer :: ctrgrd ! TEMP HOLDER FOR GROUND OBS INFO integer :: ctrtmp ! TEMP HOLDER FOR TOO WARM TEMPERATURE OBS @@ -855,13 +862,18 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & message = ' ' ! OPEN INPUT FILE. - obsfile = trim(sfcobs) // 'sfcsno_' // chemi(hemi) // & - interval // date10 // '.txt' + if (sfcobsfmt == 1) then + obsfile = trim(sfcobs) // 'sfcsno_' // chemi(hemi) // & + interval // date10 // '.txt' + else if (sfcobsfmt == 2) then ! Global file + obsfile = trim(sfcobs) // 'sfcsno_' // & + '06hr_' // date10 // '.txt' + end if inquire (file=obsfile, exist=isfile) file_check : if (isfile) then access_type = 'OPENING' - open (lunsrc(hemi), file=obsfile, iostat=istat, err=5000, & + open (lunsrc(hemi), file=obsfile, iostat=istat, err=5000, & form='formatted') isopen = .true. @@ -873,17 +885,33 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & ! LOOP THROUGH ALL OBSERVATIONS RETRIEVED FROM THE DATABASE. read_loop : do while (istat .eq. 0) - read (lunsrc(hemi), 6400, iostat=istat, end=3000, err=5000) & - date10_hourly, obsnet, obssta, oblat, oblon, obelev, & - itemp, depth, ground - + if (sfcobsfmt == 1) then + read (lunsrc(hemi), 6400, iostat=istat, end=3000, & + err=5000) & + date10_hourly, obsnet, obssta, oblat, oblon, & + obelev, & + itemp, depth, ground + else if (sfcobsfmt == 2) then + ! New format with longer station IDs + read (lunsrc(hemi), 6401, iostat=istat, end=3000, & + err=5000) & + date10_hourly, obsnet, obssta, oblat, oblon, & + obelev, & + itemp, depth, ground + end if good_read : if (istat == 0) then if (date10_hourly .ne. date10_prev) then if (totalobs > 1) then - write(ldt_logunit,6500) & - trim(routine_name), chemicap(hemi), & - date10_prev, obsrtn + if (sfcobsfmt == 1) then + write(ldt_logunit,6500) & + trim(routine_name), chemicap(hemi), & + date10_prev, obsrtn + else + write(ldt_logunit,6501) & + trim(routine_name), & + date10_prev, obsrtn + end if obsrtn = 0 end if end if @@ -924,7 +952,6 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & NETID(STCTP1) = OBSNET staid(stctp1) = obssta - stadep(stctp1) = (float (depth) / 1000.0) ! convert from mm to meters if (depth >= 1 .and. stadep(stctp1) < 0.001) then @@ -1057,38 +1084,64 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & if (totalobs > 0) then stacnt_h = stacnt - stacnt_h - write (ldt_logunit,6500) trim(routine_name), chemicap(hemi), & - date10_prev, obsrtn - - write (ldt_logunit,6800) trim(routine_name), chemicap(hemi), & - totalobs, & - stacnt_h, obwsno, ctrgrd, ctrtmp, ctrtrs - + if (sfcobsfmt == 1) then + write (ldt_logunit,6500) trim(routine_name), & + chemicap(hemi), & + date10_prev, obsrtn + write (ldt_logunit,6800) trim(routine_name), & + chemicap(hemi), & + totalobs, & + stacnt_h, obwsno, ctrgrd, ctrtmp, ctrtrs + else if (sfcobsfmt == 2) then + write (ldt_logunit,6501) trim(routine_name), & + date10_prev, obsrtn + write (ldt_logunit,6801) trim(routine_name), & + totalobs, & + stacnt_h, obwsno, ctrgrd, ctrtmp, ctrtrs + end if else - message(1) = & - '[WARN] NO SURFACE OBSERVATIONS READ FOR ' // date10 // & - ' ' // chemicap(hemi) + if (sfcobsfmt == 1) then + message(1) = & + '[WARN] NO SURFACE OBSERVATIONS READ FOR ' // & + date10 // & + ' ' // chemicap(hemi) + else if (sfcobsfmt == 2) then + message(1) = & + '[WARN] NO SURFACE OBSERVATIONS READ FOR ' // & + date10 + end if call error_message (program_name, routine_name, message) end if else file_check - message(1) = & - '[WARN] NO SURFACE OBSERVATIONS FILE FOR ' // date10 // & - ' ' // chemicap(hemi) + if (sfcobsfmt == 1) then + message(1) = & + '[WARN] NO SURFACE OBSERVATIONS FILE FOR ' // & + date10 // & + ' ' // chemicap(hemi) + else if (sfcobsfmt == 2) then + message(1) = & + '[WARN] NO SURFACE OBSERVATIONS FILE FOR ' & + // date10 + end if + message(2) = '[WARN] Looked for ' // trim(obsfile) call error_message (program_name, routine_name, message) end if file_check + ! New file format is global, so we don't need to loop again + if (sfcobsfmt == 2) exit + end do hemi_loop ! DEALLOCATE ARRAYS deallocate (oldsta) return - + ! ERROR-HANDLING SECTION. 5000 continue @@ -1103,10 +1156,14 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & 6000 format (/, '[INFO] ', A, ': READING ', A) !6200 format (I) 6400 format (A10, 1X, A5, 1X, A10, 6(I10)) +!6401 format (A10, 1X, A5, 1X, A31, 1X, 6(I10)) +6401 format (A10, 1X, A5, 1X, A32, 6(I10)) 6500 format (/, '[INFO] ', A6, ': SURFACE OBS READ FOR ', A2, ' DTG ', & A10, ' = ', I6) +6501 format (/, '[INFO] ', A6, ': SURFACE OBS READ FOR DTG ', & + A10, ' = ', I6) 6600 format (1X, '**', A6, ': DEPTH = ', I6, ' STADEP = ', I6) -6700 format (/, 1X, '[INFO] HIGH POLAR TEMP: NETW= ', A5, 1X, 'STN= ', A9, & +6700 format (/, 1X, '[INFO] HIGH POLAR TEMP: NETW= ', A5, 1X, 'STN= ', A31, & 1X, 'LAT= ', F8.2, 1X, 'LON= ', F8.2, & 1X, 'ELEV= ', I5, /, 6X, 'TEMP= ', F7.1, & 2X, 'ST OF GRND= ', I9, 2X, 'DEPTH(CM)= ', I6) @@ -1119,6 +1176,15 @@ subroutine getobs (date10, month, sfcobs, netid, staid, stacnt, & /, 5X, '[INFO] OBS NOT USED FOR SEASON AND ELEVATION = ', I4, & /, 5X, '[INFO] OBS NOT USED FOR EXCEEDED TEMP THRESH = ', I6, & /, 1X, 55('-')) +6801 format (/, 1X, 55('-'), & + /, 3X, '[INFO] SUBROUTINE: ', A6, & + /, 5X, '[INFO] TOTAL SURFACE OBS READ = ', I6, & + /, 5X, '[INFO] TOTAL NON-DUPLICATE OBS PROCESSED = ', I6, & + /, 5X, '[INFO] STATIONS WITH A FOUR-THREE GROUP = ', I4, & + /, 5X, '[INFO] OBS NOT USED FOR STATE OF GROUND = ', I4, & + /, 5X, '[INFO] OBS NOT USED FOR SEASON AND ELEVATION = ', I4, & + /, 5X, '[INFO] OBS NOT USED FOR EXCEEDED TEMP THRESH = ', I6, & + /, 1X, 55('-')) end subroutine getobs @@ -2780,7 +2846,7 @@ subroutine run_snow_analysis_noglacier(runcycle, nc, nr, landmask, & integer :: snomask_reject_count integer :: bad_back_count, glacier_zone_count real :: ob_value - character*10 :: new_name + character*32 :: new_name integer :: gindex real :: rlat diff --git a/ldt/USAFSI/USAFSI_arraysMod.F90 b/ldt/USAFSI/USAFSI_arraysMod.F90 index 59cdffed1..5c895ebf3 100644 --- a/ldt/USAFSI/USAFSI_arraysMod.F90 +++ b/ldt/USAFSI/USAFSI_arraysMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_binary.F90 b/ldt/USAFSI/USAFSI_binary.F90 index c49c65269..efee40177 100644 --- a/ldt/USAFSI/USAFSI_binary.F90 +++ b/ldt/USAFSI/USAFSI_binary.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_galwemMod.F90 b/ldt/USAFSI/USAFSI_galwemMod.F90 index 33b482481..fcf4bb1aa 100644 --- a/ldt/USAFSI/USAFSI_galwemMod.F90 +++ b/ldt/USAFSI/USAFSI_galwemMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_gofsMod.F90 b/ldt/USAFSI/USAFSI_gofsMod.F90 index 0ab04ea73..8096e4977 100644 --- a/ldt/USAFSI/USAFSI_gofsMod.F90 +++ b/ldt/USAFSI/USAFSI_gofsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_lisMod.F90 b/ldt/USAFSI/USAFSI_lisMod.F90 index a0bab9eb7..139b0870d 100644 --- a/ldt/USAFSI/USAFSI_lisMod.F90 +++ b/ldt/USAFSI/USAFSI_lisMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_netcdfMod.F90 b/ldt/USAFSI/USAFSI_netcdfMod.F90 index bf590db9b..fae7e42c4 100644 --- a/ldt/USAFSI/USAFSI_netcdfMod.F90 +++ b/ldt/USAFSI/USAFSI_netcdfMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_paramsMod.F90 b/ldt/USAFSI/USAFSI_paramsMod.F90 index 534e15c7a..c735152bb 100644 --- a/ldt/USAFSI/USAFSI_paramsMod.F90 +++ b/ldt/USAFSI/USAFSI_paramsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_run.F90 b/ldt/USAFSI/USAFSI_run.F90 index 770f57932..23a34055c 100644 --- a/ldt/USAFSI/USAFSI_run.F90 +++ b/ldt/USAFSI/USAFSI_run.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -71,6 +71,9 @@ subroutine USAFSI_run(n) !** 13 Jan 22 Added support for FNMOC SST GRIB1 file.........Eric Kemp/NASA GSFC/SSAI !** 27 Jun 23 Removed LDT_endrun for normal termination, to avoid error ! code 1.........................................Eric Kemp/SSAI + !** 28 Jun 23 Extended station names to 31 characters........Eric Kemp/SSAI + !** 24 Aug 23 Changed station names to 32 characters.........Eric Kemp/SSAI + !***************************************************************************************** !***************************************************************************************** @@ -109,8 +112,10 @@ subroutine USAFSI_run(n) character*5, allocatable :: netid (:) ! NETWORK ID OF AN OBSERVATION character*255 :: modif ! PATH TO MODIFIED DATA DIRECTORY character*255 :: sfcobs ! PATH TO DBPULL SNOW OBS DIRECTORY + integer :: sfcobsfmt ! Format of sfcobs file character*255 :: TB_product_path ! TB_based retrivals path !kyh20201118 - character*9, allocatable :: staid (:) ! STATION ID OF AN OBSERVATION + !character*9, allocatable :: staid (:) ! STATION ID OF AN OBSERVATION + character*32, allocatable :: staid (:) ! STATION ID OF AN OBSERVATION character*255 :: static ! STATIC FILE DIRECTORY PATH character*255 :: stmpdir ! SFC TEMP DIRECTORY PATH character*255 :: sstdir ! EMK 20220113 @@ -131,7 +136,8 @@ subroutine USAFSI_run(n) real, allocatable :: stadep (:) ! OBSERVATION SNOW DEPTH (METERS) character*12 :: routine_name type(LDT_bratseth_t) :: bratseth - character*10 :: network10, platform10 + character*10 :: network10 + character*32 :: platform32 real :: rob, rlat, rlon, relev integer :: nc,nr real, allocatable :: landmask(:,:) @@ -178,6 +184,8 @@ subroutine USAFSI_run(n) fracdir = trim(usafsi_settings%fracdir) modif = trim(usafsi_settings%modif) sfcobs = trim(usafsi_settings%sfcobs) + sfcobsfmt = usafsi_settings%sfcobsfmt ! EMK test + !---------------------------------------------------------kyh20201118 if (usafsi_settings%TB_option == 1) then !SSMIS TB_product_path = trim(usafsi_settings%ssmis) @@ -369,8 +377,16 @@ subroutine USAFSI_run(n) allocate (stalat (maxsobs)) allocate (stalon (maxsobs)) - call getobs (date10, month, sfcobs, netid, staid, stacnt, & - stalat, stalon, staelv, stadep) + if (sfcobsfmt == 1 .or. sfcobsfmt == 2) then + call getobs (date10, month, sfcobs, netid, staid, stacnt, & + stalat, stalon, staelv, stadep, sfcobsfmt) + else + write(LDT_logunit,*)'[ERR] Invalid sfcobs file format!' + write(LDT_logunit,*)'[ERR] Expected 1 (old) or 2 (new)' + write(LDT_logunit,*)'[ERR] Received ', sfcobsfmt + call LDT_endrun() + end if + write(LDT_logunit,*) & '[INFO] TOTAL OBSERVATIONS RETURNED FROM GETOBS: ', & stacnt @@ -378,12 +394,13 @@ subroutine USAFSI_run(n) ! EMK Copy observations to bratseth object do j = 1, stacnt network10 = trim(netid(j)) - platform10 = trim(staid(j)) + platform32 = trim(staid(j)) rob = stadep(j) rlat = real(stalat(j)) * 0.01 rlon = real(stalon(j)) * 0.01 relev = real(staelv(j)) - call bratseth%append_ob(network10, platform10, rob, rlat, rlon,& + call bratseth%append_ob(network10, platform32, rob, & + rlat, rlon,& relev, & usafsi_settings%ob_err_var, back=-1.) end do diff --git a/ldt/USAFSI/USAFSI_ssmisMod.F90 b/ldt/USAFSI/USAFSI_ssmisMod.F90 index 1557f7475..9e8378fb7 100644 --- a/ldt/USAFSI/USAFSI_ssmisMod.F90 +++ b/ldt/USAFSI/USAFSI_ssmisMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_utilMod.F90 b/ldt/USAFSI/USAFSI_utilMod.F90 index 3d430ca3a..0f26c1f90 100644 --- a/ldt/USAFSI/USAFSI_utilMod.F90 +++ b/ldt/USAFSI/USAFSI_utilMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/USAFSI_xcalgmiMod.F90 b/ldt/USAFSI/USAFSI_xcalgmiMod.F90 index e3e25ef47..51904142e 100755 --- a/ldt/USAFSI/USAFSI_xcalgmiMod.F90 +++ b/ldt/USAFSI/USAFSI_xcalgmiMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/USAFSI/ztif_frac_slice.c b/ldt/USAFSI/ztif_frac_slice.c index 598c63677..5f4b9c0a1 100644 --- a/ldt/USAFSI/ztif_frac_slice.c +++ b/ldt/USAFSI/ztif_frac_slice.c @@ -1,3 +1,12 @@ +//-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +// NASA Goddard Space Flight Center +// Land Information System Framework (LISF) +// Version 7.5 +// +// Copyright (c) 2024 United States Government as represented by the +// Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +//-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LDT_misc.h" #include "ftn_drv.h" diff --git a/ldt/arch/Config.pl b/ldt/arch/Config.pl index 65688a54a..d96487fad 100755 --- a/ldt/arch/Config.pl +++ b/ldt/arch/Config.pl @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -134,7 +134,7 @@ } elsif($sys_arch eq "Darwin_gfortran" || $sys_arch eq "linux_gfortran") { $sys_opt = "-g -Wall -Wcharacter-truncation"; - $sys_opt .= " -Wconversion-extra -Wextra -Wpedantic -Wrealloc-lhs"; + $sys_opt .= " -Wconversion-extra -Wextra -Wrealloc-lhs"; $sys_opt .= " -Wrealloc-lhs-all"; # Run-time options $sys_opt .= " -ffpe-trap=invalid,zero,overflow"; diff --git a/ldt/compile b/ldt/compile index fb6e4e4c1..658ec2114 100755 --- a/ldt/compile +++ b/ldt/compile @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/configs/ldt.config.adoc b/ldt/configs/ldt.config.adoc index bea6392f3..0ca2343ba 100644 --- a/ldt/configs/ldt.config.adoc +++ b/ldt/configs/ldt.config.adoc @@ -94,6 +94,7 @@ Surface model types: "LSM" |Mosaic |Mosaic |HySSIB |HySSIB |CLSMF2.5 |Catchment, Fortuna 2.5 +|SnowModel |SnowModel |SAC.3.5.6 |Sacramento |SNOW17 |Snow17 |RDHM.3.5.6 |Sacramento+snow17 @@ -764,15 +765,18 @@ endif::devonly[] |AVHRR |Univ. of Maryland 1992-93 AVHRR landcover map. Please see: https://doi.org/10.3334/ORNLDAAC/969 |AVHRR_GFS |Similar to "`AVHRR`" option above but on a GFS grid. -|MODIS_Native |Terra-MODIS sensor-based IGBP land classification map, modified by NCEP. For more info, please see: http://www.ral.ucar.edu/research/land/technology/noahmp_lsm.php +|MODIS_Native |Terra-MODIS sensor-based IGBP land classification map, modified by NCEP. For more info, please see: https://ral.ucar.edu/model/noah-multiparameterization-land-surface-model-noah-mp-lsm |MODIS_LIS |Similar dataset as "`MODIS_Native`" above but processed by LISF-team. -|USGS_Native |The 24-category USGS native landcover map. See: http://www.ral.ucar.edu/research/land/technology/noahmp_lsm.php +|MCD12Q1 |Terra and Aqua combined MODIS landcover map, available at yearly intervals. Allows dynamic annual landcover maps in "`Landcover file`" option. +|USGS_Native |The 24-category USGS native landcover map. See: https://ral.ucar.edu/model/noah-multiparameterization-land-surface-model-noah-mp-lsm |USGS_LIS |Similar dataset as "`USGS_Native`" but processed by LISF-team. |ALMIPII |AMMA/ALMIP Phase-2 landcover input option. For more info: http://www.cnrm.meteo.fr/amma-moana/amma_surf/almip2/input.html |CLSMF2.5 |CLSM Fortuna 2.5 landcover dataset. |VIC412 |Variable Infiltration Capacity model, v4.1.2, UMD land cover. |ISA |Impervious Surface Area (ISA) landcover dataset. |CLM45 |CLM-4.5 landcover dataset. +|NALCMS_SM |SnowModel-based NALCMS landcover dataset. +|NALCMS_SM_IGBPNCEP |SnowModel-based NALCMS landcover dataset with IGBPNCEP-mapped classes. |CONSTANT |Ability to set a constant landcover type for a set classification. |=== @@ -807,6 +811,11 @@ Landcover classification: "UMD" `Landcover file:` specifies the location of the vegetation classification file. +.Example _ldt.config_ entry +.... +Landcover file: ./MODIS/MCD12Q1.006/2001/MCD12Q1.006_2001001.nc4 +.... + `Landcover map projection:` specifies the projection of the landcover map data. `Landcover spatial transform:` indicates which spatial transform (i.e., upscale or downscale) type is to be applied to the landcover map. Options include: @@ -1721,6 +1730,7 @@ Current options include: |SRTM_LIS |Similar dataset as to the above one but processed by LISF-team. |CONSTANT |User can set a constant elevation, slope or aspect class. |MERIT_1K |The MERIT elevation map, but processed by LISF-team to have a resolution '`0.008333`'. See: http://hydro.iis.u-tokyo.ac.jp/~yamadai/MERIT_DEM/index.html +|NED_SM | SnowModel-based National Elevation Dataset (NED) topographic fields. |=== .Example _ldt.config_ entry @@ -2407,6 +2417,136 @@ Bottom temperature resolution (dy): 0.2500 Noah-MP PBL Height Value: 900. # in meters .... +Miguez-Macho and Fan (MMF) Groundwater Parameters + +IMPORTANT: Currently, Noah-MP.4.0.1 is the only land surface model that supports the MMF groundwater scheme. + +`Process Noah-MP-4.0.1 MMF groundwater parameters:` specifies whether to process Noah-MP-4.0.1 MMF groundwater parameters. Acceptable values are: + +[cols="<,<",] +|=== +|Value |Description + +|.false. | do not process (default) +|.true. | process +|=== + +.Example _ldt.config_ entry +.... +Process Noah-MP-4.0.1 MMF groundwater parameters: .true. +.... + +[NOTE] +==== +The Noah-MP-4.0.1 parameters are only needed when running option "5" for the following lis.config entry when running LIS: + +`Noah-MP.4.0.1 runoff and groundwater option: 5` + +// TODO: remove following admonition when MMF groundwater option 5 is implemented in LIS +IMPORTANT: The MMF groundwater option (option 5) is not yet supported in LIS. Work on this feature is currently in progress. +==== + +`MMF transmissivity dir:` specifies the location of the directory containing FDEPTH (transmissivity e-folding depth [m]) data on GEOGRID tiles. + +`MMF climatological recharge dir:` specifies the location of the directory containing RECHARGE (climatological recharge [mm]) data on GEOGRID tiles. + +`MMF riverbed elevation dir:` specifies the location of the directory containing RIVERBED (riverbed elevation [m]) data on GEOGRID tiles. + +`MMF equilibrium water table depth dir:` specifies the location of the directory containing EQWTD (equilibrium water table depth [m]) data on GEOGRID tiles. + +`MMF HGT_M dir:` specifies the location of the directory containing GMTED2010 (30-arc-second topography height [m from MSL]) data on GEOGRID tiles. + +.Example _ldt.config_ entry +.... +MMF transmissivity dir: ./LS_PARAMETERS/noahmp401_parms/groundwater/f/ +MMF climatological recharge dir: ./LS_PARAMETERS/noahmp401_parms/groundwater/recharge/ +MMF riverbed elevation dir: ./LS_PARAMETERS/noahmp401_parms/groundwater/riverbed/ +MMF equilibrium water table depth dir: ./LS_PARAMETERS/noahmp401_parms/groundwater/wtd/ +MMF HGT_M dir: ./LS_PARAMETERS/noahmp401_parms/groundwater/topo_gmted2010_30s/ +.... + +[NOTE] +==== +Spatial interpolation and gap filling parameters for each MMF variable are also required. See the config entries below. + +link:https://www2.mmm.ucar.edu/wrf/users/docs/user_guide_v4/v4.3/users_guide_chap3.html#_Description_of_GEOGRID.TBL[The WRF User's Guide, window=_blank] (and link:https://github.com/wrf-model/WPS/blob/master/geogrid/GEOGRID.TBL.ARW.noahmp[WPS/WPS-4.0.1/geogrid/GEOGRID.TBL.ARW.noahmp, window=_blank]) describe WPS's MMF parameter preprocessing procedures from the GEOGRID grid to the model grid. WPS performing the entire interpolation process from aggregating to gap filling on the native GEOGRID space makes it fundamentally different to LDT because LDT first aggregates input data from the native grid to the model grid and then fills gaps on the model grid space. The current LDT implementation of MMF parameter preprocessing does not attempt to replicate the WPS interpolation procedures, instead, it uses existing LDT interpolation utilities to follow the WPS's interpolation concept. +==== + +`MMF map projection:` map projection parameter is always set to latlon for MMF parameters. + +`MMF spatial transform:` spatial transform parameter is always set to average for MMF parameters. + +.Example _ldt.config_ entry +.... +MMF map projection: latlon +MMF spatial transform: average +.... + +`FDEPTH fill option:` specifies the MMF parameter fill option (`neighbor` is preferred). + +`FDEPTH fill radius:` specifies the radius with which to search for nearby value(s) to help fill in the missing value (0 is preferred). + +`FDEPTH fill value:` indicates the parameter value to be used if an arbitrary value fill is needed. + +`FDEPTH water value:` MMF scheme is active in lake/water grid cells. Thus, a suitable FDEPTH value in lakes/rivers is needed in case GEOGRID didn't have valid data at the location. + +.Example _ldt.config_ entry +.... +FDEPTH fill option: neighbor +FDEPTH fill radius: 0. +FDEPTH fill value: 100. +FDEPTH water value: 100. +.... + + +`RECHCLIM fill option:` specifies the MMF parameter fill option (`neighbor` is preferred). + +`RECHCLIM fill radius:` specifies the radius with which to search for nearby value(s) to help fill in the missing value (0 is preferred). + +`RECHCLIM fill value:` indicates the parameter value to be used if an arbitrary value fill is needed. + +`RECHCLIM water value:` MMF scheme is active in lake/water grid cells. Thus, a suitable RECHCLIM value in lakes/rivers is needed in case GEOGRID didn't have valid data at the location. + +.Example _ldt.config_ entry +.... +RECHCLIM fill option: neighbor +RECHCLIM fill radius: 0. +RECHCLIM fill value: -1. +RECHCLIM water value: -1. +.... + + +`EQWTD fill option:` specifies the MMF parameter fill option (`neighbor` is preferred). + +`EQWTD fill radius:` specifies the radius with which to search for nearby value(s) to help fill in the missing value. + +`EQWTD fill value:` indicates the parameter value to be used if an arbitrary value fill is needed. + +`EQWTD water value:` MMF scheme is active in lake/water grid cells. Thus, a suitable EQWTD value in lakes/rivers is needed in case GEOGRID didn't have valid data at the location. + +.Example _ldt.config_ entry +.... +EQWTD fill option: neighbor +EQWTD fill radius: 0. +EQWTD fill value: 0. +EQWTD water value: 0. +.... + + +`HGT_M fill option:` specifies the MMF parameter fill option (`neighbor` is preferred). + +`HGT_M fill radius:` specifies the radius with which to search for nearby value(s) to help fill in the missing value. + +`HGT_M fill value:` indicates the parameter value to be used if an arbitrary value fill is needed. + + +.Example _ldt.config_ entry +.... +HGT_M fill option: neighbor +HGT_M fill radius: 0. +HGT_M fill value: 0. +.... + If selecting the Community Land Model (4.5 version), the following config entires are also required. `CLM45 parameter mode:` specifies whether to "`readin`" the CLM-4.5 parameters from pre-processed files. Currently, only the "`readin`" option is available. @@ -2453,6 +2593,27 @@ CLM45 resolution (dx): 1.25 CLM45 resolution (dy): 0.9424060 .... +If selecting Glen Liston's SnowModel, the following config entires are required. + +`Snowmodel topo-veg data source:` specifies which pre-processed SnowModel parameters and file format type to be read in. Currently, only the "`Grads_binary`" option is available. + +`Snowmodel topo-veg map:` specifies the directory-file location of the pre-processed SnowModel topographic and vegetation class parameters. + +`Snowmodel topo-veg spatial transform:` specifies the type of grid transform for preprocessed SnowModel topographic and vegetation class parameters. Currently, this option is not yet supported and user option is only "`none`" at this time. + +`Snowmodel topo-veg map projection:` specifies the SnowModel parameter file projection. Currently, SnowModel parameter projection needs to be set to the same as the LIS domain projection, for now. SnowModel parameters are best provided either on a Lambert projection (in LIS) and supports some equal-area projection grids, like UTM, which is available in LIS. Future support for more options will be added. + +`Snowmodel topo-veg fill option:` specifies the type of fill option used with SnowModel parameters. Currently, this feature is not supported, and will be in future versions. + +.Example _ldt.config_ entry +.... +Snowmodel topo-veg data source: "Grads_binary" +Snowmodel topo-veg map: ../SnowModel_Inputs/uppertuo_100m/topo_vege.gdat +Snowmodel topo-veg spatial transform: "none" +Snowmodel topo-veg map projection: lambert +Snowmodel topo-veg fill option: none +.... + Potential Evapotranspiration (PET) maps `PET directory:` specifies the source of the monthly climatology based PET files. The climatology data files have the following naming convention: /..1gd4r. The tag should be represent the month (such as JAN, FEB, MAR, etc.). The file header can be anything (such as avhrr_pet_1KM). Currently, this parameter is used only with the RDHM-SAC model. @@ -3542,6 +3703,54 @@ landcover.1gd4r + CDF grouping attributes file: cdf_grouping.txt .... +`Stratify CDFs by external data:` specifies whether to stratify CDFs for each pixel by an externally specified categorical map; for example, by precipitation climatology. +This option generates a stratified CDF for each grid cell. That means if the domain contains 10000 grid cells, the CDF file also has 10000 CDFs. But CDFs in grid cells with a similar precipitation climatology are the same. +Acceptable values are: + +[cols="<,<",] +|=== +|Value |Description + +|0 |do not stratify by external data +|1 |stratify by external data +|=== + +.Example _ldt.config_ entry +.... +Stratify CDFs by external data: 1 +.... + +`Number of bins to use for stratification:` specifies the number of stratification bins to use for computing the CDF. + +.Example _ldt.config_ entry +.... +Number of bins to use for stratification: 15 +.... + +`Stratification data source:` specifies the name of the stratification data source + +.Example _ldt.config_ entry +.... +Stratification data source: "LIS LSM total precipitation" +.... + +`External stratification file:` Specifies the name of a NetCDF file that contains the monthly precipitation climatology. The user needs to run an LSM and generate daily total precipitation output for a long period. Then the user needs to run LVT to generate monthly precipitation climatology. + + +.Example _ldt.config_ entry +.... +External stratification file: "LVT_MEAN_FINAL.202201010000.d01.nc" +.... + + +`Write stratified geolocation independent CDFs:` specifies whether to write the stratified CDF or not. +This option eliminates the similar CDFs and collapses the stratified CDFs into a number of stratified bins. For example, if the domain contains 10000 grid cells and you chose to stratify the CDFs to 15 precipitation bins. This option collapses the 10000 CDFs to 15 CDFs. This CDF is a geolocation independent CDFs. + +.Example _ldt.config_ entry +.... +Write stratified geolocation independent CDFs: 1 +.... + `Temporal averaging interval:` specifies temporal averaging interval to be used while computing the CDF. .Example _ldt.config_ entry diff --git a/ldt/configure b/ldt/configure index bab9c35b5..2a6b5efdc 100755 --- a/ldt/configure +++ b/ldt/configure @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_ANNMod.F90 b/ldt/core/LDT_ANNMod.F90 index ca6932ce8..bf5eef3b2 100644 --- a/ldt/core/LDT_ANNMod.F90 +++ b/ldt/core/LDT_ANNMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_ANNdata_FTable.c b/ldt/core/LDT_ANNdata_FTable.c index 67fdcfdd8..4f802da0a 100644 --- a/ldt/core/LDT_ANNdata_FTable.c +++ b/ldt/core/LDT_ANNdata_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_CDFMod.F90 b/ldt/core/LDT_CDFMod.F90 index 8ffa89441..36383d4f5 100644 --- a/ldt/core/LDT_CDFMod.F90 +++ b/ldt/core/LDT_CDFMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -17,6 +17,8 @@ module LDT_CDFMod ! ! !REVISION HISTORY: ! 2 Oct 2008 Sujay Kumar Initial Specification +! 2 Dec 2021: Mahdi Navari; modified to stratify CDF based on precipitation +! and save the stratified CDF ! !EOP use LDT_DAobsDataMod @@ -214,14 +216,14 @@ subroutine computeSingleCDF(n,obs, metrics) integer :: t,i,j,k integer :: c,r - integer :: sindex + integer :: sindex,sindex0,sindex1 integer, allocatable :: strat_bincounts(:,:,:,:) real, allocatable :: strat_cdf(:,:,:,:) ! real :: datamask(LDT_rc%ngrid(n)) if(LDT_rc%endtime.eq.1) then if(obs%selectOpt.eq.1.and.metrics%selectOpt.eq.1) then - if(LDT_rc%group_cdfs.eq.0) then + if(LDT_rc%group_cdfs.eq.0 .and. LDT_rc%strat_cdfs.eq.0) then do t=1,LDT_rc%ngrid(n) do j=1,LDT_rc%cdf_ntimes do k=1,obs%vlevels @@ -237,7 +239,7 @@ subroutine computeSingleCDF(n,obs, metrics) enddo enddo enddo - elseif(LDT_rc%group_cdfs.eq.1) then + elseif(LDT_rc%group_cdfs.eq.1 .and. LDT_rc%strat_cdfs.eq.0) then allocate(strat_bincounts(LDT_rc%group_cdfs_nbins, & LDT_rc%cdf_ntimes, & @@ -294,7 +296,136 @@ subroutine computeSingleCDF(n,obs, metrics) enddo ! endif enddo - + ! MN: save stratified CDF + metrics%strat_cdf = strat_cdf + deallocate(strat_bincounts) + deallocate(strat_cdf) + +!MN: Startification based on monthly precipitation climatology +! monthly total precipitation climatology for each pixel are stored in LDT_rc%stratification_data + + elseif(LDT_rc%group_cdfs.eq.0 .and. LDT_rc%strat_cdfs.eq.1 ) then + + allocate(strat_bincounts(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels,& + LDT_rc%cdf_nbins)) + allocate(strat_cdf(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels,& + LDT_rc%cdf_nbins)) + + strat_bincounts = 0 + strat_cdf = 0 + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + do i=1,LDT_rc%cdf_nbins + sindex = LDT_rc%stratification_data(t,j) + strat_bincounts(sindex,j,k,i) = & + strat_bincounts(sindex,j,k,i) + & + metrics%cdf_bincounts(t,j,k,i) + + enddo + enddo + enddo + enddo + + do t=1,LDT_rc%strat_cdfs_nbins + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + if(sum(strat_bincounts(t,j,k,:)).ne.0) then + strat_cdf(t,j,k,1) = & + strat_bincounts(t,j,k,1)/& ! strat_cdf(t,j,k,1)/& + float(sum(strat_bincounts(t,j,k,:))) + do i=2,LDT_rc%cdf_nbins + strat_cdf(t,j,k,i) = strat_cdf(t,j,k,i-1) + & + strat_bincounts(t,j,k,i)/& + float(sum(strat_bincounts(t,j,k,:))) + enddo + endif + enddo + enddo + enddo + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + do i=1,LDT_rc%cdf_nbins + sindex = LDT_rc%stratification_data(t,j) + metrics%cdf(t,j,k,i) = strat_cdf(sindex,j,k,i) + enddo + enddo + enddo + enddo + ! MN: save stratified CDF + metrics%strat_cdf = strat_cdf + deallocate(strat_bincounts) + deallocate(strat_cdf) + + elseif(LDT_rc%group_cdfs.eq.1 .and. LDT_rc%strat_cdfs.eq.1 ) then + + allocate(strat_bincounts(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels,& + LDT_rc%cdf_nbins)) + allocate(strat_cdf(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels,& + LDT_rc%cdf_nbins)) + + strat_bincounts = 0 + strat_cdf = 0 + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + do i=1,LDT_rc%cdf_nbins + sindex0 = LDT_rc%stratification_data(t,j) + sindex1 = LDT_rc%cdf_strat_data(t) + sindex = sindex0 + (sindex1 - 1)*LDT_rc%strat_cdfs_nbins + strat_bincounts(sindex,j,k,i) = & + strat_bincounts(sindex,j,k,i) + & + metrics%cdf_bincounts(t,j,k,i) + + enddo + enddo + enddo + enddo + + do t=1,LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + if(sum(strat_bincounts(t,j,k,:)).ne.0) then + strat_cdf(t,j,k,1) = & + strat_bincounts(t,j,k,1)/& ! strat_cdf(t,j,k,1)/& + float(sum(strat_bincounts(t,j,k,:))) + do i=2,LDT_rc%cdf_nbins + strat_cdf(t,j,k,i) = strat_cdf(t,j,k,i-1) + & + strat_bincounts(t,j,k,i)/& + float(sum(strat_bincounts(t,j,k,:))) + enddo + endif + enddo + enddo + enddo + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + do i=1,LDT_rc%cdf_nbins + sindex0 = LDT_rc%stratification_data(t,j) + sindex1 = LDT_rc%cdf_strat_data(t) + sindex = sindex0 + (sindex1 - 1)*LDT_rc%strat_cdfs_nbins + metrics%cdf(t,j,k,i) = strat_cdf(sindex,j,k,i) + enddo + enddo + enddo + enddo + + ! MN: save stratified CDF + metrics%strat_cdf = strat_cdf deallocate(strat_bincounts) deallocate(strat_cdf) diff --git a/ldt/core/LDT_DAmetricsDataMod.F90 b/ldt/core/LDT_DAmetricsDataMod.F90 index dadb62de4..a4eb524bc 100644 --- a/ldt/core/LDT_DAmetricsDataMod.F90 +++ b/ldt/core/LDT_DAmetricsDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -18,6 +18,7 @@ module LDT_DAmetricsDataMod ! ! !REVISION HISTORY: ! 02 Oct 2008: Sujay Kumar; Initial version +! 28 Feb 2022: Mahdi navari modified to save stratified CDFs ! ! !USES: use ESMF @@ -36,6 +37,9 @@ module LDT_DAmetricsDataMod real, allocatable :: delta(:,:,:) real, allocatable :: xrange(:,:,:,:) real, allocatable :: cdf(:,:,:,:) + real, allocatable :: strat_xrange(:,:,:,:) + real, allocatable :: strat_cdf(:,:,:,:) + real, allocatable :: sx_mu(:,:,:) real, allocatable :: mu(:,:,:) diff --git a/ldt/core/LDT_DAmetricsMod.F90 b/ldt/core/LDT_DAmetricsMod.F90 index 78a76dc27..aba631b31 100644 --- a/ldt/core/LDT_DAmetricsMod.F90 +++ b/ldt/core/LDT_DAmetricsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -18,6 +18,7 @@ module LDT_DAmetricsMod ! ! !REVISION HISTORY: ! 02 Oct 2008: Sujay Kumar; Initial version +! 2 Dec 2021: Mahdi Navari; modified to compute CDF for precipitation ! use ESMF use LDT_DAmetricsDataMod @@ -99,6 +100,8 @@ subroutine LDT_DAmetricsInit LDT_DAobsData(n)%vod_obs,LDT_DAmetrics%vod) call registerMetricsEntry(LDT_DA_MOC_LAI,nsize,& LDT_DAobsData(n)%lai_obs,LDT_DAmetrics%lai) + call registerMetricsEntry(LDT_DA_MOC_TOTALPRECIP,nsize,& + LDT_DAobsData(n)%totalprecip_obs,LDT_DAmetrics%totalprecip) call registerMetricsEntry(LDT_DA_MOC_GVF,nsize,& LDT_DAobsData(n)%gvf_obs,LDT_DAmetrics%gvf) !Y.Kwon !------------------------------------------------------------------------ @@ -597,6 +600,33 @@ subroutine initMetricsEntry(nsize, obs, metrics) LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) allocate(metrics%cdf(nsize,& LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + + if(LDT_rc%write_strat_cdfs.eq.1) then + if(LDT_rc%group_cdfs.eq.1 .and. LDT_rc%strat_cdfs.eq.0) then + allocate(metrics%strat_xrange(LDT_rc%group_cdfs_nbins,& + LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + allocate(metrics%strat_cdf(LDT_rc%group_cdfs_nbins,& + LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + LDT_rc%stratified_cdfs_nbins = LDT_rc%group_cdfs_nbins + elseif(LDT_rc%group_cdfs.eq.0 .and. LDT_rc%strat_cdfs.eq.1 ) then + allocate(metrics%strat_xrange(LDT_rc%strat_cdfs_nbins,& + LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + allocate(metrics%strat_cdf(LDT_rc%strat_cdfs_nbins,& + LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + LDT_rc%stratified_cdfs_nbins = LDT_rc%strat_cdfs_nbins + elseif(LDT_rc%group_cdfs.eq.1 .and. LDT_rc%strat_cdfs.eq.1 ) then + allocate(metrics%strat_xrange(LDT_rc%group_cdfs_nbins*& + LDT_rc%strat_cdfs_nbins,& + LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + allocate(metrics%strat_cdf(LDT_rc%group_cdfs_nbins*& + LDT_rc%strat_cdfs_nbins,& + LDT_rc%cdf_ntimes, obs%vlevels,LDT_rc%cdf_nbins)) + LDT_rc%stratified_cdfs_nbins = LDT_rc%group_cdfs_nbins*& + LDT_rc%strat_cdfs_nbins + endif + metrics%strat_xrange = 0 + metrics%strat_cdf = 0 + endif metrics%cdf_bincounts = 0 metrics%delta = 0 @@ -735,7 +765,7 @@ subroutine LDT_computeDAobsMetrics(n, pass) implicit none - character(len=LDT_CONST_PATH_LEN) :: fname_cdf + character(len=LDT_CONST_PATH_LEN) :: fname_cdf, fname_strat_cdf character(len=LDT_CONST_PATH_LEN) :: fname_domain integer :: pass integer :: rc @@ -782,6 +812,14 @@ subroutine LDT_computeDAobsMetrics(n, pass) write(LDT_logunit,*) 'Writing CDF domain file ',trim(fname_domain) iret=nf90_create(path=trim(fname_domain),cmode=nf90_clobber,& ncid=LDT_rc%ftn_DAobs_domain) + + if(LDT_rc%write_strat_cdfs.eq.1) then + fname_strat_cdf = trim(LDT_rc%odir)//'/stratified_'//& + trim(LDT_rc%dapreprocfile)//'.nc' + write(LDT_logunit,*) 'Writing stratified CDF file ',trim(fname_strat_cdf) + iret=nf90_create(path=trim(fname_strat_cdf),cmode=nf90_clobber,& + ncid=LDT_rc%ftn_strat_cdf) + endif endif #endif #if (defined USE_NETCDF4) @@ -796,7 +834,16 @@ subroutine LDT_computeDAobsMetrics(n, pass) write(LDT_logunit,*) 'Writing CDF domain file ',trim(fname_domain) iret=nf90_create(path=trim(fname_domain),cmode=nf90_netcdf4,& ncid=LDT_rc%ftn_DAobs_domain) + + if(LDT_rc%write_strat_cdfs.eq.1) then + fname_strat_cdf = trim(LDT_rc%odir)//'/stratified_'//& + trim(LDT_rc%dapreprocfile)//'.nc' + write(LDT_logunit,*) 'Writing stratified CDF file ',trim(fname_strat_cdf) + iret=nf90_create(path=trim(fname_strat_cdf),cmode=nf90_netcdf4,& + ncid=LDT_rc%ftn_strat_cdf) + endif endif + #endif call outputFinalMetrics(n,pass) @@ -806,6 +853,10 @@ subroutine LDT_computeDAobsMetrics(n, pass) write(LDT_logunit,*) 'Successfully wrote CDF file ',trim(fname_cdf) iret=nf90_close(LDT_rc%ftn_DAobs_domain) write(LDT_logunit,*) 'Successfully wrote CDF file ',trim(fname_domain) + if(LDT_rc%write_strat_cdfs.eq.1) then + iret=nf90_close(LDT_rc%ftn_strat_cdf) + write(LDT_logunit,*) 'Successfully wrote geolocation independent stratified CDF file ',trim(fname_strat_cdf) + endif endif #endif @@ -840,7 +891,7 @@ subroutine outputFinalMetrics(n,pass) !EOP integer :: index integer :: c,r - integer :: dimID(4) + integer :: dimID(4), dimID_strat(4) integer :: bdimID(3) character(len=8) :: date character(len=10) :: time @@ -902,6 +953,52 @@ subroutine outputFinalMetrics(n,pass) LDT_DAobsDataPtr(1,index)%dataEntryPtr) enddo + +! geolocation independent stratified CDF + if(LDT_rc%write_strat_cdfs.eq.1) then +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + call LDT_verify(nf90_def_dim(LDT_rc%ftn_strat_cdf,'n_strat_bins',& + LDT_rc%stratified_cdfs_nbins,dimID_strat(1)),'nf90_def_dim failed for n_strat_bins') + call LDT_verify(nf90_def_dim(LDT_rc%ftn_strat_cdf,'ntimes',& + LDT_rc%cdf_ntimes,dimID_strat(2)),'nf90_def_dim failed for ntimes') + call LDT_verify(nf90_def_dim(LDT_rc%ftn_strat_cdf,'nbins',& + LDT_rc%cdf_nbins,dimID_strat(4)),'nf90_def_dim failed for nbins') + + call LDT_verify(nf90_put_att(LDT_rc%ftn_strat_cdf,NF90_GLOBAL,& + "missing_value", -9999.0)) + call LDT_verify(nf90_put_att(LDT_rc%ftn_strat_cdf,NF90_GLOBAL,& + "temporal_resolution_CDF", LDT_rc%cdf_ntimes)) + call LDT_verify(nf90_put_att(LDT_rc%ftn_strat_cdf,NF90_GLOBAL,& + "title", & + "Land Data Toolkit (LDT) output")) + call LDT_verify(nf90_put_att(LDT_rc%ftn_strat_cdf,NF90_GLOBAL,& + "institution", & + "NASA GSFC Hydrological Sciences Laboratory")) + call LDT_verify(nf90_put_att(LDT_rc%ftn_strat_cdf,NF90_GLOBAL,& + "history", & + "created on date: "//date(1:4)//"-"//date(5:6)//"-"//& + date(7:8)//"T"//time(1:2)//":"//time(3:4)//":"//time(5:10))) + !call LDT_verify(nf90_put_att(LDT_rc%ftn_cdf,NF90_GLOBAL,"references", & + ! "Arsenault_etal_GMD_2018, Kumar_etal_EMS_2006")) + call LDT_verify(nf90_put_att(LDT_rc%ftn_strat_cdf,NF90_GLOBAL,"comment", & + "website: http://lis.gsfc.nasa.gov/")) +#endif + do index=1,LDT_DA_MOC_COUNT + call writeFinalSingleStratifiedCDFEntryHeader(LDT_DAmetricsPtr(index)%dataEntryPtr,& + LDT_DAobsDataPtr(1,index)%dataEntryPtr, dimID_strat) + enddo + +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + call LDT_verify(nf90_enddef(LDT_rc%ftn_strat_cdf)) +#endif + + do index=1,LDT_DA_MOC_COUNT + call writeFinalSingleStratifiedCDFEntry(pass,LDT_DAmetricsPtr(index)%dataEntryPtr,& + LDT_DAobsDataPtr(1,index)%dataEntryPtr) + enddo + + endif + !domain file #if (defined USE_NETCDF3 || defined USE_NETCDF4) @@ -1440,6 +1537,73 @@ subroutine writeFinalSingleEntryHeader(metrics, obs, dimID) end subroutine writeFinalSingleEntryHeader +!BOP +! !ROUTINE: writeFinalSingleStratifiedCDFEntryHeader +! \label{writeFinalSingleStratifiedCDFEntryHeader} +! +! !INTERFACE: + subroutine writeFinalSingleStratifiedCDFEntryHeader(metrics, obs, dimID) +! !USES: + use LDT_coreMod, only : LDT_rc + use LDT_historyMod, only : LDT_writevar_gridded + + implicit none +! !ARGUMENTS: + type(DAmetricsEntry) :: metrics + type(LDT_DAmetadataEntry) :: obs + integer :: dimID(4) +! +! !DESCRIPTION: +! This routine writes the specified set of statistics for a +! single variable at the end of the analysis. +!EOP + + integer :: k + integer :: varid1, varid2 + integer :: i,c,r + integer :: n + character*100 :: vname + integer :: shuffle, deflate, deflate_level + +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + n = 1 + shuffle = NETCDF_shuffle + deflate = NETCDF_deflate + deflate_level =NETCDF_deflate_level + + if(obs%selectOpt.eq.1.and.metrics%selectOpt.eq.1) then + vname = trim(obs%standard_name)//'_levels' + call LDT_verify(nf90_def_dim(LDT_rc%ftn_strat_cdf,trim(vname),& + obs%vlevels,dimID(3))) + + if(LDT_rc%write_strat_cdfs.eq.1) then + call LDT_verify(nf90_def_var(LDT_rc%ftn_strat_cdf,& + trim(obs%standard_name)//'_xrange_stratified',& + nf90_float, dimids = dimID, varid=obs%varID(1))) + +#if (defined USE_NETCDF4) + call LDT_verify(nf90_def_var_deflate(LDT_rc%ftn_strat_cdf,& + obs%varID(1), shuffle, deflate, deflate_level),& + 'nf90_def_var_deflate failed in LDT_DAmetricsMod') +#endif + + call LDT_verify(nf90_def_var(LDT_rc%ftn_strat_cdf,& + trim(obs%standard_name)//'_CDF_stratified',& + nf90_float, dimids = dimID, varid=obs%varID(4))) + +#if (defined USE_NETCDF4) + call LDT_verify(nf90_def_var_deflate(LDT_rc%ftn_strat_cdf,& + obs%varID(4), shuffle, deflate, deflate_level),& + 'nf90_def_var_deflate failed in LDT_DAmetricsMod') +#endif + endif + + endif +#endif + + end subroutine writeFinalSingleStratifiedCDFEntryHeader + + !BOP ! !ROUTINE: writeFinalSingleEntry @@ -1519,6 +1683,61 @@ subroutine writeFinalSingleEntry(pass,metrics, obs) end subroutine writeFinalSingleEntry +!BOP +! !ROUTINE: writeFinalSingleStratifiedCDFEntry +! \label{writeFinalSingleStratifiedCDFEntry} +! +! !INTERFACE: + subroutine writeFinalSingleStratifiedCDFEntry(pass,metrics, obs) +! !USES: + use LDT_coreMod, only : LDT_rc + use LDT_historyMod, only : LDT_writevar_gridded + + implicit none +! !ARGUMENTS: + integer :: pass + type(DAmetricsEntry) :: metrics + type(LDT_DAmetadataEntry) :: obs +! +! !DESCRIPTION: +! This routine writes the specified set of statistics for a +! single variable at the end of the analysis. +!EOP + + integer :: k + integer :: varid, varid2 + integer :: i,c,r + integer :: n + integer :: iret + + n = 1 + if(obs%selectOpt.eq.1.and.metrics%selectOpt.eq.1) then + + if(pass.eq.2.and.LDT_rc%comp_cdf.eq.1) then +! MN: The LDT_writevar_gridded is not generic it assumes the +! first dimension of CDF related vaialbes is LDT_rc%glbngrid(n) +! But for geolocation independent CDFs the first dimension is +! LDT_rc%stratified_cdfs_nbins +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + if(LDT_rc%write_strat_cdfs.eq.1) then + iret = nf90_put_var(LDT_rc%ftn_strat_cdf,obs%varID(1),metrics%strat_xrange,(/1,1,1,1/),& + (/LDT_rc%stratified_cdfs_nbins,LDT_rc%cdf_ntimes, & + obs%vlevels, LDT_rc%cdf_nbins/)) + call LDT_verify(iret, 'nf90_put_var failed in writevar_gridded_real_4d') + + iret = nf90_put_var(LDT_rc%ftn_strat_cdf,obs%varID(4),metrics%strat_cdf,(/1,1,1,1/),& + (/LDT_rc%stratified_cdfs_nbins, LDT_rc%cdf_ntimes, & + obs%vlevels, LDT_rc%cdf_nbins/)) + call LDT_verify(iret, 'nf90_put_var failed in writevar_gridded_real_4d') + endif +#endif + + endif + endif + + end subroutine writeFinalSingleStratifiedCDFEntry + + !BOP ! !ROUTINE: writeFinalSingleDomainEntryHeader ! \label{writeFinalSingleDomainEntryHeader} diff --git a/ldt/core/LDT_DAobsDataMod.F90 b/ldt/core/LDT_DAobsDataMod.F90 index d3d0431f2..8faf56ed0 100644 --- a/ldt/core/LDT_DAobsDataMod.F90 +++ b/ldt/core/LDT_DAobsDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -21,6 +21,7 @@ module LDT_DAobsDataMod ! ! !REVISION HISTORY: ! 2 Oct 2008 Sujay Kumar Initial Specification +! 2 Dec 2021: Mahdi Navari; modified to compute CDF for precipitation ! !USES: PRIVATE @@ -49,6 +50,7 @@ module LDT_DAobsDataMod public :: LDT_DA_MOC_LAI public :: LDT_DA_MOC_GVF !Y.Kwon public :: LDT_DA_MOC_COUNT + public :: LDT_DA_MOC_TOTALPRECIP ! public :: LDT_MOC_GRIB_COUNT ! ALMA ENERGY BALANCE COMPONENTS @@ -60,8 +62,9 @@ module LDT_DAobsDataMod integer, parameter :: LDT_DA_MOC_LAI = 6 integer, parameter :: LDT_DA_MOC_GVF = 7 !Y.Kwon integer, parameter :: LDT_DA_MOC_SOILTEFF = 8 !Y.Kwon + integer, parameter :: LDT_DA_MOC_TOTALPRECIP= 9 ! READ ABOVE NOTE ABOUT SPECIAL CASE INDICES - integer, parameter :: LDT_DA_MOC_COUNT = 8 !Y.Kwon + integer, parameter :: LDT_DA_MOC_COUNT = 9 !Y.Kwon ! Add the special cases. LDT_MOC_GRIB_COUNT should be used only in ! LDT_gribMod.F90. ! integer, parameter :: LDT_MOC_GRIB_COUNT = 100 @@ -103,6 +106,7 @@ module LDT_DAobsDataMod type(LDT_DAmetadataEntry) :: teff ! effective soil temperature (Y.Kwon) type(LDT_DAmetadataEntry) :: vod type(LDT_DAmetadataEntry) :: lai + type(LDT_DAmetadataEntry) :: totalprecip type(LDT_DAmetadataEntry) :: gvf !Y.Kwon end type output_meta @@ -119,6 +123,7 @@ module LDT_DAobsDataMod type(LDT_DAmetadataEntry) :: tws_obs type(LDT_DAmetadataEntry) :: vod_obs type(LDT_DAmetadataEntry) :: lai_obs + type(LDT_DAmetadataEntry) :: totalprecip_obs type(LDT_DAmetadataEntry) :: gvf_obs !Y.Kwon end type obs_list_dec @@ -209,6 +214,8 @@ subroutine LDT_DAobsEntryInit(i, nsize) LDT_DAobsData(i)%vod_obs,1,nsize,(/"-"/)) call register_obsDataEntry(i,LDT_DA_MOC_LAI ,& LDT_DAobsData(i)%lai_obs,1,nsize,(/"-"/)) + call register_obsDataEntry(i,LDT_DA_MOC_TOTALPRECIP ,& + LDT_DAobsData(i)%totalprecip_obs,1,nsize,(/"kg/m2"/)) call register_obsDataEntry(i,LDT_DA_MOC_GVF ,& LDT_DAobsData(i)%gvf_obs,1,nsize,(/"-"/)) !Y.Kwon end subroutine LDT_DAobsEntryInit diff --git a/ldt/core/LDT_DAobs_FTable.c b/ldt/core/LDT_DAobs_FTable.c index fd1284227..255fb970d 100644 --- a/ldt/core/LDT_DAobs_FTable.c +++ b/ldt/core/LDT_DAobs_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_DAobservationsMod.F90 b/ldt/core/LDT_DAobservationsMod.F90 index 35b1f76e9..feaf4bb4b 100644 --- a/ldt/core/LDT_DAobservationsMod.F90 +++ b/ldt/core/LDT_DAobservationsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -18,6 +18,7 @@ module LDT_DAobservationsMod ! ! !REVISION HISTORY: ! 02 Oct 2008 Sujay Kumar Initial Specification +! 2 Dec 2021: Mahdi Navari; modified to compute CDF for precipitation ! ! !USES: @@ -71,6 +72,7 @@ subroutine LDT_DAobsDataInit call default_init_obsEntry(LDT_DAobsData(i)%vod_obs, "VOD") call default_init_obsEntry(LDT_DAobsData(i)%lai_obs, "LAI") call default_init_obsEntry(LDT_DAobsData(i)%gvf_obs, "GVF") !Y.Kwon + call default_init_obsEntry(LDT_DAobsData(i)%totalprecip_obs, "TotalPrecip") enddo call daobservationsetup(trim(LDT_rc%obs_src)//char(0)) diff --git a/ldt/core/LDT_DApreprocMod.F90 b/ldt/core/LDT_DApreprocMod.F90 index 9da0da58a..6cf50e8bc 100644 --- a/ldt/core/LDT_DApreprocMod.F90 +++ b/ldt/core/LDT_DApreprocMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -16,6 +16,7 @@ module LDT_DApreprocMod ! ! !REVISION HISTORY: ! 24 Nov 2008 Sujay Kumar Initial Specification +! 2 Dec 2021: Mahdi Navari; modified to save stratify CDF ! use ESMF @@ -53,13 +54,13 @@ subroutine LDT_DApreprocInit() character*20 :: tres integer :: rc integer :: n - integer :: c,r + integer :: c,r,j integer :: ios1 integer :: ftn character*50 :: preprocMethod real :: delta real, allocatable :: cdf_strat_data(:,:) - + real, allocatable :: stratification_data(:,:,:) n = 1 call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%obs_src,& label="DA observation source:",rc=rc) @@ -86,7 +87,7 @@ subroutine LDT_DApreprocInit() call LDT_verify(rc,'Name of the preprocessed DA file: not defined') if(LDT_rc%comp_cdf.gt.0) then - + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%cdf_nbins,& label="Number of bins to use in the CDF:",rc=rc) call LDT_verify(rc,'Number of bins to use in the CDF: not defined') @@ -166,11 +167,17 @@ subroutine LDT_DApreprocInit() do r=1,LDT_rc%lnr(n) do c=1,LDT_rc%lnc(n) - if(LDT_domain(n)%gindex(c,r).ne.-1) then - - LDT_rc%cdf_strat_data(LDT_domain(n)%gindex(c,r)) = & + if(LDT_domain(n)%gindex(c,r).ne.-1) then + + LDT_rc%cdf_strat_data(LDT_domain(n)%gindex(c,r)) = & nint((cdf_strat_data(c,r) - LDT_rc%group_cdfs_min)/& delta)+1 + if (LDT_rc%cdf_strat_data(LDT_domain(n)%gindex(c,r)) .gt. LDT_rc%group_cdfs_nbins) then + write(LDT_logunit,*) '[INFO] Group bins is larger then Max Group bins',& + LDT_rc%cdf_strat_data(LDT_domain(n)%gindex(c,r)), 'vs.', LDT_rc%group_cdfs_nbins ,& + 'Value adjusted the Max Group bins' + LDT_rc%cdf_strat_data(LDT_domain(n)%gindex(c,r)) = LDT_rc%group_cdfs_nbins + endif endif enddo enddo @@ -179,49 +186,108 @@ subroutine LDT_DApreprocInit() write(LDT_logunit,*) '[INFO] Finished reading ',& trim(LDT_rc%group_cdfs_strat_file) endif + +!This part reads the monthly total precipitation climatology and generates +! stratification input data LDT_rc%stratification_data(LDT_rc%ngrid(n),LDT_rc%cdf_ntimes). + + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%strat_cdfs,& + label="Stratify CDFs by external data:",default=0, rc=rc) + call LDT_verify(rc,"Stratify CDFs by external data: not defined") + + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%write_strat_cdfs,& + label="Write stratified geolocation independent CDFs:",default=0, rc=rc) + call LDT_verify(rc,"Write stratify geolocation independent CDFs:: not defined") + + if(LDT_rc%strat_cdfs.gt.0) then + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%strat_src,& + label="Stratification data source:", rc=rc) + call LDT_verify(rc,"Stratification data source: not defined") + + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%strat_cdfs_nbins,& + label="Number of bins to use for stratification:",rc=rc) + call LDT_verify(rc,"Number of bins to use for stratification: not defined") + + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%strat_file,& + label="External stratification file:",rc=rc) + call LDT_verify(rc,"External stratification file: not defined") + + allocate(LDT_rc%stratification_data(LDT_rc%ngrid(n),LDT_rc%cdf_ntimes)) + allocate(stratification_data(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%cdf_ntimes)) + + call read_Precip_climo (LDT_rc%lnc(n), LDT_rc%lnr(n), LDT_rc%strat_file, stratification_data) ! + + do j=1,LDT_rc%cdf_ntimes + LDT_rc%strat_cdfs_min = 0. !minval returns -9999. minval(stratification_data(:,:,j)) ! min value over the entire domain + LDT_rc%strat_cdfs_max = maxval(stratification_data(:,:,j)) ! max value over the entire domain + delta = (LDT_rc%strat_cdfs_max-LDT_rc%strat_cdfs_min)/& + LDT_rc%strat_cdfs_nbins + do r=1,LDT_rc%lnr(n) + do c=1,LDT_rc%lnc(n) + if(LDT_domain(n)%gindex(c,r).ne.-1) then + if(stratification_data(c,r,j) .gt. 0) then + LDT_rc%stratification_data(LDT_domain(n)%gindex(c,r), j) = & + nint((stratification_data(c,r,j) - LDT_rc%strat_cdfs_min)/& + delta)+1 + if (LDT_rc%stratification_data(LDT_domain(n)%gindex(c,r), j) .gt. LDT_rc%strat_cdfs_nbins) then + write(LDT_logunit,*) '[INFO] Startification bins is larger then Max Startification bins',& + LDT_rc%stratification_data(LDT_domain(n)%gindex(c,r), j) , 'vs.', LDT_rc%strat_cdfs_nbins,& + 'Value adjusted to the Max Startification bins' + LDT_rc%stratification_data(LDT_domain(n)%gindex(c,r), j) = LDT_rc%strat_cdfs_nbins + endif + else + write(LDT_logunit,*) '[INFO] Total precip is zero or undefined',& + stratification_data(c,r,j) ,c,r,j,& + 'Value adjusted to the Min Startification bins' + LDT_rc%stratification_data(LDT_domain(n)%gindex(c,r), j) = 1 + endif + endif + enddo + enddo + enddo + endif endif - - if(LDT_rc%comp_obsgrid.eq.1) then + + if(LDT_rc%comp_obsgrid.eq.1) then LDT_rc%pass = 0 else - - if(LDT_rc%tavgInterval.lt.LDT_rc%ts) then + + if(LDT_rc%tavgInterval.lt.LDT_rc%ts) then write(LDT_logunit,*) '[ERR] Temporal averaging interval must be greater than' write(LDT_logunit,*) '[ERR] or equal to the LIS output timestep. ' write(LDT_logunit,*) '[ERR] Program stopping....' call LDT_endrun() endif - + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%obsCountThreshold,& label="Observation count threshold:",& rc=rc) - call LDT_verify(rc,'Observation count threshold: not defined') - - if(LDT_rc%comp_cdf.eq.1) then + call LDT_verify(rc,'Observation count threshold: not defined') + + if(LDT_rc%comp_cdf.eq.1) then LDT_rc%pass = 2 - elseif(LDT_rc%anomalyObsProc.eq.1) then + elseif(LDT_rc%anomalyObsProc.eq.1) then LDT_rc%pass = 2 endif - + endif call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%applyMask,& label="Apply external mask:",& rc=rc) call LDT_verify(rc,'Apply external mask: not defined') - + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%maskdir,& label="External mask directory:",& rc=rc) call LDT_verify(rc,'External mask directory: not defined') - + call LDT_DAobs_plugin - + LDT_rc%nobs = 1 - + ! This flag is set to prompt the writing of the domain file - if(LDT_rc%anomalyObsProc.eq.1) then - LDT_rc%comp_obsgrid = 1 + if(LDT_rc%anomalyObsProc.eq.1) then + LDT_rc%comp_obsgrid = 1 endif end subroutine LDT_DApreprocInit diff --git a/ldt/core/LDT_DrangeMod.F90 b/ldt/core/LDT_DrangeMod.F90 index 53f97360c..3fa0947a5 100644 --- a/ldt/core/LDT_DrangeMod.F90 +++ b/ldt/core/LDT_DrangeMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -17,6 +17,7 @@ module LDT_DrangeMod ! ! !REVISION HISTORY: ! 2 Oct 2008 Sujay Kumar Initial Specification +! 16 Feb 2022 Mahdi Navari; modified to save stratify CDF ! !EOP use LDT_DAobsDataMod @@ -209,7 +210,7 @@ subroutine computeSingleDrange(n,obs, metrics) type(DAmetricsEntry) :: metrics integer :: t,i,j,k,c,r - integer :: sindex + integer :: sindex,sindex0,sindex1 real, allocatable :: strat_xrange(:,:,:,:) real, allocatable :: strat_delta(:,:,:) real, allocatable :: strat_mask(:,:,:) @@ -221,7 +222,7 @@ subroutine computeSingleDrange(n,obs, metrics) if(LDT_rc%endtime.eq.1) then if(obs%selectOpt.eq.1.and.metrics%selectOpt.eq.1) then - if(LDT_rc%group_cdfs.eq.0) then + if(LDT_rc%group_cdfs.eq.0 .and. LDT_rc%strat_cdfs.eq.0) then do t=1,LDT_rc%ngrid(n) do j=1,LDT_rc%cdf_ntimes do k=1,obs%vlevels @@ -246,7 +247,7 @@ subroutine computeSingleDrange(n,obs, metrics) enddo enddo enddo - elseif(LDT_rc%group_cdfs.eq.1) then + elseif(LDT_rc%group_cdfs.eq.1 .and. LDT_rc%strat_cdfs.eq.0) then allocate(strat_drange_total(LDT_rc%group_cdfs_nbins, & LDT_rc%cdf_ntimes, & obs%vlevels)) @@ -337,12 +338,219 @@ subroutine computeSingleDrange(n,obs, metrics) enddo enddo enddo + metrics%strat_xrange = strat_xrange + deallocate(strat_drange_total) + deallocate(strat_maxval) + deallocate(strat_minval) + deallocate(strat_mask) + deallocate(strat_delta) + +!MN: Startification based on monthly precipitation climatology +! monthly total precipitation climatology for each pixel are stored in LDT_rc%stratification_data + + elseif(LDT_rc%group_cdfs.eq.0 .and. LDT_rc%strat_cdfs.eq.1) then + allocate(strat_drange_total(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_maxval(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_minval(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_mask(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_delta(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_xrange(LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels, & + LDT_rc%cdf_nbins)) + + strat_drange_total = 0 + strat_maxval = -1000000.0 + strat_minval = 1000000.0 + strat_mask = 0 + strat_delta = 0 + strat_xrange = 0 + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + sindex = LDT_rc%stratification_data(t,j) + strat_drange_total(sindex,j,k) = & + strat_drange_total(sindex,j,k) + & + metrics%count_drange_total(t,j,k) + if(metrics%maxval(t,j,k).gt.& + strat_maxval(sindex,j,k)) then + strat_maxval(sindex,j,k) = metrics%maxval(t,j,k) + endif + if(metrics%minval(t,j,k).lt.& + strat_minval(sindex,j,k)) then + strat_minval(sindex,j,k) = metrics%minval(t,j,k) + endif + enddo + enddo + enddo + + do t=1,LDT_rc%strat_cdfs_nbins + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + if(strat_drange_total(t,j,k).le.& + LDT_rc%obsCountThreshold) then + strat_maxval(t,j,k) = LDT_rc%udef + strat_minval(t,j,k) = LDT_rc%udef + strat_mask(t,j,k) = LDT_rc%udef + else + strat_mask(t,j,k) = strat_drange_total(t,j,k) + strat_delta(t,j,k) = & + (strat_maxval(t,j,k) - & + strat_minval(t,j,k))/& + (LDT_rc%cdf_nbins-1) + strat_xrange(t,j,k,1) = strat_minval(t,j,k) + do i=2, LDT_rc%cdf_nbins + strat_xrange(t,j,k,i) = & + strat_xrange(t,j,k,i-1) + & + strat_delta(t,j,k) + + enddo + endif + enddo + enddo + enddo + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + sindex = LDT_rc%stratification_data(t,j) + if(strat_mask(sindex,j,k).eq.LDT_rc%udef) then + metrics%maxval(t,j,k) = LDT_rc%udef + metrics%minval(t,j,k) = LDT_rc%udef + metrics%mask(t,j,k) = LDT_rc%udef + else + metrics%mask(t,j,k) = strat_mask(sindex,j,k) + metrics%delta(t,j,k) = strat_delta(sindex,j,k) + metrics%xrange(t,j,k,:) =strat_xrange(sindex,j,k,:) + + metrics%maxval(t,j,k) = strat_maxval(sindex,j,k) + metrics%minval(t,j,k) = strat_minval(sindex,j,k) + endif + enddo + enddo + enddo + metrics%strat_xrange = strat_xrange + deallocate(strat_drange_total) + deallocate(strat_maxval) + deallocate(strat_minval) + deallocate(strat_mask) + deallocate(strat_delta) + deallocate(strat_xrange) + + elseif(LDT_rc%group_cdfs.eq.1 .and. LDT_rc%strat_cdfs.eq.1) then + allocate(strat_drange_total(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_maxval(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_minval(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_mask(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_delta(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels)) + allocate(strat_xrange(LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins, & + LDT_rc%cdf_ntimes, & + obs%vlevels, & + LDT_rc%cdf_nbins)) + + strat_drange_total = 0 + strat_maxval = -1000000.0 + strat_minval = 1000000.0 + strat_mask = 0 + strat_delta = 0 + strat_xrange = 0 + + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + sindex0 = LDT_rc%stratification_data(t,j) + sindex1 = LDT_rc%cdf_strat_data(t) + sindex = sindex0 + (sindex1 - 1)*LDT_rc%strat_cdfs_nbins + strat_drange_total(sindex,j,k) = & + strat_drange_total(sindex,j,k) + & + metrics%count_drange_total(t,j,k) + if(metrics%maxval(t,j,k).gt.& + strat_maxval(sindex,j,k)) then + strat_maxval(sindex,j,k) = metrics%maxval(t,j,k) + endif + if(metrics%minval(t,j,k).lt.& + strat_minval(sindex,j,k)) then + strat_minval(sindex,j,k) = metrics%minval(t,j,k) + endif + enddo + enddo + enddo + + do t=1,LDT_rc%group_cdfs_nbins*LDT_rc%strat_cdfs_nbins + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + if(strat_drange_total(t,j,k).le.& + LDT_rc%obsCountThreshold) then + strat_maxval(t,j,k) = LDT_rc%udef + strat_minval(t,j,k) = LDT_rc%udef + strat_mask(t,j,k) = LDT_rc%udef + else + strat_mask(t,j,k) = strat_drange_total(t,j,k) + strat_delta(t,j,k) = & + (strat_maxval(t,j,k) - & + strat_minval(t,j,k))/& + (LDT_rc%cdf_nbins-1) + strat_xrange(t,j,k,1) = strat_minval(t,j,k) + do i=2, LDT_rc%cdf_nbins + strat_xrange(t,j,k,i) = & + strat_xrange(t,j,k,i-1) + & + strat_delta(t,j,k) + + enddo + endif + enddo + enddo + enddo + do t=1,LDT_rc%ngrid(n) + do j=1,LDT_rc%cdf_ntimes + do k=1,obs%vlevels + sindex0 = LDT_rc%stratification_data(t,j) + sindex1 = LDT_rc%cdf_strat_data(t) + sindex = sindex0 + (sindex1 - 1)*LDT_rc%strat_cdfs_nbins + if(strat_mask(sindex,j,k).eq.LDT_rc%udef) then + metrics%maxval(t,j,k) = LDT_rc%udef + metrics%minval(t,j,k) = LDT_rc%udef + metrics%mask(t,j,k) = LDT_rc%udef + else + metrics%mask(t,j,k) = strat_mask(sindex,j,k) + metrics%delta(t,j,k) = strat_delta(sindex,j,k) + metrics%xrange(t,j,k,:) =strat_xrange(sindex,j,k,:) + + metrics%maxval(t,j,k) = strat_maxval(sindex,j,k) + metrics%minval(t,j,k) = strat_minval(sindex,j,k) + endif + enddo + enddo + enddo + metrics%strat_xrange = strat_xrange deallocate(strat_drange_total) deallocate(strat_maxval) deallocate(strat_minval) deallocate(strat_mask) deallocate(strat_delta) + deallocate(strat_xrange) endif endif diff --git a/ldt/core/LDT_FORC_AttributesMod.F90 b/ldt/core/LDT_FORC_AttributesMod.F90 index 590162da2..6321e547a 100644 --- a/ldt/core/LDT_FORC_AttributesMod.F90 +++ b/ldt/core/LDT_FORC_AttributesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_LMLCMod.F90 b/ldt/core/LDT_LMLCMod.F90 index 23c97950d..c60c93261 100644 --- a/ldt/core/LDT_LMLCMod.F90 +++ b/ldt/core/LDT_LMLCMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -182,6 +182,13 @@ subroutine LMLC_init_LIS() end if enddo + ! Option to assign all landmask and domainmask points to land: + ! 0 - "off"; 1 - "on", where all points are set to 1 + call ESMF_ConfigGetAttribute(LDT_config,LDT_rc%allmaskland,& + label="Set all land and domain masks to 1:",& + default=0,rc=rc) + call LDT_verify(rc,'Set all land and domain masks to 1: not defined') + !-- Landcover dataset file and option inputs: call ESMF_ConfigFindLabel(LDT_config,"Landcover file:",rc=rc) @@ -203,7 +210,9 @@ subroutine LMLC_init_LIS() ! Don't need to read in "Native" grid extents/resolution, just for LIS inputs: do n=1,LDT_rc%nnest if( index(LDT_LSMparam_struc(n)%landcover%source,"Native").eq.0 .and. & - index(LDT_LSMparam_struc(n)%landcover%source,"CONSTANT").eq.0 ) then + index(LDT_LSMparam_struc(n)%landcover%source,"CONSTANT").eq.0 .and.& + index(LDT_LSMparam_struc(n)%landcover%source,"MCD12Q1").eq.0) then + call LDT_readDomainConfigSpecs("Landcover", LDT_rc%lc_proj, LDT_rc%lc_gridDesc) if( LDT_rc%lc_proj == "latlon" ) then call LDT_gridOptChecks( n, "Landcover", & @@ -878,6 +887,12 @@ subroutine LMLC_writeHeader_LIS(n,ftn,dimID) case( "UMD" ) call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_LANDCATS", & 13)) + case( "NALCMS_SM" ) + call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_LANDCATS", & + 24)) + case( "NALCMS_SM_IGBPNCEP" ) + call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_LANDCATS", & + 20)) case( "Bondville" ) call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_LANDCATS", & 20)) @@ -934,6 +949,13 @@ subroutine LMLC_writeHeader_LIS(n,ftn,dimID) case ( "CLM45" ) call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & 36)) + case ( "NALCMS_SM" ) + call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & + 24)) + case ( "NALCMS_SM_IGBPNCEP" ) + call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & + 17)) +! 20)) case ( "Bondville" ) call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & 17)) @@ -950,6 +972,8 @@ subroutine LMLC_writeHeader_LIS(n,ftn,dimID) write(LDT_logunit,*) ' -- MOSAIC ' write(LDT_logunit,*) ' -- ISA ' write(LDT_logunit,*) ' -- CLM45 ' + write(LDT_logunit,*) ' -- NALCMS_SM ' + write(LDT_logunit,*) ' -- NALCMS_SM_IGBPNCEP ' write(LDT_logunit,*) ' -- CONSTANT ' write(LDT_logunit,*) ' ... program stopping. ' call LDT_endrun @@ -1107,6 +1131,13 @@ subroutine LMLC_writeHeader_LISHydro(n,ftn,dimID, flag) case ( "ISA" ) call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & 13)) + case ( "NALCMS_SM" ) + call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & + 24)) + case ( "NALCMS_SM_IGBPNCEP" ) + call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & + 17)) +! 20)) case ( "CONSTANT" ) call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMVEGTYPES", & LDT_LSMparam_struc(n)%landcover%num_bins)) @@ -1119,6 +1150,8 @@ subroutine LMLC_writeHeader_LISHydro(n,ftn,dimID, flag) write(LDT_logunit,*) ' -- USGS ' write(LDT_logunit,*) ' -- MOSAIC ' write(LDT_logunit,*) ' -- ISA ' + write(LDT_logunit,*) ' -- NALCMS_SM ' + write(LDT_logunit,*) ' -- NALCMS_SM_IGBPNCEP ' write(LDT_logunit,*) ' -- CONSTANT ' write(LDT_logunit,*) ' ... program stopping. ' call LDT_endrun diff --git a/ldt/core/LDT_LSMCropModifier_Mod.F90 b/ldt/core/LDT_LSMCropModifier_Mod.F90 index c8f7cf474..0947b1cea 100644 --- a/ldt/core/LDT_LSMCropModifier_Mod.F90 +++ b/ldt/core/LDT_LSMCropModifier_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_LSMparamProcMod.F90 b/ldt/core/LDT_LSMparamProcMod.F90 index c5d9c2dcb..8722c067e 100644 --- a/ldt/core/LDT_LSMparamProcMod.F90 +++ b/ldt/core/LDT_LSMparamProcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_LSMparams_FTable.c b/ldt/core/LDT_LSMparams_FTable.c index c195261f2..7d2812ac9 100644 --- a/ldt/core/LDT_LSMparams_FTable.c +++ b/ldt/core/LDT_LSMparams_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_MuMod.F90 b/ldt/core/LDT_MuMod.F90 index c73796e4d..2788390a9 100644 --- a/ldt/core/LDT_MuMod.F90 +++ b/ldt/core/LDT_MuMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_NUWRFprocMod.F90 b/ldt/core/LDT_NUWRFprocMod.F90 index 5c0dfbe67..82cf871db 100644 --- a/ldt/core/LDT_NUWRFprocMod.F90 +++ b/ldt/core/LDT_NUWRFprocMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_NatRunData_FTable.c b/ldt/core/LDT_NatRunData_FTable.c index cf65819fb..b8421a0a0 100644 --- a/ldt/core/LDT_NatRunData_FTable.c +++ b/ldt/core/LDT_NatRunData_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_OPTUEMod.F90 b/ldt/core/LDT_OPTUEMod.F90 index 62e401af2..12bb5fae6 100644 --- a/ldt/core/LDT_OPTUEMod.F90 +++ b/ldt/core/LDT_OPTUEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_OSSEmaskData_FTable.c b/ldt/core/LDT_OSSEmaskData_FTable.c index 77c295f68..e25e748d4 100644 --- a/ldt/core/LDT_OSSEmaskData_FTable.c +++ b/ldt/core/LDT_OSSEmaskData_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_PRIV_gridMod.F90 b/ldt/core/LDT_PRIV_gridMod.F90 index 5b97bdc83..90433ea5d 100644 --- a/ldt/core/LDT_PRIV_gridMod.F90 +++ b/ldt/core/LDT_PRIV_gridMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_PRIV_rcMod.F90 b/ldt/core/LDT_PRIV_rcMod.F90 index 328ac7656..6d0befdad 100644 --- a/ldt/core/LDT_PRIV_rcMod.F90 +++ b/ldt/core/LDT_PRIV_rcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -45,6 +45,7 @@ module LDT_PRIV_rcMod integer :: add_buffer ! KA integer :: x_buffer integer :: y_buffer + integer :: allmaskland ! KA: Temporary for NoahMP+SM coupling ! -- Land surface input parameters: integer :: max_model_types @@ -362,6 +363,18 @@ module LDT_PRIV_rcMod integer :: group_cdfs_nbins integer :: daily_interp_switch !0:on; 1:off (Y.Kwon) + integer :: strat_cdfs + integer :: write_strat_cdfs + character*50 :: strat_src + character*50 :: strat_file + !character*50 :: strat_cdfs_attrib_file + integer :: strat_cdfs_nbins + integer :: stratified_cdfs_nbins + real :: strat_cdfs_min + real :: strat_cdfs_max + integer, allocatable :: stratification_data(:,:) + + integer :: sp_sampl_cdfs integer :: sp_sample_cdf_rad @@ -376,6 +389,7 @@ module LDT_PRIV_rcMod integer :: pass_id integer :: ftn_cdf + integer :: ftn_strat_cdf integer :: ftn_DAobs_domain character*100 :: institution = 'NASA GSFC' diff --git a/ldt/core/LDT_PRIV_tileMod.F90 b/ldt/core/LDT_PRIV_tileMod.F90 index c78a2cbf0..39241f8dc 100644 --- a/ldt/core/LDT_PRIV_tileMod.F90 +++ b/ldt/core/LDT_PRIV_tileMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_SigmaMod.F90 b/ldt/core/LDT_SigmaMod.F90 index 4b9ac9df3..4deff4e52 100644 --- a/ldt/core/LDT_SigmaMod.F90 +++ b/ldt/core/LDT_SigmaMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -178,14 +178,16 @@ subroutine diagnoseSingleSigma(n,obs, metrics) gmt = LDT_rc%hr call LDT_gmt2localtime(gmt, lon, lhour, zone) - if(lhour.eq.6) then + !if(lhour.eq.6) then ! Orig + if(lhour > 4 .and. lhour < 8) then ! EMK for 3-hrly data metrics%sxx_sigma_6am(t,j,k) = metrics%sxx_sigma_6am(t,j,k) + & obs%value(t1,k)*obs%value(t1,k) metrics%sx_sigma_6am(t,j,k) = metrics%sx_sigma_6am(t,j,k) + & obs%value(t1,k) metrics%count_sigma_6am(t,j,k) = & metrics%count_sigma_6am(t,j,k) + 1 - elseif(lhour.eq.18) then + !elseif(lhour.eq.18) then ! Orig + elseif (lhour > 16 .and. lhour < 20) then ! EMK for 3-hrly data metrics%sxx_sigma_6pm(t,j,k) = metrics%sxx_sigma_6pm(t,j,k) + & obs%value(t1,k)*obs%value(t1,k) metrics%sx_sigma_6pm(t,j,k) = metrics%sx_sigma_6pm(t,j,k) + & diff --git a/ldt/core/LDT_SurfaceTypeMod.F90 b/ldt/core/LDT_SurfaceTypeMod.F90 index d40a022e5..3c6424605 100644 --- a/ldt/core/LDT_SurfaceTypeMod.F90 +++ b/ldt/core/LDT_SurfaceTypeMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_albedoMod.F90 b/ldt/core/LDT_albedoMod.F90 index b17e6b7c8..15793b1fe 100644 --- a/ldt/core/LDT_albedoMod.F90 +++ b/ldt/core/LDT_albedoMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_albedo_FTable.c b/ldt/core/LDT_albedo_FTable.c index 41250640b..e8fa0eae6 100644 --- a/ldt/core/LDT_albedo_FTable.c +++ b/ldt/core/LDT_albedo_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_binaryIOlayer_module.F90 b/ldt/core/LDT_binaryIOlayer_module.F90 index f6bce81ae..9a352a319 100644 --- a/ldt/core/LDT_binaryIOlayer_module.F90 +++ b/ldt/core/LDT_binaryIOlayer_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_climateParmsMod.F90 b/ldt/core/LDT_climateParmsMod.F90 index 0be9f8ae5..f7146a592 100644 --- a/ldt/core/LDT_climateParmsMod.F90 +++ b/ldt/core/LDT_climateParmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_climoRstProcMod.F90 b/ldt/core/LDT_climoRstProcMod.F90 index 5f55a32da..5547245af 100644 --- a/ldt/core/LDT_climoRstProcMod.F90 +++ b/ldt/core/LDT_climoRstProcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_climparms_FTable.c b/ldt/core/LDT_climparms_FTable.c index 592b817ef..dfb8dd8af 100644 --- a/ldt/core/LDT_climparms_FTable.c +++ b/ldt/core/LDT_climparms_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_constantsMod.F90 b/ldt/core/LDT_constantsMod.F90 index 7eb6f65a1..d667adba5 100644 --- a/ldt/core/LDT_constantsMod.F90 +++ b/ldt/core/LDT_constantsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_coreMod.F90 b/ldt/core/LDT_coreMod.F90 index cc111b6bc..d956afbc0 100644 --- a/ldt/core/LDT_coreMod.F90 +++ b/ldt/core/LDT_coreMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_create_subdirs.c b/ldt/core/LDT_create_subdirs.c index bfef1d735..dc0af42a0 100644 --- a/ldt/core/LDT_create_subdirs.c +++ b/ldt/core/LDT_create_subdirs.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_domainMod.F90 b/ldt/core/LDT_domainMod.F90 index 6dc7b1f5f..396b17a02 100644 --- a/ldt/core/LDT_domainMod.F90 +++ b/ldt/core/LDT_domainMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_domain_FTable.c b/ldt/core/LDT_domain_FTable.c index 21623a99b..5871543a5 100644 --- a/ldt/core/LDT_domain_FTable.c +++ b/ldt/core/LDT_domain_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_ensRstMod.F90 b/ldt/core/LDT_ensRstMod.F90 index 3f8c2588a..b6549ee7a 100644 --- a/ldt/core/LDT_ensRstMod.F90 +++ b/ldt/core/LDT_ensRstMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_fileIOMod.F90 b/ldt/core/LDT_fileIOMod.F90 index b4c4aad2f..246c51294 100644 --- a/ldt/core/LDT_fileIOMod.F90 +++ b/ldt/core/LDT_fileIOMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -725,7 +725,64 @@ subroutine LDT_readDomainConfigSpecs(segment_name, param_proj, domain_info) domain_info(i,11) = 64 domain_info(i,20) = 64 enddo - + +! -- Added Lambert parameter domain (KRA) + + case ( "lambert" ) + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" lower left lat:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,4),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' lower left lat:') + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" lower left lon:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,5),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' lower left lon:') + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" true lat1:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,10),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' true lat1:') + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" true lat2:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,7),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' true lat2:') + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" standard lon:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,11),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' standard lon:') + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" resolution:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,8),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' resolution:') + domain_info(i,9) = domain_info(i,8) ! set dx = dy for now + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" x-dimension size:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,2),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' x-dimension size:') + enddo + + call ESMF_ConfigFindLabel(LDT_config,trim(segment_name)//" y-dimension size:",rc=rc) + do i=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,domain_info(i,3),rc=rc) + call LDT_verify(rc,'please specify '//trim(segment_name)//' y-dimension size:') + enddo + + do i=1,LDT_rc%nnest + domain_info(i,6) = 8.0 + enddo + ! --- case ( "gaussian" ) diff --git a/ldt/core/LDT_forcingparms_Ftable.c b/ldt/core/LDT_forcingparms_Ftable.c index 7fb0708cc..f6be0ef1c 100644 --- a/ldt/core/LDT_forcingparms_Ftable.c +++ b/ldt/core/LDT_forcingparms_Ftable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_gfracMod.F90 b/ldt/core/LDT_gfracMod.F90 index a0ed6a23b..78ee092a6 100644 --- a/ldt/core/LDT_gfracMod.F90 +++ b/ldt/core/LDT_gfracMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_gfrac_FTable.c b/ldt/core/LDT_gfrac_FTable.c index a3ccfe49c..fe47d33df 100644 --- a/ldt/core/LDT_gfrac_FTable.c +++ b/ldt/core/LDT_gfrac_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_glacierFractionMod.F90 b/ldt/core/LDT_glacierFractionMod.F90 index 3d1855ded..d3d4d9d80 100644 --- a/ldt/core/LDT_glacierFractionMod.F90 +++ b/ldt/core/LDT_glacierFractionMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_glacierMod.F90 b/ldt/core/LDT_glacierMod.F90 index 439e01096..53dee3951 100644 --- a/ldt/core/LDT_glacierMod.F90 +++ b/ldt/core/LDT_glacierMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_glacier_FTable.c b/ldt/core/LDT_glacier_FTable.c index a80d3fca3..382ce231e 100644 --- a/ldt/core/LDT_glacier_FTable.c +++ b/ldt/core/LDT_glacier_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_gridmappingMod.F90 b/ldt/core/LDT_gridmappingMod.F90 index 4febde5fe..56d64c421 100644 --- a/ldt/core/LDT_gridmappingMod.F90 +++ b/ldt/core/LDT_gridmappingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_historyMod.F90 b/ldt/core/LDT_historyMod.F90 index 8a0462f89..fe89bd4b2 100644 --- a/ldt/core/LDT_historyMod.F90 +++ b/ldt/core/LDT_historyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_irrig_Ftable.c b/ldt/core/LDT_irrig_Ftable.c index 4e08180bf..9465ed944 100644 --- a/ldt/core/LDT_irrig_Ftable.c +++ b/ldt/core/LDT_irrig_Ftable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_irrigationMod.F90 b/ldt/core/LDT_irrigationMod.F90 index 4c40f5879..e63e8c976 100644 --- a/ldt/core/LDT_irrigationMod.F90 +++ b/ldt/core/LDT_irrigationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_laisaiMod.F90 b/ldt/core/LDT_laisaiMod.F90 index 19b154c98..11a61e1bf 100644 --- a/ldt/core/LDT_laisaiMod.F90 +++ b/ldt/core/LDT_laisaiMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_laisai_FTable.c b/ldt/core/LDT_laisai_FTable.c index df205a80d..05d628f3f 100644 --- a/ldt/core/LDT_laisai_FTable.c +++ b/ldt/core/LDT_laisai_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_lakeParamProcMod.F90 b/ldt/core/LDT_lakeParamProcMod.F90 index ae93252fd..a48170260 100644 --- a/ldt/core/LDT_lakeParamProcMod.F90 +++ b/ldt/core/LDT_lakeParamProcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_lakeparams_FTable.c b/ldt/core/LDT_lakeparams_FTable.c index c1e374671..66cdc8939 100644 --- a/ldt/core/LDT_lakeparams_FTable.c +++ b/ldt/core/LDT_lakeparams_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_landcover_FTable.c b/ldt/core/LDT_landcover_FTable.c index 74f0ba0be..f31fdbafc 100644 --- a/ldt/core/LDT_landcover_FTable.c +++ b/ldt/core/LDT_landcover_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_logMod.F90 b/ldt/core/LDT_logMod.F90 index 88d427e51..0901750b1 100644 --- a/ldt/core/LDT_logMod.F90 +++ b/ldt/core/LDT_logMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_mapSurfaceModelType.F90 b/ldt/core/LDT_mapSurfaceModelType.F90 index ce046fa44..34b97a79b 100644 --- a/ldt/core/LDT_mapSurfaceModelType.F90 +++ b/ldt/core/LDT_mapSurfaceModelType.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_mask_FTable.c b/ldt/core/LDT_mask_FTable.c index 57bbd27c8..06b412503 100644 --- a/ldt/core/LDT_mask_FTable.c +++ b/ldt/core/LDT_mask_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_metforcDscaleMod.F90 b/ldt/core/LDT_metforcDscaleMod.F90 index 33264010d..b69fe3f04 100644 --- a/ldt/core/LDT_metforcDscaleMod.F90 +++ b/ldt/core/LDT_metforcDscaleMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_metforcdscale_FTable.c b/ldt/core/LDT_metforcdscale_FTable.c index ed425f482..a2f44d6ac 100644 --- a/ldt/core/LDT_metforcdscale_FTable.c +++ b/ldt/core/LDT_metforcdscale_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_metforcingMod.F90 b/ldt/core/LDT_metforcingMod.F90 index f728358d1..d8be4abad 100644 --- a/ldt/core/LDT_metforcingMod.F90 +++ b/ldt/core/LDT_metforcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_metforcingParmsMod.F90 b/ldt/core/LDT_metforcingParmsMod.F90 index 6fbdf813b..36cbfa10b 100644 --- a/ldt/core/LDT_metforcingParmsMod.F90 +++ b/ldt/core/LDT_metforcingParmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_metforcing_FTable.c b/ldt/core/LDT_metforcing_FTable.c index 2b0b2e318..4888fc6df 100644 --- a/ldt/core/LDT_metforcing_FTable.c +++ b/ldt/core/LDT_metforcing_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_mpDecomp.c b/ldt/core/LDT_mpDecomp.c index eca19ae56..6a2f0d593 100644 --- a/ldt/core/LDT_mpDecomp.c +++ b/ldt/core/LDT_mpDecomp.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_mpiMod.F90 b/ldt/core/LDT_mpiMod.F90 index ffeb15a7b..ed523613c 100644 --- a/ldt/core/LDT_mpiMod.F90 +++ b/ldt/core/LDT_mpiMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_noahparms_FTable.c b/ldt/core/LDT_noahparms_FTable.c index a4cb08e6a..7b3a82a2b 100644 --- a/ldt/core/LDT_noahparms_FTable.c +++ b/ldt/core/LDT_noahparms_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_numericalMethodsMod.F90 b/ldt/core/LDT_numericalMethodsMod.F90 index aa7d7bedc..839356369 100644 --- a/ldt/core/LDT_numericalMethodsMod.F90 +++ b/ldt/core/LDT_numericalMethodsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_obsSimMod.F90 b/ldt/core/LDT_obsSimMod.F90 index 7dc5422c2..75501b137 100644 --- a/ldt/core/LDT_obsSimMod.F90 +++ b/ldt/core/LDT_obsSimMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_openwaterMod.F90 b/ldt/core/LDT_openwaterMod.F90 index abfa213cf..16f22df21 100644 --- a/ldt/core/LDT_openwaterMod.F90 +++ b/ldt/core/LDT_openwaterMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_paramDataMod.F90 b/ldt/core/LDT_paramDataMod.F90 index 600bf48ef..00bcb0a49 100644 --- a/ldt/core/LDT_paramDataMod.F90 +++ b/ldt/core/LDT_paramDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_paramMaskCheckMod.F90 b/ldt/core/LDT_paramMaskCheckMod.F90 index 2145c73b1..a38ae56d7 100644 --- a/ldt/core/LDT_paramMaskCheckMod.F90 +++ b/ldt/core/LDT_paramMaskCheckMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -332,7 +332,7 @@ end subroutine LDT_discreteParam_Fill ! ! !INTERFACE: subroutine LDT_contIndivParam_Fill( n, pnc, pnr, gridtransform, pnl, & - param_value, undef, mask_value, fill_option, fill_value, fill_rad ) + param_value, undef, mask_value, fill_option, fill_value, fill_rad, leave_good_data) ! !USES: use ESMF @@ -359,6 +359,7 @@ subroutine LDT_contIndivParam_Fill( n, pnc, pnr, gridtransform, pnl, & real, intent(in) :: fill_value real, intent(in) :: fill_rad character(50), intent(in) :: fill_option + logical, intent(in), optional :: leave_good_data !- Local parameters: integer :: i, j, l @@ -464,12 +465,15 @@ subroutine LDT_contIndivParam_Fill( n, pnc, pnr, gridtransform, pnl, & end if end if - !== Mask: indicates water point; Parameter: indicates valid value - if( mask_value(i, j, 1) == 0 .and. & - param_value(i, j, l) /= undef ) then - param_value(i, j, l) = undef - end if ! End mask-param value check - + ! MMF scheme is active on lake/water grid cells. Thus, when MMF parameters are being processed, + ! "leave_good_data" optional argument is used to leave acceptable parameter values in lake/water grid cells intact. + if(.not.present(leave_good_data)) then + !== Mask: indicates water point; Parameter: indicates valid value + if( mask_value(i, j, 1) == 0 .and. & + param_value(i, j, l) /= undef ) then + param_value(i, j, l) = undef + end if ! End mask-param value check + endif end do ! End nc-loop end do ! End nr-loop diff --git a/ldt/core/LDT_paramOptCheckMod.F90 b/ldt/core/LDT_paramOptCheckMod.F90 index 41e17df70..58882f98b 100644 --- a/ldt/core/LDT_paramOptCheckMod.F90 +++ b/ldt/core/LDT_paramOptCheckMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -336,6 +336,20 @@ subroutine LDT_LMLCOptChecks( param_name, lc_type, nt, spatial_transform ) write(LDT_logunit,*) " Stopping ..." call LDT_endrun endif + case( "NALCMS_SM" ) + if( nt .lt. 24 .or. nt .ge. 25 ) then + write(LDT_logunit,*) "Param_Check: NALCMS_SM has a minimum of 24 types (includes water)." + write(LDT_logunit,*) " Value is currently at: ",nt + write(LDT_logunit,*) " Stopping ..." + call LDT_endrun + endif + case( "NALCMS_SM_IGBPNCEP" ) + if( nt .lt. 20 .or. nt .ge. 21 ) then + write(LDT_logunit,*) "Param_Check: NALCMS_SM_IGBPNCEP has a minimum of 20 types (includes water)." + write(LDT_logunit,*) " Value is currently at: ",nt + write(LDT_logunit,*) " Stopping ..." + call LDT_endrun + endif #if 0 case( "CONSTANT" ) if( nt .lt. 2 ) then @@ -356,6 +370,8 @@ subroutine LDT_LMLCOptChecks( param_name, lc_type, nt, spatial_transform ) write(LDT_logunit,*) " -- MOSAIC " write(LDT_logunit,*) " -- ISA " write(LDT_logunit,*) " -- CLM45 " + write(LDT_logunit,*) " -- NALCMS_SM " + write(LDT_logunit,*) " -- NALCMS_SM_IGBPNCEP " write(LDT_logunit,*) " -- CONSTANT " write(LDT_logunit,*) " Stopping ..." call LDT_endrun @@ -483,8 +499,8 @@ subroutine LDT_soilsOptChecks( n, param_name, soil_class, spatial_transform ) endif case( "ISRIC") - if (nt.ne.13) then - write(LDT_logunit,*) "Param_Check: ISRIC has 13 types (includes water) for tiling." + if (nt.ne.16) then + write(LDT_logunit,*) "Param_Check: ISRIC has 16 types (includes water) for tiling." write(LDT_logunit,*) " The current value is: ",nt write(LDT_logunit,*) " Stopping ..." call LDT_endrun diff --git a/ldt/core/LDT_paramProcMod.F90 b/ldt/core/LDT_paramProcMod.F90 index 61af05562..b47d65c98 100644 --- a/ldt/core/LDT_paramProcMod.F90 +++ b/ldt/core/LDT_paramProcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -2475,7 +2475,7 @@ subroutine setLandcoverCategories(n,source) LDT_LSMparam_struc(n)%landcover%standard_name = & "AVHRR UMD landcover map" - case( "MODIS_Native", "MODIS_LIS" ) + case( "MODIS_Native", "MODIS_LIS", "MCD12Q1" ) LDT_rc%lc_type(n) = "IGBPNCEP" LDT_LSMparam_struc(n)%landcover%num_bins = 20 LDT_LSMparam_struc(n)%landcover%standard_name = & @@ -2536,6 +2536,18 @@ subroutine setLandcoverCategories(n,source) LDT_LSMparam_struc(n)%landcover%standard_name = & "CLM-4.5 PFT and landunits landcover map" + case( "NALCMS_SM" ) + LDT_rc%lc_type(n) = "NALCMS_SM" + LDT_LSMparam_struc(n)%landcover%num_bins = 24 + LDT_LSMparam_struc(n)%landcover%standard_name = & + "SnowModel-mapped NALCMS landcover classes map" + + case( "NALCMS_SM_IGBPNCEP" ) + LDT_rc%lc_type(n) = "NALCMS_SM_IGBPNCEP" + LDT_LSMparam_struc(n)%landcover%num_bins = 20 + LDT_LSMparam_struc(n)%landcover%standard_name = & + "NALCMS/SnowModel landcover classes mapped to IGBP/NCEP" + case( "CONSTANT" ) LDT_LSMparam_struc(n)%landcover%num_bins = 13 LDT_LSMparam_struc(n)%landcover%standard_name = & diff --git a/ldt/core/LDT_paramTileInputMod.F90 b/ldt/core/LDT_paramTileInputMod.F90 index c5ede7371..a87768910 100644 --- a/ldt/core/LDT_paramTileInputMod.F90 +++ b/ldt/core/LDT_paramTileInputMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -109,7 +109,9 @@ subroutine param_index_fgrdcalc( n, param_proj, spatial_transform, & if( t == water_class ) then fgrd(c,r,t) = 0. else - if(varcnt(c,r,t)+1 > LDT_rc%udef) fgrd(c,r,t) = varcnt(c,r,t)/isum + if(varcnt(c,r,t)+1 > LDT_rc%udef) then + fgrd(c,r,t) = varcnt(c,r,t)/isum + endif endif endif diff --git a/ldt/core/LDT_ran2_gasdev.F90 b/ldt/core/LDT_ran2_gasdev.F90 index a73e221db..e2a7c29f1 100644 --- a/ldt/core/LDT_ran2_gasdev.F90 +++ b/ldt/core/LDT_ran2_gasdev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_readConfig.F90 b/ldt/core/LDT_readConfig.F90 index e035de22b..9303d707b 100644 --- a/ldt/core/LDT_readConfig.F90 +++ b/ldt/core/LDT_readConfig.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_routingParamProcMod.F90 b/ldt/core/LDT_routingParamProcMod.F90 index 51ff7ef81..626e92529 100644 --- a/ldt/core/LDT_routingParamProcMod.F90 +++ b/ldt/core/LDT_routingParamProcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_routingparams_FTable.c b/ldt/core/LDT_routingparams_FTable.c index 82bec17cb..28b98761b 100644 --- a/ldt/core/LDT_routingparams_FTable.c +++ b/ldt/core/LDT_routingparams_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_rstTransformProcMod.F90 b/ldt/core/LDT_rstTransformProcMod.F90 index 13141e5f2..33116e44e 100644 --- a/ldt/core/LDT_rstTransformProcMod.F90 +++ b/ldt/core/LDT_rstTransformProcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_runmode_FTable.c b/ldt/core/LDT_runmode_FTable.c index 1d2551151..b5a489ebf 100644 --- a/ldt/core/LDT_runmode_FTable.c +++ b/ldt/core/LDT_runmode_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_soilsMod.F90 b/ldt/core/LDT_soilsMod.F90 index cff4a36b2..dd750988c 100644 --- a/ldt/core/LDT_soilsMod.F90 +++ b/ldt/core/LDT_soilsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -782,7 +782,7 @@ subroutine soils_init_LIS() elseif(INDEX(LDT_LSMparam_struc(n)%texture%source,"ZOBLER") >0) then soiltext%watervalue = 1.0 elseif(INDEX(LDT_LSMparam_struc(n)%texture%source,"ISRIC") >0) then - soiltext%watervalue = 13. + soiltext%watervalue = 14. else soiltext%watervalue = LDT_rc%udef endif @@ -1484,7 +1484,7 @@ subroutine soils_init_LISHydro(flag) elseif(INDEX(LDT_LSMparam_struc(n)%texture%source,"ZOBLER") >0) then soiltext%watervalue = 1.0 elseif(INDEX(LDT_LSMparam_struc(n)%texture%source,"ISRIC") >0) then - soiltext%watervalue = 13. + soiltext%watervalue = 14. else soiltext%watervalue = LDT_rc%udef endif @@ -1814,7 +1814,7 @@ subroutine soils_writeHeader_LIS(n,ftn,dimID) 14)) elseif( LDT_rc%soil_classification(1) == "ISRIC" ) then call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_SOILTYPES", & - 13)) + 19)) else call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_SOILTYPES", & 19)) @@ -1972,7 +1972,7 @@ subroutine soils_writeHeader_LISHydro(n,ftn,dimID,flag) 14)) elseif( LDT_rc%soil_classification(1) == "ISRIC" ) then call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_SOILTYPES", & - 13)) + 19)) else call LDT_verify(nf90_put_att(ftn,NF90_GLOBAL,"NUMBER_SOILTYPES", & 19)) diff --git a/ldt/core/LDT_soils_FTable.c b/ldt/core/LDT_soils_FTable.c index a178f69b0..017cfa136 100644 --- a/ldt/core/LDT_soils_FTable.c +++ b/ldt/core/LDT_soils_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_spatialDownscalingMod.F90 b/ldt/core/LDT_spatialDownscalingMod.F90 index 77947dc6b..d84e014e0 100644 --- a/ldt/core/LDT_spatialDownscalingMod.F90 +++ b/ldt/core/LDT_spatialDownscalingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_statDscaleMod.F90 b/ldt/core/LDT_statDscaleMod.F90 index a39ee4789..6b360fa01 100644 --- a/ldt/core/LDT_statDscaleMod.F90 +++ b/ldt/core/LDT_statDscaleMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_statdscale_FTable.c b/ldt/core/LDT_statdscale_FTable.c index cb20dadc1..1136d823f 100644 --- a/ldt/core/LDT_statdscale_FTable.c +++ b/ldt/core/LDT_statdscale_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_timeMgrMod.F90 b/ldt/core/LDT_timeMgrMod.F90 index f9d555f5b..20ac021fb 100644 --- a/ldt/core/LDT_timeMgrMod.F90 +++ b/ldt/core/LDT_timeMgrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_topoMod.F90 b/ldt/core/LDT_topoMod.F90 index 401d6da1c..99e7f630b 100644 --- a/ldt/core/LDT_topoMod.F90 +++ b/ldt/core/LDT_topoMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_topo_FTable.c b/ldt/core/LDT_topo_FTable.c index 034c633ee..303f361ed 100644 --- a/ldt/core/LDT_topo_FTable.c +++ b/ldt/core/LDT_topo_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/LDT_vegdataMod.F90 b/ldt/core/LDT_vegdataMod.F90 index 39996e749..59c02e9da 100644 --- a/ldt/core/LDT_vegdataMod.F90 +++ b/ldt/core/LDT_vegdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/core/readzipf.c b/ldt/core/readzipf.c index 5af14f8c8..b2781c0da 100644 --- a/ldt/core/readzipf.c +++ b/ldt/core/readzipf.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/UTM/readinput_UTM.F90 b/ldt/domains/UTM/readinput_UTM.F90 index 2685d62c8..5e37bbcb5 100644 --- a/ldt/domains/UTM/readinput_UTM.F90 +++ b/ldt/domains/UTM/readinput_UTM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/easev2/readinput_easev2.F90 b/ldt/domains/easev2/readinput_easev2.F90 index 9b8d833d3..503b22d08 100644 --- a/ldt/domains/easev2/readinput_easev2.F90 +++ b/ldt/domains/easev2/readinput_easev2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/gaussian/gaussian_quadrature.F90 b/ldt/domains/gaussian/gaussian_quadrature.F90 index 015064f65..371053a76 100644 --- a/ldt/domains/gaussian/gaussian_quadrature.F90 +++ b/ldt/domains/gaussian/gaussian_quadrature.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/gaussian/readinput_gaussian.F90 b/ldt/domains/gaussian/readinput_gaussian.F90 index dce52b10b..a02007c40 100644 --- a/ldt/domains/gaussian/readinput_gaussian.F90 +++ b/ldt/domains/gaussian/readinput_gaussian.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/hrap/readinput_hrap.F90 b/ldt/domains/hrap/readinput_hrap.F90 index 0f767d88e..5acb2f1f2 100644 --- a/ldt/domains/hrap/readinput_hrap.F90 +++ b/ldt/domains/hrap/readinput_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/lambert/readinput_lambert.F90 b/ldt/domains/lambert/readinput_lambert.F90 index 1e9e10976..a7dd864bb 100644 --- a/ldt/domains/lambert/readinput_lambert.F90 +++ b/ldt/domains/lambert/readinput_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/latlon/readinput_latlon.F90 b/ldt/domains/latlon/readinput_latlon.F90 index d3ed74632..a4611bf87 100644 --- a/ldt/domains/latlon/readinput_latlon.F90 +++ b/ldt/domains/latlon/readinput_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/merc/readinput_merc.F90 b/ldt/domains/merc/readinput_merc.F90 index 4a3115dbe..67dcd8587 100644 --- a/ldt/domains/merc/readinput_merc.F90 +++ b/ldt/domains/merc/readinput_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/domains/polar/readinput_polar.F90 b/ldt/domains/polar/readinput_polar.F90 index 06f068ed4..848e91b90 100644 --- a/ldt/domains/polar/readinput_polar.F90 +++ b/ldt/domains/polar/readinput_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/UTM_utils.F90 b/ldt/interp/UTM_utils.F90 index 9c574de3d..0a88b4b49 100755 --- a/ldt/interp/UTM_utils.F90 +++ b/ldt/interp/UTM_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/bilinear_interp.F90 b/ldt/interp/bilinear_interp.F90 index 1f6c42605..cd37f2ad9 100644 --- a/ldt/interp/bilinear_interp.F90 +++ b/ldt/interp/bilinear_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/bilinear_interp_input.F90 b/ldt/interp/bilinear_interp_input.F90 index 36691b319..8d6224eb0 100644 --- a/ldt/interp/bilinear_interp_input.F90 +++ b/ldt/interp/bilinear_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/bilinear_interp_input_withgrid.F90 b/ldt/interp/bilinear_interp_input_withgrid.F90 index abada4a96..966d6177f 100644 --- a/ldt/interp/bilinear_interp_input_withgrid.F90 +++ b/ldt/interp/bilinear_interp_input_withgrid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/breakpt_module.F90 b/ldt/interp/breakpt_module.F90 index a9c40c979..699db0a57 100644 --- a/ldt/interp/breakpt_module.F90 +++ b/ldt/interp/breakpt_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord.F90 b/ldt/interp/compute_earth_coord.F90 index a246fdc50..4db7a608e 100644 --- a/ldt/interp/compute_earth_coord.F90 +++ b/ldt/interp/compute_earth_coord.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_UTM.F90 b/ldt/interp/compute_earth_coord_UTM.F90 index 2a95ad9b2..df22653d0 100644 --- a/ldt/interp/compute_earth_coord_UTM.F90 +++ b/ldt/interp/compute_earth_coord_UTM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_ease.F90 b/ldt/interp/compute_earth_coord_ease.F90 index 281b07fef..0dc39a925 100644 --- a/ldt/interp/compute_earth_coord_ease.F90 +++ b/ldt/interp/compute_earth_coord_ease.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_gauss.F90 b/ldt/interp/compute_earth_coord_gauss.F90 index 4d0f74dc0..889336aa7 100644 --- a/ldt/interp/compute_earth_coord_gauss.F90 +++ b/ldt/interp/compute_earth_coord_gauss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_hrap.F90 b/ldt/interp/compute_earth_coord_hrap.F90 index 21ff8ecae..6d8843fb7 100644 --- a/ldt/interp/compute_earth_coord_hrap.F90 +++ b/ldt/interp/compute_earth_coord_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_lambert.F90 b/ldt/interp/compute_earth_coord_lambert.F90 index 4d0e40d32..bea34c7be 100644 --- a/ldt/interp/compute_earth_coord_lambert.F90 +++ b/ldt/interp/compute_earth_coord_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_latlon.F90 b/ldt/interp/compute_earth_coord_latlon.F90 index 0e9f17375..ed5d475af 100644 --- a/ldt/interp/compute_earth_coord_latlon.F90 +++ b/ldt/interp/compute_earth_coord_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_latlon_ll.F90 b/ldt/interp/compute_earth_coord_latlon_ll.F90 index f635143b3..dd1552a9e 100644 --- a/ldt/interp/compute_earth_coord_latlon_ll.F90 +++ b/ldt/interp/compute_earth_coord_latlon_ll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_latlon_ur.F90 b/ldt/interp/compute_earth_coord_latlon_ur.F90 index 746758fe8..352e3316f 100644 --- a/ldt/interp/compute_earth_coord_latlon_ur.F90 +++ b/ldt/interp/compute_earth_coord_latlon_ur.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_ll.F90 b/ldt/interp/compute_earth_coord_ll.F90 index b8f4b2cf4..5ddbc32e5 100644 --- a/ldt/interp/compute_earth_coord_ll.F90 +++ b/ldt/interp/compute_earth_coord_ll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_merc.F90 b/ldt/interp/compute_earth_coord_merc.F90 index 857367e14..6050b5ab9 100644 --- a/ldt/interp/compute_earth_coord_merc.F90 +++ b/ldt/interp/compute_earth_coord_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_polar.F90 b/ldt/interp/compute_earth_coord_polar.F90 index 68967fae0..c790f8bf8 100644 --- a/ldt/interp/compute_earth_coord_polar.F90 +++ b/ldt/interp/compute_earth_coord_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_earth_coord_ur.F90 b/ldt/interp/compute_earth_coord_ur.F90 index a1bf875db..e3c7fadb8 100644 --- a/ldt/interp/compute_earth_coord_ur.F90 +++ b/ldt/interp/compute_earth_coord_ur.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord.F90 b/ldt/interp/compute_grid_coord.F90 index c6c6a3b9c..7c50b76f3 100644 --- a/ldt/interp/compute_grid_coord.F90 +++ b/ldt/interp/compute_grid_coord.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_ease.F90 b/ldt/interp/compute_grid_coord_ease.F90 index b16d34561..373101f34 100644 --- a/ldt/interp/compute_grid_coord_ease.F90 +++ b/ldt/interp/compute_grid_coord_ease.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_gauss.F90 b/ldt/interp/compute_grid_coord_gauss.F90 index 038b89b43..376580aa2 100644 --- a/ldt/interp/compute_grid_coord_gauss.F90 +++ b/ldt/interp/compute_grid_coord_gauss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_hrap.F90 b/ldt/interp/compute_grid_coord_hrap.F90 index d6bba4f09..892fdda2d 100644 --- a/ldt/interp/compute_grid_coord_hrap.F90 +++ b/ldt/interp/compute_grid_coord_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_lambert.F90 b/ldt/interp/compute_grid_coord_lambert.F90 index 12c23200f..d699e999a 100644 --- a/ldt/interp/compute_grid_coord_lambert.F90 +++ b/ldt/interp/compute_grid_coord_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_latlon.F90 b/ldt/interp/compute_grid_coord_latlon.F90 index cff48fb7a..f4e9beadc 100644 --- a/ldt/interp/compute_grid_coord_latlon.F90 +++ b/ldt/interp/compute_grid_coord_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_merc.F90 b/ldt/interp/compute_grid_coord_merc.F90 index 7fa420223..4dc597365 100644 --- a/ldt/interp/compute_grid_coord_merc.F90 +++ b/ldt/interp/compute_grid_coord_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_grid_coord_polar.F90 b/ldt/interp/compute_grid_coord_polar.F90 index e9e653eac..38adc02ed 100644 --- a/ldt/interp/compute_grid_coord_polar.F90 +++ b/ldt/interp/compute_grid_coord_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_stnwts.F90 b/ldt/interp/compute_stnwts.F90 index ea829845e..88d72f2de 100644 --- a/ldt/interp/compute_stnwts.F90 +++ b/ldt/interp/compute_stnwts.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/compute_vinterp_weights.F90 b/ldt/interp/compute_vinterp_weights.F90 index 30d1dc267..b4ec7f9cf 100644 --- a/ldt/interp/compute_vinterp_weights.F90 +++ b/ldt/interp/compute_vinterp_weights.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/conserv_interp.F90 b/ldt/interp/conserv_interp.F90 index 95d918aa0..46d80870a 100644 --- a/ldt/interp/conserv_interp.F90 +++ b/ldt/interp/conserv_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/conserv_interp_input.F90 b/ldt/interp/conserv_interp_input.F90 index 6c78b597b..f9fbaa448 100644 --- a/ldt/interp/conserv_interp_input.F90 +++ b/ldt/interp/conserv_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/conserv_interp_input_withgrid.F90 b/ldt/interp/conserv_interp_input_withgrid.F90 index bb5bbe544..22ce86e36 100644 --- a/ldt/interp/conserv_interp_input_withgrid.F90 +++ b/ldt/interp/conserv_interp_input_withgrid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/diff_lon.F90 b/ldt/interp/diff_lon.F90 index 91792709a..ac3247b68 100644 --- a/ldt/interp/diff_lon.F90 +++ b/ldt/interp/diff_lon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/ezlh_convert.F90 b/ldt/interp/ezlh_convert.F90 index d86cb9a4f..e83289fd5 100755 --- a/ldt/interp/ezlh_convert.F90 +++ b/ldt/interp/ezlh_convert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/ezlh_inverse.F90 b/ldt/interp/ezlh_inverse.F90 index dce789cfe..91843a741 100755 --- a/ldt/interp/ezlh_inverse.F90 +++ b/ldt/interp/ezlh_inverse.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/gaussian_mod.F90.keep b/ldt/interp/gaussian_mod.F90.keep index bd9563b6f..63eaaaa2a 100644 --- a/ldt/interp/gaussian_mod.F90.keep +++ b/ldt/interp/gaussian_mod.F90.keep @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/gaussian_routines.F90 b/ldt/interp/gaussian_routines.F90 index 79ee8e111..68080c8c7 100644 --- a/ldt/interp/gaussian_routines.F90 +++ b/ldt/interp/gaussian_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/gausslat.F90 b/ldt/interp/gausslat.F90 index 20128406c..b91e70d45 100644 --- a/ldt/interp/gausslat.F90 +++ b/ldt/interp/gausslat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/get_fieldpos.F90 b/ldt/interp/get_fieldpos.F90 index e42e23eda..6951aaf9f 100644 --- a/ldt/interp/get_fieldpos.F90 +++ b/ldt/interp/get_fieldpos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/hrapToLatLon.F90 b/ldt/interp/hrapToLatLon.F90 index de7a66e8a..9be802cc6 100644 --- a/ldt/interp/hrapToLatLon.F90 +++ b/ldt/interp/hrapToLatLon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/idw_module.F90 b/ldt/interp/idw_module.F90 index 022f45851..1cf214bbf 100644 --- a/ldt/interp/idw_module.F90 +++ b/ldt/interp/idw_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/interp_stndata.F90 b/ldt/interp/interp_stndata.F90 index 8d6c7b7b3..7f1a310ff 100644 --- a/ldt/interp/interp_stndata.F90 +++ b/ldt/interp/interp_stndata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/latlonTohrap.F90 b/ldt/interp/latlonTohrap.F90 index f3a8928ab..8718605c6 100644 --- a/ldt/interp/latlonTohrap.F90 +++ b/ldt/interp/latlonTohrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/latlonTopolar.F90 b/ldt/interp/latlonTopolar.F90 index 55df36918..365662ce0 100644 --- a/ldt/interp/latlonTopolar.F90 +++ b/ldt/interp/latlonTopolar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/lltops.F90 b/ldt/interp/lltops.F90 index 4f3661ab7..7812c9917 100644 --- a/ldt/interp/lltops.F90 +++ b/ldt/interp/lltops.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/map_utils.F90 b/ldt/interp/map_utils.F90 index 65477cd24..e54080e81 100644 --- a/ldt/interp/map_utils.F90 +++ b/ldt/interp/map_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/mqb_module.F90 b/ldt/interp/mqb_module.F90 index 414ae5f62..f5bba3e33 100644 --- a/ldt/interp/mqb_module.F90 +++ b/ldt/interp/mqb_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/neighbor_interp.F90 b/ldt/interp/neighbor_interp.F90 index 6f0e594c9..9ecd28d78 100644 --- a/ldt/interp/neighbor_interp.F90 +++ b/ldt/interp/neighbor_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/neighbor_interp_input.F90 b/ldt/interp/neighbor_interp_input.F90 index 4a1c572eb..d0d9c1044 100644 --- a/ldt/interp/neighbor_interp_input.F90 +++ b/ldt/interp/neighbor_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/neighbor_interp_input_withgrid.F90 b/ldt/interp/neighbor_interp_input_withgrid.F90 index 8b77b1636..aba0b5541 100644 --- a/ldt/interp/neighbor_interp_input_withgrid.F90 +++ b/ldt/interp/neighbor_interp_input_withgrid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/normalize_stnwts.F90 b/ldt/interp/normalize_stnwts.F90 index 0f8e5d480..d95252415 100644 --- a/ldt/interp/normalize_stnwts.F90 +++ b/ldt/interp/normalize_stnwts.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/polarToLatLon.F90 b/ldt/interp/polarToLatLon.F90 index 700249857..da44ae1b4 100644 --- a/ldt/interp/polarToLatLon.F90 +++ b/ldt/interp/polarToLatLon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/polfixs.F90 b/ldt/interp/polfixs.F90 index 29c6fbe8a..76d65363c 100644 --- a/ldt/interp/polfixs.F90 +++ b/ldt/interp/polfixs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/pstoll.F90 b/ldt/interp/pstoll.F90 index 0a8818363..165f0cd44 100644 --- a/ldt/interp/pstoll.F90 +++ b/ldt/interp/pstoll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/stninterp_module.F90 b/ldt/interp/stninterp_module.F90 index 6397ecc40..acadaeed2 100644 --- a/ldt/interp/stninterp_module.F90 +++ b/ldt/interp/stninterp_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/upscaleByAveraging.F90 b/ldt/interp/upscaleByAveraging.F90 index c990bb6c1..28872cd92 100644 --- a/ldt/interp/upscaleByAveraging.F90 +++ b/ldt/interp/upscaleByAveraging.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/upscaleByAveraging_input.F90 b/ldt/interp/upscaleByAveraging_input.F90 index 25a4a8fd1..7afdfd95b 100644 --- a/ldt/interp/upscaleByAveraging_input.F90 +++ b/ldt/interp/upscaleByAveraging_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/upscaleByCnt.F90 b/ldt/interp/upscaleByCnt.F90 index 3c784b863..8088f452e 100644 --- a/ldt/interp/upscaleByCnt.F90 +++ b/ldt/interp/upscaleByCnt.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/upscaleByMode.F90 b/ldt/interp/upscaleByMode.F90 index 3146ee331..57c43fb17 100755 --- a/ldt/interp/upscaleByMode.F90 +++ b/ldt/interp/upscaleByMode.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/vinterp.F90 b/ldt/interp/vinterp.F90 index acacc4ef6..4186f7939 100644 --- a/ldt/interp/vinterp.F90 +++ b/ldt/interp/vinterp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/interp/zterp.F90 b/ldt/interp/zterp.F90 index beca04190..ee8057224 100644 --- a/ldt/interp/zterp.F90 +++ b/ldt/interp/zterp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/lib/xmrg/LDT_xmrg_reader.F90 b/ldt/lib/xmrg/LDT_xmrg_reader.F90 index d23afd869..7bd2af9c1 100755 --- a/ldt/lib/xmrg/LDT_xmrg_reader.F90 +++ b/ldt/lib/xmrg/LDT_xmrg_reader.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/main/LDTmain.F90 b/ldt/main/LDTmain.F90 index 1fb4bc9c3..6d9c5cea6 100644 --- a/ldt/main/LDTmain.F90 +++ b/ldt/main/LDTmain.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/make/Filepath b/ldt/make/Filepath index 8e437960e..c8a408916 100644 --- a/ldt/make/Filepath +++ b/ldt/make/Filepath @@ -1 +1 @@ -dirs := . ../main ../core ../interp ../plugins ../lib/bil ../lib/xmrg ../params/mask ../params/landcover ../params/soils ../params/topo ../params/albedo ../params/gfrac ../params/LAISAI ../params/slopetype ../params/tbot ../params/pet ../params/climateparms ../params/crop_parms ../params/irrigation ../params/catchment ../params/CLM2 ../params/GeoWRSI ../params/FLAKE ../params/HYMAP ../params/JULES ../params/Mosaic ../params/Noah ../params/RDHM ../params/RUC ../params/SACHTET ../params/Snow17 ../params/SiB2 ../params/VIC ../params/glacier ../runmodes/ANNproc ../runmodes/DApreproc ../runmodes/LSMparamproc ../runmodes/EnsRstpreproc ../runmodes/NUWRFpreproc ../runmodes/Metforcproc ../runmodes/MetTimeDScale ../runmodes/climoRstproc ../runmodes/rstTransformProc ../runmodes/StatDscaleMetForc ../runmodes/OPTUEproc/ ../domains/latlon ../domains/gaussian ../domains/hrap ../domains/lambert ../domains/polar ../domains/merc ../domains/easev2 ../DAobs/MCD15A2H_LAI ../DAobs/LISlsmSMobs ../DAobs/LISlsmTEFFobs ../DAobs/synthetic_sm ../DAobs/NASA_AMSRE_sm ../DAobs/LPRM_AMSREsm ../DAobs/LPRMvod ../DAobs/ESACCI_sm ../DAobs/WindSat_sm ../DAobs/GRACE_tws ../DAobs/GRACEQL_tws ../DAobs/SMOPS ../DAobs/ASCAT_TUW ../DAobs/SMOS_L2sm ../DAobs/SMOS_NESDIS ../DAobs/GCOMW_AMSR2L3snd ../DAobs/GCOMW_AMSR2L3sm ../DAobs/Aquarius_L2sm ../DAobs/simGRACE_JPL ../DAobs/SMMR_SNWD ../DAobs/SSMI_SNWD ../DAobs/ANSA_SNWD ../DAobs/NASA_SMAPsm ../DAobs/SMOS_NRTNN_L2sm ../DAobs/NASA_SMAPvod ../DAobs/GLASSlai ../DAobs/THySM ../DAobs/GEOS_FP_TEFFobs ../DAobs/SMAP_E_OPLsm ../DAobs/VIIRS_GVF ../DAobs/CDFS_GVF ../RESTRICTED/usaf/usaf ../metforcing/agrradps ../metforcing/cmap ../metforcing/cmorph ../metforcing/ecmwf ../metforcing/gdas ../metforcing/geos5fcst ../metforcing/gfs ../metforcing/gldas ../metforcing/gswp1 ../metforcing/gswp2 ../metforcing/merra2 ../metforcing/era5 ../metforcing/nam242 ../metforcing/narr ../metforcing/princeton ../metforcing/nldas2 ../metforcing/WRFoutv2 ../metforcing/WRFAKdom ../metforcing/stg2 ../metforcing/stg4 ../metforcing/3B42RTV7 ../metforcing/3B42V6 ../metforcing/3B42V7 ../metforcing/RFE2Daily ../metforcing/RFE2gdas ../metforcing/chirps2 ../MetforcScale ../ANNdata/LISlsmSM ../ANNdata/synthetic_sm ../ANNdata/LPRM_AMSREsm ../ANNdata/MODIS_LST ../ANNdata/MOD10A1 ../ANNdata/GHCNsnwd ../ANNdata/GCOMW_AMSR2_TB ../statDscale/BayesianMerging ../statDscale/Climo ../params/CLM45 ../USAFSI ../SMAP_E_OPL ../runmodes/USAFSI ../runmodes/LISHydropreproc ../runmodes/SMAP_E_OPL ../params/Crocus ../runmodes/obsSim ../obsSim/NatureRun/LISout/ ../obsSim/OSSEmask/LISout/ ../obsSim/OSSEmask/AMSR2/ ../obsSim/OSSEmask/TSMM/ ../obsSim/OSSEmask/MODIS/ ../obsSim/OSSEmask/Sentinel1A/ +dirs := . ../main ../core ../interp ../plugins ../lib/bil ../lib/xmrg ../params/mask ../params/landcover ../params/soils ../params/topo ../params/albedo ../params/gfrac ../params/LAISAI ../params/slopetype ../params/tbot ../params/pet ../params/climateparms ../params/crop_parms ../params/irrigation ../params/catchment ../params/CLM2 ../params/GeoWRSI ../params/FLAKE ../params/HYMAP ../params/JULES ../params/Mosaic ../params/Noah ../params/RDHM ../params/RUC ../params/SACHTET ../params/Snow17 ../params/SnowModel ../params/SiB2 ../params/VIC ../params/glacier ../runmodes/ANNproc ../runmodes/DApreproc ../runmodes/LSMparamproc ../runmodes/EnsRstpreproc ../runmodes/NUWRFpreproc ../runmodes/Metforcproc ../runmodes/MetTimeDScale ../runmodes/climoRstproc ../runmodes/rstTransformProc ../runmodes/StatDscaleMetForc ../runmodes/OPTUEproc/ ../domains/latlon ../domains/gaussian ../domains/hrap ../domains/lambert ../domains/polar ../domains/merc ../domains/easev2 ../DAobs/MCD15A2H_LAI ../DAobs/LISlsmSMobs ../DAobs/LISlsmPrecipobs ../DAobs/LISlsmTEFFobs ../DAobs/synthetic_sm ../DAobs/NASA_AMSRE_sm ../DAobs/LPRM_AMSREsm ../DAobs/LPRMvod ../DAobs/ESACCI_sm ../DAobs/WindSat_sm ../DAobs/GRACE_tws ../DAobs/GRACEQL_tws ../DAobs/SMOPS ../DAobs/ASCAT_TUW ../DAobs/SMOS_L2sm ../DAobs/SMOS_NESDIS ../DAobs/GCOMW_AMSR2L3snd ../DAobs/GCOMW_AMSR2L3sm ../DAobs/Aquarius_L2sm ../DAobs/simGRACE_JPL ../DAobs/SMMR_SNWD ../DAobs/SSMI_SNWD ../DAobs/ANSA_SNWD ../DAobs/NASA_SMAPsm ../DAobs/SMOS_NRTNN_L2sm ../DAobs/NASA_SMAPvod ../DAobs/GLASSlai ../DAobs/THySM ../DAobs/GEOS_FP_TEFFobs ../DAobs/SMAP_E_OPLsm ../DAobs/VIIRS_GVF ../DAobs/CDFS_GVF ../RESTRICTED/usaf/usaf ../metforcing/agrradps ../metforcing/cmap ../metforcing/cmorph ../metforcing/ecmwf ../metforcing/gdas ../metforcing/geos5fcst ../metforcing/gfs ../metforcing/gldas ../metforcing/gswp1 ../metforcing/gswp2 ../metforcing/merra2 ../metforcing/era5 ../metforcing/nam242 ../metforcing/narr ../metforcing/princeton ../metforcing/nldas2 ../metforcing/WRFoutv2 ../metforcing/WRFAKdom ../metforcing/stg2 ../metforcing/stg4 ../metforcing/3B42RTV7 ../metforcing/3B42V6 ../metforcing/3B42V7 ../metforcing/RFE2Daily ../metforcing/RFE2gdas ../metforcing/chirps2 ../MetforcScale ../ANNdata/LISlsmSM ../ANNdata/synthetic_sm ../ANNdata/LPRM_AMSREsm ../ANNdata/MODIS_LST ../ANNdata/MOD10A1 ../ANNdata/GHCNsnwd ../ANNdata/GCOMW_AMSR2_TB ../statDscale/BayesianMerging ../statDscale/Climo ../params/CLM45 ../USAFSI ../SMAP_E_OPL ../runmodes/USAFSI ../runmodes/LISHydropreproc ../runmodes/SMAP_E_OPL ../params/Crocus ../runmodes/obsSim ../obsSim/NatureRun/LISout/ ../obsSim/OSSEmask/LISout/ ../obsSim/OSSEmask/AMSR2/ ../obsSim/OSSEmask/TSMM/ ../obsSim/OSSEmask/MODIS/ ../obsSim/OSSEmask/Sentinel1A/ diff --git a/ldt/make/makedep.py b/ldt/make/makedep.py index a7d033e9c..77955a4c1 100755 --- a/ldt/make/makedep.py +++ b/ldt/make/makedep.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 b/ldt/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 index c32a381db..f63143aab 100644 --- a/ldt/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 +++ b/ldt/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 b/ldt/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 index 1f58eb638..148a9f4f6 100644 --- a/ldt/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 +++ b/ldt/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 b/ldt/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 index d06323251..f7bdbf7a7 100644 --- a/ldt/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 +++ b/ldt/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 b/ldt/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 index 521919b68..15f8030aa 100644 --- a/ldt/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 +++ b/ldt/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 b/ldt/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 index b80953c07..0c3b42227 100644 --- a/ldt/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 +++ b/ldt/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 b/ldt/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 index 7870567f2..88424da6a 100644 --- a/ldt/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 +++ b/ldt/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 b/ldt/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 index 1b02b7186..2babdef6f 100644 --- a/ldt/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 +++ b/ldt/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 b/ldt/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 index 094b4135c..45c42fb2a 100644 --- a/ldt/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 +++ b/ldt/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/finalize_TRMM3B42V6.F90 b/ldt/metforcing/3B42V6/finalize_TRMM3B42V6.F90 index baa1447f7..1dce901df 100644 --- a/ldt/metforcing/3B42V6/finalize_TRMM3B42V6.F90 +++ b/ldt/metforcing/3B42V6/finalize_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/get_TRMM3B42V6.F90 b/ldt/metforcing/3B42V6/get_TRMM3B42V6.F90 index 12231c5c9..d1b7d6e8e 100644 --- a/ldt/metforcing/3B42V6/get_TRMM3B42V6.F90 +++ b/ldt/metforcing/3B42V6/get_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/interp_TRMM3B42V6.F90 b/ldt/metforcing/3B42V6/interp_TRMM3B42V6.F90 index 600063112..ff30bf0c0 100644 --- a/ldt/metforcing/3B42V6/interp_TRMM3B42V6.F90 +++ b/ldt/metforcing/3B42V6/interp_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/read_TRMM3B42V6.F90 b/ldt/metforcing/3B42V6/read_TRMM3B42V6.F90 index 978830ba4..12450e59d 100644 --- a/ldt/metforcing/3B42V6/read_TRMM3B42V6.F90 +++ b/ldt/metforcing/3B42V6/read_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 b/ldt/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 index 23c4e5c66..3cfdec577 100644 --- a/ldt/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 +++ b/ldt/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 b/ldt/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 index 2364d94ed..d29500dd4 100644 --- a/ldt/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 +++ b/ldt/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 b/ldt/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 index b09d21e51..0ab81cc85 100644 --- a/ldt/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 +++ b/ldt/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/finalize_TRMM3B42V7.F90 b/ldt/metforcing/3B42V7/finalize_TRMM3B42V7.F90 index d0aba143f..77e6bab50 100644 --- a/ldt/metforcing/3B42V7/finalize_TRMM3B42V7.F90 +++ b/ldt/metforcing/3B42V7/finalize_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/get_TRMM3B42V7.F90 b/ldt/metforcing/3B42V7/get_TRMM3B42V7.F90 index f5462c1fb..8c18f9172 100644 --- a/ldt/metforcing/3B42V7/get_TRMM3B42V7.F90 +++ b/ldt/metforcing/3B42V7/get_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/interp_TRMM3B42V7.F90 b/ldt/metforcing/3B42V7/interp_TRMM3B42V7.F90 index ce8c65d83..ae469dece 100644 --- a/ldt/metforcing/3B42V7/interp_TRMM3B42V7.F90 +++ b/ldt/metforcing/3B42V7/interp_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/read_TRMM3B42V7.F90 b/ldt/metforcing/3B42V7/read_TRMM3B42V7.F90 index b729e488e..91d525389 100644 --- a/ldt/metforcing/3B42V7/read_TRMM3B42V7.F90 +++ b/ldt/metforcing/3B42V7/read_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 b/ldt/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 index 19764b753..185a07cb7 100644 --- a/ldt/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 +++ b/ldt/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 b/ldt/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 index cc6256210..6812f0105 100644 --- a/ldt/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 +++ b/ldt/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 b/ldt/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 index 62899212e..e40901a1a 100644 --- a/ldt/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 +++ b/ldt/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/finalize_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/finalize_RFE2Daily.F90 index 361bfb33b..43b16c1aa 100644 --- a/ldt/metforcing/RFE2Daily/finalize_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/finalize_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/get_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/get_RFE2Daily.F90 index 0739a67f4..a11b83cbc 100644 --- a/ldt/metforcing/RFE2Daily/get_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/get_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 index db738b789..b1422178f 100644 --- a/ldt/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 index 8f4fa95d6..fb2c99110 100644 --- a/ldt/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/reproject_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/reproject_RFE2Daily.F90 index 9d5081a3e..c3bd06581 100644 --- a/ldt/metforcing/RFE2Daily/reproject_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/reproject_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/reset_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/reset_RFE2Daily.F90 index 589013fd9..2f927534f 100644 --- a/ldt/metforcing/RFE2Daily/reset_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/reset_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 b/ldt/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 index 407759f03..252bbca72 100644 --- a/ldt/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 +++ b/ldt/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 b/ldt/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 index 978804f52..65854ca25 100644 --- a/ldt/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 +++ b/ldt/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/finalize_RFE2gdas.F90 b/ldt/metforcing/RFE2gdas/finalize_RFE2gdas.F90 index 8a52f8b9a..155a48483 100644 --- a/ldt/metforcing/RFE2gdas/finalize_RFE2gdas.F90 +++ b/ldt/metforcing/RFE2gdas/finalize_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/get_RFE2gdas.F90 b/ldt/metforcing/RFE2gdas/get_RFE2gdas.F90 index 06f07a53d..085b5eb23 100644 --- a/ldt/metforcing/RFE2gdas/get_RFE2gdas.F90 +++ b/ldt/metforcing/RFE2gdas/get_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/readRFE2gdascrd.F90 b/ldt/metforcing/RFE2gdas/readRFE2gdascrd.F90 index da075b02b..c1318739b 100644 --- a/ldt/metforcing/RFE2gdas/readRFE2gdascrd.F90 +++ b/ldt/metforcing/RFE2gdas/readRFE2gdascrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 b/ldt/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 index e72f79f44..912c7d265 100644 --- a/ldt/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 +++ b/ldt/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/reproject_RFE2gdas.F90 b/ldt/metforcing/RFE2gdas/reproject_RFE2gdas.F90 index 5b65f384e..efb6b45fb 100644 --- a/ldt/metforcing/RFE2gdas/reproject_RFE2gdas.F90 +++ b/ldt/metforcing/RFE2gdas/reproject_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/reset_RFE2gdas.F90 b/ldt/metforcing/RFE2gdas/reset_RFE2gdas.F90 index f37ed49a6..29ccab33d 100644 --- a/ldt/metforcing/RFE2gdas/reset_RFE2gdas.F90 +++ b/ldt/metforcing/RFE2gdas/reset_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 b/ldt/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 index 47bc11eb5..335e117d2 100644 --- a/ldt/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 +++ b/ldt/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 b/ldt/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 index 8d7c2701e..deb24d5f6 100644 --- a/ldt/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 +++ b/ldt/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/WRFAKdom/read_WRFAK_elev.F90 b/ldt/metforcing/WRFAKdom/read_WRFAK_elev.F90 index 1b8260c92..dbc4cb32c 100644 --- a/ldt/metforcing/WRFAKdom/read_WRFAK_elev.F90 +++ b/ldt/metforcing/WRFAKdom/read_WRFAK_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 b/ldt/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 index b4ebf77be..c3e397330 100644 --- a/ldt/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 +++ b/ldt/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 b/ldt/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 index 6d5a9bf80..1cf4b5de3 100644 --- a/ldt/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 +++ b/ldt/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 b/ldt/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 index 6dddd0d93..418e8544e 100644 --- a/ldt/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 +++ b/ldt/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -109,7 +109,7 @@ subroutine read_wrfoutv2_elev( n, findex, wrfoutv2elev, elevdiff ) ! Open and Read-in Forcing Terrain Hght File - Bring to LIS run domain ! ------------------------------------------------------------------- write(LDT_logunit,*) "[INFO] Reading the WRFoutv2 terrain height file: ", & - wrfoutv2_struc(n)%file_wrfelev + trim(wrfoutv2_struc(n)%file_wrfelev) #if (defined USE_NETCDF4) diff --git a/ldt/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 b/ldt/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 index 7bc43b2b8..ac1f4d3d9 100644 --- a/ldt/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 +++ b/ldt/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/agrradps/agrradps_forcingMod.F90 b/ldt/metforcing/agrradps/agrradps_forcingMod.F90 index d82c15b11..13cccd971 100644 --- a/ldt/metforcing/agrradps/agrradps_forcingMod.F90 +++ b/ldt/metforcing/agrradps/agrradps_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/chirps2_forcingMod.F90 b/ldt/metforcing/chirps2/chirps2_forcingMod.F90 index 97447bbf2..941ce05a6 100644 --- a/ldt/metforcing/chirps2/chirps2_forcingMod.F90 +++ b/ldt/metforcing/chirps2/chirps2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/finalize_chirps2.F90 b/ldt/metforcing/chirps2/finalize_chirps2.F90 index 08d9ec38d..96c20b452 100644 --- a/ldt/metforcing/chirps2/finalize_chirps2.F90 +++ b/ldt/metforcing/chirps2/finalize_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/get_chirps2.F90 b/ldt/metforcing/chirps2/get_chirps2.F90 index 0343f36ff..b5a474c42 100644 --- a/ldt/metforcing/chirps2/get_chirps2.F90 +++ b/ldt/metforcing/chirps2/get_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/read_chirps2.F90 b/ldt/metforcing/chirps2/read_chirps2.F90 index 7cfa2af4f..0d8211856 100644 --- a/ldt/metforcing/chirps2/read_chirps2.F90 +++ b/ldt/metforcing/chirps2/read_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/readconfig_chirps2.F90 b/ldt/metforcing/chirps2/readconfig_chirps2.F90 index 0103603f3..a540c9f62 100644 --- a/ldt/metforcing/chirps2/readconfig_chirps2.F90 +++ b/ldt/metforcing/chirps2/readconfig_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/reset_chirps2.F90 b/ldt/metforcing/chirps2/reset_chirps2.F90 index 17eda36f3..7c1256ff1 100644 --- a/ldt/metforcing/chirps2/reset_chirps2.F90 +++ b/ldt/metforcing/chirps2/reset_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/chirps2/timeinterp_chirps2.F90 b/ldt/metforcing/chirps2/timeinterp_chirps2.F90 index d8d10096e..6bf94bf68 100644 --- a/ldt/metforcing/chirps2/timeinterp_chirps2.F90 +++ b/ldt/metforcing/chirps2/timeinterp_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/cmap_forcingMod.F90 b/ldt/metforcing/cmap/cmap_forcingMod.F90 index d9aee667e..dd74bdfa3 100644 --- a/ldt/metforcing/cmap/cmap_forcingMod.F90 +++ b/ldt/metforcing/cmap/cmap_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/finalize_cmap.F90 b/ldt/metforcing/cmap/finalize_cmap.F90 index 1aaa6055c..d4a27a4e0 100644 --- a/ldt/metforcing/cmap/finalize_cmap.F90 +++ b/ldt/metforcing/cmap/finalize_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/get_cmap.F90 b/ldt/metforcing/cmap/get_cmap.F90 index a49668230..41ccfcf73 100644 --- a/ldt/metforcing/cmap/get_cmap.F90 +++ b/ldt/metforcing/cmap/get_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/interp_cmap.F90 b/ldt/metforcing/cmap/interp_cmap.F90 index 69a0e0fbe..fd941a268 100644 --- a/ldt/metforcing/cmap/interp_cmap.F90 +++ b/ldt/metforcing/cmap/interp_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/read_cmap.F90 b/ldt/metforcing/cmap/read_cmap.F90 index 3d622f00b..b433471f0 100644 --- a/ldt/metforcing/cmap/read_cmap.F90 +++ b/ldt/metforcing/cmap/read_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/readcrd_cmap.F90 b/ldt/metforcing/cmap/readcrd_cmap.F90 index c1f1df6ef..65175e539 100644 --- a/ldt/metforcing/cmap/readcrd_cmap.F90 +++ b/ldt/metforcing/cmap/readcrd_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/reset_cmap.F90 b/ldt/metforcing/cmap/reset_cmap.F90 index 8135d6f12..3c39993c1 100644 --- a/ldt/metforcing/cmap/reset_cmap.F90 +++ b/ldt/metforcing/cmap/reset_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmap/timeinterp_cmap.F90 b/ldt/metforcing/cmap/timeinterp_cmap.F90 index 912c01ed5..ec6a7488b 100644 --- a/ldt/metforcing/cmap/timeinterp_cmap.F90 +++ b/ldt/metforcing/cmap/timeinterp_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/cm_readzipf.c b/ldt/metforcing/cmorph/cm_readzipf.c index 78e48f9b7..4bdf9a6c9 100644 --- a/ldt/metforcing/cmorph/cm_readzipf.c +++ b/ldt/metforcing/cmorph/cm_readzipf.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/cmorph_forcingMod.F90 b/ldt/metforcing/cmorph/cmorph_forcingMod.F90 index e8a8830d7..13342a5a1 100644 --- a/ldt/metforcing/cmorph/cmorph_forcingMod.F90 +++ b/ldt/metforcing/cmorph/cmorph_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/finalize_cmorph.F90 b/ldt/metforcing/cmorph/finalize_cmorph.F90 index 4ea5f3b2e..3871e42cc 100644 --- a/ldt/metforcing/cmorph/finalize_cmorph.F90 +++ b/ldt/metforcing/cmorph/finalize_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/get_cmorph.F90 b/ldt/metforcing/cmorph/get_cmorph.F90 index 9a3e44b1b..dd68721fa 100644 --- a/ldt/metforcing/cmorph/get_cmorph.F90 +++ b/ldt/metforcing/cmorph/get_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/interp_cmorph.F90 b/ldt/metforcing/cmorph/interp_cmorph.F90 index 3e377dd74..286f4b36c 100644 --- a/ldt/metforcing/cmorph/interp_cmorph.F90 +++ b/ldt/metforcing/cmorph/interp_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/read_cmorph.F90 b/ldt/metforcing/cmorph/read_cmorph.F90 index d44efe1e3..09df1d763 100644 --- a/ldt/metforcing/cmorph/read_cmorph.F90 +++ b/ldt/metforcing/cmorph/read_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/readcrd_cmorph.F90 b/ldt/metforcing/cmorph/readcrd_cmorph.F90 index c7d2f81e2..e61411117 100644 --- a/ldt/metforcing/cmorph/readcrd_cmorph.F90 +++ b/ldt/metforcing/cmorph/readcrd_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/cmorph/timeinterp_cmorph.F90 b/ldt/metforcing/cmorph/timeinterp_cmorph.F90 index 1604d757e..4478cda21 100644 --- a/ldt/metforcing/cmorph/timeinterp_cmorph.F90 +++ b/ldt/metforcing/cmorph/timeinterp_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/ecmwf_forcingMod.F90 b/ldt/metforcing/ecmwf/ecmwf_forcingMod.F90 index 7cfd95a11..d70bd507e 100644 --- a/ldt/metforcing/ecmwf/ecmwf_forcingMod.F90 +++ b/ldt/metforcing/ecmwf/ecmwf_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/finalize_ecmwf.F90 b/ldt/metforcing/ecmwf/finalize_ecmwf.F90 index 4f5fd87b0..c5d8e6c73 100644 --- a/ldt/metforcing/ecmwf/finalize_ecmwf.F90 +++ b/ldt/metforcing/ecmwf/finalize_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/get_ecmwf.F90 b/ldt/metforcing/ecmwf/get_ecmwf.F90 index 2f6875b25..af5465afd 100644 --- a/ldt/metforcing/ecmwf/get_ecmwf.F90 +++ b/ldt/metforcing/ecmwf/get_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/read_ecmwf.F90 b/ldt/metforcing/ecmwf/read_ecmwf.F90 index a387f33cc..d42f4f5cf 100644 --- a/ldt/metforcing/ecmwf/read_ecmwf.F90 +++ b/ldt/metforcing/ecmwf/read_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/read_ecmwf_elev.F90 b/ldt/metforcing/ecmwf/read_ecmwf_elev.F90 index 4b1644a37..fa3edf926 100644 --- a/ldt/metforcing/ecmwf/read_ecmwf_elev.F90 +++ b/ldt/metforcing/ecmwf/read_ecmwf_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/read_ecmwfelev_ldtproc.F90 b/ldt/metforcing/ecmwf/read_ecmwfelev_ldtproc.F90 index 8ef0629ba..f06827ff6 100644 --- a/ldt/metforcing/ecmwf/read_ecmwfelev_ldtproc.F90 +++ b/ldt/metforcing/ecmwf/read_ecmwfelev_ldtproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/readcrd_ecmwf.F90 b/ldt/metforcing/ecmwf/readcrd_ecmwf.F90 index 890d156c0..0a33bae14 100644 --- a/ldt/metforcing/ecmwf/readcrd_ecmwf.F90 +++ b/ldt/metforcing/ecmwf/readcrd_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/reset_ecmwf.F90 b/ldt/metforcing/ecmwf/reset_ecmwf.F90 index ce2aab8db..b4c559217 100644 --- a/ldt/metforcing/ecmwf/reset_ecmwf.F90 +++ b/ldt/metforcing/ecmwf/reset_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/ecmwf/timeinterp_ecmwf.F90 b/ldt/metforcing/ecmwf/timeinterp_ecmwf.F90 index b353fadd1..040094365 100644 --- a/ldt/metforcing/ecmwf/timeinterp_ecmwf.F90 +++ b/ldt/metforcing/ecmwf/timeinterp_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/era5_forcingMod.F90 b/ldt/metforcing/era5/era5_forcingMod.F90 index cffb93bb9..8a595a7b8 100644 --- a/ldt/metforcing/era5/era5_forcingMod.F90 +++ b/ldt/metforcing/era5/era5_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/finalize_era5.F90 b/ldt/metforcing/era5/finalize_era5.F90 index 112f7e56c..2ea0fb33d 100644 --- a/ldt/metforcing/era5/finalize_era5.F90 +++ b/ldt/metforcing/era5/finalize_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/get_era5.F90 b/ldt/metforcing/era5/get_era5.F90 index 52b22aa6b..ef125d43c 100644 --- a/ldt/metforcing/era5/get_era5.F90 +++ b/ldt/metforcing/era5/get_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/read_era5.F90 b/ldt/metforcing/era5/read_era5.F90 index 52550422b..0f818acc2 100644 --- a/ldt/metforcing/era5/read_era5.F90 +++ b/ldt/metforcing/era5/read_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/read_era5_elev.F90 b/ldt/metforcing/era5/read_era5_elev.F90 index 8f5360729..de0f874d8 100644 --- a/ldt/metforcing/era5/read_era5_elev.F90 +++ b/ldt/metforcing/era5/read_era5_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/readcrd_era5.F90 b/ldt/metforcing/era5/readcrd_era5.F90 index eb2516ce9..0715fdc25 100644 --- a/ldt/metforcing/era5/readcrd_era5.F90 +++ b/ldt/metforcing/era5/readcrd_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/reset_era5.F90 b/ldt/metforcing/era5/reset_era5.F90 index 0cf11163c..786fe9899 100644 --- a/ldt/metforcing/era5/reset_era5.F90 +++ b/ldt/metforcing/era5/reset_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/era5/timeinterp_era5.F90 b/ldt/metforcing/era5/timeinterp_era5.F90 index afb46f839..89b5de718 100644 --- a/ldt/metforcing/era5/timeinterp_era5.F90 +++ b/ldt/metforcing/era5/timeinterp_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/create_gdasf9_filename.F90 b/ldt/metforcing/gdas/create_gdasf9_filename.F90 index 88a50f6ed..948610bc0 100644 --- a/ldt/metforcing/gdas/create_gdasf9_filename.F90 +++ b/ldt/metforcing/gdas/create_gdasf9_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/create_gdasfilename.F90 b/ldt/metforcing/gdas/create_gdasfilename.F90 index effa0d13c..d7f2ab7e2 100644 --- a/ldt/metforcing/gdas/create_gdasfilename.F90 +++ b/ldt/metforcing/gdas/create_gdasfilename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/finalize_gdas.F90 b/ldt/metforcing/gdas/finalize_gdas.F90 index e971652d5..388ddd5b9 100644 --- a/ldt/metforcing/gdas/finalize_gdas.F90 +++ b/ldt/metforcing/gdas/finalize_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/gdas_forcingMod.F90 b/ldt/metforcing/gdas/gdas_forcingMod.F90 index 9640f0a11..773982dc0 100644 --- a/ldt/metforcing/gdas/gdas_forcingMod.F90 +++ b/ldt/metforcing/gdas/gdas_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/get_gdas.F90 b/ldt/metforcing/gdas/get_gdas.F90 index c19a904f6..59e1aff55 100644 --- a/ldt/metforcing/gdas/get_gdas.F90 +++ b/ldt/metforcing/gdas/get_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/read_gdas.F90 b/ldt/metforcing/gdas/read_gdas.F90 index bcd6b4828..a37c9dd33 100644 --- a/ldt/metforcing/gdas/read_gdas.F90 +++ b/ldt/metforcing/gdas/read_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/read_gdas_elev.F90 b/ldt/metforcing/gdas/read_gdas_elev.F90 index e890bcdec..d06a0bc0c 100644 --- a/ldt/metforcing/gdas/read_gdas_elev.F90 +++ b/ldt/metforcing/gdas/read_gdas_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/read_gdaselev_ldtproc.F90 b/ldt/metforcing/gdas/read_gdaselev_ldtproc.F90 index 02c7df635..0f33b0cc7 100644 --- a/ldt/metforcing/gdas/read_gdaselev_ldtproc.F90 +++ b/ldt/metforcing/gdas/read_gdaselev_ldtproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/readcrd_gdas.F90 b/ldt/metforcing/gdas/readcrd_gdas.F90 index 6ceab4551..506647134 100644 --- a/ldt/metforcing/gdas/readcrd_gdas.F90 +++ b/ldt/metforcing/gdas/readcrd_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/reset_gdas.F90 b/ldt/metforcing/gdas/reset_gdas.F90 index f2bf3142c..33e498781 100644 --- a/ldt/metforcing/gdas/reset_gdas.F90 +++ b/ldt/metforcing/gdas/reset_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gdas/timeinterp_gdas.F90 b/ldt/metforcing/gdas/timeinterp_gdas.F90 index f38cd560d..11f3f53ce 100644 --- a/ldt/metforcing/gdas/timeinterp_gdas.F90 +++ b/ldt/metforcing/gdas/timeinterp_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/finalize_geos5fcst.F90 b/ldt/metforcing/geos5fcst/finalize_geos5fcst.F90 index 0164a8b0f..7d73cda30 100644 --- a/ldt/metforcing/geos5fcst/finalize_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/finalize_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/geos5fcst_forcingMod.F90 b/ldt/metforcing/geos5fcst/geos5fcst_forcingMod.F90 index f4a024cb1..44f433f62 100644 --- a/ldt/metforcing/geos5fcst/geos5fcst_forcingMod.F90 +++ b/ldt/metforcing/geos5fcst/geos5fcst_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/get_geos5fcst.F90 b/ldt/metforcing/geos5fcst/get_geos5fcst.F90 index 57b37ed2f..05c9e65f5 100644 --- a/ldt/metforcing/geos5fcst/get_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/get_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/interp_geos5fcst.F90 b/ldt/metforcing/geos5fcst/interp_geos5fcst.F90 index 9c7d785f0..c84771474 100644 --- a/ldt/metforcing/geos5fcst/interp_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/interp_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/read_geos5fcst.F90 b/ldt/metforcing/geos5fcst/read_geos5fcst.F90 index 4619f963f..fd14e3d9b 100644 --- a/ldt/metforcing/geos5fcst/read_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/read_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/readcrd_geos5fcst.F90 b/ldt/metforcing/geos5fcst/readcrd_geos5fcst.F90 index 92262a39d..9f794274c 100644 --- a/ldt/metforcing/geos5fcst/readcrd_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/readcrd_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/reset_geos5fcst.F90 b/ldt/metforcing/geos5fcst/reset_geos5fcst.F90 index 6f3df0fd1..9ff216016 100644 --- a/ldt/metforcing/geos5fcst/reset_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/reset_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/geos5fcst/timeinterp_geos5fcst.F90 b/ldt/metforcing/geos5fcst/timeinterp_geos5fcst.F90 index b09b5e678..af169b7a2 100644 --- a/ldt/metforcing/geos5fcst/timeinterp_geos5fcst.F90 +++ b/ldt/metforcing/geos5fcst/timeinterp_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/create_gfs_f0backup_filename.F90 b/ldt/metforcing/gfs/create_gfs_f0backup_filename.F90 index 051e945c9..36dbe7688 100644 --- a/ldt/metforcing/gfs/create_gfs_f0backup_filename.F90 +++ b/ldt/metforcing/gfs/create_gfs_f0backup_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/create_gfsfilename.F90 b/ldt/metforcing/gfs/create_gfsfilename.F90 index e5992de53..f03d75661 100644 --- a/ldt/metforcing/gfs/create_gfsfilename.F90 +++ b/ldt/metforcing/gfs/create_gfsfilename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/finalize_gfs.F90 b/ldt/metforcing/gfs/finalize_gfs.F90 index abe9e1ac2..f1ef142c4 100644 --- a/ldt/metforcing/gfs/finalize_gfs.F90 +++ b/ldt/metforcing/gfs/finalize_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/get_gfs.F90 b/ldt/metforcing/gfs/get_gfs.F90 index 2697d7a04..054e67def 100644 --- a/ldt/metforcing/gfs/get_gfs.F90 +++ b/ldt/metforcing/gfs/get_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/gfs_forcingMod.F90 b/ldt/metforcing/gfs/gfs_forcingMod.F90 index b0309e353..a8060bfc9 100644 --- a/ldt/metforcing/gfs/gfs_forcingMod.F90 +++ b/ldt/metforcing/gfs/gfs_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/read_gfs.F90 b/ldt/metforcing/gfs/read_gfs.F90 index 658edc32f..1d6d7d610 100644 --- a/ldt/metforcing/gfs/read_gfs.F90 +++ b/ldt/metforcing/gfs/read_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/read_gfs_elev.F90 b/ldt/metforcing/gfs/read_gfs_elev.F90 index b6f260557..985ff2af6 100644 --- a/ldt/metforcing/gfs/read_gfs_elev.F90 +++ b/ldt/metforcing/gfs/read_gfs_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/readcrd_gfs.F90 b/ldt/metforcing/gfs/readcrd_gfs.F90 index 5da67c631..7298e342d 100644 --- a/ldt/metforcing/gfs/readcrd_gfs.F90 +++ b/ldt/metforcing/gfs/readcrd_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gfs/timeinterp_gfs.F90 b/ldt/metforcing/gfs/timeinterp_gfs.F90 index 40201ab75..8da42813b 100644 --- a/ldt/metforcing/gfs/timeinterp_gfs.F90 +++ b/ldt/metforcing/gfs/timeinterp_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gldas/gldas_forcingMod.F90 b/ldt/metforcing/gldas/gldas_forcingMod.F90 index 07ee74d3a..3b99d7f7a 100644 --- a/ldt/metforcing/gldas/gldas_forcingMod.F90 +++ b/ldt/metforcing/gldas/gldas_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gswp1/gswp1_forcingMod.F90 b/ldt/metforcing/gswp1/gswp1_forcingMod.F90 index be9b15c57..dbc95168b 100644 --- a/ldt/metforcing/gswp1/gswp1_forcingMod.F90 +++ b/ldt/metforcing/gswp1/gswp1_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/gswp2/gswp2_forcingMod.F90 b/ldt/metforcing/gswp2/gswp2_forcingMod.F90 index d07f5bcf3..50ec837e7 100644 --- a/ldt/metforcing/gswp2/gswp2_forcingMod.F90 +++ b/ldt/metforcing/gswp2/gswp2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/finalize_merra2.F90 b/ldt/metforcing/merra2/finalize_merra2.F90 index a610ca771..7e8dd7429 100644 --- a/ldt/metforcing/merra2/finalize_merra2.F90 +++ b/ldt/metforcing/merra2/finalize_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/get_merra2.F90 b/ldt/metforcing/merra2/get_merra2.F90 index fb6ed64b1..8af0cd198 100644 --- a/ldt/metforcing/merra2/get_merra2.F90 +++ b/ldt/metforcing/merra2/get_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/merra2_forcingMod.F90 b/ldt/metforcing/merra2/merra2_forcingMod.F90 index 423d87043..960377c99 100644 --- a/ldt/metforcing/merra2/merra2_forcingMod.F90 +++ b/ldt/metforcing/merra2/merra2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/read_merra2.F90 b/ldt/metforcing/merra2/read_merra2.F90 index c73087c4d..d6ae1b339 100644 --- a/ldt/metforcing/merra2/read_merra2.F90 +++ b/ldt/metforcing/merra2/read_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/read_merra2_elev.F90 b/ldt/metforcing/merra2/read_merra2_elev.F90 index 8ecd696ff..d1564d046 100644 --- a/ldt/metforcing/merra2/read_merra2_elev.F90 +++ b/ldt/metforcing/merra2/read_merra2_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/readcrd_merra2.F90 b/ldt/metforcing/merra2/readcrd_merra2.F90 index d72bb6012..373f8a6ad 100644 --- a/ldt/metforcing/merra2/readcrd_merra2.F90 +++ b/ldt/metforcing/merra2/readcrd_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/reset_merra2.F90 b/ldt/metforcing/merra2/reset_merra2.F90 index 10c0189cd..bfd4d60e9 100644 --- a/ldt/metforcing/merra2/reset_merra2.F90 +++ b/ldt/metforcing/merra2/reset_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/merra2/timeinterp_merra2.F90 b/ldt/metforcing/merra2/timeinterp_merra2.F90 index 22c483379..f1e592d2b 100644 --- a/ldt/metforcing/merra2/timeinterp_merra2.F90 +++ b/ldt/metforcing/merra2/timeinterp_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/create_nam242f9_filename.F90 b/ldt/metforcing/nam242/create_nam242f9_filename.F90 index ea7607b23..72039198f 100644 --- a/ldt/metforcing/nam242/create_nam242f9_filename.F90 +++ b/ldt/metforcing/nam242/create_nam242f9_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/create_nam242filename.F90 b/ldt/metforcing/nam242/create_nam242filename.F90 index 010933e3e..9cf8119f6 100644 --- a/ldt/metforcing/nam242/create_nam242filename.F90 +++ b/ldt/metforcing/nam242/create_nam242filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/finalize_nam242.F90 b/ldt/metforcing/nam242/finalize_nam242.F90 index 92dd2b6da..d4a5106f3 100644 --- a/ldt/metforcing/nam242/finalize_nam242.F90 +++ b/ldt/metforcing/nam242/finalize_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/get_nam242.F90 b/ldt/metforcing/nam242/get_nam242.F90 index 57e23a265..3dbabdd97 100644 --- a/ldt/metforcing/nam242/get_nam242.F90 +++ b/ldt/metforcing/nam242/get_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/nam242_forcingMod.F90 b/ldt/metforcing/nam242/nam242_forcingMod.F90 index a59ac8b41..fde12eb35 100644 --- a/ldt/metforcing/nam242/nam242_forcingMod.F90 +++ b/ldt/metforcing/nam242/nam242_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/read_nam242.F90 b/ldt/metforcing/nam242/read_nam242.F90 index 7ea03621f..dca64b40f 100644 --- a/ldt/metforcing/nam242/read_nam242.F90 +++ b/ldt/metforcing/nam242/read_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/read_nam242_elev.F90 b/ldt/metforcing/nam242/read_nam242_elev.F90 index dec2c7acf..5dd2734bc 100644 --- a/ldt/metforcing/nam242/read_nam242_elev.F90 +++ b/ldt/metforcing/nam242/read_nam242_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/readcrd_nam242.F90 b/ldt/metforcing/nam242/readcrd_nam242.F90 index 0491da066..fa5c5b094 100644 --- a/ldt/metforcing/nam242/readcrd_nam242.F90 +++ b/ldt/metforcing/nam242/readcrd_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/reset_nam242.F90 b/ldt/metforcing/nam242/reset_nam242.F90 index 63f16b5c6..c9bc5894f 100644 --- a/ldt/metforcing/nam242/reset_nam242.F90 +++ b/ldt/metforcing/nam242/reset_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nam242/timeinterp_nam242.F90 b/ldt/metforcing/nam242/timeinterp_nam242.F90 index f357a8f49..072e1f181 100644 --- a/ldt/metforcing/nam242/timeinterp_nam242.F90 +++ b/ldt/metforcing/nam242/timeinterp_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/narr/narr_forcingMod.F90 b/ldt/metforcing/narr/narr_forcingMod.F90 index 0f516233a..d067d3400 100644 --- a/ldt/metforcing/narr/narr_forcingMod.F90 +++ b/ldt/metforcing/narr/narr_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/finalize_nldas2.F90 b/ldt/metforcing/nldas2/finalize_nldas2.F90 index eda514e73..8a3cb4897 100644 --- a/ldt/metforcing/nldas2/finalize_nldas2.F90 +++ b/ldt/metforcing/nldas2/finalize_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/get_gesdisc_filenames.F90 b/ldt/metforcing/nldas2/get_gesdisc_filenames.F90 index eaebb1ed3..7b4c91c84 100755 --- a/ldt/metforcing/nldas2/get_gesdisc_filenames.F90 +++ b/ldt/metforcing/nldas2/get_gesdisc_filenames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/get_ncep_filenames.F90 b/ldt/metforcing/nldas2/get_ncep_filenames.F90 index aa1419003..25380206c 100755 --- a/ldt/metforcing/nldas2/get_ncep_filenames.F90 +++ b/ldt/metforcing/nldas2/get_ncep_filenames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/get_nldas2.F90 b/ldt/metforcing/nldas2/get_nldas2.F90 index e2048c492..5fa0b1f7f 100644 --- a/ldt/metforcing/nldas2/get_nldas2.F90 +++ b/ldt/metforcing/nldas2/get_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/nldas2_ec_removal.F90 b/ldt/metforcing/nldas2/nldas2_ec_removal.F90 index 370b1e83c..6cddffce8 100644 --- a/ldt/metforcing/nldas2/nldas2_ec_removal.F90 +++ b/ldt/metforcing/nldas2/nldas2_ec_removal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/nldas2_forcingMod.F90 b/ldt/metforcing/nldas2/nldas2_forcingMod.F90 index 9e5477267..566b4fdd5 100644 --- a/ldt/metforcing/nldas2/nldas2_forcingMod.F90 +++ b/ldt/metforcing/nldas2/nldas2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/read_nldas2_elev.F90 b/ldt/metforcing/nldas2/read_nldas2_elev.F90 index ca935350b..24d19f854 100644 --- a/ldt/metforcing/nldas2/read_nldas2_elev.F90 +++ b/ldt/metforcing/nldas2/read_nldas2_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/read_nldas2a.F90 b/ldt/metforcing/nldas2/read_nldas2a.F90 index 14cc7e8f5..8d269a1d6 100644 --- a/ldt/metforcing/nldas2/read_nldas2a.F90 +++ b/ldt/metforcing/nldas2/read_nldas2a.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/read_nldas2b.F90 b/ldt/metforcing/nldas2/read_nldas2b.F90 index c0743c826..0d4847c82 100644 --- a/ldt/metforcing/nldas2/read_nldas2b.F90 +++ b/ldt/metforcing/nldas2/read_nldas2b.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/readcrd_nldas2.F90 b/ldt/metforcing/nldas2/readcrd_nldas2.F90 index 61f800af3..00c27d1d9 100644 --- a/ldt/metforcing/nldas2/readcrd_nldas2.F90 +++ b/ldt/metforcing/nldas2/readcrd_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/reset_nldas2.F90 b/ldt/metforcing/nldas2/reset_nldas2.F90 index 543c8734e..3d2589bd2 100644 --- a/ldt/metforcing/nldas2/reset_nldas2.F90 +++ b/ldt/metforcing/nldas2/reset_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/nldas2/timeinterp_nldas2.F90 b/ldt/metforcing/nldas2/timeinterp_nldas2.F90 index 6d5b3933d..fdb90cbd9 100644 --- a/ldt/metforcing/nldas2/timeinterp_nldas2.F90 +++ b/ldt/metforcing/nldas2/timeinterp_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/finalize_princeton.F90 b/ldt/metforcing/princeton/finalize_princeton.F90 index 9543ff2c8..66a89b0ad 100644 --- a/ldt/metforcing/princeton/finalize_princeton.F90 +++ b/ldt/metforcing/princeton/finalize_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/get_princeton.F90 b/ldt/metforcing/princeton/get_princeton.F90 index 5233c0447..a5161ba36 100644 --- a/ldt/metforcing/princeton/get_princeton.F90 +++ b/ldt/metforcing/princeton/get_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/princeton_forcingMod.F90 b/ldt/metforcing/princeton/princeton_forcingMod.F90 index d5d6e0b23..d422aee84 100644 --- a/ldt/metforcing/princeton/princeton_forcingMod.F90 +++ b/ldt/metforcing/princeton/princeton_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/read_princeton.F90 b/ldt/metforcing/princeton/read_princeton.F90 index dd1c95bfc..d770d6ff7 100644 --- a/ldt/metforcing/princeton/read_princeton.F90 +++ b/ldt/metforcing/princeton/read_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/read_princeton_elev.F90 b/ldt/metforcing/princeton/read_princeton_elev.F90 index dd93595e4..90c70fc91 100644 --- a/ldt/metforcing/princeton/read_princeton_elev.F90 +++ b/ldt/metforcing/princeton/read_princeton_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/readcrd_princeton.F90 b/ldt/metforcing/princeton/readcrd_princeton.F90 index 4297d0a4b..0aae63622 100644 --- a/ldt/metforcing/princeton/readcrd_princeton.F90 +++ b/ldt/metforcing/princeton/readcrd_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/reset_princeton.F90 b/ldt/metforcing/princeton/reset_princeton.F90 index d6fbd9ed2..ded57bfcd 100644 --- a/ldt/metforcing/princeton/reset_princeton.F90 +++ b/ldt/metforcing/princeton/reset_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/princeton/timeinterp_princeton.F90 b/ldt/metforcing/princeton/timeinterp_princeton.F90 index b82592b7a..a7efe37b6 100644 --- a/ldt/metforcing/princeton/timeinterp_princeton.F90 +++ b/ldt/metforcing/princeton/timeinterp_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/finalize_stg2.F90 b/ldt/metforcing/stg2/finalize_stg2.F90 index 9b7586c4a..119bed4ba 100644 --- a/ldt/metforcing/stg2/finalize_stg2.F90 +++ b/ldt/metforcing/stg2/finalize_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/get_stg2.F90 b/ldt/metforcing/stg2/get_stg2.F90 index 5225cdc32..f41c4bc85 100644 --- a/ldt/metforcing/stg2/get_stg2.F90 +++ b/ldt/metforcing/stg2/get_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/interp_stg2.F90 b/ldt/metforcing/stg2/interp_stg2.F90 index c982abeec..f11115433 100644 --- a/ldt/metforcing/stg2/interp_stg2.F90 +++ b/ldt/metforcing/stg2/interp_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/read_stg2.F90 b/ldt/metforcing/stg2/read_stg2.F90 index fc5b1eb09..1b6d06abf 100644 --- a/ldt/metforcing/stg2/read_stg2.F90 +++ b/ldt/metforcing/stg2/read_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/readcrd_stg2.F90 b/ldt/metforcing/stg2/readcrd_stg2.F90 index f77da854a..f367c0a94 100644 --- a/ldt/metforcing/stg2/readcrd_stg2.F90 +++ b/ldt/metforcing/stg2/readcrd_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/stg2_forcingMod.F90 b/ldt/metforcing/stg2/stg2_forcingMod.F90 index efed8425b..c7ce14adf 100644 --- a/ldt/metforcing/stg2/stg2_forcingMod.F90 +++ b/ldt/metforcing/stg2/stg2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/stg2file.F90 b/ldt/metforcing/stg2/stg2file.F90 index c64ab8461..d9d1dc769 100644 --- a/ldt/metforcing/stg2/stg2file.F90 +++ b/ldt/metforcing/stg2/stg2file.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg2/timeinterp_stg2.F90 b/ldt/metforcing/stg2/timeinterp_stg2.F90 index 3d2763a41..391b74b09 100644 --- a/ldt/metforcing/stg2/timeinterp_stg2.F90 +++ b/ldt/metforcing/stg2/timeinterp_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/finalize_stg4.F90 b/ldt/metforcing/stg4/finalize_stg4.F90 index 8d94ce93c..762019227 100644 --- a/ldt/metforcing/stg4/finalize_stg4.F90 +++ b/ldt/metforcing/stg4/finalize_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/get_stg4.F90 b/ldt/metforcing/stg4/get_stg4.F90 index 93482820c..31c81292c 100644 --- a/ldt/metforcing/stg4/get_stg4.F90 +++ b/ldt/metforcing/stg4/get_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/interp_stg4.F90 b/ldt/metforcing/stg4/interp_stg4.F90 index 0109b8c3f..f68401f78 100644 --- a/ldt/metforcing/stg4/interp_stg4.F90 +++ b/ldt/metforcing/stg4/interp_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/read_stg4.F90 b/ldt/metforcing/stg4/read_stg4.F90 index ca8fa6879..b17d3456c 100644 --- a/ldt/metforcing/stg4/read_stg4.F90 +++ b/ldt/metforcing/stg4/read_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/readcrd_stg4.F90 b/ldt/metforcing/stg4/readcrd_stg4.F90 index ca239927c..707846b3f 100644 --- a/ldt/metforcing/stg4/readcrd_stg4.F90 +++ b/ldt/metforcing/stg4/readcrd_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/reset_stg4.F90 b/ldt/metforcing/stg4/reset_stg4.F90 index 77e62c7f5..eecd70332 100644 --- a/ldt/metforcing/stg4/reset_stg4.F90 +++ b/ldt/metforcing/stg4/reset_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/stg4_forcingMod.F90 b/ldt/metforcing/stg4/stg4_forcingMod.F90 index b112a6d99..69321a7c3 100644 --- a/ldt/metforcing/stg4/stg4_forcingMod.F90 +++ b/ldt/metforcing/stg4/stg4_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/stg4file.F90 b/ldt/metforcing/stg4/stg4file.F90 index b589a7c9f..32b1ca4ab 100644 --- a/ldt/metforcing/stg4/stg4file.F90 +++ b/ldt/metforcing/stg4/stg4file.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/metforcing/stg4/timeinterp_stg4.F90 b/ldt/metforcing/stg4/timeinterp_stg4.F90 index c471a7d25..119bd121a 100644 --- a/ldt/metforcing/stg4/timeinterp_stg4.F90 +++ b/ldt/metforcing/stg4/timeinterp_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/NatureRun/LISout/LISoutNatureRun_Mod.F90 b/ldt/obsSim/NatureRun/LISout/LISoutNatureRun_Mod.F90 index 75d5ea253..8b3df514a 100644 --- a/ldt/obsSim/NatureRun/LISout/LISoutNatureRun_Mod.F90 +++ b/ldt/obsSim/NatureRun/LISout/LISoutNatureRun_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/NatureRun/LISout/readLISoutNatureRun.F90 b/ldt/obsSim/NatureRun/LISout/readLISoutNatureRun.F90 index 207d7d6fe..42b2b6051 100644 --- a/ldt/obsSim/NatureRun/LISout/readLISoutNatureRun.F90 +++ b/ldt/obsSim/NatureRun/LISout/readLISoutNatureRun.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/AMSR2/AMSR2OSSEmask_Mod.F90 b/ldt/obsSim/OSSEmask/AMSR2/AMSR2OSSEmask_Mod.F90 index 011b7ec1d..28cefb9f3 100644 --- a/ldt/obsSim/OSSEmask/AMSR2/AMSR2OSSEmask_Mod.F90 +++ b/ldt/obsSim/OSSEmask/AMSR2/AMSR2OSSEmask_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/AMSR2/readAMSR2OSSEmask.F90 b/ldt/obsSim/OSSEmask/AMSR2/readAMSR2OSSEmask.F90 index 5cc537b8d..6529ce857 100644 --- a/ldt/obsSim/OSSEmask/AMSR2/readAMSR2OSSEmask.F90 +++ b/ldt/obsSim/OSSEmask/AMSR2/readAMSR2OSSEmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/LISout/LISoutOSSEmask_Mod.F90 b/ldt/obsSim/OSSEmask/LISout/LISoutOSSEmask_Mod.F90 index c0d866d8a..b434a6c5e 100644 --- a/ldt/obsSim/OSSEmask/LISout/LISoutOSSEmask_Mod.F90 +++ b/ldt/obsSim/OSSEmask/LISout/LISoutOSSEmask_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/LISout/readLISoutOSSEmask.F90 b/ldt/obsSim/OSSEmask/LISout/readLISoutOSSEmask.F90 index 08f1acf9c..c29a2e5f7 100644 --- a/ldt/obsSim/OSSEmask/LISout/readLISoutOSSEmask.F90 +++ b/ldt/obsSim/OSSEmask/LISout/readLISoutOSSEmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/MODIS/MODISOSSEmask_Mod.F90 b/ldt/obsSim/OSSEmask/MODIS/MODISOSSEmask_Mod.F90 index fed3a98fe..d402abdab 100644 --- a/ldt/obsSim/OSSEmask/MODIS/MODISOSSEmask_Mod.F90 +++ b/ldt/obsSim/OSSEmask/MODIS/MODISOSSEmask_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/MODIS/readMODISOSSEmask.F90 b/ldt/obsSim/OSSEmask/MODIS/readMODISOSSEmask.F90 index ddbd1f99f..1de2a643c 100644 --- a/ldt/obsSim/OSSEmask/MODIS/readMODISOSSEmask.F90 +++ b/ldt/obsSim/OSSEmask/MODIS/readMODISOSSEmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/Sentinel1A/Sentinel1AOSSEmask_Mod.F90 b/ldt/obsSim/OSSEmask/Sentinel1A/Sentinel1AOSSEmask_Mod.F90 index a0bc20c4f..f10e55148 100644 --- a/ldt/obsSim/OSSEmask/Sentinel1A/Sentinel1AOSSEmask_Mod.F90 +++ b/ldt/obsSim/OSSEmask/Sentinel1A/Sentinel1AOSSEmask_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/Sentinel1A/readSentinel1AOSSEmask.F90 b/ldt/obsSim/OSSEmask/Sentinel1A/readSentinel1AOSSEmask.F90 index 30465751f..c58ec0c0a 100644 --- a/ldt/obsSim/OSSEmask/Sentinel1A/readSentinel1AOSSEmask.F90 +++ b/ldt/obsSim/OSSEmask/Sentinel1A/readSentinel1AOSSEmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/TSMM/TSMMOSSEmask_Mod.F90 b/ldt/obsSim/OSSEmask/TSMM/TSMMOSSEmask_Mod.F90 index 620e54cee..ce4ad8136 100644 --- a/ldt/obsSim/OSSEmask/TSMM/TSMMOSSEmask_Mod.F90 +++ b/ldt/obsSim/OSSEmask/TSMM/TSMMOSSEmask_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/obsSim/OSSEmask/TSMM/readTSMMOSSEmask.F90 b/ldt/obsSim/OSSEmask/TSMM/readTSMMOSSEmask.F90 index d44f43d00..7fc126ab3 100644 --- a/ldt/obsSim/OSSEmask/TSMM/readTSMMOSSEmask.F90 +++ b/ldt/obsSim/OSSEmask/TSMM/readTSMMOSSEmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/CLM2/CLM2_parmsMod.F90 b/ldt/params/CLM2/CLM2_parmsMod.F90 index e6d58ab81..4bbf13148 100644 --- a/ldt/params/CLM2/CLM2_parmsMod.F90 +++ b/ldt/params/CLM2/CLM2_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/CLM45/CLM45_parmsMod.F90 b/ldt/params/CLM45/CLM45_parmsMod.F90 index 4c0873976..5d62cb996 100644 --- a/ldt/params/CLM45/CLM45_parmsMod.F90 +++ b/ldt/params/CLM45/CLM45_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/CLM45/read_netcdf_4d.F90 b/ldt/params/CLM45/read_netcdf_4d.F90 index b0ad9470e..5012bdeb2 100644 --- a/ldt/params/CLM45/read_netcdf_4d.F90 +++ b/ldt/params/CLM45/read_netcdf_4d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Crocus/Crocus_parmsMod.F90 b/ldt/params/Crocus/Crocus_parmsMod.F90 index b8825f7c9..e7e01141e 100755 --- a/ldt/params/Crocus/Crocus_parmsMod.F90 +++ b/ldt/params/Crocus/Crocus_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Crocus/read_CONSTANT_slopetype_cro.F90 b/ldt/params/Crocus/read_CONSTANT_slopetype_cro.F90 index 5f1573d6a..0dc554902 100755 --- a/ldt/params/Crocus/read_CONSTANT_slopetype_cro.F90 +++ b/ldt/params/Crocus/read_CONSTANT_slopetype_cro.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Crocus/read_CONSTANT_tbot_cro.F90 b/ldt/params/Crocus/read_CONSTANT_tbot_cro.F90 index 1b74f296c..3b68bc012 100755 --- a/ldt/params/Crocus/read_CONSTANT_tbot_cro.F90 +++ b/ldt/params/Crocus/read_CONSTANT_tbot_cro.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Crocus/read_ISLSCP1_cro_tbot.F90 b/ldt/params/Crocus/read_ISLSCP1_cro_tbot.F90 index 2cb5307fe..3a9466793 100755 --- a/ldt/params/Crocus/read_ISLSCP1_cro_tbot.F90 +++ b/ldt/params/Crocus/read_ISLSCP1_cro_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Crocus/read_NCEP_GFS_cro_tbot.F90 b/ldt/params/Crocus/read_NCEP_GFS_cro_tbot.F90 index 1c0c505b4..4476c6f3b 100755 --- a/ldt/params/Crocus/read_NCEP_GFS_cro_tbot.F90 +++ b/ldt/params/Crocus/read_NCEP_GFS_cro_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Crocus/read_NCEP_cro_tbot.F90 b/ldt/params/Crocus/read_NCEP_cro_tbot.F90 index e50096b48..bac5a6a27 100755 --- a/ldt/params/Crocus/read_NCEP_cro_tbot.F90 +++ b/ldt/params/Crocus/read_NCEP_cro_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/FLAKE/FLAKE_parmsMod.F90 b/ldt/params/FLAKE/FLAKE_parmsMod.F90 index d863a793d..b964f3a69 100644 --- a/ldt/params/FLAKE/FLAKE_parmsMod.F90 +++ b/ldt/params/FLAKE/FLAKE_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/FLAKE/read_GLWD_inlandwatertype.F90 b/ldt/params/FLAKE/read_GLWD_inlandwatertype.F90 index fd73bb615..f93b0f921 100644 --- a/ldt/params/FLAKE/read_GLWD_inlandwatertype.F90 +++ b/ldt/params/FLAKE/read_GLWD_inlandwatertype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/GeoWRSI_parmsMod.F90 b/ldt/params/GeoWRSI/GeoWRSI_parmsMod.F90 index 0b56bdc72..fc9403878 100644 --- a/ldt/params/GeoWRSI/GeoWRSI_parmsMod.F90 +++ b/ldt/params/GeoWRSI/GeoWRSI_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/geowrsi2_arraymgmt_module.F90 b/ldt/params/GeoWRSI/geowrsi2_arraymgmt_module.F90 index 8e4b1cf70..391c909d6 100644 --- a/ldt/params/GeoWRSI/geowrsi2_arraymgmt_module.F90 +++ b/ldt/params/GeoWRSI/geowrsi2_arraymgmt_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/geowrsi2_set_gcoords.F90 b/ldt/params/GeoWRSI/geowrsi2_set_gcoords.F90 index 035a0be30..e17a3df90 100644 --- a/ldt/params/GeoWRSI/geowrsi2_set_gcoords.F90 +++ b/ldt/params/GeoWRSI/geowrsi2_set_gcoords.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_landmask.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_landmask.F90 index 81dc663aa..d2b418fab 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_landmask.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_landmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_lgp.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_lgp.F90 index 0f154bbd9..d63a2e92d 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_lgp.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_lgp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_sos.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_sos.F90 index 618408f23..104e004ce 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_sos.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_sos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_sosanom.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_sosanom.F90 index 68e9e2c8f..18c021206 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_sosanom.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_sosanom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_sosclim.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_sosclim.F90 index ff3cf5f3b..99a50f65c 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_sosclim.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_sosclim.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_whc.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_whc.F90 index 60d99ae25..007be4806 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_whc.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_whc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/GeoWRSI/read_GeoWRSI2_wrsiclim.F90 b/ldt/params/GeoWRSI/read_GeoWRSI2_wrsiclim.F90 index 0be198075..6a3e03f60 100644 --- a/ldt/params/GeoWRSI/read_GeoWRSI2_wrsiclim.F90 +++ b/ldt/params/GeoWRSI/read_GeoWRSI2_wrsiclim.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/HYMAP_parmsMod.F90 b/ldt/params/HYMAP/HYMAP_parmsMod.F90 index 6a26c5fb8..3f707138b 100644 --- a/ldt/params/HYMAP/HYMAP_parmsMod.F90 +++ b/ldt/params/HYMAP/HYMAP_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_baseflow_delay.F90 b/ldt/params/HYMAP/read_HYMAP_baseflow_delay.F90 index 6182f335b..b8a0fcb69 100644 --- a/ldt/params/HYMAP/read_HYMAP_baseflow_delay.F90 +++ b/ldt/params/HYMAP/read_HYMAP_baseflow_delay.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_baseflow_dwi_ratio.F90 b/ldt/params/HYMAP/read_HYMAP_baseflow_dwi_ratio.F90 index 0d77add0f..37c1aa950 100755 --- a/ldt/params/HYMAP/read_HYMAP_baseflow_dwi_ratio.F90 +++ b/ldt/params/HYMAP/read_HYMAP_baseflow_dwi_ratio.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_basin.F90 b/ldt/params/HYMAP/read_HYMAP_basin.F90 index 1ff9b9f8a..b601db7a1 100755 --- a/ldt/params/HYMAP/read_HYMAP_basin.F90 +++ b/ldt/params/HYMAP/read_HYMAP_basin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_basin_mask.F90 b/ldt/params/HYMAP/read_HYMAP_basin_mask.F90 index 2a28f36a1..1cdacb0ac 100644 --- a/ldt/params/HYMAP/read_HYMAP_basin_mask.F90 +++ b/ldt/params/HYMAP/read_HYMAP_basin_mask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_drain_area.F90 b/ldt/params/HYMAP/read_HYMAP_drain_area.F90 index 3809a200e..9195f184f 100755 --- a/ldt/params/HYMAP/read_HYMAP_drain_area.F90 +++ b/ldt/params/HYMAP/read_HYMAP_drain_area.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_fld_height.F90 b/ldt/params/HYMAP/read_HYMAP_fld_height.F90 index 8a5cee7b4..feb4b8f98 100644 --- a/ldt/params/HYMAP/read_HYMAP_fld_height.F90 +++ b/ldt/params/HYMAP/read_HYMAP_fld_height.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_fld_z.F90 b/ldt/params/HYMAP/read_HYMAP_fld_z.F90 index 69c16e529..d1942673b 100644 --- a/ldt/params/HYMAP/read_HYMAP_fld_z.F90 +++ b/ldt/params/HYMAP/read_HYMAP_fld_z.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_flow_dir_x.F90 b/ldt/params/HYMAP/read_HYMAP_flow_dir_x.F90 index af2c10bd5..839cb6575 100644 --- a/ldt/params/HYMAP/read_HYMAP_flow_dir_x.F90 +++ b/ldt/params/HYMAP/read_HYMAP_flow_dir_x.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_flow_dir_y.F90 b/ldt/params/HYMAP/read_HYMAP_flow_dir_y.F90 index 1da2d5556..463720457 100644 --- a/ldt/params/HYMAP/read_HYMAP_flow_dir_y.F90 +++ b/ldt/params/HYMAP/read_HYMAP_flow_dir_y.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_flow_type.F90 b/ldt/params/HYMAP/read_HYMAP_flow_type.F90 index bac6ecc25..c6ea24639 100755 --- a/ldt/params/HYMAP/read_HYMAP_flow_type.F90 +++ b/ldt/params/HYMAP/read_HYMAP_flow_type.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_grid_area.F90 b/ldt/params/HYMAP/read_HYMAP_grid_area.F90 index 2a8c54359..b9bb65b22 100644 --- a/ldt/params/HYMAP/read_HYMAP_grid_area.F90 +++ b/ldt/params/HYMAP/read_HYMAP_grid_area.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_grid_dist.F90 b/ldt/params/HYMAP/read_HYMAP_grid_dist.F90 index c120b0df1..916df3460 100644 --- a/ldt/params/HYMAP/read_HYMAP_grid_dist.F90 +++ b/ldt/params/HYMAP/read_HYMAP_grid_dist.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_grid_elev.F90 b/ldt/params/HYMAP/read_HYMAP_grid_elev.F90 index b557da632..6c3f70407 100644 --- a/ldt/params/HYMAP/read_HYMAP_grid_elev.F90 +++ b/ldt/params/HYMAP/read_HYMAP_grid_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_refq.F90 b/ldt/params/HYMAP/read_HYMAP_refq.F90 index baf7e9e41..884554ac7 100644 --- a/ldt/params/HYMAP/read_HYMAP_refq.F90 +++ b/ldt/params/HYMAP/read_HYMAP_refq.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_river_height.F90 b/ldt/params/HYMAP/read_HYMAP_river_height.F90 index 15dca00a0..8f651fb34 100644 --- a/ldt/params/HYMAP/read_HYMAP_river_height.F90 +++ b/ldt/params/HYMAP/read_HYMAP_river_height.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_river_length.F90 b/ldt/params/HYMAP/read_HYMAP_river_length.F90 index 14a1f13ba..ec8f0d661 100644 --- a/ldt/params/HYMAP/read_HYMAP_river_length.F90 +++ b/ldt/params/HYMAP/read_HYMAP_river_length.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_river_width.F90 b/ldt/params/HYMAP/read_HYMAP_river_width.F90 index 81e76d184..47c0f48db 100644 --- a/ldt/params/HYMAP/read_HYMAP_river_width.F90 +++ b/ldt/params/HYMAP/read_HYMAP_river_width.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_river_z.F90 b/ldt/params/HYMAP/read_HYMAP_river_z.F90 index 5dff1fc4c..d2ec6533d 100644 --- a/ldt/params/HYMAP/read_HYMAP_river_z.F90 +++ b/ldt/params/HYMAP/read_HYMAP_river_z.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_runoff_delay.F90 b/ldt/params/HYMAP/read_HYMAP_runoff_delay.F90 index 266ddbea5..69b4db405 100644 --- a/ldt/params/HYMAP/read_HYMAP_runoff_delay.F90 +++ b/ldt/params/HYMAP/read_HYMAP_runoff_delay.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_runoff_delaym.F90 b/ldt/params/HYMAP/read_HYMAP_runoff_delaym.F90 index 62f3027ce..774b262c3 100644 --- a/ldt/params/HYMAP/read_HYMAP_runoff_delaym.F90 +++ b/ldt/params/HYMAP/read_HYMAP_runoff_delaym.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/HYMAP/read_HYMAP_runoff_dwi_ratio.F90 b/ldt/params/HYMAP/read_HYMAP_runoff_dwi_ratio.F90 index 2baad3fb2..d26bbb831 100755 --- a/ldt/params/HYMAP/read_HYMAP_runoff_dwi_ratio.F90 +++ b/ldt/params/HYMAP/read_HYMAP_runoff_dwi_ratio.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/JULES/JULES50_parmsMod.F90 b/ldt/params/JULES/JULES50_parmsMod.F90 index 833db1642..6e9c9d245 100644 --- a/ldt/params/JULES/JULES50_parmsMod.F90 +++ b/ldt/params/JULES/JULES50_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/JULES/create_soil_albedo_from_whs.F90 b/ldt/params/JULES/create_soil_albedo_from_whs.F90 index 60c9bc865..ff4199daf 100755 --- a/ldt/params/JULES/create_soil_albedo_from_whs.F90 +++ b/ldt/params/JULES/create_soil_albedo_from_whs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/JULES/create_soil_params_from_cap.F90 b/ldt/params/JULES/create_soil_params_from_cap.F90 index 4ec2fc681..5d611b69b 100755 --- a/ldt/params/JULES/create_soil_params_from_cap.F90 +++ b/ldt/params/JULES/create_soil_params_from_cap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/JULES/read_um_soil_params.F90 b/ldt/params/JULES/read_um_soil_params.F90 index 4bdaad09f..0a11c9d44 100755 --- a/ldt/params/JULES/read_um_soil_params.F90 +++ b/ldt/params/JULES/read_um_soil_params.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_AVHRR_lai.F90 b/ldt/params/LAISAI/read_AVHRR_lai.F90 index ac954a531..e7320810c 100644 --- a/ldt/params/LAISAI/read_AVHRR_lai.F90 +++ b/ldt/params/LAISAI/read_AVHRR_lai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_AVHRR_sai.F90 b/ldt/params/LAISAI/read_AVHRR_sai.F90 index 336f5a9ed..db7a2ad83 100644 --- a/ldt/params/LAISAI/read_AVHRR_sai.F90 +++ b/ldt/params/LAISAI/read_AVHRR_sai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_CLSMF25_lai.F90 b/ldt/params/LAISAI/read_CLSMF25_lai.F90 index 29c8f1f98..5249a93c1 100644 --- a/ldt/params/LAISAI/read_CLSMF25_lai.F90 +++ b/ldt/params/LAISAI/read_CLSMF25_lai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_CLSMF25_laimax.F90 b/ldt/params/LAISAI/read_CLSMF25_laimax.F90 index 5e742e0cb..f702a28ea 100644 --- a/ldt/params/LAISAI/read_CLSMF25_laimax.F90 +++ b/ldt/params/LAISAI/read_CLSMF25_laimax.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_CLSMF25_laimin.F90 b/ldt/params/LAISAI/read_CLSMF25_laimin.F90 index 6b11a79ef..b9c4cee1f 100644 --- a/ldt/params/LAISAI/read_CLSMF25_laimin.F90 +++ b/ldt/params/LAISAI/read_CLSMF25_laimin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_CONSTANT_lai.F90 b/ldt/params/LAISAI/read_CONSTANT_lai.F90 index b0083baaa..bef813cdc 100644 --- a/ldt/params/LAISAI/read_CONSTANT_lai.F90 +++ b/ldt/params/LAISAI/read_CONSTANT_lai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/read_CONSTANT_sai.F90 b/ldt/params/LAISAI/read_CONSTANT_sai.F90 index 998229783..aceb6e2c4 100644 --- a/ldt/params/LAISAI/read_CONSTANT_sai.F90 +++ b/ldt/params/LAISAI/read_CONSTANT_sai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/setLAISAIParmsFullnames.F90 b/ldt/params/LAISAI/setLAISAIParmsFullnames.F90 index feb8c4f12..6619108e1 100644 --- a/ldt/params/LAISAI/setLAISAIParmsFullnames.F90 +++ b/ldt/params/LAISAI/setLAISAIParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/set_AVHRR_lai_attribs.F90 b/ldt/params/LAISAI/set_AVHRR_lai_attribs.F90 index b9eb24438..f8dd911bd 100644 --- a/ldt/params/LAISAI/set_AVHRR_lai_attribs.F90 +++ b/ldt/params/LAISAI/set_AVHRR_lai_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/LAISAI/set_CLSMF25_lai_attribs.F90 b/ldt/params/LAISAI/set_CLSMF25_lai_attribs.F90 index 5852093d9..f79ee9560 100644 --- a/ldt/params/LAISAI/set_CLSMF25_lai_attribs.F90 +++ b/ldt/params/LAISAI/set_CLSMF25_lai_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Mosaic/Mosaic_parmsMod.F90 b/ldt/params/Mosaic/Mosaic_parmsMod.F90 index 2af812607..62aa632cd 100644 --- a/ldt/params/Mosaic/Mosaic_parmsMod.F90 +++ b/ldt/params/Mosaic/Mosaic_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/Noah_parmsMod.F90 b/ldt/params/Noah/Noah_parmsMod.F90 index e02798d48..679b31eb7 100644 --- a/ldt/params/Noah/Noah_parmsMod.F90 +++ b/ldt/params/Noah/Noah_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -25,8 +25,9 @@ module Noah_parmsMod ! !REVISION HISTORY: ! ! 08 Aug 2005: Sujay Kumar; Initial implementation -! 04 Aug 2012: K. Arsenault: Made updates to Tbot inputs -! +! 04 Aug 2012: K. Arsenault: Made updates to Tbot inputs +! 27 Aug 2021: Sarith Mahanama: MMF groundwater parameters were added. + use ESMF use LDT_coreMod use LDT_historyMod @@ -34,6 +35,7 @@ module Noah_parmsMod use LDT_logMod use LDT_constantsMod, only : LDT_CONST_PATH_LEN use LDT_paramMaskCheckMod + use MMF_groundwater, ONLY : MMF_BCsReader, cell_area implicit none @@ -64,40 +66,41 @@ module Noah_parmsMod character*50 :: tbot_proj character*50 :: slopetype_proj + character(len=LDT_CONST_PATH_LEN) :: mmf_fdepth_dir + character(len=LDT_CONST_PATH_LEN) :: mmf_rechclim_dir + character(len=LDT_CONST_PATH_LEN) :: mmf_riverbed_dir + character(len=LDT_CONST_PATH_LEN) :: mmf_eqwtd_dir + character(len=LDT_CONST_PATH_LEN) :: mmf_hgtm_dir + character*50 :: mmf_transform + real :: pblh_value ! - Noah LSM-specific: type(LDT_paramEntry) :: tbot ! Bottom temperature (Noah) type(LDT_paramEntry) :: slopetype ! Slope type index (Noah) type(LDT_paramEntry) :: pblh ! Planetary Boundary Layer Height (Noah-MP) - + type(LDT_paramEntry) :: fdepth + type(LDT_paramEntry) :: rechclim + type(LDT_paramEntry) :: riverbed + type(LDT_paramEntry) :: eqwtd + type(LDT_paramEntry) :: areaxy + type(LDT_paramEntry) :: hgtm + end type noah_type_dec type(noah_type_dec), allocatable :: Noah_struc(:) - - contains - subroutine NoahParms_init(flag) - - integer :: flag - - if(flag.eq.0) then - call NoahParms_init_LIS() - elseif(flag.eq.1) then - call NoahParms_init_LISHydro(flag) - endif - end subroutine NoahParms_init - !BOP ! -! !ROUTINE: NoahParms_init_LIS -! \label{NoahParms_init_LIS} +! !ROUTINE: NoahParms_init +! \label{NoahParms_init} ! ! !INTERFACE: - subroutine NoahParms_init_LIS -! !USES: + + subroutine NoahParms_init (flag) + ! !USES: use LDT_fileIOMod, only : LDT_readDomainConfigSpecs use LDT_logMod, only : LDT_verify use LDT_paramOptCheckMod, only: LDT_noahparmsOptChecks, & @@ -116,6 +119,7 @@ subroutine NoahParms_init_LIS ! !EOP implicit none + integer, intent (in) :: flag integer :: n,i,c,r,m integer :: rc real :: temp @@ -126,14 +130,25 @@ subroutine NoahParms_init_LIS real, allocatable :: force_elev(:,:) character*50 :: tbot_proj character*50 :: slopetype_proj + character*50 :: MMF_proj + type(MMF_BCsReader):: MBR_FDEPTH, MBR_RECH, MBR_RIVERBED, MBR_WTD, MBR_HGT + logical :: run_mmf = .false. ! _____________________________________________________________________ allocate( Noah_struc(LDT_rc%nnest) ) do n=1,LDT_rc%nnest - call set_param_attribs(Noah_struc(n)%tbot, "TBOT",& - units="K", & - full_name="Noah LSM bottom temperature") + + if(flag == 0) then + call set_param_attribs(Noah_struc(n)%tbot, "TBOT",& + units="K", & + full_name="Noah LSM bottom temperature") + elseif (flag == 1) then + call set_param_attribs(Noah_struc(n)%tbot, "SOILTEMP",& + units="K", & + full_name="Noah LSM bottom temperature") + endif + call set_param_attribs(Noah_struc(n)%slopetype,"SLOPETYPE",& units="-", & full_name="Noah LSM slope type") @@ -143,6 +158,30 @@ subroutine NoahParms_init_LIS call set_param_attribs(Noah_struc(n)%pblh,"NOAHMP36_PBLH",& units="m", & full_name="Noah-MP LSM planetary boundary height") + + if (LDT_rc%lsm.eq."Noah-MP.4.0.1") then + call ESMF_ConfigGetAttribute(LDT_config, run_mmf,label='Process Noah-MP-4.0.1 MMF groundwater parameters:', DEFAULT= .false., rc=rc) + if (run_mmf) then + call set_param_attribs(Noah_struc(n)%fdepth,"MMF_FDEPTH",& + units="m", & + full_name="transmissivity e-folding depth") + call set_param_attribs(Noah_struc(n)%rechclim,"MMF_RECHCLIM",& + units="mm", & + full_name="climatological recharge") + call set_param_attribs(Noah_struc(n)%riverbed,"MMF_RIVERBED",& + units="m", & + full_name="riverbed elevation") + call set_param_attribs(Noah_struc(n)%eqwtd,"MMF_EQWTD",& + units="m", & + full_name="equilibrium water table depth") + call set_param_attribs(Noah_struc(n)%areaxy,"AREAXY",& + units="km^2", & + full_name="area of the grid cell") + call set_param_attribs(Noah_struc(n)%hgtm,"MMF_HGTM",& + units="m MSL", & + full_name="GMTED2010 30-arc-second topography height") + endif + endif endif enddo @@ -455,388 +494,131 @@ subroutine NoahParms_init_LIS enddo endif - - end subroutine NoahParms_init_LIS - -!BOP -! -! !ROUTINE: NoahParms_init -! \label{NoahParms_init} -! -! !INTERFACE: - subroutine NoahParms_init_LISHydro(flag) -! !USES: - use LDT_fileIOMod, only : LDT_readDomainConfigSpecs - use LDT_logMod, only : LDT_verify - use LDT_paramOptCheckMod, only: LDT_noahparmsOptChecks, & - LDT_gridOptChecks,LDT_soilsOptChecks -! -! !DESCRIPTION: -! -! Allocates memory for data structures for reading -! the noahParms fraction datasets -! -! The routines invoked are: -! \begin{description} -! \item[noahParmssetup](\ref{noahParmssetup}) \newline -! calls the registry to invoke the noahParms setup methods. -! \end{description} -! -!EOP - implicit none - integer :: flag - integer :: n,i,c,r,m - integer :: rc - real :: temp - logical :: file_exists - logical :: check_data - type(LDT_fillopts) :: tbot - type(LDT_fillopts) :: slopetype - real, allocatable :: force_elev(:,:) - character*50 :: tbot_proj - character*50 :: slopetype_proj - - character*100 :: SOILTEMP - character*100 :: SLOPECAT -! _____________________________________________________________________ - - SOILTEMP = "TBOT" - SLOPECAT = "SLOPETYPE" - allocate( Noah_struc(LDT_rc%nnest) ) - do n=1,LDT_rc%nnest - call set_param_attribs(Noah_struc(n)%tbot, "SOILTEMP",& - units="K", & - full_name="Noah LSM bottom temperature") - call set_param_attribs(Noah_struc(n)%slopetype,"SLOPETYPE",& - units="-", & - full_name="Noah LSM slope type") - - if ((LDT_rc%lsm.eq."Noah-MP.3.6").or. & - (LDT_rc%lsm.eq."Noah-MP.4.0.1")) then - call set_param_attribs(Noah_struc(n)%pblh,"NOAHMP36_PBLH",& - units="m", & - full_name="Noah-MP LSM planetary boundary height") - endif - enddo - -! -- Slope type: -- - - check_data = .false. - - call ESMF_ConfigFindLabel(LDT_config,"Slope type data source:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%slopetype%source,rc=rc) - call LDT_verify(rc,"Slope type data source: not defined") + !== MMF parameters + RUN_MMF_SCHME: if (run_mmf) then - if( Noah_struc(n)%slopetype%source.eq."none" ) then - Noah_struc(n)%slopetype%selectOpt = 0 - endif - if( Noah_struc(n)%slopetype%selectOpt.eq.1 ) then - check_data = .true. - allocate(Noah_struc(n)%slopetype%value(& - LDT_rc%lnc(n),LDT_rc%lnr(n),& - Noah_struc(n)%slopetype%num_bins)) - endif - enddo - - if(check_data) then - write(LDT_logunit,*)" - - - - - - - - - Slope Type Parameter - - - - - - - - - - - -" - - ! Read in slope type file config entries: - call ESMF_ConfigFindLabel(LDT_config,"Slope type map:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%slopetypefile,rc=rc) - enddo - call ESMF_ConfigGetAttribute(LDT_config,slopetype_proj,& - label="Slope type map projection:",rc=rc) - call LDT_verify(rc,'Slope type map projection: option not specified in the config file') - Noah_struc(:)%slopetype_proj = slopetype_proj + check_data = .false. - call ESMF_ConfigFindLabel(LDT_config,"Slope type spatial transform:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%slopetype_gridtransform,& - rc=rc) - call LDT_verify(rc,'Slope type spatial tranform: option not specified in the config file') - enddo + write(LDT_logunit,*)" - - - - - - - MMF Groundwater Parameters - - - - - - - - - -" - ! Read in Slope type "fill" options: - slopetype%filltype = "none" - call ESMF_ConfigGetAttribute(LDT_config, slopetype%filltype, & - label="Slope type fill option:",rc=rc) - call LDT_verify(rc,"Slope type fill option: option not specified in the config file") + do n = 1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config, Noah_struc(n)%mmf_fdepth_dir, label='MMF transmissivity dir:', rc=rc) + call LDT_verify(rc,"MMF transmissivity dir: not defined") + call ESMF_ConfigGetAttribute(LDT_config, Noah_struc(n)%mmf_rechclim_dir, label='MMF climatological recharge dir:', RC=RC) + call LDT_verify(rc,"MMF climatological recharge dir: not defined") + call ESMF_ConfigGetAttribute(LDT_config, Noah_struc(n)%mmf_riverbed_dir, label='MMF riverbed elevation dir:', RC=RC) + call LDT_verify(rc,"MMF riverbed elevation dir: not defined") + call ESMF_ConfigGetAttribute(LDT_config, Noah_struc(n)%mmf_eqwtd_dir , label='MMF equilibrium water table depth dir:', RC=RC) + call LDT_verify(rc,"MMF equilibrium water table depth dir: not defined") + call ESMF_ConfigGetAttribute(LDT_config, Noah_struc(n)%mmf_hgtm_dir , label='MMF HGT_M dir:', RC=RC) + call LDT_verify(rc,"MMF HGT_M dir: not defined") + check_data = .true. + end do - if( slopetype%filltype == "neighbor" ) then - call ESMF_ConfigGetAttribute(LDT_config, slopetype%fillradius, & - label="Slope type fill radius:",rc=rc) - call LDT_verify(rc,"Slope type fill radius: option not specified in the config file") + if (check_data) then - call ESMF_ConfigGetAttribute(LDT_config, slopetype%fillvalue, & - label="Slope type fill value:",rc=rc) - call LDT_verify(rc,"Slope type fill value: option not specified in the config file") - if( slopetype%fillvalue > 9. ) then - slopetype%fillvalue = 9. ! Set slopetype upper limit to 9 - end if - elseif( slopetype%filltype == "none" ) then - write(LDT_logunit,*) " -- 'NONE' Parameter-Mask Agreement Option Selected for Slope type" - else - write(LDT_logunit,*) "[ERR] Fill option for Slope type is not valid: ",trim(slopetype%filltype) - write(LDT_logunit,*) " Please select one of these: none or neighbor " - write(LDT_logunit,*) " Programming stopping ..." - call LDT_endrun - end if - - do n=1,LDT_rc%nnest - if( index(Noah_struc(n)%slopetype%source,"Native").eq.0 .and. & - index(Noah_struc(n)%slopetype%source,"CONSTANT").eq.0 ) then - call LDT_readDomainConfigSpecs("Slope type", & - slopetype_proj, Noah_struc(n)%slopetype_gridDesc) - if( slopetype_proj == "latlon" ) then - call LDT_gridOptChecks( n, "Slope type", Noah_struc(n)%slopetype_gridtransform,& - slopetype_proj, Noah_struc(n)%slopetype_gridDesc(9) ) - endif - endif - call LDT_soilsOptChecks(n, "Slope type", & - slopetype_proj, & - Noah_struc(n)%slopetype_gridtransform ) - - !- Read in slope type map (mostly used for Noah LSM): - select case ( Noah_struc(n)%slopetype%source ) - case ( "NCEP_LIS" ) - call read_NCEP_slopetype(n,& - Noah_struc(n)%slopetype%value) - case ( "NCEP_GFS" ) - call read_GFS_slopetype(n,& - Noah_struc(n)%slopetype%value) - case ( "NCEP_Native" ) - call read_NCEPNative_slopetype(n,& - Noah_struc(n)%slopetype%value) - case ( "CONSTANT" ) - call read_CONSTANT_slopetype(n,& - Noah_struc(n)%slopetype%value) - case default - write(LDT_logunit,*) "[WARN] Slopetype data source has not been selected." - write(LDT_logunit,*) " Your Noah LSM will not run without this parameter set." - write(LDT_logunit,*) " Please select one of the following: " - write(LDT_logunit,*) " -- NCEP_LIS, NCEP_Native, NCEP_GFS, CONSTANT " - write(LDT_logunit,*) "Program stopping ..." - call LDT_endrun - end select - - ! Fill where parameter values are missing compared to land/water mask: - if( slopetype%filltype == "neighbor" ) then - write(LDT_logunit,*) "Checking/filling mask values for: ", & - trim(Noah_struc(n)%slopetype%short_name) - write(fill_logunit,*) "Checking/filling mask values for: ", & - trim(Noah_struc(n)%slopetype%short_name) - slopetype%watervalue = 0. - call LDT_discreteParam_Fill( n, LDT_rc%lnc(n), LDT_rc%lnr(n), & - Noah_struc(n)%slopetype_gridtransform, & - Noah_struc(n)%slopetype%num_bins, & - Noah_struc(n)%slopetype%value, slopetype%watervalue, & - LDT_LSMparam_struc(n)%landmask2%value, & - slopetype%filltype, slopetype%fillvalue, slopetype%fillradius ) - endif - enddo - - end if ! Slopetype selection check - - -!-- Bottom soil temperature (K) field: - - call ESMF_ConfigFindLabel(LDT_config,"Bottom temperature data source:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%tbot%source,rc=rc) - call LDT_verify(rc,'Bottom temperature data source: not specified') - enddo - - check_data = .false. - do n=1,LDT_rc%nnest - if(Noah_struc(n)%tbot%source.eq."none") then - Noah_struc(n)%tbot%selectOpt = 0 - endif - if(Noah_struc(n)%tbot%selectOpt.eq.1) then - check_data = .true. - allocate(Noah_struc(n)%tbot%value(& - LDT_rc%lnc(n),LDT_rc%lnr(n),& - Noah_struc(n)%tbot%vlevels)) + call ESMF_ConfigGetAttribute(LDT_config, MMF_proj, label='MMF map projection:', rc=rc) + call LDT_verify(rc,"MMF map projection not defined.") + + call ESMF_ConfigGetAttribute(LDT_config, MBR_FDEPTH%gap_fill%filltype, label='FDEPTH fill option:', rc=rc) + call LDT_verify(rc,"FDEPTH fill option not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_FDEPTH%gap_fill%fillradius,label='FDEPTH fill radius:', rc=rc) + call LDT_verify(rc,"FDEPTH fill radius not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_FDEPTH%gap_fill%fillvalue, label='FDEPTH fill value:' , rc=rc) + call LDT_verify(rc,"FDEPTH fill value not defined." ) + call ESMF_ConfigGetAttribute(LDT_config, MBR_FDEPTH%water_value, label='FDEPTH water value:', DEFAULT= 100., rc=rc) + call LDT_verify(rc,"Suitable FDEPTH parameter value in lakes/waterbodies not defined." ) + + call ESMF_ConfigGetAttribute(LDT_config, MBR_RECH%gap_fill%filltype, label='RECHCLIM fill option:',rc=rc) + call LDT_verify(rc,"RECHCLIM fill option not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_RECH%gap_fill%fillradius,label='RECHCLIM fill radius:',rc=rc) + call LDT_verify(rc,"RECHCLIM fill radius not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_RECH%gap_fill%fillvalue, label='RECHCLIM fill value:' ,rc=rc) + call LDT_verify(rc,"RECHCLIM fill value not defined." ) + call ESMF_ConfigGetAttribute(LDT_config, MBR_RECH%water_value, label='RECHCLIM water value:', DEFAULT= 0., rc=rc) + call LDT_verify(rc,"Suitable RECHCLIM parameter value in lakes/waterbodies not defined." ) + + call ESMF_ConfigGetAttribute(LDT_config, MBR_RIVERBED%gap_fill%filltype, label='RIVERBED fill option:', DEFAULT= "neighbor", rc=rc) + call LDT_verify(rc,"RIVERBED fill option not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_RIVERBED%gap_fill%fillradius,label='RIVERBED fill radius:', DEFAULT= 0., rc=rc) + call LDT_verify(rc,"RIVERBED fill radius not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_RIVERBED%gap_fill%fillvalue, label='RIVERBED fill value:' , DEFAULT= 10000., rc=rc) + call LDT_verify(rc,"RIVERBED fill value not defined." ) + call ESMF_ConfigGetAttribute(LDT_config, MBR_RIVERBED%water_value, label='RIVERBED water value:', DEFAULT= -100., rc=rc) + call LDT_verify(rc,"Suitable RIVERBED parameter value in lakes/waterbodies not defined." ) + + call ESMF_ConfigGetAttribute(LDT_config, MBR_WTD%gap_fill%filltype, label='EQWTD fill option:',rc=rc) + call LDT_verify(rc,"EQWTD fill option not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_WTD%gap_fill%fillradius,label='EQWTD fill radius:',rc=rc) + call LDT_verify(rc,"EQWTD fill radius not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_WTD%gap_fill%fillvalue, label='EQWTD fill value:' ,rc=rc) + call LDT_verify(rc,"EQWTD fill value not defined." ) + call ESMF_ConfigGetAttribute(LDT_config, MBR_WTD%water_value, label='EQWTD water value:', DEFAULT= 0., rc=rc) + call LDT_verify(rc,"Suitable EQWTD parameter value in lakes/waterbodies not defined." ) + + call ESMF_ConfigGetAttribute(LDT_config, MBR_HGT%gap_fill%filltype, label='HGT_M fill option:',rc=rc) + call LDT_verify(rc,"HGT_M fill option not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_HGT%gap_fill%fillradius,label='HGT_M fill radius:',rc=rc) + call LDT_verify(rc,"HGT_M fill radius not defined.") + call ESMF_ConfigGetAttribute(LDT_config, MBR_HGT%gap_fill%fillvalue, label='HGT_M fill value:' ,rc=rc) + call LDT_verify(rc,"HGT_M fill value not defined." ) + + do n = 1,LDT_rc%nnest + + allocate (Noah_struc(n)%fdepth%value (LDT_rc%lnc(n),LDT_rc%lnr(n),Noah_struc(n)%fdepth%num_bins )) + allocate (Noah_struc(n)%rechclim%value (LDT_rc%lnc(n),LDT_rc%lnr(n),Noah_struc(n)%rechclim%num_bins)) + allocate (Noah_struc(n)%riverbed%value (LDT_rc%lnc(n),LDT_rc%lnr(n),Noah_struc(n)%riverbed%num_bins)) + allocate (Noah_struc(n)%eqwtd%value (LDT_rc%lnc(n),LDT_rc%lnr(n),Noah_struc(n)%eqwtd%num_bins )) + allocate (Noah_struc(n)%areaxy%value (LDT_rc%lnc(n),LDT_rc%lnr(n),Noah_struc(n)%eqwtd%num_bins )) + allocate (Noah_struc(n)%hgtm%value (LDT_rc%lnc(n),LDT_rc%lnr(n),Noah_struc(n)%hgtm%num_bins )) + + call ESMF_ConfigGetAttribute(LDT_config, Noah_struc(n)%mmf_transform, label='MMF spatial transform:', rc=rc) + call LDT_verify(rc,"MMF spatial transform method is not defined in the config file.") + + ! Read in index files in GEOGRID directories and create mapping + + call MBR_FDEPTH%mi (n, MMF_proj, Noah_struc(n)%mmf_fdepth_dir) + call MBR_RECH%mi (n, MMF_proj, Noah_struc(n)%mmf_rechclim_dir, MBR_FDEPTH%MMF_mapping) + call MBR_RIVERBED%mi (n, MMF_proj, Noah_struc(n)%mmf_riverbed_dir, MBR_FDEPTH%MMF_mapping) + call MBR_WTD%mi (n, MMF_proj, Noah_struc(n)%mmf_eqwtd_dir , MBR_FDEPTH%MMF_mapping) + call MBR_HGT%mi (n, MMF_proj, Noah_struc(n)%mmf_hgtm_dir , MBR_FDEPTH%MMF_mapping) + + ! Read in variables fields + + call MBR_FDEPTH%mr (n, trim(Noah_struc(n)%mmf_fdepth_dir ), Noah_struc(n)%fdepth%value , Noah_struc(n)%mmf_transform, Noah_struc(n)%fdepth%short_name ) + call MBR_RECH%mr (n, trim(Noah_struc(n)%mmf_rechclim_dir), Noah_struc(n)%rechclim%value, Noah_struc(n)%mmf_transform, Noah_struc(n)%rechclim%short_name) + call MBR_RIVERBED%mr (n, trim(Noah_struc(n)%mmf_riverbed_dir), Noah_struc(n)%riverbed%value, Noah_struc(n)%mmf_transform, Noah_struc(n)%riverbed%short_name) + call MBR_WTD%mr (n, trim(Noah_struc(n)%mmf_eqwtd_dir ), Noah_struc(n)%eqwtd%value , Noah_struc(n)%mmf_transform, Noah_struc(n)%eqwtd%short_name ) + call MBR_HGT%mr (n, trim(Noah_struc(n)%mmf_hgtm_dir ), Noah_struc(n)%hgtm%value , Noah_struc(n)%mmf_transform, Noah_struc(n)%hgtm%short_name ) + + ! Ensure RIVERBED value in LAKES and WATER grid cells is same as MMF_HGTM + where (Noah_struc(n)%riverbed%value == MBR_RIVERBED%water_value) + Noah_struc(n)%riverbed%value = Noah_struc(n)%hgtm%value + endwhere + + ! Ensure RIVERBED value <= MMF_HGTM + where (Noah_struc(n)%riverbed%value > Noah_struc(n)%hgtm%value) + Noah_struc(n)%riverbed%value = Noah_struc(n)%hgtm%value + endwhere + + ! write areaXY + call cell_area (n,Noah_struc(n)%areaxy%value) + + end do endif - enddo - - if( check_data ) then - write(LDT_logunit,*)" - - - - - - - - - Bottom Temperature Parameter - - - - - - - - - - - -" - - call ESMF_ConfigFindLabel(LDT_config,"Bottom temperature map:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%tbotfile,rc=rc) - call LDT_verify(rc,'Bottom temperature map: not specified') - enddo - call ESMF_ConfigGetAttribute(LDT_config, tbot_proj,& - label="Bottom temperature map projection:",rc=rc) - call LDT_verify(rc,'Bottom temperature map projection: option not specified in the config file') - Noah_struc(:)%tbot_proj = tbot_proj - - call ESMF_ConfigFindLabel(LDT_config,"Bottom temperature spatial transform:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%tbot_gridtransform,& - rc=rc) - call LDT_verify(rc,'Bottom temperature tranform: option not specified in the config file') - enddo - - Noah_struc(:)%tbot_topocorr = "none" - call ESMF_ConfigFindLabel(LDT_config,"Bottom temperature topographic downscaling:",rc=rc) - do n=1,LDT_rc%nnest - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%tbot_topocorr,rc=rc) - call LDT_verify(rc,'Bottom temperature topographic downscaling: not specified') - ! Allow for mis-entered lapse-rate option entry: - if( Noah_struc(n)%tbot_topocorr == "lapse_rate" ) Noah_struc(n)%tbot_topocorr="lapse-rate" - if( Noah_struc(n)%tbot_topocorr == "lapse rate" ) Noah_struc(n)%tbot_topocorr="lapse-rate" - if( Noah_struc(n)%tbot_topocorr == "Lapse-rate" ) Noah_struc(n)%tbot_topocorr="lapse-rate" - enddo - - ! Read in "fill" option entries: - tbot%filltype = "none" - call ESMF_ConfigGetAttribute(LDT_config, tbot%filltype, & - label="Bottom temperature fill option:",rc=rc) - call LDT_verify(rc,"Bottom temperature fill option: option not specified in the config file") - - if( tbot%filltype == "neighbor" .or. tbot%filltype == "average" ) then - call ESMF_ConfigGetAttribute(LDT_config, tbot%fillvalue, & - label="Bottom temperature fill value:",rc=rc) - call LDT_verify(rc,"Bottom temperature fill value: option not specified in the config file") - - call ESMF_ConfigGetAttribute(LDT_config, tbot%fillradius, & - label="Bottom temperature fill radius:",rc=rc) - call LDT_verify(rc,"Bottom temperature fill radius: option not specified in the config file") - elseif( tbot%filltype == "none" ) then - write(LDT_logunit,*) " -- 'NONE' Parameter-Mask Agreement Option Selected for Bottom Temperature" - else - write(LDT_logunit,*) "[ERR] Fill option for Bottom Temperature is not valid: ",trim(tbot%filltype) - write(LDT_logunit,*) " Please select one of these: none, neighbor or average " - write(LDT_logunit,*) " Programming stopping ..." - call LDT_endrun - - end if - - ! Don't need to read in "Native" grid extents/resolution, just for LIS inputs - do n=1,LDT_rc%nnest - if( index(Noah_struc(n)%tbot%source,"Native").eq.0 .and. & - index(Noah_struc(n)%tbot%source,"ISLSCP1").eq.0 .and. & - index(Noah_struc(n)%tbot%source,"CONSTANT").eq.0) then - call LDT_readDomainConfigSpecs("Bottom temperature", & - tbot_proj, Noah_struc(n)%tbot_gridDesc) - if( tbot_proj == "latlon" ) then - call LDT_gridOptChecks( n, "Bottom temperature", Noah_struc(n)%tbot_gridtransform, & - tbot_proj, Noah_struc(n)%tbot_gridDesc(9) ) - endif - endif - call LDT_noahparmsOptChecks( n, "Bottom temperature", tbot_proj, & - Noah_struc(n)%tbot_gridtransform ) - enddo - - do n = 1, LDT_rc%nnest - - ! Read in Tbot File: - select case ( Noah_struc(n)%tbot%source ) - case( "NCEP_LIS" ) - call read_NCEP_tbot(& - n,Noah_struc(n)%tbot%value(:,:,1)) - case( "NCEP_GFS" ) - call read_NCEP_GFS_tbot(& - n,Noah_struc(n)%tbot%value(:,:,1)) - case( "ISLSCP1" ) - call read_ISLSCP1_tbot(& - n,Noah_struc(n)%tbot%value(:,:,1)) - case( "CONSTANT" ) - call read_CONSTANT_tbot(& - n,Noah_struc(n)%tbot%value(:,:,1)) - case default - write(LDT_logunit,*) "[WARN] Bottom temperature data source not selected." - write(LDT_logunit,*) " Your Noah LSM will not run without this parameter set." - write(LDT_logunit,*) " Please select one of the following: " - write(LDT_logunit,*) " -- NCEP_LIS, ISLSCP1, NCEP_GFS, CONSTANT " - write(LDT_logunit,*) "Program stopping ..." - call LDT_endrun - end select - - ! Fill where parameter values are missing compared to land/water mask: - if( tbot%filltype == "neighbor" .or. & - tbot%filltype == "average" ) then - write(LDT_logunit,*) "Checking/filling mask values for: ", & - trim(Noah_struc(n)%tbot%short_name) - write(fill_logunit,*) "Checking/filling mask values for: ", & - trim(Noah_struc(n)%tbot%short_name) - tbot%watervalue = LDT_rc%udef - call LDT_contIndivParam_Fill( n, LDT_rc%lnc(n), LDT_rc%lnr(n), & - Noah_struc(n)%tbot_gridtransform, & - Noah_struc(n)%tbot%num_bins, & - Noah_struc(n)%tbot%value, tbot%watervalue, & - LDT_LSMparam_struc(n)%landmask2%value, & - tbot%filltype, tbot%fillvalue, tbot%fillradius ) - endif - - !- Modify final Tbot output with elevation correction: - if( Noah_struc(n)%tbot_topocorr == "lapse-rate" ) then - if( LDT_LSMparam_struc(n)%elevation%selectOpt == 1 ) then - write(LDT_logunit,*) "Performing lapse-rate correction to Tbot output." - allocate(force_elev(LDT_rc%lnc(n),LDT_rc%lnr(n))) - force_elev = 0. - do r = 1, LDT_rc%lnr(n) - do c = 1, LDT_rc%lnc(n) - if( Noah_struc(n)%tbot%value(c,r,1)/=LDT_rc%udef ) & - Noah_struc(n)%tbot%value(c,r,1) = & - Noah_struc(n)%tbot%value(c,r,1) & - + (-0.0065)*(LDT_LSMparam_struc(n)%elevation%value(c,r,1) & - - force_elev(c,r)) - end do - end do - deallocate(force_elev) - elseif( LDT_LSMparam_struc(n)%elevation%selectOpt == 0 ) then - write(LDT_logunit,*) "Cannot perform lapse-rate correction to Tbot output," - write(LDT_logunit,*) " since no elevation/terrain map option was selected. " - write(LDT_logunit,*) " Stopping ... " - call LDT_endrun - endif - endif - - enddo - end if - - !== Other Noah LSM related parameters == - -! -- Noah-MP Planetary Boundary Layer Height: -- - - check_data = .false. - if ((LDT_rc%lsm.eq."Noah-MP.3.6").or.(LDT_rc%lsm.eq."Noah-MP.4.0.1")) then - -! if(check_data) &! then - write(LDT_logunit,*)" - - - - - - - - - Noah-MP Parameters - - - - - - - - - - - -" - - call ESMF_ConfigFindLabel(LDT_config,"Noah-MP PBL Height Value:",rc=rc) - do n=1,LDT_rc%nnest -! call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%pblh%source,rc=rc) - call ESMF_ConfigGetAttribute(LDT_config,Noah_struc(n)%pblh_value,rc=rc) - call LDT_verify(rc,"Noah-MP PBL Height Value: not defined") - - Noah_struc(n)%pblh%selectOpt = 1 - - allocate(Noah_struc(n)%pblh%value(& - LDT_rc%lnc(n),LDT_rc%lnr(n),& - Noah_struc(n)%pblh%num_bins)) - - Noah_struc(n)%pblh%value = Noah_struc(n)%pblh_value - - enddo - endif - - - end subroutine NoahParms_init_LISHydro + endif RUN_MMF_SCHME + + end subroutine NoahParms_init + ! -------------------------------------------------------------------- + subroutine NoahParms_writeHeader(n,ftn,dimID) - integer :: n + integer :: n, rc integer :: ftn integer :: dimID(3) - + logical :: run_mmf = .false. + call LDT_writeNETCDFdataHeader(n,ftn,dimID,& Noah_struc(n)%tbot) @@ -844,18 +626,29 @@ subroutine NoahParms_writeHeader(n,ftn,dimID) Noah_struc(n)%slopetype) if ((LDT_rc%lsm.eq."Noah-MP.3.6").or. & - (LDT_rc%lsm.eq."Noah-MP.4.0.1")) then - call LDT_writeNETCDFdataHeader(n,ftn,dimID,& - Noah_struc(n)%pblh) + (LDT_rc%lsm.eq."Noah-MP.4.0.1")) then + call LDT_writeNETCDFdataHeader(n,ftn,dimID,& + Noah_struc(n)%pblh) + endif + if (LDT_rc%lsm.eq."Noah-MP.4.0.1") then + call ESMF_ConfigGetAttribute(LDT_config, run_mmf,label='Process Noah-MP-4.0.1 MMF groundwater parameters:', DEFAULT= .false., rc=rc) + if (run_mmf) then + call LDT_writeNETCDFdataHeader(n,ftn,dimID,Noah_struc(n)%fdepth ) + call LDT_writeNETCDFdataHeader(n,ftn,dimID,Noah_struc(n)%rechclim ) + call LDT_writeNETCDFdataHeader(n,ftn,dimID,Noah_struc(n)%riverbed ) + call LDT_writeNETCDFdataHeader(n,ftn,dimID,Noah_struc(n)%eqwtd ) + call LDT_writeNETCDFdataHeader(n,ftn,dimID,Noah_struc(n)%areaxy ) + call LDT_writeNETCDFdataHeader(n,ftn,dimID,Noah_struc(n)%hgtm ) + endif endif - end subroutine NoahParms_writeHeader subroutine NoahParms_writeData(n,ftn) - integer :: n + integer :: n, rc integer :: ftn - + logical :: run_mmf = .false. + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%tbot) call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%slopetype) @@ -864,7 +657,17 @@ subroutine NoahParms_writeData(n,ftn) (LDT_rc%lsm.eq."Noah-MP.4.0.1")) then call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%pblh) endif - + if (LDT_rc%lsm.eq."Noah-MP.4.0.1") then + call ESMF_ConfigGetAttribute(LDT_config, run_mmf,label='Process Noah-MP-4.0.1 MMF groundwater parameters:', DEFAULT= .false., rc=rc) + if (run_mmf) then + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%fdepth ) + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%rechclim ) + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%riverbed ) + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%eqwtd ) + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%areaxy ) + call LDT_writeNETCDFdata(n,ftn,Noah_struc(n)%hgtm ) + endif + endif end subroutine NoahParms_writeData diff --git a/ldt/params/Noah/module_MMF_groundwater.F90 b/ldt/params/Noah/module_MMF_groundwater.F90 new file mode 100644 index 000000000..af5194212 --- /dev/null +++ b/ldt/params/Noah/module_MMF_groundwater.F90 @@ -0,0 +1,565 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !MODULE: MMF_groundwater +! \label{MMF_groundwater} +! +! !REVISION HISTORY: +! 27 Aug 2021: Sarith Mahanama +! with inputs from David Mocko, Shugong Wang, Timothy Lahmers, Kristi Arsenault, and Zhuo Wang ; Initial Specification +! +! !INTERFACE: + +#include "LDT_misc.h" +module MMF_groundwater + + use ESMF + use LDT_logMod, only : LDT_logunit, LDT_endrun, LDT_verify + use LDT_coreMod, only : LDT_rc, LDT_domain, LDT_config + use LDT_gridmappingMod, only : LDT_RunDomainPts + use LDT_paramMaskCheckMod,only : LDT_fillopts, LDT_contIndivParam_Fill, fill_logunit + use LDT_paramDataMod, only : LDT_LSMparam_struc + implicit none + + private + + integer,parameter :: NX_MMF=43200, NY_MMF = 21600 + + ! defaults parameters for GEOGRID tiles based on the FDEPTH data set + ! ------------------------------------------------------------------ + type :: geogrid + + real :: sf = 1. + real :: undef = -9999. + logical:: DE = .true. + integer:: wordsize = 2 + integer:: tile_x = 1200 + integer:: tile_y = 1200 + integer:: tile_z = 1 + integer:: tile_bdr = 0 + integer:: endian = 0 + integer:: iSigned = 1 + + end type geogrid + + ! MMF grid to LIS grid mapping + ! ---------------------------- + type, public :: MMF_mapping + + real, dimension(20) :: param_gridDesc, subparam_gridDesc + integer :: glpnc, glpnr, subpnc, subpnr + integer, pointer, dimension (:,:):: lat_line, lon_line + + end type MMF_mapping + + ! MMF data reader Fortran object + ! ------------------------------ + type, public, extends (MMF_mapping) :: MMF_BCsReader + + type(LDT_fillopts), public :: gap_fill + type(geogrid), public :: gp + real, public :: water_value + + contains + + procedure, public :: mi => mmf_init + procedure, public :: mr => mmf_data_reader + + end type MMF_BCsReader + + ! Grid cell area + ! -------------- + public :: cell_area + +contains + + SUBROUTINE mmf_init (MBR, nest, project, DATADIR, map) + + implicit none + + class (MMF_BCsReader), intent(inout) :: MBR + type(MMF_mapping),intent(in),optional:: map + integer, intent (in) :: nest + character(*), intent (in) :: project + CHARACTER(*), INTENT(IN) :: DATADIR + real :: IN_xres, IN_yres + real :: dx, dy, known_lon + type(geogrid) :: GG + type(ESMF_Config) :: GCF + integer :: RC + character*3 :: signed + integer, save, allocatable, target, dimension (:,:):: tlat_line, tlon_line + + ! Reads index file for from the GEOGRID data directory for GEOGRID tile information and data conversion + + GCF = ESMF_ConfigCreate(RC=RC) ; call LDT_verify(rc,"mmf_init: create failed." ) + CALL ESMF_ConfigLoadFile (GCF,trim(DATADIR)//'index',rc=rc) ; call LDT_verify(rc,"mmf_init: load index failed.") + CALL ESMF_ConfigGetAttribute (GCF, label='dx:' , VALUE=dx , RC=RC ); call LDT_verify(rc,"mmf_init: dx not defined.") + CALL ESMF_ConfigGetAttribute (GCF, label='dy:' , VALUE=dy , RC=RC ); call LDT_verify(rc,"mmf_init: dy not defined.") + CALL ESMF_ConfigGetAttribute (GCF, label='scale_factor:' , VALUE=MBR%gp%sf ,DEFAULT=GG%sf , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='missing_value:', VALUE=MBR%gp%undef ,DEFAULT=GG%undef , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='wordsize:' , VALUE=MBR%gp%wordsize ,DEFAULT=GG%wordsize , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='tile_x:' , VALUE=MBR%gp%tile_x ,DEFAULT=GG%tile_x , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='tile_y:' , VALUE=MBR%gp%tile_y ,DEFAULT=GG%tile_y , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='tile_z:' , VALUE=MBR%gp%tile_z ,DEFAULT=GG%tile_z , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='tile_bdr:' , VALUE=MBR%gp%tile_bdr ,DEFAULT=GG%tile_bdr , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='signed:' , VALUE=signed ,DEFAULT= 'yes' , RC=RC ) + CALL ESMF_ConfigGetAttribute (GCF, label='known_lon:' , VALUE=known_lon ,DEFAULT= -180. , RC=RC ) + CALL ESMF_ConfigDestroy (GCF, RC=RC) + + if(trim(signed) == 'yes') then + MBR%gp%isigned = 1 + else + MBR%gp%isigned = 0 + endif + + ! the western edge + if(known_lon < -179.) then + MBR%gp%DE = .true. + else + MBR%gp%DE = .false. + endif + + ! Verify NX_MMF, MY_MMF match with dx, dy + if ((NINT (360./dx) /= NX_MMF) .OR. (NINT (180./dy) /= NY_MMF)) then + write(LDT_logunit,*) "[ERR] MMF_INIT: DX, DY are NOT consistent with NX_MMF and NY_MMF" + write(LDT_logunit,*) dx, dy, nx_mmf, ny_mmf + write(LDT_logunit,*) " Programming stopping ..." + call LDT_endrun + endif + + if(.not. present (map)) then + + ! NOTE: Since source data array dimensions are the same for all MMF parameters, + ! we run this block once with the first parameter and copy mapping arrays to other parameters. + + ! ------------------------------------------------------------ + ! PREPARE SUBSETTED PARAMETER GRID FOR READING IN BCS DATA + ! ------------------------------------------------------------ + !- Map Parameter Grid Info to LIS Target Grid/Projection Info -- + + IN_xres = 360./REAL(NX_MMF) + IN_yres = 180./REAL(NY_MMF) + MBR%param_gridDesc(1) = 0. ! Latlon + MBR%param_gridDesc(2) = real(NX_MMF) + MBR%param_gridDesc(3) = real(NY_MMF) + MBR%param_gridDesc(4) = -90.0 + (IN_yres/2) ! LL lat + MBR%param_gridDesc(5) = -180.0 + (IN_xres/2) ! LL lon + MBR%param_gridDesc(6) = 128 + MBR%param_gridDesc(7) = 90.0 - (IN_yres/2) ! UR lat + MBR%param_gridDesc(8) = 180.0 - (IN_xres/2) ! UR lon + MBR%param_gridDesc(9) = IN_yres + MBR%param_gridDesc(10) = IN_xres + MBR%param_gridDesc(20) = 64 + + MBR%subparam_gridDesc = 0. + + if(allocated (tlat_line)) deallocate (tlat_line) + if(allocated (tlon_line)) deallocate (tlon_line) + + call LDT_RunDomainPts( nest, project, MBR%param_gridDesc(:), & + MBR%glpnc, MBR%glpnr, MBR%subpnc, MBR%subpnr, MBR%subparam_gridDesc, & + tlat_line, tlon_line) + MBR%lat_line => tlat_line + MBR%lon_line => tlon_line + else + + MBR%param_gridDesc = map%param_gridDesc + MBR%glpnc = map%glpnc + MBR%glpnr = map%glpnr + MBR%subpnc = map%subpnc + MBR%subpnr = map%subpnr + MBR%subparam_gridDesc= map%subparam_gridDesc + MBR%lat_line => map%lat_line + MBR%lon_line => map%lon_line + + endif + + END SUBROUTINE mmf_init + + ! ---------------------------------------------------------------- + + SUBROUTINE mmf_data_reader (MBR, nest, datadir, lisout, mmf_transform, short_name) + + implicit none + + class (MMF_BCsReader), intent(inout) :: MBR + character(*), intent (in) :: datadir, mmf_transform, short_name + real, dimension (:,:,:), intent (inout) :: lisout + integer, intent (in) :: nest + character(len=1024):: geogridFile + character(len=80) :: tileName + integer :: num_tile_lon,num_tile_lat + integer :: rc,status,tx,ty,txs,txe,tys,tye + integer :: nlat_tile_bdr, nlon_tile_bdr, nbins + real,allocatable :: tarray(:,:,:), garray(:,:,:) + + ! c function from Michael G. Duda, NCAR/MMM + integer, external :: read_geogrid + ! Adapted from Zhuo Wang's + ! /discover/nobackup/projects/lis_aist17/zwang9/Geogrid/geogrid2netcdf.f90 + + + ! Reading GEOGRID data + ! -------------------- + write(LDT_logunit,*) "Reading data from: ",trim(datadir) + + num_tile_lon = NX_MMF / MBR%gp%tile_x + num_tile_lat = NY_MMF / MBR%gp%tile_y + + nlon_tile_bdr = MBR%gp%tile_x + 2*MBR%gp%tile_bdr + nlat_tile_bdr = MBR%gp%tile_y + 2*MBR%gp%tile_bdr + + allocate(tarray(nlon_tile_bdr,nlat_tile_bdr,MBR%gp%tile_z)) + allocate(garray(NX_MMF, NY_MMF, MBR%gp%tile_z)) + + garray = LDT_rc%udef ! global array (43200,21600) is constructed by assebling 36x18 # of tarrays (1200,1200) + + TILE_COLS: do tx = 1, num_tile_lon + + txs = 1 + (tx-1)*MBR%gp%tile_x + txe = tx * MBR%gp%tile_x + + TILE_ROWS: do ty = 1, num_tile_lat + + tarray = MBR%gp%undef + tys = 1 + (ty-1)*MBR%gp%tile_y + tye = ty * MBR%gp%tile_y + + if(MBR%gp%DE) then + ! The western edge is on the dateline + write(tileName, fmt='(4(a1,i5.5))') '/',txs, '-', txe, '.', tys, '-', tye + + else + ! Elevation data x-axis start from the Greenwich line + if(txe <= 21600) then + write(tileName, fmt='(4(a1,i5.5))') '/',txs+21600, '-', txe+21600, '.', tys, '-', tye + else + write(tileName, fmt='(4(a1,i5.5))') '/',txs-21600, '-', txe-21600, '.', tys, '-', tye + endif + + endif + + geogridFile = trim(datadir)//trim(tileName) + + rc = read_geogrid(trim(geogridFile),len(trim(geogridFile)),tarray, & + nlon_tile_bdr,nlat_tile_bdr,MBR%gp%tile_z,MBR%gp%isigned,MBR%gp%endian,1.,MBR%gp%wordsize,status) + + if (rc == 1 .or. status == 1) then + write(LDT_logunit,*) '[ERROR] reading GEOGRID file : ',trim(geogridFile) + call LDT_endrun + end if + + where(tarray == MBR%gp%undef) + tarray = LDT_rc%udef + elsewhere + tarray = MBR%gp%SF * tarray + end where + + garray(txs:txe,tys:tye,1) = tarray (1 + MBR%gp%tile_bdr : MBR%gp%tile_bdr + MBR%gp%tile_x, 1 + MBR%gp%tile_bdr: MBR%gp%tile_bdr + MBR%gp%tile_y,1) + + end do TILE_ROWS + end do TILE_COLS + + ! regrid garray and construct lisout array on the LIS grid + + call regrid_to_lisgrid (nest, garray, lisout) + + nbins = size (lisout, 3) + + ! Search and fill gaps + ! -------------------- + write(LDT_logunit,*) "Checking/filling mask values for: ", & + trim(short_name) + write(fill_logunit,*) "Checking/filling mask values for: ", & + trim(short_name) + + call LDT_contIndivParam_Fill( nest, LDT_rc%lnc(nest), LDT_rc%lnr(nest), & + mmf_transform, & + nbins, & + lisout, LDT_rc%udef, & + LDT_LSMparam_struc(nest)%landmask2%value, & + MBR%gap_fill%filltype, MBR%gap_fill%fillvalue, & + MBR%gap_fill%fillradius, leave_good_data = .true. ) + + if (trim (short_name) /= "MMF_HGTM") then + ! fill suitable parameter values in lakes/water bodies + where (lisout == LDT_rc%udef) + lisout = MBR%water_value + end where + endif + deallocate (tarray, garray) + + contains + + ! --------------------------------------------------------------------- + + SUBROUTINE regrid_to_lisgrid (nest, data_in, var_subset) + + ! adapted from params/irrigation/read_GRIPC_irrigfrac.F90 + + implicit none + integer, intent (in) :: nest + real, dimension(:,:,:), intent (in) :: data_in + real, dimension(:,:,:), intent(inout) :: var_subset + + ! arrays read from LL + integer,parameter :: k10 = selected_int_kind(10) + integer :: mi ! Total number of input param grid array points + integer :: mo ! Total number of output LIS grid array points + integer :: nc, nr, i, j + integer, allocatable :: n11(:) ! Array that maps the location of each input grid + ! point in the output grid. + real, allocatable :: gi(:) ! Input parameter 1d grid + logical*1,allocatable :: li(:) ! Input logical mask (to match gi) + real, allocatable, dimension (:,:) :: var_in + real, allocatable, dimension (:) :: go2 ! Output lis 1d grid + logical*1, allocatable, dimension (:) :: lo2 ! Output logical mask (to match go) + + mi = MBR%subpnc*MBR%subpnr + mo = LDT_rc%lnc(nest)*LDT_rc%lnr(nest) + + allocate (var_in(MBR%subpnc,MBR%subpnr)) + allocate ( li(mi), gi (mi), n11(mi)) + allocate (go2(mo), lo2(mo)) + + !- Create mapping between parameter domain and LIS grid domain: + call upscaleByAveraging_input( MBR%subparam_gridDesc, & + LDT_rc%gridDesc(nest,:), mi, mo, n11) + + Data_Fields: do j = 1, size (data_in, 3) + + var_in = LDT_rc%udef + do nr = 1, MBR%subpnr + do nc = 1, MBR%subpnc + var_in (nc,nr) = data_in (MBR%lon_line(nc,1),MBR%lat_line (1,nr),j) + end do + end do + + ! ------------------------------------------------------------------- + ! AGGREGATING FINE-SCALE GRIDS TO COARSER LIS OUTPUT GRID + ! ------------------------------------------------------------------- + + gi = LDT_rc%udef + li = .false. + + !- Assign 2-D array to 1-D for aggregation routines: + i = 0 + do nr = 1, MBR%subpnr + do nc = 1, MBR%subpnc + i = i + 1 + if( var_in(nc,nr) .NE. LDT_rc%udef) then + gi(i) = var_in(nc,nr) + li(i) = .true. + endif + end do + enddo + + !- Spatial average within each coarse gridcell: + call upscaleByAveraging ( mi, mo, LDT_rc%udef, n11, li, gi, & + lo2(:), go2 (:)) + i = 0 + do nr = 1, LDT_rc%lnr(nest) + do nc = 1, LDT_rc%lnc(nest) + i = i + 1 + var_subset (nc,nr,j) = go2(i) + enddo + enddo + + end do Data_Fields + deallocate (var_in, li, gi, n11, go2, lo2) + + END SUBROUTINE regrid_to_lisgrid + + END SUBROUTINE mmf_data_reader + + ! ---------------------------------------------------------------- + + SUBROUTINE cell_area (nest, area) + + use map_utils, only : ij_to_latlon + use LDT_constantsMod, ONLY : radius => LDT_CONST_REARTH, pi => LDT_CONST_PI + + implicit none + + ! interface grid_cell_area + ! module procedure area_latlon + ! module procedure areaint + ! module procedure area_wps + ! end interface grid_cell_area + + integer, intent (in) :: nest + real, dimension (:,:,:), intent (inout) :: area + integer :: i,j + real :: lat_ll, lat_ur , lat_ul, lat_lr, c, r + real :: lon_ll, lon_ur , lon_ul, lon_lr + + area = 0. + + do j = 1, LDT_rc%lnr(nest) + do i = 1, LDT_rc%lnc(nest) + + r = float (j) + c = float (i) + + select case (LDT_domain(nest)%ldtproj%code) + case (0) + ! lat/lon + call ij_to_latlon(LDT_domain(nest)%ldtproj,c, r, lat_ll, lon_ll) + area (i,j,1) = area_latlon (nest, lat_ll) + + case (3) + ! Lambert conical follows WPS + area (i,j,1) = area_wps () + + case DEFAULT + ! Area of a polygon areaint.m from Matlab + call ij_to_latlon(LDT_domain(nest)%ldtproj,c-0.5, r-0.5, lat_ll, lon_ll) ! SW corner (A) + call ij_to_latlon(LDT_domain(nest)%ldtproj,c-0.5, r+0.5, lat_ul, lon_ul) ! NW corner (B) + call ij_to_latlon(LDT_domain(nest)%ldtproj,c+0.5, r+0.5, lat_ur, lon_ur) ! NE corner (C) + call ij_to_latlon(LDT_domain(nest)%ldtproj,c+0.5, r-0.5, lat_lr, lon_lr) ! SE corner (D) + area (i,j,1) = areaint((/lat_ll, lat_ul, lat_ur, lat_lr/), (/lon_ll, lon_ul, lon_ur, lon_lr/)) + + END select + end do + end do + + contains + + ! ---------------------------------------------------------------- + + real function area_latlon (nest, lat) + + implicit none + + real, intent (in) :: lat + integer, intent (in) :: nest + + area_latlon = radius * radius * & + (sin(d2r(lat + 0.5*LDT_rc%gridDesc(nest,9))) - & + sin(d2r(lat - 0.5*LDT_rc%gridDesc(nest,9))))* & + d2r(LDT_rc%gridDesc(nest,10))/1000./1000. ! [km2] + + end function area_latlon + + ! ---------------------------------------------------------------- + + real function area_wps () + + implicit none + integer :: rc + real :: DXY, MSFTX, MSFTY + + MSFTY = 1. + MSFTX = 1. + + call ESMF_ConfigGetAttribute(LDT_config, DXY,label='Run domain resolution:', rc=rc); call LDT_verify(rc,"Run domain resolution of the Lambert grid is not defined.") + area_wps = DXY*DXY/MSFTX/MSFTY + + end function area_wps + + ! ---------------------------------------------------------------- + + real FUNCTION areaint (lat, lon) + + + ! simplified from Matlab's areaint.m to compute area of a single polygon + ! AREAINT Surface area of polygon on sphere + ! A = AREAINT(LAT,LON) calculates the spherical surface area of the + ! polygon specified by the input vectors LAT, LON. LAT and LON are in + ! degrees. The calculation uses a line integral approach. The output, + ! A, is the surface area fraction covered by the polygon on a unit + ! sphere. + + implicit none + real, intent(in), dimension(:) :: lat, lon + real, allocatable , dimension (:) :: latc, lonc, colat, az, integrands + real :: lat0,lon0,dlat,dlon,a,deltas,daz,colat2 + integer :: n, i + + n = size (lat) + 1 + allocate (latc (1:n)) + allocate (lonc (1:n)) + allocate (colat(1:n)) + allocate (az (1:n)) + + latc(1:n-1) = lat + lonc(1:n-1) = lon + latc(n) = lat(1) + lonc(n) = lon(1) + lat0 = 0. + lon0 = 0. + + ! greatcircle distance, and greatcircle azimuth wrt 0.,0 (Matlab's distance.m) + ! ---------------------------------------------------------------------------- + + do i = 1,n + + latc(i) = d2r(latc(i)) + lonc(i) = d2r(lonc(i)) + dlat = latc(i) - lat0 + dlon = lonc(i) - lon0 + + ! haversine + a = (sin(dlat/2.))**2 + cos(lat0)*cos(latc(i))*(sin(dlon/2.))**2 + if(a < 0.) a =0. + if(a > 1.) a =1. + + colat(i) = 2.*atan2(sqrt(a),sqrt(1.-a)) + az(i) = atan2(cos(latc(i)) * sin(lonc(i)-lon0), & + cos(lat0) * sin(latc(i)) - sin(lat0) * cos(latc(i))* cos(lonc(i)-lon0)) + ! wrap az to the range 0-2pi + az(i) = az(i) - 2.*pi*floor(az(i)/2./pi) + + end do + + n = n -1 + allocate (integrands (1:n)) + + do i = 1, n + + ! Calculate step sizes + daz = az(i+1) - az(i) + ! wrap to -pi <= daz <=pi + daz = daz - 2.*pi*floor((daz+pi)/2./pi) + + ! Determine average surface distance for each step + deltas = (colat (i+1) - colat (i))/2. + colat2 = colat(i) + deltas + + ! Integral over azimuth is 1-cos(colatitudes) + integrands (i) = (1. - cos(colat2)) * daz + end do + + areaint = abs (sum (integrands))/4./pi + areaint = 4.*pi*radius*radius * MIN (areaint, 1. - areaint) /1000./1000. + + deallocate (integrands, latc, lonc, colat, az) + + end FUNCTION areaint + + ! ---------------------------------------------------------------- + + function d2r (degree) result(rad) + + ! degrees to radians + real,intent(in) :: degree + real :: rad + + rad = degree*PI/180. + + end function d2r + + end SUBROUTINE cell_area + +end module MMF_groundwater + + diff --git a/ldt/params/Noah/read_CONSTANT_slopetype.F90 b/ldt/params/Noah/read_CONSTANT_slopetype.F90 index caedb37f2..e9db024bb 100644 --- a/ldt/params/Noah/read_CONSTANT_slopetype.F90 +++ b/ldt/params/Noah/read_CONSTANT_slopetype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_CONSTANT_tbot.F90 b/ldt/params/Noah/read_CONSTANT_tbot.F90 index d5ca54a1c..fde2b8865 100644 --- a/ldt/params/Noah/read_CONSTANT_tbot.F90 +++ b/ldt/params/Noah/read_CONSTANT_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_GFS_slopetype.F90 b/ldt/params/Noah/read_GFS_slopetype.F90 index acfa29362..6f9ab13a7 100644 --- a/ldt/params/Noah/read_GFS_slopetype.F90 +++ b/ldt/params/Noah/read_GFS_slopetype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_ISLSCP1_tbot.F90 b/ldt/params/Noah/read_ISLSCP1_tbot.F90 index 41d4abfd3..2ce62ead4 100644 --- a/ldt/params/Noah/read_ISLSCP1_tbot.F90 +++ b/ldt/params/Noah/read_ISLSCP1_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_NCEPNative_slopetype.F90 b/ldt/params/Noah/read_NCEPNative_slopetype.F90 index 0eecf8c98..e7406e09b 100644 --- a/ldt/params/Noah/read_NCEPNative_slopetype.F90 +++ b/ldt/params/Noah/read_NCEPNative_slopetype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_NCEP_GFS_tbot.F90 b/ldt/params/Noah/read_NCEP_GFS_tbot.F90 index 55fed8214..c76828680 100644 --- a/ldt/params/Noah/read_NCEP_GFS_tbot.F90 +++ b/ldt/params/Noah/read_NCEP_GFS_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_NCEP_slopetype.F90 b/ldt/params/Noah/read_NCEP_slopetype.F90 index fb12e3254..be756c06d 100644 --- a/ldt/params/Noah/read_NCEP_slopetype.F90 +++ b/ldt/params/Noah/read_NCEP_slopetype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_NCEP_tbot.F90 b/ldt/params/Noah/read_NCEP_tbot.F90 index be15e7e2d..9ad087ab6 100644 --- a/ldt/params/Noah/read_NCEP_tbot.F90 +++ b/ldt/params/Noah/read_NCEP_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Noah/read_geogrid.c b/ldt/params/Noah/read_geogrid.c new file mode 100644 index 000000000..09ddc2048 --- /dev/null +++ b/ldt/params/Noah/read_geogrid.c @@ -0,0 +1,136 @@ +/* File: read_geogrid.c + + Sample subroutine to read an array from the geogrid binary format. + + Notes: Depending on the compiler and compiler flags, the name of + the read_geogrid() routine may need to be adjusted with respect + to the number of trailing underscores when calling from Fortran. + + Michael G. Duda, NCAR/MMM +*/ +#include +#include +#include +#include + +/* +#define BIG_ENDIAN 0 +#define LITTLE_ENDIAN 1 +*/ + +int read_geogrid_( + char * fname, /* The name of the file to read from */ + int * len, /* The length of the filename */ + float * rarray, /* The array to be filled */ + int * nx, /* x-dimension of the array */ + int * ny, /* y-dimension of the array */ + int * nz, /* z-dimension of the array */ + int * isigned, /* 0=unsigned data, 1=signed data */ + int * endian, /* 0=big endian, 1=little endian */ + float * scalefactor, /* value to multiply array elements by before truncation to integers */ + int * wordsize, /* number of bytes to use for each array element */ + int * status) +{ + int i, ival, cnt, narray; + int A2, B2; + int A3, B3, C3; + int A4, B4, C4, D4; + unsigned char * c; + char local_fname[1024]; + FILE * bfile; + + *status = 0; + + narray = (*nx) * (*ny) * (*nz); + + /* Make a null-terminated local copy of the filename */ + strncpy(local_fname,fname,*len); + local_fname[*len]='\0'; + + /* Attempt to open file for reading */ + if (!(bfile = fopen(local_fname,"rb"))) + { + printf("ERROR opening %s\n",local_fname); + *status = 1; + return 1; + } + + /* Allocate memory to hold bytes from file and read data */ + c = (unsigned char *)malloc(sizeof(unsigned char)*(*wordsize) * narray); + cnt = fread((void *)c, sizeof(unsigned char), narray*(*wordsize), bfile); + + fclose(bfile); + + if (cnt == 0) + { + printf("ERROR reading %s\n",local_fname); + *status = 1; + return 1; + } + + /* + Set up byte offsets for each wordsize depending on byte order. + A, B, C, D give the offsets of the LSB through MSB (i.e., for + word ABCD, A=MSB, D=LSB) in the array from the beginning of a word + */ + if (*endian == 0) { + A2 = 0; B2 = 1; + A3 = 0; B3 = 1; C3 = 2; + A4 = 0; B4 = 1; C4 = 2; D4 = 3; + } + else { + B2 = 0; A2 = 1; + C3 = 0; B3 = 1; A3 = 2; + D4 = 0; C4 = 1; B4 = 2; A4 = 3; + } + + /* Convert words from native byte order */ + switch(*wordsize) { + case 1: + for(i=0; i (1 << 7))) ival -= (1 << 8); + rarray[i] = (float)ival; + } + break; + + case 2: + for(i=0; i (1 << 15))) ival -= (1 << 16); + rarray[i] = (float)ival; + } + break; + + case 3: + for(i=0; i (1 << 23))) ival -= (1 << 24); + rarray[i] = (float)ival; + } + break; + + case 4: + for(i=0; i (1 << 31))) ival -= (1 << 32); + rarray[i] = (float)ival; + } + break; + } + + free(c); + + /* Scale real-valued array by scalefactor */ + if (*scalefactor != 1.0) + { + for (i=0; i.00001- is + created, where is the argument nx and is the argument ny, + both in i5.5 format. + + Notes: Depending on the compiler and compiler flags, the name of + the write_geogrid() routine may need to be adjusted with respect + to the number of trailing underscores when calling from Fortran. + + Michael G. Duda, NCAR/MMM +*/ + +#include +#include +#include + +#ifdef _UNDERSCORE +#define write_geogrid write_geogrid_ +#endif +#ifdef _DOUBLEUNDERSCORE +#define write_geogrid write_geogrid__ +#endif + +#define BIG_ENDIAN 0 +#define LITTLE_ENDIAN 1 + +int write_geogrid_( + float * rarray, /* The array to be written */ + int * nx, /* x-dimension of the array */ + int * ny, /* y-dimension of the array */ + int * nz, /* z-dimension of the array */ + int * isigned, /* 0=unsigned data, 1=signed data */ + int * endian, /* 0=big endian, 1=little endian */ + float * scalefactor, /* value to divide array elements by before truncation to integers */ + int * wordsize ) /* number of bytes to use for each array element */ +{ + int i, narray; + int A2, B2; + int A3, B3, C3; + int A4, B4, C4, D4; + unsigned int * iarray; + unsigned char * barray; + char fname[24]; + FILE * bfile; + + narray = (*nx) * (*ny) * (*nz); + + iarray = (unsigned int *)malloc(sizeof(int) * narray); + barray = (unsigned char *)malloc(sizeof(unsigned char) * narray * (*wordsize)); + + /* Scale real-valued array by scalefactor and convert to integers */ + for (i=0; i> 8) & 0xff); + barray[(*wordsize)*i+B2] = (unsigned char)( iarray[i] & 0xff); + } + break; + + case 3: + for(i=0; i> 16) & 0xff); + barray[(*wordsize)*i+B3] = (unsigned char)((iarray[i] >> 8) & 0xff); + barray[(*wordsize)*i+C3] = (unsigned char)( iarray[i] & 0xff); + } + break; + + case 4: + for(i=0; i> 24) & 0xff); + barray[(*wordsize)*i+B4] = (unsigned char)((iarray[i] >> 16) & 0xff); + barray[(*wordsize)*i+C4] = (unsigned char)((iarray[i] >> 8) & 0xff); + barray[(*wordsize)*i+D4] = (unsigned char)( iarray[i] & 0xff); + } + break; + } + + sprintf(fname,"%5.5i-%5.5i.%5.5i-%5.5i",1,*nx,1,*ny); + + /* Write array to file */ + bfile = fopen(fname,"wb"); + fwrite(barray,sizeof(unsigned char),narray*(*wordsize),bfile); + fclose(bfile); + + free(iarray); + free(barray); + + return 0; +} diff --git a/ldt/params/RDHM/RDHM_parmsMod.F90 b/ldt/params/RDHM/RDHM_parmsMod.F90 index 3949339c1..18f08e15d 100644 --- a/ldt/params/RDHM/RDHM_parmsMod.F90 +++ b/ldt/params/RDHM/RDHM_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/RUC/RUC_parmsMod.F90 b/ldt/params/RUC/RUC_parmsMod.F90 index b3af02138..31d5115db 100644 --- a/ldt/params/RUC/RUC_parmsMod.F90 +++ b/ldt/params/RUC/RUC_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/RUC/read_RUC_ISLSCP1tbot.F90 b/ldt/params/RUC/read_RUC_ISLSCP1tbot.F90 index 47ba20c11..317a477d8 100644 --- a/ldt/params/RUC/read_RUC_ISLSCP1tbot.F90 +++ b/ldt/params/RUC/read_RUC_ISLSCP1tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/RUC/read_RUC_NCEPLIS_slopetype.F90 b/ldt/params/RUC/read_RUC_NCEPLIS_slopetype.F90 index b7e754b98..6b2880bb0 100644 --- a/ldt/params/RUC/read_RUC_NCEPLIS_slopetype.F90 +++ b/ldt/params/RUC/read_RUC_NCEPLIS_slopetype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/RUC/read_RUC_NCEPLIS_tbot.F90 b/ldt/params/RUC/read_RUC_NCEPLIS_tbot.F90 index 0869cdb89..81decf651 100644 --- a/ldt/params/RUC/read_RUC_NCEPLIS_tbot.F90 +++ b/ldt/params/RUC/read_RUC_NCEPLIS_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/RUC/read_RUC_NCEPslopetype.F90 b/ldt/params/RUC/read_RUC_NCEPslopetype.F90 index 64153c89b..f98790682 100644 --- a/ldt/params/RUC/read_RUC_NCEPslopetype.F90 +++ b/ldt/params/RUC/read_RUC_NCEPslopetype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SACHTET/SACHTET_parmsMod.F90 b/ldt/params/SACHTET/SACHTET_parmsMod.F90 index ea080a863..c600f5ea8 100644 --- a/ldt/params/SACHTET/SACHTET_parmsMod.F90 +++ b/ldt/params/SACHTET/SACHTET_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SACHTET/create_SACsoilparms_Korenv1.F90 b/ldt/params/SACHTET/create_SACsoilparms_Korenv1.F90 index fcf5df485..a47b87db3 100644 --- a/ldt/params/SACHTET/create_SACsoilparms_Korenv1.F90 +++ b/ldt/params/SACHTET/create_SACsoilparms_Korenv1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SACHTET/read_SACHTET356_pet.F90 b/ldt/params/SACHTET/read_SACHTET356_pet.F90 index 216b03f6c..18a53472a 100644 --- a/ldt/params/SACHTET/read_SACHTET356_pet.F90 +++ b/ldt/params/SACHTET/read_SACHTET356_pet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SACHTET/read_SACHTET356_petadj.F90 b/ldt/params/SACHTET/read_SACHTET356_petadj.F90 index 135625977..bfa66688e 100644 --- a/ldt/params/SACHTET/read_SACHTET356_petadj.F90 +++ b/ldt/params/SACHTET/read_SACHTET356_petadj.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SACHTET/read_SACHTET356_tbot.F90 b/ldt/params/SACHTET/read_SACHTET356_tbot.F90 index 4a772c7ba..0702941a4 100644 --- a/ldt/params/SACHTET/read_SACHTET356_tbot.F90 +++ b/ldt/params/SACHTET/read_SACHTET356_tbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SiB2/SiB2_parmsMod.F90 b/ldt/params/SiB2/SiB2_parmsMod.F90 index 6605c00dd..877fd99f4 100644 --- a/ldt/params/SiB2/SiB2_parmsMod.F90 +++ b/ldt/params/SiB2/SiB2_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SiB2/read_SiB2_parms.F90 b/ldt/params/SiB2/read_SiB2_parms.F90 index 79e50a7ac..77253ec99 100644 --- a/ldt/params/SiB2/read_SiB2_parms.F90 +++ b/ldt/params/SiB2/read_SiB2_parms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/Snow17/Snow17_parmsMod.F90 b/ldt/params/Snow17/Snow17_parmsMod.F90 index 1f766d91b..774054a36 100644 --- a/ldt/params/Snow17/Snow17_parmsMod.F90 +++ b/ldt/params/Snow17/Snow17_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/SnowModel/SnowModel_parmsMod.F90 b/ldt/params/SnowModel/SnowModel_parmsMod.F90 new file mode 100644 index 000000000..3f229b57b --- /dev/null +++ b/ldt/params/SnowModel/SnowModel_parmsMod.F90 @@ -0,0 +1,328 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LDT_misc.h" +module SnowModel_parmsMod +!BOP +! +! !MODULE: SnowModel_parmsMod +! +! !DESCRIPTION: +! The code in this file implements routines to read SnowModel parameter +! data. +! \subsubsection{Overview} +! This routines in this module provides routines to read the +! SnowModel parameter file data. +! +! !REVISION HISTORY: +! +! 16 July 2020: K. Arsenault: SnowModel model parameters +! +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + use ESMF + use LDT_coreMod + use LDT_historyMod + use LDT_paramDataMod + use LDT_logMod + use LDT_paramMaskCheckMod + + implicit none + + PRIVATE +!------------------------------------------------------------------------------ +! !PUBLIC MEMBER FUNCTIONS: +!------------------------------------------------------------------------------ + public :: SnowModelparms_init !allocates memory for required structures + public :: SnowModelparms_writeHeader + public :: SnowModelparms_writeData + +!------------------------------------------------------------------------------ +! !PUBLIC TYPES: +!------------------------------------------------------------------------------ + public :: SnowModel_struc + + type, public :: sm_type_dec + +! - SnowModel-specific: + integer :: Nveg + + real :: topoveg_gridDesc(20) + character(140) :: topoveg_file + character(50) :: topoveg_gridtransform + character(50) :: topoveg_proj + + type(LDT_paramEntry) :: sm ! SnowModel parameters (collective) + type(LDT_paramEntry) :: sm_topo ! SnowModel-specific topo map + type(LDT_paramEntry) :: sm_vege ! SnowModel-specific veg map + + end type sm_type_dec + + type(sm_type_dec), allocatable :: SnowModel_struc(:) + +contains + +!BOP +! +! !ROUTINE: SnowModelparms_init +! \label{SnowModelparms_init} +! +! !INTERFACE: + subroutine SnowModelparms_init + +! !USES: + use LDT_logMod, only : LDT_verify, LDT_endrun, & + LDT_getNextUnitNumber, LDT_releaseUnitNumber +! +! !DESCRIPTION: +! +! Glen Liston's SnowModel model parameters. +! +! The routines invoked are: +! \begin{description} +! \item[smParmssetup](\ref{smParmssetup}) \newline +! calls the registry to invoke the SnowModel Parms setup methods. +! \end{description} +! +!EOP + implicit none + integer :: n + integer :: c,r,m,k + integer :: rc + integer :: file_status + logical :: file_exists + logical :: sm_select + logical :: check_data + character*50 :: topoveg_proj + + type(LDT_fillopts) :: topoveg + +! integer :: veg_tiling_scheme ! 0=SnowModel, 1=LIS + + ! _____________________________________________________________________ + + allocate(SnowModel_struc(LDT_rc%nnest)) + + sm_select = .false. + do n=1,LDT_rc%nnest + ! - SnowModel parameters: + call set_param_attribs(SnowModel_struc(n)%sm,"SnowModel") + if( SnowModel_struc(n)%sm%selectOpt == 1 ) then + sm_select = .true. + + call set_param_attribs(SnowModel_struc(n)%sm_topo,"SMTOPO",& + units="m", & + full_name="SnowModel topography") + + call set_param_attribs(SnowModel_struc(n)%sm_vege,"SMVEG",& + units="-", & + full_name="SnowModel landcover classes") + endif + enddo + + if( sm_select ) then + write(LDT_logunit,*)" - - - - - - - - - - SnowModel LSM Parameters - - - - - - - - - - - - -" + write(LDT_logunit,*)"[INFO] SnowModel Model Parameters are available for" + write(LDT_logunit,*)" specific landcover, landmask and topographic maps" + endif + + ! SnowModel specific topo-vege input parameter file + ! (Typically a Grads binary file read in the preprocess.f routine) + check_data = .false. + + call ESMF_ConfigFindLabel(LDT_config,"Snowmodel topo-veg data source:",rc=rc) + do n=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,SnowModel_struc(n)%sm_topo%source,rc=rc) + call LDT_verify(rc,"Snowmodel topo-veg data source: not defined") + + if( SnowModel_struc(n)%sm_topo%source.eq."none" ) then + SnowModel_struc(n)%sm_topo%selectOpt = 0 + SnowModel_struc(n)%sm_vege%selectOpt = 0 + endif + if( SnowModel_struc(n)%sm_topo%selectOpt.eq.1 ) then + check_data = .true. + allocate(SnowModel_struc(n)%sm_topo%value(& + LDT_rc%lnc(n),LDT_rc%lnr(n),& + SnowModel_struc(n)%sm_topo%num_bins)) + allocate(SnowModel_struc(n)%sm_vege%value(& + LDT_rc%lnc(n),LDT_rc%lnr(n),& + SnowModel_struc(n)%sm_vege%num_bins)) + endif + enddo + + if(check_data) then + write(LDT_logunit,*)"[INFO] SnowModel Topo-Vege Fields " + + call ESMF_ConfigFindLabel(LDT_config,"Snowmodel topo-veg map:",rc=rc) + do n=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,SnowModel_struc(n)%topoveg_file,rc=rc) + enddo + call ESMF_ConfigGetAttribute(LDT_config,topoveg_proj,& + label="Snowmodel topo-veg map projection:",rc=rc) + call LDT_verify(rc,'Snowmodel topo-veg map projection: option not specified in the config file') + SnowModel_struc(:)%topoveg_proj = topoveg_proj + + ! SnowModel parameter projection check: + do n=1,LDT_rc%nnest + if( LDT_rc%lis_map_proj(n) .ne. SnowModel_struc(n)%topoveg_proj ) then + write(LDT_logunit,*)"[ERR] SnowModel parameter projection should be set " + write(LDT_logunit,*)" the same as the LIS domain projection, for now. " + write(LDT_logunit,*)" Future options will be provided to process input " + write(LDT_logunit,*)" SnowModel parameters for LIS model runs." + call LDT_endrun + endif + enddo + + call ESMF_ConfigFindLabel(LDT_config,"Snowmodel topo-veg spatial transform:",rc=rc) + do n=1,LDT_rc%nnest + call ESMF_ConfigGetAttribute(LDT_config,SnowModel_struc(n)%topoveg_gridtransform,& + rc=rc) + call LDT_verify(rc,'Snowmodel topo-veg spatial transform: option not specified in the config file') + enddo + do n=1,LDT_rc%nnest + if( SnowModel_struc(n)%topoveg_gridtransform .ne. "none" ) then + write(LDT_logunit,*)"[ERR] Currently, spatial grid transform of SnowModel parameter" + write(LDT_logunit,*)" is not supported but will be in future versions." + call LDT_endrun + endif + enddo + + ! Read in SnowModel topo-veg "fill" options: + topoveg%filltype = "none" + call ESMF_ConfigGetAttribute(LDT_config, topoveg%filltype, & + label="Snowmodel topo-veg fill option:",rc=rc) + call LDT_verify(rc,"Snowmodel topo-veg fill option: option not specified in the config file") + + if( topoveg%filltype == "neighbor" ) then + call ESMF_ConfigGetAttribute(LDT_config, topoveg%fillradius, & + label="Snowmodel topo-veg fill radius:",rc=rc) + call LDT_verify(rc,"Snowmodel topo-veg fill radius: option not specified in the config file") + + call ESMF_ConfigGetAttribute(LDT_config, topoveg%fillvalue, & + label="Snowmodel topo-veg fill value:",rc=rc) + call LDT_verify(rc,"Snowmodel topo-veg fill value: option not specified in the config file") + + elseif( topoveg%filltype == "none" ) then + write(LDT_logunit,*) " -- 'NONE' Parameter-Mask Agreement Option Selected for Snowmodel topo-veg" + else + write(LDT_logunit,*) "[ERR] Fill option for Snowmodel topo-veg is not valid: ",& + trim(topoveg%filltype) + write(LDT_logunit,*) " Please select one of these: none or neighbor " + call LDT_endrun + end if + + ! Read in topo-veg map (used in original SnowModel): + do n=1,LDT_rc%nnest + select case ( SnowModel_struc(n)%sm_topo%source ) + + case ( "Grads_binary" ) + call read_SMGradsBin_topoveg(n,& + SnowModel_struc(n)%sm_topo%value, & + SnowModel_struc(n)%sm_vege%value ) + +! case ( "CONSTANT" ) +! call read_CONSTANT_topoveg(n,& +! SnowModel_struc(n)%topoveg%value) + + case default + write(LDT_logunit,*) "[ERR] SnowModel Topo-veg data source has not been selected." + write(LDT_logunit,*) " Your SnowModel LSM will not run without this parameter set." + write(LDT_logunit,*) " Please select one of the following: " + write(LDT_logunit,*) " -- Grads_binary | Native | none " + call LDT_endrun + end select + + end do + + endif + + + end subroutine SnowModelparms_init + + + subroutine SnowModelparms_writeHeader(n,ftn,dimID) + + integer :: n + integer :: ftn + integer :: dimID(3) + + if( SnowModel_struc(n)%sm%selectOpt == 1 ) then + + call LDT_writeNETCDFdataHeader(n,ftn,dimID,& + SnowModel_struc(n)%sm_topo) + + call LDT_writeNETCDFdataHeader(n,ftn,dimID,& + SnowModel_struc(n)%sm_vege) + + endif + + + end subroutine SnowModelparms_writeHeader + + subroutine SnowModelparms_writeData(n,ftn) + + integer :: n + integer :: ftn + + if( SnowModel_struc(n)%sm%selectOpt == 1 ) then + call LDT_writeNETCDFdata(n,ftn,SnowModel_struc(n)%sm_topo) + call LDT_writeNETCDFdata(n,ftn,SnowModel_struc(n)%sm_vege) + endif + + end subroutine SnowModelparms_writeData + +!BOP +! !ROUTINE: set_param_attribs +! \label{set_param_attribs} +! +! !INTERFACE: + subroutine set_param_attribs(paramEntry, short_name, & + units, full_name ) + +! !DESCRIPTION: +! This routine reads over the parameter attribute entries +! in the param_attribs.txt file. +! +! !USES: + type(LDT_paramEntry),intent(inout) :: paramEntry + character(len=*), intent(in) :: short_name + character(len=*), optional :: units + character(len=*), optional :: full_name + + character(20) :: unit_temp + character(100):: name_temp +! ____________________________________________________ + + + if(present(units)) then + unit_temp = units + else + unit_temp = "none" + endif + if(present(full_name)) then + name_temp = full_name + else + name_temp = trim(short_name) + endif + + paramEntry%short_name = trim(short_name) + paramEntry%vlevels = 1 + paramEntry%selectOpt = 1 + paramEntry%source = "SnowModel" + paramEntry%units = unit_temp + paramEntry%num_times = 1 + paramEntry%num_bins = 1 + paramEntry%standard_name = trim(name_temp) + + end subroutine set_param_attribs + +end module SnowModel_parmsMod + diff --git a/ldt/params/SnowModel/read_SMGradsBin_topoveg.F90 b/ldt/params/SnowModel/read_SMGradsBin_topoveg.F90 new file mode 100644 index 000000000..a1302e9cf --- /dev/null +++ b/ldt/params/SnowModel/read_SMGradsBin_topoveg.F90 @@ -0,0 +1,114 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_SMGradsBin_topoveg +! \label{read_SMGradsBin_topoveg} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 16Dec2021: Kristi Arsenault; Added parallel read of parameters +! +! !INTERFACE: +subroutine read_SMGradsBin_topoveg(n, array1, array2) + +! !USES: + use LDT_coreMod + use LDT_paramDataMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use SnowModel_parmsMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n ! Input nest index + real, intent(inout) :: array1(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + real, intent(inout) :: array2(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + +! !DESCRIPTION: +! This subroutine retrieves SnowModel's topo-veg data and reprojects +! it to the latlon projection. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[array1] +! output field with the retrieved topo data +! \item[array2] +! output field with the retrieved vege data +! \end{description} +!EOP + + integer :: ftn + integer :: c, r + logical :: file_exists + real, allocatable :: read_topomap(:,:) ! Read input parameters + real, allocatable :: read_vegmap(:,:) + +! ____________________________________________________________________________________ + + array1 = LDT_rc%udef + array2 = LDT_rc%udef + + inquire(file=trim(SnowModel_struc(n)%topoveg_file), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "SnowModel topo-veg map, ",& + trim(SnowModel_struc(n)%topoveg_file),", not found." + call LDT_endrun + endif + select case ( SnowModel_struc(n)%topoveg_gridtransform ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading Grads_binary topoveg file: ",& + trim(SnowModel_struc(n)%topoveg_file) + case default + write(LDT_logunit,*) "[ERR] Since the Topo-Veg field involves discrete data values," + write(LDT_logunit,*) " Please check your entries for this parameter." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=SnowModel_struc(n)%topoveg_file, & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + +! Original code from Snowmodel's preprocess.f +! open (unit=37,file=topoveg_fname, & +! form='unformatted',access='direct',recl=4*nx*ny) +! read (37,rec=1) ((topo_land(i,j),i=1,nx),j=1,ny) + + ! Read in topographic map + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + + array1(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n),1) = & + read_topomap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + deallocate(read_topomap) + + ! Read in vegetation type map + allocate(read_vegmap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + read(ftn,rec=2) ((read_vegmap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + + array2(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n),1) = & + read_vegmap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + deallocate(read_vegmap) + + call LDT_releaseUnitNumber(ftn) + + ! Set landmask all to "=1" since SnowModel expects to have a land/water type + ! at each point in the domain: + LDT_LSMparam_struc(n)%landmask%value = 1 + LDT_LSMparam_struc(n)%dommask%value = 1 + + write(LDT_logunit, *) "[INFO] Done reading Grads_binary topo-veg file" + +end subroutine read_SMGradsBin_topoveg diff --git a/ldt/params/VIC/LDT_vic412rstMod.F90 b/ldt/params/VIC/LDT_vic412rstMod.F90 index 38c7f44ce..4f37fd94f 100644 --- a/ldt/params/VIC/LDT_vic412rstMod.F90 +++ b/ldt/params/VIC/LDT_vic412rstMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/VIC/VIC_parmsMod.F90 b/ldt/params/VIC/VIC_parmsMod.F90 index 69abd548b..ce2ced2be 100644 --- a/ldt/params/VIC/VIC_parmsMod.F90 +++ b/ldt/params/VIC/VIC_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_BarlageNative_maxsnoalb.F90 b/ldt/params/albedo/read_BarlageNative_maxsnoalb.F90 index 97ce4eb31..5d1a96b4a 100644 --- a/ldt/params/albedo/read_BarlageNative_maxsnoalb.F90 +++ b/ldt/params/albedo/read_BarlageNative_maxsnoalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_BrieglebNative_monalbedo.F90 b/ldt/params/albedo/read_BrieglebNative_monalbedo.F90 index 68afcaa26..67b2529e7 100644 --- a/ldt/params/albedo/read_BrieglebNative_monalbedo.F90 +++ b/ldt/params/albedo/read_BrieglebNative_monalbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_BrieglebNative_qtralbedo.F90 b/ldt/params/albedo/read_BrieglebNative_qtralbedo.F90 index 070fb9099..ee8507d48 100644 --- a/ldt/params/albedo/read_BrieglebNative_qtralbedo.F90 +++ b/ldt/params/albedo/read_BrieglebNative_qtralbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_Briegleb_albedo.F90 b/ldt/params/albedo/read_Briegleb_albedo.F90 index 0bc67100f..7d3f9a210 100644 --- a/ldt/params/albedo/read_Briegleb_albedo.F90 +++ b/ldt/params/albedo/read_Briegleb_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_CONSTANT_albedo.F90 b/ldt/params/albedo/read_CONSTANT_albedo.F90 index 54de82e45..b90745f58 100644 --- a/ldt/params/albedo/read_CONSTANT_albedo.F90 +++ b/ldt/params/albedo/read_CONSTANT_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_CONSTANT_mxsnoalb.F90 b/ldt/params/albedo/read_CONSTANT_mxsnoalb.F90 index 893530cf4..b04aa75eb 100644 --- a/ldt/params/albedo/read_CONSTANT_mxsnoalb.F90 +++ b/ldt/params/albedo/read_CONSTANT_mxsnoalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_GFS_maxsnoalb.F90 b/ldt/params/albedo/read_GFS_maxsnoalb.F90 index 8051269de..48eebdc8e 100644 --- a/ldt/params/albedo/read_GFS_maxsnoalb.F90 +++ b/ldt/params/albedo/read_GFS_maxsnoalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_RobinsonKuklaNative_mxsnoalb.F90 b/ldt/params/albedo/read_RobinsonKuklaNative_mxsnoalb.F90 index d7f5bfe09..09b0b535e 100644 --- a/ldt/params/albedo/read_RobinsonKuklaNative_mxsnoalb.F90 +++ b/ldt/params/albedo/read_RobinsonKuklaNative_mxsnoalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_RobinsonKukla_mxsnoalb.F90 b/ldt/params/albedo/read_RobinsonKukla_mxsnoalb.F90 index 99a276ba2..99fa56ebf 100644 --- a/ldt/params/albedo/read_RobinsonKukla_mxsnoalb.F90 +++ b/ldt/params/albedo/read_RobinsonKukla_mxsnoalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/read_SACHTET356_mxsnoalb.F90 b/ldt/params/albedo/read_SACHTET356_mxsnoalb.F90 index 42575e8c0..974f15d93 100644 --- a/ldt/params/albedo/read_SACHTET356_mxsnoalb.F90 +++ b/ldt/params/albedo/read_SACHTET356_mxsnoalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/setAlbedoParmsFullnames.F90 b/ldt/params/albedo/setAlbedoParmsFullnames.F90 index ae9794164..e185d39ff 100644 --- a/ldt/params/albedo/setAlbedoParmsFullnames.F90 +++ b/ldt/params/albedo/setAlbedoParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/albedo/set_albedo_attribs.F90 b/ldt/params/albedo/set_albedo_attribs.F90 index 1153e08d4..95071565f 100644 --- a/ldt/params/albedo/set_albedo_attribs.F90 +++ b/ldt/params/albedo/set_albedo_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/CLSMF25_parmsMod.F90 b/ldt/params/catchment/CLSMF25_parmsMod.F90 index 3efbb8cb3..c8f33544f 100644 --- a/ldt/params/catchment/CLSMF25_parmsMod.F90 +++ b/ldt/params/catchment/CLSMF25_parmsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_albnir.F90 b/ldt/params/catchment/read_CLSMF25_albnir.F90 index c39370801..9ae24ab91 100644 --- a/ldt/params/catchment/read_CLSMF25_albnir.F90 +++ b/ldt/params/catchment/read_CLSMF25_albnir.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_albvis.F90 b/ldt/params/catchment/read_CLSMF25_albvis.F90 index 9e84bffae..2a2686c66 100644 --- a/ldt/params/catchment/read_CLSMF25_albvis.F90 +++ b/ldt/params/catchment/read_CLSMF25_albvis.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_araparams.F90 b/ldt/params/catchment/read_CLSMF25_araparams.F90 index 51113eb3e..15f5f1ec7 100644 --- a/ldt/params/catchment/read_CLSMF25_araparams.F90 +++ b/ldt/params/catchment/read_CLSMF25_araparams.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_arsparams.F90 b/ldt/params/catchment/read_CLSMF25_arsparams.F90 index 9d4834d7b..450d05af9 100644 --- a/ldt/params/catchment/read_CLSMF25_arsparams.F90 +++ b/ldt/params/catchment/read_CLSMF25_arsparams.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_arwparams.F90 b/ldt/params/catchment/read_CLSMF25_arwparams.F90 index 8cba7cb42..1b5fbd55f 100644 --- a/ldt/params/catchment/read_CLSMF25_arwparams.F90 +++ b/ldt/params/catchment/read_CLSMF25_arwparams.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_bedrockdepth.F90 b/ldt/params/catchment/read_CLSMF25_bedrockdepth.F90 index 9be51a562..f1968f00b 100644 --- a/ldt/params/catchment/read_CLSMF25_bedrockdepth.F90 +++ b/ldt/params/catchment/read_CLSMF25_bedrockdepth.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_bexp.F90 b/ldt/params/catchment/read_CLSMF25_bexp.F90 index ddfba3e76..15cb8727d 100644 --- a/ldt/params/catchment/read_CLSMF25_bexp.F90 +++ b/ldt/params/catchment/read_CLSMF25_bexp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_bfparams.F90 b/ldt/params/catchment/read_CLSMF25_bfparams.F90 index 9364ce8ff..ab9eddb7d 100644 --- a/ldt/params/catchment/read_CLSMF25_bfparams.F90 +++ b/ldt/params/catchment/read_CLSMF25_bfparams.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_gnuparam.F90 b/ldt/params/catchment/read_CLSMF25_gnuparam.F90 index 7091ebe1d..abbc851e1 100644 --- a/ldt/params/catchment/read_CLSMF25_gnuparam.F90 +++ b/ldt/params/catchment/read_CLSMF25_gnuparam.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_ksat.F90 b/ldt/params/catchment/read_CLSMF25_ksat.F90 index cf17b3faf..8d16e41ff 100644 --- a/ldt/params/catchment/read_CLSMF25_ksat.F90 +++ b/ldt/params/catchment/read_CLSMF25_ksat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_psisat.F90 b/ldt/params/catchment/read_CLSMF25_psisat.F90 index 2a85732b8..9f6fbea04 100644 --- a/ldt/params/catchment/read_CLSMF25_psisat.F90 +++ b/ldt/params/catchment/read_CLSMF25_psisat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_tauparams.F90 b/ldt/params/catchment/read_CLSMF25_tauparams.F90 index 72fdf1f99..ff925789e 100644 --- a/ldt/params/catchment/read_CLSMF25_tauparams.F90 +++ b/ldt/params/catchment/read_CLSMF25_tauparams.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_tsparams.F90 b/ldt/params/catchment/read_CLSMF25_tsparams.F90 index ed69e95a7..036a6d6f0 100644 --- a/ldt/params/catchment/read_CLSMF25_tsparams.F90 +++ b/ldt/params/catchment/read_CLSMF25_tsparams.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/read_CLSMF25_wpwet.F90 b/ldt/params/catchment/read_CLSMF25_wpwet.F90 index 5208d3ed5..488096652 100644 --- a/ldt/params/catchment/read_CLSMF25_wpwet.F90 +++ b/ldt/params/catchment/read_CLSMF25_wpwet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/catchment/set_CLSMF25_gfrac_attribs.F90 b/ldt/params/catchment/set_CLSMF25_gfrac_attribs.F90 index 8cecea792..a54076425 100644 --- a/ldt/params/catchment/set_CLSMF25_gfrac_attribs.F90 +++ b/ldt/params/catchment/set_CLSMF25_gfrac_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/climateparms/LDT_NAFPA_back_climpptMod.F90 b/ldt/params/climateparms/LDT_NAFPA_back_climpptMod.F90 index 5fe9340a5..374952fc1 100644 --- a/ldt/params/climateparms/LDT_NAFPA_back_climpptMod.F90 +++ b/ldt/params/climateparms/LDT_NAFPA_back_climpptMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/climateparms/read_NLDAS_climppt.F90 b/ldt/params/climateparms/read_NLDAS_climppt.F90 index 5d68938d1..242e221a5 100755 --- a/ldt/params/climateparms/read_NLDAS_climppt.F90 +++ b/ldt/params/climateparms/read_NLDAS_climppt.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/climateparms/read_PRISM_climppt.F90 b/ldt/params/climateparms/read_PRISM_climppt.F90 index 828ab7671..615d65fa9 100644 --- a/ldt/params/climateparms/read_PRISM_climppt.F90 +++ b/ldt/params/climateparms/read_PRISM_climppt.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/climateparms/read_WorldClim_climppt.F90 b/ldt/params/climateparms/read_WorldClim_climppt.F90 index de485d584..696c5232d 100644 --- a/ldt/params/climateparms/read_WorldClim_climppt.F90 +++ b/ldt/params/climateparms/read_WorldClim_climppt.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/climateparms/setClimateParmsFullnames.F90 b/ldt/params/climateparms/setClimateParmsFullnames.F90 index a7a035a1d..ba3448f6f 100644 --- a/ldt/params/climateparms/setClimateParmsFullnames.F90 +++ b/ldt/params/climateparms/setClimateParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/crop_parms/Monfredaetal08_crops_module.F90 b/ldt/params/crop_parms/Monfredaetal08_crops_module.F90 index 4bbc5e87c..09a745691 100755 --- a/ldt/params/crop_parms/Monfredaetal08_crops_module.F90 +++ b/ldt/params/crop_parms/Monfredaetal08_crops_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/crop_parms/assigncroptype.F90 b/ldt/params/crop_parms/assigncroptype.F90 index 09d8c2a8e..ff47c9784 100644 --- a/ldt/params/crop_parms/assigncroptype.F90 +++ b/ldt/params/crop_parms/assigncroptype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/crop_parms/read_UMDCROPMAP_croptype.F90 b/ldt/params/crop_parms/read_UMDCROPMAP_croptype.F90 index 09a326579..349551a1e 100755 --- a/ldt/params/crop_parms/read_UMDCROPMAP_croptype.F90 +++ b/ldt/params/crop_parms/read_UMDCROPMAP_croptype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/crop_parms/readcropinventory.F90 b/ldt/params/crop_parms/readcropinventory.F90 index c4d8152ad..ab8984d0a 100644 --- a/ldt/params/crop_parms/readcropinventory.F90 +++ b/ldt/params/crop_parms/readcropinventory.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/crop_parms/setCropParmsFullnames.F90 b/ldt/params/crop_parms/setCropParmsFullnames.F90 index d0cd9ea96..4a76c2b30 100644 --- a/ldt/params/crop_parms/setCropParmsFullnames.F90 +++ b/ldt/params/crop_parms/setCropParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_AVHRRNative_gfrac.F90 b/ldt/params/gfrac/read_AVHRRNative_gfrac.F90 index 3633dd7d9..a0eff9873 100644 --- a/ldt/params/gfrac/read_AVHRRNative_gfrac.F90 +++ b/ldt/params/gfrac/read_AVHRRNative_gfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_AVHRR_gfrac.F90 b/ldt/params/gfrac/read_AVHRR_gfrac.F90 index 2acb4ee7f..e0fa5280c 100644 --- a/ldt/params/gfrac/read_AVHRR_gfrac.F90 +++ b/ldt/params/gfrac/read_AVHRR_gfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_CLSMF25_gfrac.F90 b/ldt/params/gfrac/read_CLSMF25_gfrac.F90 index be9565e8c..081caa11c 100644 --- a/ldt/params/gfrac/read_CLSMF25_gfrac.F90 +++ b/ldt/params/gfrac/read_CLSMF25_gfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_CLSMF25_gfracmax.F90 b/ldt/params/gfrac/read_CLSMF25_gfracmax.F90 index 8735828f7..d1aead826 100644 --- a/ldt/params/gfrac/read_CLSMF25_gfracmax.F90 +++ b/ldt/params/gfrac/read_CLSMF25_gfracmax.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_CLSMF25_gfracmin.F90 b/ldt/params/gfrac/read_CLSMF25_gfracmin.F90 index e6b984e8d..98a42cbcd 100644 --- a/ldt/params/gfrac/read_CLSMF25_gfracmin.F90 +++ b/ldt/params/gfrac/read_CLSMF25_gfracmin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_CONSTANT_gfrac.F90 b/ldt/params/gfrac/read_CONSTANT_gfrac.F90 index 4dcbf48e6..17b58e16a 100644 --- a/ldt/params/gfrac/read_CONSTANT_gfrac.F90 +++ b/ldt/params/gfrac/read_CONSTANT_gfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_CONSTANT_gfracmax.F90 b/ldt/params/gfrac/read_CONSTANT_gfracmax.F90 index b77c26f0c..4555e6dc1 100644 --- a/ldt/params/gfrac/read_CONSTANT_gfracmax.F90 +++ b/ldt/params/gfrac/read_CONSTANT_gfracmax.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_CONSTANT_gfracmin.F90 b/ldt/params/gfrac/read_CONSTANT_gfracmin.F90 index 5ffedbc25..3b6fc674f 100644 --- a/ldt/params/gfrac/read_CONSTANT_gfracmin.F90 +++ b/ldt/params/gfrac/read_CONSTANT_gfracmin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_NCEPNative_shdmax.F90 b/ldt/params/gfrac/read_NCEPNative_shdmax.F90 index eac2edd57..efb2c6bfd 100644 --- a/ldt/params/gfrac/read_NCEPNative_shdmax.F90 +++ b/ldt/params/gfrac/read_NCEPNative_shdmax.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_NCEPNative_shdmin.F90 b/ldt/params/gfrac/read_NCEPNative_shdmin.F90 index 6653c80f3..bc77cb1dd 100644 --- a/ldt/params/gfrac/read_NCEPNative_shdmin.F90 +++ b/ldt/params/gfrac/read_NCEPNative_shdmin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_NCEP_shdmax.F90 b/ldt/params/gfrac/read_NCEP_shdmax.F90 index a346bd96b..3921b63f0 100644 --- a/ldt/params/gfrac/read_NCEP_shdmax.F90 +++ b/ldt/params/gfrac/read_NCEP_shdmax.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_NCEP_shdmin.F90 b/ldt/params/gfrac/read_NCEP_shdmin.F90 index bef40d95e..98b639500 100644 --- a/ldt/params/gfrac/read_NCEP_shdmin.F90 +++ b/ldt/params/gfrac/read_NCEP_shdmin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/read_SACHTET356_gfrac.F90 b/ldt/params/gfrac/read_SACHTET356_gfrac.F90 index 3ad1843ad..a539dd090 100644 --- a/ldt/params/gfrac/read_SACHTET356_gfrac.F90 +++ b/ldt/params/gfrac/read_SACHTET356_gfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/setGfracParmsFullnames.F90 b/ldt/params/gfrac/setGfracParmsFullnames.F90 index b580dd680..82d7eae99 100644 --- a/ldt/params/gfrac/setGfracParmsFullnames.F90 +++ b/ldt/params/gfrac/setGfracParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/gfrac/set_gfrac_attribs.F90 b/ldt/params/gfrac/set_gfrac_attribs.F90 index fb5ee4d02..3f20390a1 100644 --- a/ldt/params/gfrac/set_gfrac_attribs.F90 +++ b/ldt/params/gfrac/set_gfrac_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/glacier/read_GLIMS_glacierfraction.F90 b/ldt/params/glacier/read_GLIMS_glacierfraction.F90 index 957424b84..89b11abbd 100755 --- a/ldt/params/glacier/read_GLIMS_glacierfraction.F90 +++ b/ldt/params/glacier/read_GLIMS_glacierfraction.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/glacier/read_GLIMS_glaciermask.F90 b/ldt/params/glacier/read_GLIMS_glaciermask.F90 index 6ffdbf18a..13768026e 100755 --- a/ldt/params/glacier/read_GLIMS_glaciermask.F90 +++ b/ldt/params/glacier/read_GLIMS_glaciermask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/glacier/setGlacierFracParmsFullnames.F90 b/ldt/params/glacier/setGlacierFracParmsFullnames.F90 index 07ca28033..f615a7559 100644 --- a/ldt/params/glacier/setGlacierFracParmsFullnames.F90 +++ b/ldt/params/glacier/setGlacierFracParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/glacier/set_glacierfraction_attribs.F90 b/ldt/params/glacier/set_glacierfraction_attribs.F90 index 8bc277162..139951a43 100644 --- a/ldt/params/glacier/set_glacierfraction_attribs.F90 +++ b/ldt/params/glacier/set_glacierfraction_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/read_GRIPC_irrigfrac.F90 b/ldt/params/irrigation/read_GRIPC_irrigfrac.F90 index 6f6163204..f58354daf 100644 --- a/ldt/params/irrigation/read_GRIPC_irrigfrac.F90 +++ b/ldt/params/irrigation/read_GRIPC_irrigfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/read_GRIPC_irrigtype.F90 b/ldt/params/irrigation/read_GRIPC_irrigtype.F90 index 9478ffd96..1e315db26 100644 --- a/ldt/params/irrigation/read_GRIPC_irrigtype.F90 +++ b/ldt/params/irrigation/read_GRIPC_irrigtype.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/read_OzdoganGutman_irrigfrac.F90 b/ldt/params/irrigation/read_OzdoganGutman_irrigfrac.F90 index dc6c4b6fd..d9547e74e 100644 --- a/ldt/params/irrigation/read_OzdoganGutman_irrigfrac.F90 +++ b/ldt/params/irrigation/read_OzdoganGutman_irrigfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/read_USGSNative_irriggwratio.F90 b/ldt/params/irrigation/read_USGSNative_irriggwratio.F90 index 4e2c8851f..eba1f05df 100644 --- a/ldt/params/irrigation/read_USGSNative_irriggwratio.F90 +++ b/ldt/params/irrigation/read_USGSNative_irriggwratio.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/read_UserDerived_irrigfrac.F90 b/ldt/params/irrigation/read_UserDerived_irrigfrac.F90 index 746ff4cbb..d31b948a8 100644 --- a/ldt/params/irrigation/read_UserDerived_irrigfrac.F90 +++ b/ldt/params/irrigation/read_UserDerived_irrigfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/setIrrigParmsFullnames.F90 b/ldt/params/irrigation/setIrrigParmsFullnames.F90 index 81a3277e3..2ce5c03c1 100644 --- a/ldt/params/irrigation/setIrrigParmsFullnames.F90 +++ b/ldt/params/irrigation/setIrrigParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/set_irrigation_attribs.F90 b/ldt/params/irrigation/set_irrigation_attribs.F90 index 3cf7cf46b..f46c8ef2d 100644 --- a/ldt/params/irrigation/set_irrigation_attribs.F90 +++ b/ldt/params/irrigation/set_irrigation_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/irrigation/set_irriggwratio_attribs.F90 b/ldt/params/irrigation/set_irriggwratio_attribs.F90 index 006a8d979..f3befde78 100644 --- a/ldt/params/irrigation/set_irriggwratio_attribs.F90 +++ b/ldt/params/irrigation/set_irriggwratio_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_ALMIPII_droot.F90 b/ldt/params/landcover/read_ALMIPII_droot.F90 index 31f5310a1..17f17bcdd 100644 --- a/ldt/params/landcover/read_ALMIPII_droot.F90 +++ b/ldt/params/landcover/read_ALMIPII_droot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_ALMIPII_lc.F90 b/ldt/params/landcover/read_ALMIPII_lc.F90 index 7e945df5a..91eb12aa0 100644 --- a/ldt/params/landcover/read_ALMIPII_lc.F90 +++ b/ldt/params/landcover/read_ALMIPII_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_AVHRR_GFS_lc.F90 b/ldt/params/landcover/read_AVHRR_GFS_lc.F90 index bd4946cfe..3fa0e285f 100755 --- a/ldt/params/landcover/read_AVHRR_GFS_lc.F90 +++ b/ldt/params/landcover/read_AVHRR_GFS_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_AVHRR_lc.F90 b/ldt/params/landcover/read_AVHRR_lc.F90 index 500bb97bf..369cb7582 100755 --- a/ldt/params/landcover/read_AVHRR_lc.F90 +++ b/ldt/params/landcover/read_AVHRR_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_CLM45_lc.F90 b/ldt/params/landcover/read_CLM45_lc.F90 index 6f5112189..588b43d78 100644 --- a/ldt/params/landcover/read_CLM45_lc.F90 +++ b/ldt/params/landcover/read_CLM45_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_CLSMF25_lc.F90 b/ldt/params/landcover/read_CLSMF25_lc.F90 index f465457f2..506d008a5 100755 --- a/ldt/params/landcover/read_CLSMF25_lc.F90 +++ b/ldt/params/landcover/read_CLSMF25_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_CONSTANT_lc.F90 b/ldt/params/landcover/read_CONSTANT_lc.F90 index 82b73a96d..635e75e04 100755 --- a/ldt/params/landcover/read_CONSTANT_lc.F90 +++ b/ldt/params/landcover/read_CONSTANT_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_ISA_lc.F90 b/ldt/params/landcover/read_ISA_lc.F90 index 1641c0262..1da5e8c4d 100755 --- a/ldt/params/landcover/read_ISA_lc.F90 +++ b/ldt/params/landcover/read_ISA_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_MCD12Q1_lc.F90 b/ldt/params/landcover/read_MCD12Q1_lc.F90 new file mode 100755 index 000000000..1e04a406f --- /dev/null +++ b/ldt/params/landcover/read_MCD12Q1_lc.F90 @@ -0,0 +1,310 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LDT_misc.h" +!BOP +! +! !ROUTINE: read_MCD12Q1_lc +! \label{read_MCD12Q1_lc} +! +! !REVISION HISTORY: +! 03 June 2022: Sujay Kumar; Initial Specification +! +! !INTERFACE: +subroutine read_MCD12Q1_lc(n, num_types, fgrd, maskarray ) + +! !USES: + use LDT_coreMod, only : LDT_rc + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_verify, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_index_fgrdcalc +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + use netcdf +#endif + + implicit none + +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(inout) :: num_types + real, intent(inout) :: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real, intent(inout) :: maskarray(LDT_rc%lnc(n),LDT_rc%lnr(n)) +! +! !DESCRIPTION: +! This subroutine reads the MODIS Terra+Aqua landcover data and returns the +! distribution of vegetation in each grid cell, in a lat/lon +! projection. Also, the landmask is either generated and/or +! read in this routine. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of nest +! \item[fgrd] +! fraction of grid covered by each vegetation type +! \item[maskarray] +! landmask for the region of interest +! \end{description} +!EOP +! +! IGBP-NCEP landcover version: + integer, parameter :: IN_cols_igbpncep = 86400 + integer, parameter :: IN_rows_igbpncep = 43200 + real, parameter :: IN_xres = 1.0/240.0 + real, parameter :: IN_yres = 1.0/240.0 +! character*1 :: read_igbpncep_veg(IN_cols_igbpncep,IN_rows_igbpncep) + integer, allocatable :: read_igbpncep_veg(:,:) + + integer :: ftn, ierr, ios1, lcid + logical :: file_exists + integer :: i, t, c, r, line + integer :: input_cols, input_rows + integer :: glpnc, glpnr ! Parameter (global) total columns and rows + integer :: subpnc, subpnr ! Parameter subsetted columns and rows + integer :: mi ! Total number of input param grid array points + integer :: mo ! Total number of output LIS grid array points + real :: param_gridDesc(20) ! Input parameter grid desc array + real :: subparam_gridDesc(20) ! Subsetted parameter grid desc array + integer, allocatable :: lat_line(:,:), lon_line(:,:) + real, allocatable :: gi(:) ! Input parameter 1d grid + logical*1,allocatable :: li(:) ! Input logical mask (to match gi) + real :: go1(LDT_rc%lnc(n)*LDT_rc%lnr(n)) ! Output lis 1d grid + logical*1 :: lo1(LDT_rc%lnc(n)*LDT_rc%lnr(n)) ! Output logical mask (to match go) + real :: go2(LDT_rc%lnc(n)*LDT_rc%lnr(n), LDT_rc%nt) ! Output lis 1d grid + logical*1 :: lo2(LDT_rc%lnc(n)*LDT_rc%lnr(n), LDT_rc%nt) ! Output logical mask (to match go) + + real, allocatable :: subset_veg(:,:) ! Read input parameter + real :: vegcnt(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real :: vegtype(LDT_rc%lnc(n),LDT_rc%lnr(n)) + +!__________________________________________________________________ + + num_types = 20 + +!- Check if land cover file exists: + inquire( file=trim(LDT_rc%vfile(n)), exist=file_exists ) + if(.not. file_exists) then + write(LDT_logunit,*)"[ERR] The landcover map: ",trim(LDT_rc%vfile(n))," does not exist." + write(LDT_logunit,*)" Program stopping ..." + call LDT_endrun + endif + + write(LDT_logunit,*) "[INFO] Reading landcover file: ",trim(LDT_rc%vfile(n)) + +!- Open LDT land cover file: + select case ( LDT_rc%lc_type(n) ) + + case ( "IGBPNCEP" ) + + !- Assign additional land cover types, including generic water points: + LDT_rc%wetlandclass = 11 + LDT_rc%urbanclass = 13 + LDT_rc%snowclass = 15 + LDT_rc%glacierclass = 15 + LDT_rc%bareclass = 16 + LDT_rc%waterclass = 17 + + input_cols = IN_cols_igbpncep + input_rows = IN_rows_igbpncep + + !- Set parameter grid array inputs: + param_gridDesc(1) = 0. ! Latlon + param_gridDesc(2) = input_cols + param_gridDesc(3) = input_rows + param_gridDesc(4) = -90.0 + (IN_yres/2) ! LL lat + param_gridDesc(5) = -180.0 + (IN_xres/2) ! LL lon + param_gridDesc(6) = 128 + param_gridDesc(7) = 90.0 - (IN_yres/2) ! UR lat + param_gridDesc(8) = 180.0 - (IN_xres/2) ! UR lon + param_gridDesc(9) = IN_xres ! dx: 0.0083333 + param_gridDesc(10) = IN_yres ! dy: 0.0083333 + param_gridDesc(20) = 64 + +! -------------------------------- +! case ( "IGBP" ) +! case ( "UMD" ) +! case ( "PFT" ) + +!- Other landcover classifications associated with MODIS landcover: + case default ! Non-supported options + write(LDT_logunit,*) "[ERR] The native MODIS map with land classification: ",& + trim(LDT_rc%lc_type(n)),", is not yet supported." + write(LDT_logunit,*) " -- Please select: IGBPNCEP " + write(LDT_logunit,*) " Program stopping ..." + call LDT_endrun + + end select + +! ------------------------------------------------------------------- +! PREPARE SUBSETTED PARAMETER GRID FOR READING IN NEEDED DATA +! ------------------------------------------------------------------- + +!- Map Parameter Grid Info to LIS Target Grid/Projection Info -- + subparam_gridDesc = 0. + call LDT_RunDomainPts( n, LDT_rc%lc_proj, param_gridDesc(:), & + glpnc, glpnr, subpnc, subpnr, subparam_gridDesc, lat_line, lon_line ) + + + ! Open file: +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + ierr = nf90_open(path=trim(LDT_rc%vfile(n)),mode=NF90_NOWRITE,ncid=ftn) + call LDT_verify(ierr,'error opening MCD12Q1 landcover data') + + ierr = nf90_inq_varid(ftn,'LC_Type1',lcId) + call LDT_verify(ierr, 'nf90_inq_varid failed for LC_Type1in read_MCD12Q1_lc') + allocate( read_igbpncep_veg(subpnc,subpnr)) + + ierr = nf90_get_var(ftn,lcId, read_igbpncep_veg,& + count=(/subpnc,subpnr/), & + start=(/lon_line(1,1),lat_line(1,1)/)) + call LDT_verify(ierr, 'nf90_get_var failed for LC_Type1') + + ierr = nf90_close(ftn) + call LDT_verify(ierr) +#endif + + write(LDT_logunit,*) "[INFO] Done reading ", trim(LDT_rc%vfile(n)) + +! ------------------------------------------------------------------- + vegcnt = 0. + vegtype = float(LDT_rc%waterclass) + maskarray= 0.0 + fgrd = 0.0 + + allocate( subset_veg(subpnc, subpnr) ) + subset_veg = LDT_rc%waterclass + +!- Subset parameter read-in array: + line = 0 + do r = 1, subpnr + do c = 1, subpnc + if(read_igbpncep_veg(c,r).ne.255) then + subset_veg(c,r) = real(read_igbpncep_veg(c,r)) + else + subset_veg(c,r) = real(LDT_rc%waterclass) + endif + enddo + enddo + +! print*, subparam_gridDesc(1:10) +! open(100,file='test.bin',form='unformatted') +! write(100) subset_veg +! close(100) +! stop + +! ------------------------------------------------------------------- + + deallocate( read_igbpncep_veg ) +! ------------------------------------------------------------------- +! AGGREGATING FINE-SCALE GRIDS TO COARSER LIS OUTPUT GRID +! ------------------------------------------------------------------- + mi = subpnc*subpnr + allocate( gi(mi), li(mi) ) + gi = float(LDT_rc%waterclass) + li = .false. + mo = LDT_rc%lnc(n)*LDT_rc%lnr(n) + lo1 = .false.; lo2 = .false. + +!- Assign 2-D array to 1-D for aggregation routines: + i = 0 + do r = 1, subpnr + do c = 1, subpnc; i = i + 1 + gi(i) = subset_veg(c,r) + if( gi(i) .ne. LDT_rc%udef ) li(i) = .true. + enddo + enddo + +!- Aggregation/Spatial Transform Section: + select case ( LDT_rc%lc_gridtransform(n) ) + + !- (a) Estimate NON-TILED dominant land cover types (vegtype): + case( "neighbor", "mode" ) + + !- Transform parameter from original grid to LIS output grid: + call LDT_transform_paramgrid(n, LDT_rc%lc_gridtransform(n), & + subparam_gridDesc, mi, 1, gi, li, mo, go1, lo1 ) + + !- Convert 1D vegcnt to 2D grid arrays: + i = 0 + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + i = i + 1 + vegtype(c,r) = go1(i) + enddo + enddo + + !- (b) Estimate TILED land cover files (vegcnt): + case( "tile" ) + + !- Transform parameter from original grid to LIS output grid: + call LDT_transform_paramgrid(n, LDT_rc%lc_gridtransform(n), & + subparam_gridDesc, mi, LDT_rc%nt, gi, li, mo, go2, lo2 ) + + !- Convert 1D vegcnt to 2D grid arrays: + i = 0 + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + i = i + 1 + do t = 1, LDT_rc%nt + vegcnt(c,r,t) = go2(i,t) + end do + enddo + enddo + + end select ! End vegtype/cnt aggregation method + deallocate( gi, li ) + +! ........................................................................ + +!- Bring 2-D Vegtype to 3-D Vegcnt tile space: + if ( LDT_rc%lc_gridtransform(n) == "none" .or. & ! -- NON-TILED SURFACES + LDT_rc%lc_gridtransform(n) == "neighbor" .or. & + LDT_rc%lc_gridtransform(n) == "mode" ) then + + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + if ( vegtype(c,r) .le. 0 ) then + vegtype(c,r) = float(LDT_rc%waterclass) + endif + if ( (nint(vegtype(c,r)) .ne. LDT_rc%waterclass ) .and. & + (nint(vegtype(c,r)) .ne. LDT_rc%udef)) then + vegcnt(c,r,NINT(vegtype(c,r))) = 1.0 + endif + enddo + end do + endif ! End NON-TILED vegetation option + +!- Estimate fraction of grid (fgrid) represented by vegetation type:: + call param_index_fgrdcalc( n, LDT_rc%lc_proj, LDT_rc%lc_gridtransform(n), & + LDT_rc%waterclass, LDT_rc%nt, vegcnt, fgrd ) + + +! ------------------------------------------------------------------- +! CREATE OR READ-IN (OR IMPOSE) LAND MASK FILE AND CREATE +! SURFACE MAP +! ------------------------------------------------------------------- + +!- "READ-IN" land mask file, if user-specified: + if( LDT_rc%mask_type(n) == "readin" ) then + + call read_maskfile( n, vegtype, fgrd, maskarray ) + +!- "CREATE" land mask and surface type fields (user-specified): + elseif( LDT_rc%mask_type(n) == "create" ) then + + call create_maskfile( n, LDT_rc%nt, LDT_rc%lc_gridtransform(n), & + vegtype, vegcnt, maskarray ) + + end if + deallocate( subset_veg ) + + +end subroutine read_MCD12Q1_lc diff --git a/ldt/params/landcover/read_MODISNative_PFT.F90 b/ldt/params/landcover/read_MODISNative_PFT.F90 index 7ec61b3e3..6c850bfa7 100755 --- a/ldt/params/landcover/read_MODISNative_PFT.F90 +++ b/ldt/params/landcover/read_MODISNative_PFT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_MODISNative_lc.F90 b/ldt/params/landcover/read_MODISNative_lc.F90 index c3f391e12..e3ab883b2 100755 --- a/ldt/params/landcover/read_MODISNative_lc.F90 +++ b/ldt/params/landcover/read_MODISNative_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_MODIS_lc.F90 b/ldt/params/landcover/read_MODIS_lc.F90 index f0a281b53..05bd457f5 100755 --- a/ldt/params/landcover/read_MODIS_lc.F90 +++ b/ldt/params/landcover/read_MODIS_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_NALCMS_SM_IGBPNCEP_lc.F90 b/ldt/params/landcover/read_NALCMS_SM_IGBPNCEP_lc.F90 new file mode 100644 index 000000000..e8784430b --- /dev/null +++ b/ldt/params/landcover/read_NALCMS_SM_IGBPNCEP_lc.F90 @@ -0,0 +1,231 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_NALCMS_SM_IGBPNCEP_lc +! \label{read_NALCMS_SM_IGBPNCEP_lc} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 03Jan2022 Kristi Arsenault; Added SM NALCMS landcover as separate field +! 13Jul2022 Kristi Arsenault; Added SM NALCMS landcover with IGBP-NCEP classes +! +! !INTERFACE: +subroutine read_NALCMS_SM_IGBPNCEP_lc( n, num_types, fgrd, maskarray ) + +! !USES: + use LDT_coreMod + use LDT_paramDataMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_index_fgrdcalc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(inout) :: num_types + real, intent(inout):: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real, intent(inout):: maskarray(LDT_rc%lnc(n),LDT_rc%lnr(n)) + +! !DESCRIPTION: +! This subroutine reads in SnowModel's NALCMS landcover-derived +! SM vegtype classes and converts to the IGBP/NCEP-modified classes +! for use by Noah and NoahMP LSMs. +! +! Final mapped IGBP-NCEP classes include, +! (A) New IGBP_MODIS_BU+tundra Landcover Class Legend: +! 1 Evergreen Needleleaf Forest +! 2 Evergreen Broadleaf Forest +! 3 Deciduous Needleleaf Forest +! 4 Deciduous Broadleaf Forest +! 5 Mixed Forests +! 6 Closed Shrublands +! 7 Open Shrublands +! 8 Woody Savannas +! 9 Savannas +! 10 Grasslands +! 11 Permanent Wetland +! 12 Croplands +! 13 Urban and Built-Up +! 14 Cropland/Natural Vegetation Mosaic +! 15 Snow and Ice +! 16 Barren or Sparsely Vegetated +! 17 Ocean +! 18 Wooded Tundra +! 19 Mixed Tundra +! 20 Bare Ground Tundra +! _________________________ +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[num_types] +! number of bins (or bands) +! \item[fgrd] +! output grid fractions for landcover bins (or bands) +! \item[maskarray] +! landcover average for each bin (or band) +!EOP + + integer :: ftn + integer :: c, r, t + logical :: file_exists + real :: vegtype(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: vegtype2(LDT_rc%lnc(n),LDT_rc%lnr(n)) ! Mapped IGBP/NCEP classes + real :: vegcnt(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real, allocatable :: read_topomap(:,:) ! Read input parameters + real, allocatable :: read_vegmap(:,:) ! Read input parameters +! ____________________________________________________________________________________ + + ! Assign additional land cover types, including generic water points: + LDT_rc%wetlandclass = 11 + LDT_rc%urbanclass = 13 + LDT_rc%snowclass = 15 + LDT_rc%glacierclass = 15 + LDT_rc%bareclass = 16 + LDT_rc%waterclass = 17 + + vegcnt = 0. + vegtype = float(LDT_rc%waterclass) + vegtype2 = float(LDT_rc%waterclass) + maskarray= 0.0 + fgrd = 0.0 + + inquire(file=trim(LDT_rc%vfile(n)), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "[ERR] The SM-based NALCMS landcover map: ",& + trim(LDT_rc%vfile(n))," not found." + call LDT_endrun + endif + + select case ( LDT_rc%lc_gridtransform(n) ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading NALCMS (SnowModel-based) landcover file: ",& + trim(LDT_rc%vfile(n)) + case default + write(LDT_logunit,*) "[ERR] This NALCMS (SnowModel-based) landcover reader currently" + write(LDT_logunit,*) " only supports domains the same as the set LIS run domain." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=LDT_rc%vfile(n), & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + + ! Read in topographic map + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + deallocate(read_topomap) + + ! Read in landcover map + allocate(read_vegmap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + read(ftn,rec=2) ((read_vegmap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + vegtype(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n)) = & + read_vegmap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + deallocate(read_vegmap) + + write(LDT_logunit,*) "[INFO] SnowModel-NALCMS: Mapping SnowModel classes to IGBP-NCEP" + + ! Transform 2D landcover field to 3D + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + + ! Map SnowModel classes to the IGBP/NCEP-modified classes: + ! SnowModel Classes ==>> IGBP/NCEP-modified classes + if ( vegtype(c,r) == 1.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 2.0 ) vegtype2(c,r) = 4.0 + if ( vegtype(c,r) == 3.0 ) vegtype2(c,r) = 5.0 +! if ( vegtype(c,r) == 4.0 ) vegtype2(c,r) = 1.0 +! if ( vegtype(c,r) == 5.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 6.0 ) vegtype2(c,r) = 6.0 +! if ( vegtype(c,r) == 7.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 8.0 ) vegtype2(c,r) = 7.0 +! if ( vegtype(c,r) == 9.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 10.0 ) vegtype2(c,r) = 18.0 +! if ( vegtype(c,r) == 11.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 12.0 ) vegtype2(c,r) = 10.0 +! if ( vegtype(c,r) == 13.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 14.0 ) vegtype2(c,r) = 19.0 +! if ( vegtype(c,r) == 15.0 ) vegtype2(c,r) = 1.0 +! if ( vegtype(c,r) == 16.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 17.0 ) vegtype2(c,r) = 11.0 + if ( vegtype(c,r) == 18.0 ) vegtype2(c,r) = 16.0 + if ( vegtype(c,r) == 19.0 ) vegtype2(c,r) = 17.0 + if ( vegtype(c,r) == 20.0 ) vegtype2(c,r) = 15.0 + if ( vegtype(c,r) == 21.0 ) vegtype2(c,r) = 13.0 + if ( vegtype(c,r) == 22.0 ) vegtype2(c,r) = 12.0 +! if ( vegtype(c,r) == 23.0 ) vegtype2(c,r) = 1.0 + if ( vegtype(c,r) == 24.0 ) vegtype2(c,r) = 17.0 + + if( vegtype(c,r) == 4.0 .or. & + vegtype(c,r) == 5.0 .or. & + vegtype(c,r) == 7.0 .or. & + vegtype(c,r) == 9.0 .or. & + vegtype(c,r) == 11.0 .or. & + vegtype(c,r) == 13.0 .or. & + vegtype(c,r) == 15.0 .or. & + vegtype(c,r) == 16.0 .or. & + vegtype(c,r) == 23.0 ) then + + print *, "[WARN] We have SM class vegtypes in this domain that are " + print *, " not mapped to an IGBP/NCEP class !!! " + print *, c, r, vegtype(c,r) + endif + + if( vegtype2(c,r) .le. 0 ) then + vegtype2(c,r) = float(LDT_rc%waterclass) + endif + if( (nint(vegtype2(c,r)) .ne. LDT_rc%waterclass ) .and. & + (nint(vegtype2(c,r)) .ne. LDT_rc%udef)) then + vegcnt(c,r,NINT(vegtype2(c,r))) = 1.0 + endif + enddo + end do + + ! Estimate fraction of grid (fgrid) represented by vegetation type:: + call param_index_fgrdcalc( n, LDT_rc%lc_proj, LDT_rc%lc_gridtransform(n), & + LDT_rc%waterclass, LDT_rc%nt, vegcnt, fgrd ) + +! ------------------------------------------------------------------- +! CREATE OR READ-IN (OR IMPOSE) LAND MASK FILE AND CREATE +! SURFACE MAP +! ------------------------------------------------------------------- + + ! "READ-IN" land mask file, if user-specified: + if( LDT_rc%mask_type(n) == "readin" ) then + write(LDT_logunit,*) "[WARN] The SnowModel-based NALCMS landcover map reader " + write(LDT_logunit,*) " has not been tested with reading in and imposing an" + write(LDT_logunit,*) " outside landmask at this time. Please use with caution." + call read_maskfile( n, vegtype2, fgrd, maskarray ) + + ! "CREATE" land mask and surface type fields (user-specified): + elseif( LDT_rc%mask_type(n) == "create" ) then + call create_maskfile( n, LDT_rc%nt, LDT_rc%lc_gridtransform(n), & + vegtype2, vegcnt, maskarray ) + end if + + ! Temporary option added for NoahMP401+SM coupling: (KRA) + if( LDT_rc%allmaskland == 1 ) then + LDT_LSMparam_struc(n)%landmask%value = 1 + LDT_LSMparam_struc(n)%dommask%value = 1 + endif + ! Temporary option (KRA) + +! -- + + call LDT_releaseUnitNumber(ftn) + write(LDT_logunit, *) "[INFO] Done reading SnowModel-based NALCMS landcover file" + +end subroutine read_NALCMS_SM_IGBPNCEP_lc diff --git a/ldt/params/landcover/read_NALCMS_SM_lc.F90 b/ldt/params/landcover/read_NALCMS_SM_lc.F90 new file mode 100644 index 000000000..022d55937 --- /dev/null +++ b/ldt/params/landcover/read_NALCMS_SM_lc.F90 @@ -0,0 +1,150 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_NALCMS_SM_lc +! \label{read_NALCMS_SM_lc} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 03Jan2022 Kristi Arsenault; Added SM NALCMS landcover as separate field +! +! !INTERFACE: +subroutine read_NALCMS_SM_lc( n, num_types, fgrd, maskarray ) + +! !USES: + use LDT_coreMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_index_fgrdcalc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(inout) :: num_types + real, intent(inout):: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real, intent(inout):: maskarray(LDT_rc%lnc(n),LDT_rc%lnr(n)) + +! !DESCRIPTION: +! This subroutine retrieves SnowModel's NALCMS landcover data files. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[num_types] +! number of bins (or bands) +! \item[fgrd] +! output grid fractions for landcover bins (or bands) +! \item[maskarray] +! landcover average for each bin (or band) +!EOP + + integer :: ftn + integer :: c, r, t + logical :: file_exists + real :: vegtype(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: vegcnt(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real, allocatable :: read_topomap(:,:) ! Read input parameters + real, allocatable :: read_vegmap(:,:) ! Read input parameters + +! ____________________________________________________________________________________ + + ! Assign additional land cover types, including generic water points: + LDT_rc%wetlandclass = 9 + LDT_rc%urbanclass = 21 + LDT_rc%snowclass = 19 + LDT_rc%glacierclass = 20 + LDT_rc%bareclass = 18 + LDT_rc%waterclass = 24 + + vegcnt = 0. + vegtype = float(LDT_rc%waterclass) + maskarray= 0.0 + fgrd = 0.0 + + inquire(file=trim(LDT_rc%vfile(n)), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "[ERR] The landcover map: ",& + trim(LDT_rc%vfile(n))," not found." + call LDT_endrun + endif + + select case ( LDT_rc%lc_gridtransform(n) ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading NALCMS (SnowModel-based) landcover file: ",& + trim(LDT_rc%vfile(n)) + case default + write(LDT_logunit,*) "[ERR] This NALCMS (SnowModel-based) landcover reader currently" + write(LDT_logunit,*) " only supports domains the same as the set LIS run domain." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=LDT_rc%vfile(n), & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + + ! Read in topographic map + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + deallocate(read_topomap) + + ! Read in landcover map + allocate(read_vegmap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + read(ftn,rec=2) ((read_vegmap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + vegtype(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n)) = & + read_vegmap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + deallocate(read_vegmap) + + ! Transform 2D landcover field to 3D + do r = 1, LDT_rc%lnr(n) + do c = 1, LDT_rc%lnc(n) + if( vegtype(c,r) .le. 0 ) then + vegtype(c,r) = float(LDT_rc%waterclass) + endif + if( (nint(vegtype(c,r)) .ne. LDT_rc%waterclass ) .and. & + (nint(vegtype(c,r)) .ne. LDT_rc%udef)) then + vegcnt(c,r,NINT(vegtype(c,r))) = 1.0 + endif + enddo + end do + + ! Estimate fraction of grid (fgrid) represented by vegetation type:: + call param_index_fgrdcalc( n, LDT_rc%lc_proj, LDT_rc%lc_gridtransform(n), & + LDT_rc%waterclass, LDT_rc%nt, vegcnt, fgrd ) + +! ------------------------------------------------------------------- +! CREATE OR READ-IN (OR IMPOSE) LAND MASK FILE AND CREATE +! SURFACE MAP +! ------------------------------------------------------------------- + + ! "READ-IN" land mask file, if user-specified: + if( LDT_rc%mask_type(n) == "readin" ) then + write(LDT_logunit,*) "[WARN] The SnowModel-based NALCMS landcover map reader " + write(LDT_logunit,*) " has not been tested with reading in and imposing an" + write(LDT_logunit,*) " outside landmask at this time. Please use with caution." + call read_maskfile( n, vegtype, fgrd, maskarray ) + + ! "CREATE" land mask and surface type fields (user-specified): + elseif( LDT_rc%mask_type(n) == "create" ) then + call create_maskfile( n, LDT_rc%nt, LDT_rc%lc_gridtransform(n), & + vegtype, vegcnt, maskarray ) + end if + +! -- + + call LDT_releaseUnitNumber(ftn) + write(LDT_logunit, *) "[INFO] Done reading SnowModel-based NALCMS landcover file" + +end subroutine read_NALCMS_SM_lc diff --git a/ldt/params/landcover/read_SACHTET356_lc.F90 b/ldt/params/landcover/read_SACHTET356_lc.F90 index 6eb255522..49358613e 100755 --- a/ldt/params/landcover/read_SACHTET356_lc.F90 +++ b/ldt/params/landcover/read_SACHTET356_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_UKMO_IGBP_PFT.F90 b/ldt/params/landcover/read_UKMO_IGBP_PFT.F90 index 4395c3349..8cdbdb9d8 100755 --- a/ldt/params/landcover/read_UKMO_IGBP_PFT.F90 +++ b/ldt/params/landcover/read_UKMO_IGBP_PFT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.binary b/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.binary index 52baebbde..f574e592b 100755 --- a/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.binary +++ b/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.binary @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.nc b/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.nc index 4395c3349..8cdbdb9d8 100755 --- a/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.nc +++ b/ldt/params/landcover/read_UKMO_IGBP_PFT.F90.nc @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_UM_ancillary.F90 b/ldt/params/landcover/read_UM_ancillary.F90 index 94d8619b8..662222f78 100755 --- a/ldt/params/landcover/read_UM_ancillary.F90 +++ b/ldt/params/landcover/read_UM_ancillary.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_USGSNative_lc.F90 b/ldt/params/landcover/read_USGSNative_lc.F90 index abd1ce65e..9e452e88f 100644 --- a/ldt/params/landcover/read_USGSNative_lc.F90 +++ b/ldt/params/landcover/read_USGSNative_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_USGS_lc.F90 b/ldt/params/landcover/read_USGS_lc.F90 index 89ddb6554..09c823eee 100644 --- a/ldt/params/landcover/read_USGS_lc.F90 +++ b/ldt/params/landcover/read_USGS_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_VIC411_lc.F90 b/ldt/params/landcover/read_VIC411_lc.F90 index 26829909f..7bb3f87fc 100755 --- a/ldt/params/landcover/read_VIC411_lc.F90 +++ b/ldt/params/landcover/read_VIC411_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/landcover/read_VIC412_lc.F90 b/ldt/params/landcover/read_VIC412_lc.F90 index 52deb770f..77257c14d 100755 --- a/ldt/params/landcover/read_VIC412_lc.F90 +++ b/ldt/params/landcover/read_VIC412_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/create_maskfile.F90 b/ldt/params/mask/create_maskfile.F90 index 6ac226bac..0a17fbce0 100755 --- a/ldt/params/mask/create_maskfile.F90 +++ b/ldt/params/mask/create_maskfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/read_ISA_maskfile.F90 b/ldt/params/mask/read_ISA_maskfile.F90 index 9983b5ba5..fdba9b335 100755 --- a/ldt/params/mask/read_ISA_maskfile.F90 +++ b/ldt/params/mask/read_ISA_maskfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/read_maskfile.F90 b/ldt/params/mask/read_maskfile.F90 index bbea2716e..ecbd4a89a 100755 --- a/ldt/params/mask/read_maskfile.F90 +++ b/ldt/params/mask/read_maskfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -100,6 +100,11 @@ subroutine read_maskfile(n, vegtype, fgrd, localmask ) call LDT_endrun endif + if(LDT_rc%mask_source(n) =="MCD12Q1") then + call read_maskfile_MCD12Q1(n,vegtype, fgrd, localmask) + return + endif + ! ------------------------------------------------------------------- ! PREPARE SUBSETTED PARAMETER GRID FOR READING IN NEEDED DATA ! ------------------------------------------------------------------- diff --git a/ldt/params/mask/read_maskfile_MCD12Q1.F90 b/ldt/params/mask/read_maskfile_MCD12Q1.F90 new file mode 100644 index 000000000..ebc7f456c --- /dev/null +++ b/ldt/params/mask/read_maskfile_MCD12Q1.F90 @@ -0,0 +1,56 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +! SUBROUTINE: MCD12Q1 +! +! REVISION HISTORY: +! 03 June 2022: Sujay Kumar; Initial Specification +! +! DESCRIPTION: +! Source code for reading and interpolating land mask data in netCDF format +! produced from MCD12Q1 land use data. The input maskfile is expected to be +! at the same exact grid and resolution of the LDT target grid. +! No spatial transformation is performed. +!------------------------------------------------------------------------------ + +#include "LDT_misc.h" + subroutine read_maskfile_MCD12Q1(n,vegtype, fgrd, localmask) + + use LDT_coreMod + use LDT_logMod +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + use netcdf +#endif + + implicit none + + integer, intent(in) :: n + real, intent(in) :: vegtype(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real, intent(in) :: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),LDT_rc%nt) + real, intent(out) :: localmask(LDT_rc%lnc(n),LDT_rc%lnr(n)) + + integer :: ftn, ierr,maskId + +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + ierr = nf90_open(path=trim(LDT_rc%mfile(n)),mode=NF90_NOWRITE,ncid=ftn) + call LDT_verify(ierr,'error opening MCD12Q1 landmask data') + + ierr = nf90_inq_varid(ftn,'LANDMASK',maskId) + call LDT_verify(ierr, 'nf90_inq_varid failed for LANDMASK in read_maskfile_MCD12Q1') + + ierr = nf90_get_var(ftn,maskId, localmask) + call LDT_verify(ierr, 'nf90_get_var failed for LANDMASK in read_maskfile_MCD12Q1') + + ierr = nf90_close(ftn) + call LDT_verify(ierr) +#endif + + + end subroutine read_maskfile_MCD12Q1 diff --git a/ldt/params/mask/read_maskfile_UKMO_CAP_Netcdf.F90 b/ldt/params/mask/read_maskfile_UKMO_CAP_Netcdf.F90 index 10b6e678a..335df5d39 100644 --- a/ldt/params/mask/read_maskfile_UKMO_CAP_Netcdf.F90 +++ b/ldt/params/mask/read_maskfile_UKMO_CAP_Netcdf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/read_maskfile_UKMO_IGBP_Native_PFT.F90 b/ldt/params/mask/read_maskfile_UKMO_IGBP_Native_PFT.F90 index 61cec1d89..fa30238c5 100644 --- a/ldt/params/mask/read_maskfile_UKMO_IGBP_Native_PFT.F90 +++ b/ldt/params/mask/read_maskfile_UKMO_IGBP_Native_PFT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/read_regmask_gis.F90 b/ldt/params/mask/read_regmask_gis.F90 index be9d2e407..8ee84a351 100644 --- a/ldt/params/mask/read_regmask_gis.F90 +++ b/ldt/params/mask/read_regmask_gis.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/read_regmask_mask.F90 b/ldt/params/mask/read_regmask_mask.F90 index 66414269b..d33e48d0b 100644 --- a/ldt/params/mask/read_regmask_mask.F90 +++ b/ldt/params/mask/read_regmask_mask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/mask/read_regmask_wrsi.F90 b/ldt/params/mask/read_regmask_wrsi.F90 index e1c733cbb..54ac03e87 100644 --- a/ldt/params/mask/read_regmask_wrsi.F90 +++ b/ldt/params/mask/read_regmask_wrsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_ALMIPII_dsoil.F90 b/ldt/params/soils/read_ALMIPII_dsoil.F90 index e151f766a..176a96c8c 100644 --- a/ldt/params/soils/read_ALMIPII_dsoil.F90 +++ b/ldt/params/soils/read_ALMIPII_dsoil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_ALMIPII_soilfractions.F90 b/ldt/params/soils/read_ALMIPII_soilfractions.F90 index 4d3a75025..bc209c1f7 100644 --- a/ldt/params/soils/read_ALMIPII_soilfractions.F90 +++ b/ldt/params/soils/read_ALMIPII_soilfractions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_CLSMF25_porosity.F90 b/ldt/params/soils/read_CLSMF25_porosity.F90 index b8dedaf27..7f339feea 100644 --- a/ldt/params/soils/read_CLSMF25_porosity.F90 +++ b/ldt/params/soils/read_CLSMF25_porosity.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_CONSTANT_porosity.F90 b/ldt/params/soils/read_CONSTANT_porosity.F90 index c518476b8..8f83d112c 100644 --- a/ldt/params/soils/read_CONSTANT_porosity.F90 +++ b/ldt/params/soils/read_CONSTANT_porosity.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_CONSTANT_soilfractions.F90 b/ldt/params/soils/read_CONSTANT_soilfractions.F90 index 740b1b2dd..3e042ee2d 100644 --- a/ldt/params/soils/read_CONSTANT_soilfractions.F90 +++ b/ldt/params/soils/read_CONSTANT_soilfractions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_CONSTANT_texture.F90 b/ldt/params/soils/read_CONSTANT_texture.F90 index ed3ba3aff..6c39e3907 100644 --- a/ldt/params/soils/read_CONSTANT_texture.F90 +++ b/ldt/params/soils/read_CONSTANT_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_FAO_color.F90 b/ldt/params/soils/read_FAO_color.F90 index 89b8501ff..1f83891d1 100644 --- a/ldt/params/soils/read_FAO_color.F90 +++ b/ldt/params/soils/read_FAO_color.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_FAO_porosity.F90 b/ldt/params/soils/read_FAO_porosity.F90 index 0459411fe..90c743952 100644 --- a/ldt/params/soils/read_FAO_porosity.F90 +++ b/ldt/params/soils/read_FAO_porosity.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_FAO_soilfractions.F90 b/ldt/params/soils/read_FAO_soilfractions.F90 index 63e3db752..a5caa2204 100644 --- a/ldt/params/soils/read_FAO_soilfractions.F90 +++ b/ldt/params/soils/read_FAO_soilfractions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_FAO_texture.F90 b/ldt/params/soils/read_FAO_texture.F90 index 2df796073..e138d3e80 100644 --- a/ldt/params/soils/read_FAO_texture.F90 +++ b/ldt/params/soils/read_FAO_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_ISRIC_soilfractions.F90 b/ldt/params/soils/read_ISRIC_soilfractions.F90 index 7b7efbeb1..85436a99f 100644 --- a/ldt/params/soils/read_ISRIC_soilfractions.F90 +++ b/ldt/params/soils/read_ISRIC_soilfractions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_ISRIC_texture.F90 b/ldt/params/soils/read_ISRIC_texture.F90 index 1b6bf4d0d..a73e44171 100644 --- a/ldt/params/soils/read_ISRIC_texture.F90 +++ b/ldt/params/soils/read_ISRIC_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -94,7 +94,7 @@ subroutine read_ISRIC_texture( n, num_bins, fgrd, texture_layers ) ! ___________________________________________________________________ - water_class = 13 ! Water class for ISRIC soil texture class + water_class = 14 ! Water class for ISRIC soil texture class temp = LDT_rc%udef gridcnt = 0. diff --git a/ldt/params/soils/read_STATSGOFAO_Native_texture.F90 b/ldt/params/soils/read_STATSGOFAO_Native_texture.F90 index ac675e801..7475e7668 100644 --- a/ldt/params/soils/read_STATSGOFAO_Native_texture.F90 +++ b/ldt/params/soils/read_STATSGOFAO_Native_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_STATSGOFAO_texture.F90 b/ldt/params/soils/read_STATSGOFAO_texture.F90 index 47bcefb01..7d4c3fa52 100644 --- a/ldt/params/soils/read_STATSGOFAO_texture.F90 +++ b/ldt/params/soils/read_STATSGOFAO_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_STATSGOv1_hydrosoilgroup.F90 b/ldt/params/soils/read_STATSGOv1_hydrosoilgroup.F90 index 00173a6e4..c78610311 100644 --- a/ldt/params/soils/read_STATSGOv1_hydrosoilgroup.F90 +++ b/ldt/params/soils/read_STATSGOv1_hydrosoilgroup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_STATSGOv1_soilfractions.F90 b/ldt/params/soils/read_STATSGOv1_soilfractions.F90 index 850531248..b361d37cc 100644 --- a/ldt/params/soils/read_STATSGOv1_soilfractions.F90 +++ b/ldt/params/soils/read_STATSGOv1_soilfractions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_STATSGOv1_texture.F90 b/ldt/params/soils/read_STATSGOv1_texture.F90 index 6cf96bad4..6f05ab1a7 100644 --- a/ldt/params/soils/read_STATSGOv1_texture.F90 +++ b/ldt/params/soils/read_STATSGOv1_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_Special_soilfractions.F90 b/ldt/params/soils/read_Special_soilfractions.F90 index 888aa5c33..a16a820df 100644 --- a/ldt/params/soils/read_Special_soilfractions.F90 +++ b/ldt/params/soils/read_Special_soilfractions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_Special_texture.F90 b/ldt/params/soils/read_Special_texture.F90 index 7631b7b2f..8f26e4ca4 100644 --- a/ldt/params/soils/read_Special_texture.F90 +++ b/ldt/params/soils/read_Special_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/read_ZOBLER_GFS_texture.F90 b/ldt/params/soils/read_ZOBLER_GFS_texture.F90 index b239e534f..14c1c7d5b 100644 --- a/ldt/params/soils/read_ZOBLER_GFS_texture.F90 +++ b/ldt/params/soils/read_ZOBLER_GFS_texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_CONSTANT_texture_attribs.F90 b/ldt/params/soils/set_CONSTANT_texture_attribs.F90 index efd7a7de4..47c11b53b 100644 --- a/ldt/params/soils/set_CONSTANT_texture_attribs.F90 +++ b/ldt/params/soils/set_CONSTANT_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_ISRIC_texture_attribs.F90 b/ldt/params/soils/set_ISRIC_texture_attribs.F90 index a50614c00..b657dfa02 100644 --- a/ldt/params/soils/set_ISRIC_texture_attribs.F90 +++ b/ldt/params/soils/set_ISRIC_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -34,7 +34,7 @@ subroutine set_ISRIC_texture_attribs() ! \end{description} !EOP ! - LDT_LSMparam_struc(:)%texture%num_bins = 13 + LDT_LSMparam_struc(:)%texture%num_bins = 16 LDT_LSMparam_struc(:)%texture%vlevels = 1 LDT_soils_struc(:)%texture_nlyrs%num_bins = 1 diff --git a/ldt/params/soils/set_STATSGOFAO_LIS_texture_attribs.F90 b/ldt/params/soils/set_STATSGOFAO_LIS_texture_attribs.F90 index 580edd2d6..37aff85e3 100644 --- a/ldt/params/soils/set_STATSGOFAO_LIS_texture_attribs.F90 +++ b/ldt/params/soils/set_STATSGOFAO_LIS_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_STATSGOFAO_Native_texture_attribs.F90 b/ldt/params/soils/set_STATSGOFAO_Native_texture_attribs.F90 index 2375887b8..1823bc7f1 100644 --- a/ldt/params/soils/set_STATSGOFAO_Native_texture_attribs.F90 +++ b/ldt/params/soils/set_STATSGOFAO_Native_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_STATSGOv1_hsg_attribs.F90 b/ldt/params/soils/set_STATSGOv1_hsg_attribs.F90 index 36f325199..13bedf0ba 100644 --- a/ldt/params/soils/set_STATSGOv1_hsg_attribs.F90 +++ b/ldt/params/soils/set_STATSGOv1_hsg_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_STATSGOv1_texture_attribs.F90 b/ldt/params/soils/set_STATSGOv1_texture_attribs.F90 index 720d46dc8..58671e083 100644 --- a/ldt/params/soils/set_STATSGOv1_texture_attribs.F90 +++ b/ldt/params/soils/set_STATSGOv1_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_Special_texture_attribs.F90 b/ldt/params/soils/set_Special_texture_attribs.F90 index 515779ba1..838a280df 100644 --- a/ldt/params/soils/set_Special_texture_attribs.F90 +++ b/ldt/params/soils/set_Special_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/soils/set_ZOBLER_GFS_texture_attribs.F90 b/ldt/params/soils/set_ZOBLER_GFS_texture_attribs.F90 index f85820d51..b4df44a3e 100644 --- a/ldt/params/soils/set_ZOBLER_GFS_texture_attribs.F90 +++ b/ldt/params/soils/set_ZOBLER_GFS_texture_attribs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/calc_SlopeAspect_module.F90 b/ldt/params/topo/calc_SlopeAspect_module.F90 index f68fc2841..3cdfcfb8f 100644 --- a/ldt/params/topo/calc_SlopeAspect_module.F90 +++ b/ldt/params/topo/calc_SlopeAspect_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_CONSTANT_aspect.F90 b/ldt/params/topo/read_CONSTANT_aspect.F90 index 5f2c0f754..82dc0e0b8 100644 --- a/ldt/params/topo/read_CONSTANT_aspect.F90 +++ b/ldt/params/topo/read_CONSTANT_aspect.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_CONSTANT_elev.F90 b/ldt/params/topo/read_CONSTANT_elev.F90 index f5491dfca..7829709e6 100644 --- a/ldt/params/topo/read_CONSTANT_elev.F90 +++ b/ldt/params/topo/read_CONSTANT_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_CONSTANT_slope.F90 b/ldt/params/topo/read_CONSTANT_slope.F90 index 5e534d55f..2934cb48c 100644 --- a/ldt/params/topo/read_CONSTANT_slope.F90 +++ b/ldt/params/topo/read_CONSTANT_slope.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_GTOPO30Native_elev.F90 b/ldt/params/topo/read_GTOPO30Native_elev.F90 index 3ea46ce0c..bbb5ba95d 100644 --- a/ldt/params/topo/read_GTOPO30Native_elev.F90 +++ b/ldt/params/topo/read_GTOPO30Native_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_GTOPO30_GFS_elev.F90 b/ldt/params/topo/read_GTOPO30_GFS_elev.F90 index 465de4bc8..0ab031b6c 100644 --- a/ldt/params/topo/read_GTOPO30_GFS_elev.F90 +++ b/ldt/params/topo/read_GTOPO30_GFS_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_GTOPO30_aspect.F90 b/ldt/params/topo/read_GTOPO30_aspect.F90 index 310941468..cf1e8cbe7 100644 --- a/ldt/params/topo/read_GTOPO30_aspect.F90 +++ b/ldt/params/topo/read_GTOPO30_aspect.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_GTOPO30_curv.F90 b/ldt/params/topo/read_GTOPO30_curv.F90 index 1f4162076..1cbbb3414 100644 --- a/ldt/params/topo/read_GTOPO30_curv.F90 +++ b/ldt/params/topo/read_GTOPO30_curv.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_GTOPO30_elev.F90 b/ldt/params/topo/read_GTOPO30_elev.F90 index cbdb83ee3..fd39d52f2 100644 --- a/ldt/params/topo/read_GTOPO30_elev.F90 +++ b/ldt/params/topo/read_GTOPO30_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_GTOPO30_slope.F90 b/ldt/params/topo/read_GTOPO30_slope.F90 index eae9a4e44..8b79e0944 100644 --- a/ldt/params/topo/read_GTOPO30_slope.F90 +++ b/ldt/params/topo/read_GTOPO30_slope.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_MERIT1K_aspect.F90 b/ldt/params/topo/read_MERIT1K_aspect.F90 index f9dfae9a5..0c2b64e2b 100755 --- a/ldt/params/topo/read_MERIT1K_aspect.F90 +++ b/ldt/params/topo/read_MERIT1K_aspect.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_MERIT1K_elev.F90 b/ldt/params/topo/read_MERIT1K_elev.F90 index f07170587..3ce0d8902 100755 --- a/ldt/params/topo/read_MERIT1K_elev.F90 +++ b/ldt/params/topo/read_MERIT1K_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_MERIT1K_slope.F90 b/ldt/params/topo/read_MERIT1K_slope.F90 index 916665b0c..8aae117c0 100755 --- a/ldt/params/topo/read_MERIT1K_slope.F90 +++ b/ldt/params/topo/read_MERIT1K_slope.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -18,6 +18,7 @@ ! 01 Aug 2012: KR Arsenault; Expanded for elevation tiling ! 30 May 2017: KR Arsenault; Expanded for Antarctica ! 03 Mar 2020: Yeosang Yoon; Modify codes for MERIT DEM +! 04 Apr 2024: Yeosang Yoon; Fix bug slope value along the coastal area ! ! !INTERFACE: subroutine read_MERIT1K_slope( n, num_bins, fgrd, slopeave ) @@ -279,6 +280,11 @@ subroutine read_MERIT1K_slope( n, num_bins, fgrd, slopeave ) do r = 1, subpnr do c = 1, subpnc subset_elev(c,r) = yrev_elev(lon_line(c,r),lat_line(c,r)) + + ! for coastal areas + if (subset_elev(c,r) .eq. LDT_rc%udef) then + subset_elev(c,r) = 0. + endif enddo enddo deallocate( yrev_elev ) diff --git a/ldt/params/topo/read_NED_SM_aspect.F90 b/ldt/params/topo/read_NED_SM_aspect.F90 new file mode 100644 index 000000000..63a6a53f9 --- /dev/null +++ b/ldt/params/topo/read_NED_SM_aspect.F90 @@ -0,0 +1,177 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_NED_SM_aspect +! \label{read_NED_SM_aspect} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 28Dec2021: Kristi Arsenault; Added SM NED aspect as separate field +! +! !INTERFACE: +subroutine read_NED_SM_aspect( n, num_bins, fgrd, aspectave ) + +! !USES: + use LDT_coreMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_1dbin_areacalc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: num_bins + real, intent(out):: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),num_bins) + real, intent(out):: aspectave(LDT_rc%lnc(n),LDT_rc%lnr(n),num_bins) + +! !DESCRIPTION: +! This subroutine retrieves SnowModel's NED elevation data files. +! The code in this routine is from Glen Liston's MicroMet code +! described in Liston and Elder (2006) MicroMet paper. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[num_bins] +! number of bins (or bands) +! \item[fgrd] +! output grid fractions for aspect bins (or bands) +! \item[aspectave] +! aspect average for each bin (or band) +!EOP + + integer :: ftn + integer :: c, r, t + logical :: file_exists + real, allocatable :: read_topomap(:,:) ! Read input parameters + real :: elev(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: aspect(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + +! For aspect calculation: + integer :: i,j + real :: pi, rad2deg + real :: deltax,deltay,deltaxy + real :: dzdx(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: dzdy(LDT_rc%lnc(n),LDT_rc%lnr(n)) +! ____________________________________________________________________________________ + + elev = 0. + aspect = 0. + fgrd = 0. + aspectave = 0. + + inquire(file=trim(LDT_rc%elevfile(n)), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "[ERR] Elevation/aspect map ",& + trim(LDT_rc%elevfile(n))," not found." + call LDT_endrun + endif + + select case ( LDT_rc%topo_gridtransform(n) ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading NED (SnowModel-based) aspect file: ",& + trim(LDT_rc%elevfile(n)) + case default + write(LDT_logunit,*) "[ERR] This NED (SnowModel-based) aspect reader currently" + write(LDT_logunit,*) " only supports domains the same as the set LIS run domain." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=LDT_rc%elevfile(n), & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + + ! Read in topographic map + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + + elev(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n)) = & + read_topomap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + + deallocate(read_topomap) + + ! From MicroMet calculations: + pi = 2.0 * acos(0.0) + rad2deg = 180.0 / pi + + ! Compute the average grid increment. + deltax = LDT_rc%topo_gridDesc(n,8) * 1000. ! Convert to meters + deltay = LDT_rc%topo_gridDesc(n,9) * 1000. ! Convert to meters + deltaxy = 0.5 * (deltax + deltay) + + ! Find dzdx. + do j=1,LDT_rc%lnr(n) ! ny + dzdx(1,j) = (elev(2,j) - elev(1,j)) / deltax + do i=2,LDT_rc%lnc(n)-1 ! nx + dzdx(i,j) = (elev(i+1,j) - elev(i-1,j)) / (2.0 * deltax) + enddo + dzdx(LDT_rc%lnc(n),j) = (elev(LDT_rc%lnc(n),j) - elev(LDT_rc%lnc(n)-1,j)) / deltax + enddo + + ! Find dzdy. + do i=1,LDT_rc%lnc(n) !nx + dzdy(i,1) = (elev(i,2) - elev(i,1)) / deltay + do j=2,LDT_rc%lnr(n)-1 ! ny + dzdy(i,j) = (elev(i,j+1) - elev(i,j-1)) / (2.0 * deltay) + enddo + dzdy(i,LDT_rc%lnr(n)) = (elev(i,LDT_rc%lnr(n)) - elev(i,LDT_rc%lnr(n)-1)) / deltay + enddo + + ! Calculate the terrain aspect and azimuth. + do i=1,LDT_rc%lnc(n) + do j=1,LDT_rc%lnr(n) + + ! Some compilers will not allow dzdx and dzdy to both be 0.0 in + ! the atan2 computation. + !if (abs(dzdx(i,j)).lt.1e-10) dzdx(i,j) = 1e-10 + if (abs(dzdy(i,j)).lt.1e-10) then + dzdy(i,j) = 1e-10 + endif + + ! Compute the slope azimuth, making sure that north has zero + ! azimuth. Also note that for the Ryan wind rotation, the + ! azimuth values must range from 0 to 360. +! slope_az(i,j) = rad2deg * & + aspect(i,j,1) = rad2deg * & + (3.0 / 2.0 * pi - atan2(dzdy(i,j),dzdx(i,j))) +! if (slope_az(i,j).ge.360.0) then +! slope_az(i,j) = slope_az(i,j) - 360.0 + if (aspect(i,j,1).ge.360.0) then + aspect(i,j,1) = aspect(i,j,1) - 360.0 + endif + + enddo + enddo + + + ! Transform 2D aspect field to 3D + do r=1,LDT_rc%lnr(n) + do c=1,LDT_rc%lnc(n) + do t = 1, num_bins + ! Single aspect layer, write to first bin: + if( t == 1 ) then + fgrd(c,r,t) = 1.0 + aspectave(c,r,t) = aspect(c,r,1) + endif + end do + enddo + enddo + + call LDT_releaseUnitNumber(ftn) + write(LDT_logunit, *) "[INFO] Done reading SnowModel-based NED aspect file" + +end subroutine read_NED_SM_aspect diff --git a/ldt/params/topo/read_NED_SM_curvature.F90 b/ldt/params/topo/read_NED_SM_curvature.F90 new file mode 100644 index 000000000..0b11ac5dd --- /dev/null +++ b/ldt/params/topo/read_NED_SM_curvature.F90 @@ -0,0 +1,186 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_NED_SM_curvature +! \label{read_NED_SM_curvature} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 28Dec2021: Kristi Arsenault; Added SM NED curvature as separate field +! +! !INTERFACE: +subroutine read_NED_SM_curvature( n, curv ) + +! !USES: + use LDT_coreMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_1dbin_areacalc +#if ( defined SPMD ) + use mpi +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + real, intent(out):: curv(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + +! !DESCRIPTION: +! +! This subroutine retrieves SnowModel's NED elevation data files. +! The code in this routine is from Glen Liston's MicroMet code +! described in Liston and Elder (2006) MicroMet paper. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[curv] +! curvature average +!EOP + + integer :: ftn + integer :: c, r, t + integer :: ierr + logical :: file_exists + real, allocatable :: read_topomap(:,:) ! Read input parameters + real :: elev(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: curvature(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + +! For curvature calculation: + integer :: i, j + real :: pi, rad2deg + real :: deltax,deltay,deltaxy + real :: curve_max, curve_max_all + integer :: inc + +! The curvature is used as part of the wind model. Define a length +! scale that the curvature calculation will be performed on. This +! has units of meters, and should be approximately one-half the +! wavelength of the topographic features within the domain. +!!! (recommended default value: curve_len_scale = 500.0) + real, parameter :: curve_len_scale = 300.0 + +! ____________________________________________________________________________________ + + elev = 0. + curvature = 0. + curv = 0. + + inquire(file=trim(LDT_rc%elevfile(n)), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "[ERR] Elevation/curvature map ",& + trim(LDT_rc%elevfile(n))," not found." + call LDT_endrun + endif + + select case ( LDT_rc%topo_gridtransform(n) ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading NED (SnowModel-based) curvature file: ",& + trim(LDT_rc%elevfile(n)) + case default + write(LDT_logunit,*) "[ERR] This NED (SnowModel-based) curvature reader currently" + write(LDT_logunit,*) " only supports domains the same as the set LIS run domain." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=LDT_rc%elevfile(n), & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + + ! Read in topographic map + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + + elev(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n)) = & + read_topomap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + + deallocate(read_topomap) + + ! From MicroMet calculations: + pi = 2.0 * acos(0.0) + rad2deg = 180.0 / pi + + ! Compute the average grid increment. + deltax = LDT_rc%topo_gridDesc(n,8) * 1000. ! Convert to meters + deltay = LDT_rc%topo_gridDesc(n,9) * 1000. ! Convert to meters + deltaxy = 0.5 * (deltax + deltay) + + ! Convert the length scale to an appropriate grid increment. + inc = max(1,nint(curve_len_scale/deltaxy)) + + ! Compute the curvature. + do i=1,LDT_rc%lnc(n) ! nx + do j=1,LDT_rc%lnr(n) ! ny + + curvature(i,j,1) = (4.0 * elev(i,j) - & + elev(max(1,i-inc),max(1,j-inc)) - & + elev(min(LDT_rc%lnc(n),i+inc),min(LDT_rc%lnr(n),j+inc)) - & + elev(min(LDT_rc%lnc(n),i+inc),max(1,j-inc)) - & + elev(max(1,i-inc),min(LDT_rc%lnr(n),j+inc))) / & + (sqrt(2.0) * 16.0 * real(inc) * deltaxy) + & + (4.0 * elev(i,j) - & + elev(min(LDT_rc%lnc(n),i+inc),j) - elev(max(1,i-inc),j) - & + elev(i,min(LDT_rc%lnr(n),j+inc)) - elev(i,max(1,j-inc))) / & + (16.0 * real(inc) * deltaxy) + enddo + enddo + + ! Scale the curvature such that the max abs(curvature) has a value + ! of abs(0.5). Include a 1 mm curvature in curve_max to prevent + ! divisions by zero in flat terrain where the curvature is zero. + curve_max = 0.0 + 0.001 + do j=1,LDT_rc%lnr(n) + do i=1,LDT_rc%lnc(n) + curve_max = max(curve_max,abs(curvature(i,j,1))) + enddo + enddo + +#if (defined SPMD) + call MPI_Barrier(MPI_COMM_WORLD, ierr) + call MPI_ALLREDUCE(curve_max, curve_max_all, 1,& + MPI_REAL, MPI_MAX,& + mpi_comm_world, ierr) + curve_max = curve_max_all +#endif + + do j=1,LDT_rc%lnr(n) + do i=1,LDT_rc%lnc(n) + curvature(i,j,1) = curvature(i,j,1) / (2.0 * curve_max) + enddo + enddo + + curv = curvature + +#if 0 + ! Transform 2D curvature field to 3D + do r=1,LDT_rc%lnr(n) + do c=1,LDT_rc%lnc(n) + do t = 1, num_bins + ! Single curvature layer, write to first bin: + if( t == 1 ) then + fgrd(c,r,t) = 1.0 + curvave(c,r,t) = curvature(c,r,1) + endif + end do + enddo + enddo +#endif + + call LDT_releaseUnitNumber(ftn) + write(LDT_logunit, *) "[INFO] Done reading SnowModel-based NED curvature file" + +end subroutine read_NED_SM_curvature diff --git a/ldt/params/topo/read_NED_SM_elev.F90 b/ldt/params/topo/read_NED_SM_elev.F90 new file mode 100644 index 000000000..c3c22cd7c --- /dev/null +++ b/ldt/params/topo/read_NED_SM_elev.F90 @@ -0,0 +1,112 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_NED_SM_elev +! \label{read_NED_SM_elev} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 20Dec2021: Kristi Arsenault; Added SM NED elevation as separate field +! +! !INTERFACE: +subroutine read_NED_SM_elev( n, num_bins, fgrd, elevave ) + +! !USES: + use LDT_coreMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_1dbin_areacalc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: num_bins + real, intent(out):: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),num_bins) + real, intent(out):: elevave(LDT_rc%lnc(n),LDT_rc%lnr(n),num_bins) + +! !DESCRIPTION: +! This subroutine retrieves SnowModel's NED elevation data files. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[num_bins] +! number of bins (or bands) +! \item[fgrd] +! output grid fractions for elevation bins (or bands) +! \item[elevave] +! elevation average for each bin (or band) +!EOP + + integer :: ftn + integer :: c, r, t + logical :: file_exists + real :: elev(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + real, allocatable :: read_topomap(:,:) ! Read input parameters + +! ____________________________________________________________________________________ + + elev = 0. + fgrd = 0. + elevave = 0. + + inquire(file=trim(LDT_rc%elevfile(n)), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "[ERR] Elevation map ",& + trim(LDT_rc%elevfile(n))," not found." + call LDT_endrun + endif + + select case ( LDT_rc%topo_gridtransform(n) ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading NED (SnowModel-based) elevation file: ",& + trim(LDT_rc%elevfile(n)) + case default + write(LDT_logunit,*) "[ERR] This NED (SnowModel-based) elevation reader currently" + write(LDT_logunit,*) " only supports domains the same as the set LIS run domain." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=LDT_rc%elevfile(n), & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + + ! Read in topographic map + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + + elev(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n),1) = & + read_topomap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + deallocate(read_topomap) + + ! Transform 2D elevation field to 3D + do r=1,LDT_rc%lnr(n) + do c=1,LDT_rc%lnc(n) + do t = 1, num_bins + ! Single elevation layer, write to first bin: + if( t == 1 ) then + fgrd(c,r,t) = 1.0 + elevave(c,r,t) = elev(c,r,1) + endif + end do + enddo + enddo + + call LDT_releaseUnitNumber(ftn) + write(LDT_logunit, *) "[INFO] Done reading SnowModel-based NED elevation file" + +end subroutine read_NED_SM_elev diff --git a/ldt/params/topo/read_NED_SM_slope.F90 b/ldt/params/topo/read_NED_SM_slope.F90 new file mode 100644 index 000000000..454f302fd --- /dev/null +++ b/ldt/params/topo/read_NED_SM_slope.F90 @@ -0,0 +1,170 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: read_NED_SM_slope +! \label{read_NED_SM_slope} +! +! !REVISION HISTORY: +! 16Jul2020: Kristi Arsenault; Added SnowModel topo-veg reader +! 20Dec2021: Kristi Arsenault; Added SM NED slope as separate field +! +! !INTERFACE: +subroutine read_NED_SM_slope( n, num_bins, fgrd, slopeave ) + +! !USES: + use LDT_coreMod + use LDT_logMod, only : LDT_logunit, LDT_getNextUnitNumber, & + LDT_releaseUnitNumber, LDT_endrun + use LDT_gridmappingMod + use LDT_fileIOMod + use LDT_paramTileInputMod, only: param_1dbin_areacalc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: num_bins + real, intent(out):: fgrd(LDT_rc%lnc(n),LDT_rc%lnr(n),num_bins) + real, intent(out):: slopeave(LDT_rc%lnc(n),LDT_rc%lnr(n),num_bins) + +! !DESCRIPTION: +! This subroutine retrieves SnowModel's NED slope data files. +! The code in this routine is from Glen Liston's MicroMet code +! described in Liston and Elder (2006) MicroMet paper. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[num_bins] +! number of bins (or bands) +! \item[fgrd] +! output grid fractions for slope bins (or bands) +! \item[slopeave] +! slope average for each bin (or band) +!EOP + + integer :: ftn + integer :: c, r, t + logical :: file_exists + real, allocatable :: read_topomap(:,:) ! Read input parameters +! real :: elev(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + real :: elev(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: slope(LDT_rc%lnc(n),LDT_rc%lnr(n),1) + +! For slope calculation: + integer :: i,j + real :: pi, rad2deg + real :: deltax,deltay,deltaxy + real :: dzdx(LDT_rc%lnc(n),LDT_rc%lnr(n)) + real :: dzdy(LDT_rc%lnc(n),LDT_rc%lnr(n)) +! ____________________________________________________________________________________ + + elev = 0. + slope = 0. + fgrd = 0. + slopeave = 0. + + inquire(file=trim(LDT_rc%elevfile(n)), exist=file_exists) + if(.not.file_exists) then + write(LDT_logunit,*) "[ERR] Elevation/slope map ",& + trim(LDT_rc%elevfile(n))," not found." + call LDT_endrun + endif + + select case ( LDT_rc%topo_gridtransform(n) ) + case( "none" ) + write(LDT_logunit,*) "[INFO] Reading NED (SnowModel-based) slope file: ",& + trim(LDT_rc%elevfile(n)) + case default + write(LDT_logunit,*) "[ERR] This NED (SnowModel-based) slope reader currently" + write(LDT_logunit,*) " only supports domains the same as the set LIS run domain." + call LDT_endrun + end select + + ftn = LDT_getNextUnitNumber() + open( ftn, file=LDT_rc%elevfile(n), & + form="unformatted", access='direct',status='old', & + recl=4*LDT_rc%gnc(n)*LDT_rc%gnr(n) ) + + allocate(read_topomap(LDT_rc%gnc(n),LDT_rc%gnr(n))) + + ! Read in topographic map + read(ftn,rec=1) ((read_topomap(c,r),c=1,LDT_rc%gnc(n)),r=1,LDT_rc%gnr(n)) + + elev(1:LDT_rc%lnc(n),1:LDT_rc%lnr(n)) = & + read_topomap((LDT_ews_halo_ind(n,LDT_localPet+1)):(LDT_ewe_halo_ind(n,LDT_localPet+1)),& + (LDT_nss_halo_ind(n,LDT_localPet+1)):(LDT_nse_halo_ind(n,LDT_localPet+1))) + + deallocate(read_topomap) + + + ! From MicroMet calculations: + pi = 2.0 * acos(0.0) + rad2deg = 180.0 / pi + + ! Compute the average grid increment. + deltax = LDT_rc%topo_gridDesc(n,8) * 1000. ! Convert to meters + deltay = LDT_rc%topo_gridDesc(n,9) * 1000. ! Convert to meters + deltaxy = 0.5 * (deltax + deltay) + + ! Find dzdx. + do j=1,LDT_rc%lnr(n) ! ny + dzdx(1,j) = (elev(2,j) - elev(1,j)) / deltax + do i=2,LDT_rc%lnc(n)-1 ! nx + dzdx(i,j) = (elev(i+1,j) - elev(i-1,j)) / (2.0 * deltax) + enddo + dzdx(LDT_rc%lnc(n),j) = (elev(LDT_rc%lnc(n),j) - elev(LDT_rc%lnc(n)-1,j)) / deltax + enddo + + ! Find dzdy. + do i=1,LDT_rc%lnc(n) !nx + dzdy(i,1) = (elev(i,2) - elev(i,1)) / deltay + do j=2,LDT_rc%lnr(n)-1 ! ny + dzdy(i,j) = (elev(i,j+1) - elev(i,j-1)) / (2.0 * deltay) + enddo + dzdy(i,LDT_rc%lnr(n)) = (elev(i,LDT_rc%lnr(n)) - elev(i,LDT_rc%lnr(n)-1)) / deltay + enddo + + ! Calculate the terrain slope and azimuth. + do i=1,LDT_rc%lnc(n) + do j=1,LDT_rc%lnr(n) + + ! Some compilers will not allow dzdx and dzdy to both be 0.0 in + ! the atan2 computation. + !if (abs(dzdx(i,j)).lt.1e-10) dzdx(i,j) = 1e-10 + if (abs(dzdy(i,j)).lt.1e-10) then + dzdy(i,j) = 1e-10 + endif + + ! Compute the slope of the terrain. +! terrain_slope(i,j) = rad2deg * & + slope(i,j,1) = rad2deg * & + atan(sqrt(dzdx(i,j)*dzdx(i,j) + dzdy(i,j)*dzdy(i,j))) + enddo + enddo + + ! Transform 2D slope field to 3D + do r=1,LDT_rc%lnr(n) + do c=1,LDT_rc%lnc(n) + do t = 1, num_bins + ! Single slope layer, write to first bin: + if( t == 1 ) then + fgrd(c,r,t) = 1.0 + slopeave(c,r,t) = slope(c,r,1) + endif + end do + enddo + enddo + + call LDT_releaseUnitNumber(ftn) + write(LDT_logunit, *) "[INFO] Done reading SnowModel-based NED slope file" + +end subroutine read_NED_SM_slope diff --git a/ldt/params/topo/read_SRTM_Native_aspect.F90 b/ldt/params/topo/read_SRTM_Native_aspect.F90 index 63adb5b22..465c7057b 100644 --- a/ldt/params/topo/read_SRTM_Native_aspect.F90 +++ b/ldt/params/topo/read_SRTM_Native_aspect.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_SRTM_Native_elev.F90 b/ldt/params/topo/read_SRTM_Native_elev.F90 index 716c7391d..4d2c4649e 100644 --- a/ldt/params/topo/read_SRTM_Native_elev.F90 +++ b/ldt/params/topo/read_SRTM_Native_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_SRTM_Native_slope.F90 b/ldt/params/topo/read_SRTM_Native_slope.F90 index 948c47c1d..53a5df248 100644 --- a/ldt/params/topo/read_SRTM_Native_slope.F90 +++ b/ldt/params/topo/read_SRTM_Native_slope.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_SRTM_aspect.F90 b/ldt/params/topo/read_SRTM_aspect.F90 index 3aa03cef4..810e8d509 100644 --- a/ldt/params/topo/read_SRTM_aspect.F90 +++ b/ldt/params/topo/read_SRTM_aspect.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_SRTM_elev.F90 b/ldt/params/topo/read_SRTM_elev.F90 index 5356ebad2..94491f992 100644 --- a/ldt/params/topo/read_SRTM_elev.F90 +++ b/ldt/params/topo/read_SRTM_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/read_SRTM_slope.F90 b/ldt/params/topo/read_SRTM_slope.F90 index 97e339329..6a43744f1 100644 --- a/ldt/params/topo/read_SRTM_slope.F90 +++ b/ldt/params/topo/read_SRTM_slope.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/params/topo/setTopoParmsFullnames.F90 b/ldt/params/topo/setTopoParmsFullnames.F90 index 44087e3e4..14bd5ec75 100644 --- a/ldt/params/topo/setTopoParmsFullnames.F90 +++ b/ldt/params/topo/setTopoParmsFullnames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -70,6 +70,9 @@ subroutine setTopoParmsFullnames(n,datatype,source) case( "MERIT_1K" ) LDT_LSMparam_struc(n)%elevation%standard_name =& "MERIT '1K' elevation" + case( "NED_SM" ) + LDT_LSMparam_struc(n)%elevation%standard_name =& + "SnowModel-based NED elevation" end select case( "slope" ) @@ -95,6 +98,9 @@ subroutine setTopoParmsFullnames(n,datatype,source) case( "MERIT_1K" ) LDT_LSMparam_struc(n)%slope%standard_name =& "MERIT '1K' slope" + case( "NED_SM" ) + LDT_LSMparam_struc(n)%slope%standard_name =& + "SnowModel-based NED-derived slope" end select case( "aspect" ) @@ -120,6 +126,9 @@ subroutine setTopoParmsFullnames(n,datatype,source) case( "MERIT_1K" ) LDT_LSMparam_struc(n)%aspect%standard_name =& "MERIT '1K' aspect" + case( "NED_SM" ) + LDT_LSMparam_struc(n)%aspect%standard_name =& + "SnowModel-based NED-derived aspect" end select case( "curvature" ) @@ -127,6 +136,9 @@ subroutine setTopoParmsFullnames(n,datatype,source) case( "GTOPO30_LIS" ) LDT_LSMparam_struc(n)%curvature%standard_name =& "GTOPO30 (LIS-based) curvature" + case( "NED_SM" ) + LDT_LSMparam_struc(n)%curvature%standard_name =& + "SnowModel-based NED-derived curvature" end select case default diff --git a/ldt/plugins/LDT_ANNdata_pluginMod.F90 b/ldt/plugins/LDT_ANNdata_pluginMod.F90 index 1fd4d77b4..e632decd5 100644 --- a/ldt/plugins/LDT_ANNdata_pluginMod.F90 +++ b/ldt/plugins/LDT_ANNdata_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_DAobs_pluginMod.F90 b/ldt/plugins/LDT_DAobs_pluginMod.F90 index 93b91724d..cc4779936 100644 --- a/ldt/plugins/LDT_DAobs_pluginMod.F90 +++ b/ldt/plugins/LDT_DAobs_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -72,6 +72,7 @@ subroutine LDT_DAobs_plugin use LPRMvod_obsMod, only : LPRMvod_obsinit use MCD15A2Hlai_obsMod, only : MCD15A2Hlai_obsinit use THySM_obsMod, only : THySM_obsinit + use LISlsmPrecip_obsMod, only : LISlsmPrecip_obsInit use VIIRSGVFobsMod, only : VIIRSGVFobsinit !Y.Kwon use CDFSGVFobsMod, only : CDFSGVFobsinit !Y.Kwon use GEOSTEFF_obsMod, only : GEOSTeffobsinit !Y.Kwon @@ -104,6 +105,7 @@ subroutine LDT_DAobs_plugin external readLPRMvodObs external readMCD15A2HlaiObs external readTHySMobs + external readLISlsmPrecipObs external readVIIRS_GVFObs !Y.Kwon external readCDFS_GVFObs !Y.Kwon external readGEOSTEFFObs !Y.Kwon @@ -112,6 +114,9 @@ subroutine LDT_DAobs_plugin call registerdaobssetup(trim(LDT_LISlsmSMobsId)//char(0), LISlsmSM_obsInit) call registerdaobsread(trim(LDT_LISlsmSMobsId)//char(0), readLISlsmSMObs) + call registerdaobssetup(trim(LDT_LISlsmPrecipobsId)//char(0), LISlsmPrecip_obsInit) + call registerdaobsread(trim(LDT_LISlsmPrecipobsId)//char(0), readLISlsmPrecipObs) + !Y.Kwon call registerdaobssetup(trim(LDT_LISlsmTEFFobsId)//char(0), LISlsmTEFF_obsInit) call registerdaobsread(trim(LDT_LISlsmTEFFobsId)//char(0), readLISlsmTEFFObs) diff --git a/ldt/plugins/LDT_NatureRunData_pluginMod.F90 b/ldt/plugins/LDT_NatureRunData_pluginMod.F90 index 84f1b008a..fed5ca096 100644 --- a/ldt/plugins/LDT_NatureRunData_pluginMod.F90 +++ b/ldt/plugins/LDT_NatureRunData_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_OSSEmaskData_pluginMod.F90 b/ldt/plugins/LDT_OSSEmaskData_pluginMod.F90 index 6ca256e08..5fef95fc1 100644 --- a/ldt/plugins/LDT_OSSEmaskData_pluginMod.F90 +++ b/ldt/plugins/LDT_OSSEmaskData_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_domain_pluginMod.F90 b/ldt/plugins/LDT_domain_pluginMod.F90 index e4262b829..39f06bc87 100644 --- a/ldt/plugins/LDT_domain_pluginMod.F90 +++ b/ldt/plugins/LDT_domain_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_metforcScale_pluginMod.F90 b/ldt/plugins/LDT_metforcScale_pluginMod.F90 index feda65403..f8477c05f 100644 --- a/ldt/plugins/LDT_metforcScale_pluginMod.F90 +++ b/ldt/plugins/LDT_metforcScale_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_metforcing_pluginMod.F90 b/ldt/plugins/LDT_metforcing_pluginMod.F90 index 012a62bc7..c056981e6 100644 --- a/ldt/plugins/LDT_metforcing_pluginMod.F90 +++ b/ldt/plugins/LDT_metforcing_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_param_pluginMod.F90 b/ldt/plugins/LDT_param_pluginMod.F90 index 8b41ec458..e8c37add0 100644 --- a/ldt/plugins/LDT_param_pluginMod.F90 +++ b/ldt/plugins/LDT_param_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -78,6 +78,7 @@ subroutine LDT_LSMparam_plugin use RUC_parmsMod use JULES50_parmsMod use Crocus_parmsMod + use SnowModel_parmsMod external :: registerlsmparamprocinit external :: registerlsmparamprocwriteheader @@ -244,7 +245,7 @@ subroutine LDT_LSMparam_plugin call registerlsmparamprocwritedata(trim(LDT_jules50Id)//char(0),& JULES50Parms_writeData) - !Crocus 8.1 : + ! Crocus 8.1 : call registerlsmparamprocinit(trim(LDT_Crocus81Id)//char(0),& CrocusParms_init) call registerlsmparamprocwriteheader(trim(LDT_Crocus81Id)//char(0),& @@ -252,6 +253,14 @@ subroutine LDT_LSMparam_plugin call registerlsmparamprocwritedata(trim(LDT_Crocus81Id)//char(0),& CrocusParms_writeData) + ! SnowModel LSM: + call registerlsmparamprocinit(trim(LDT_snowmodelId)//char(0),& + SnowModelParms_init) + call registerlsmparamprocwriteheader(trim(LDT_snowmodelId)//char(0),& + SnowModelParms_writeHeader) + call registerlsmparamprocwritedata(trim(LDT_snowmodelId)//char(0),& + SnowModelParms_writeData) + end subroutine LDT_LSMparam_plugin !BOP @@ -374,6 +383,7 @@ subroutine LDT_landcover_plugin external set_MODISNative_lc_attribs external read_MODISNative_lc + external read_MCD12Q1_lc external read_MODISNative_PFT external read_UKMO_IGBP_PFT external read_UM_ancillary @@ -387,6 +397,8 @@ subroutine LDT_landcover_plugin external read_CONSTANT_lc external read_SACHTET356_lc external read_CLM45_lc + external read_NALCMS_SM_lc + external read_NALCMS_SM_IGBPNCEP_lc external read_regmask_gis external read_regmask_wrsi @@ -421,6 +433,7 @@ subroutine LDT_landcover_plugin ! MODIS-IGBP/NCEP (LIS-based): call registerreadlc(trim(LDT_modislcLISId)//char(0), read_MODIS_lc) + call registerreadlc(trim(LDT_mcd12q1Id)//char(0), read_MCD12Q1_lc) ! USGS (Native): call registerreadlc(trim(LDT_usgslcNATId)//char(0), read_USGSNative_lc) @@ -442,6 +455,11 @@ subroutine LDT_landcover_plugin ! CLM-4.5 Landcover: call registerreadlc(trim(LDT_clm45lcId)//char(0), read_CLM45_lc) + ! SnowModel-based NALCMS Landcover: + call registerreadlc(trim(LDT_nalcmsSMlcId)//char(0), read_NALCMS_SM_lc) + ! NALCMS/SnowModel-mapped to IGBP/NCEP Landcover: + call registerreadlc(trim(LDT_nalcmsSMIGBPlcId)//char(0), read_NALCMS_SM_IGBPNCEP_lc) + ! Constant Landcover: call registerreadlc(trim(LDT_constId)//char(0), read_CONSTANT_lc) @@ -551,6 +569,11 @@ subroutine LDT_topo_plugin external read_MERIT1K_slope external read_MERIT1K_aspect + external read_NED_SM_elev + external read_NED_SM_slope + external read_NED_SM_aspect + external read_NED_SM_curvature + !- GTOPO30: call registerreadelev(trim(LDT_gtopoLISId)//char(0),read_GTOPO30_elev) call registerreadelev(trim(LDT_gtopoGFSId)//char(0),read_GTOPO30_GFS_elev) @@ -577,6 +600,12 @@ subroutine LDT_topo_plugin call registerreadslope(trim(LDT_merit1KId)//char(0),read_MERIT1K_slope) call registerreadaspect(trim(LDT_merit1KId)//char(0),read_MERIT1K_aspect) +!- NED (SnowModel file version) elevation: + call registerreadelev(trim(LDT_nedSMId)//char(0),read_NED_SM_elev) + call registerreadslope(trim(LDT_nedSMId)//char(0),read_NED_SM_slope) + call registerreadaspect(trim(LDT_nedSMId)//char(0),read_NED_SM_aspect) + call registerreadcurv(trim(LDT_nedSMId)//char(0),read_NED_SM_curvature) + end subroutine LDT_topo_plugin diff --git a/ldt/plugins/LDT_pluginIndices.F90 b/ldt/plugins/LDT_pluginIndices.F90 index defb15e4c..42cb0c232 100644 --- a/ldt/plugins/LDT_pluginIndices.F90 +++ b/ldt/plugins/LDT_pluginIndices.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -120,9 +120,10 @@ module LDT_pluginIndices = "GLASS LAI" character*50, public, parameter :: LDT_LPRMvodobsId & = "LPRM vegetation optical depth" - character*50, public, parameter :: LDT_MCD15A2HlaiobsId & = "MCD15A2H LAI" + character*50, public, parameter :: LDT_LISlsmPrecipobsId & + = "LIS LSM total precipitation" character*50, public, parameter :: LDT_VIIRSgvfobsId & = "VIIRS GVF" !Y.Kwon character*50, public, parameter :: LDT_CDFSgvfobsId & @@ -219,6 +220,7 @@ module LDT_pluginIndices ! Snow models and data !------------------------------------------------------------------------- character*50, public, parameter :: LDT_Crocus81Id = "Crocus8.1" ! this is SURFEX version comes from surf_version.F90 + character*50, public, parameter :: LDT_snowmodelId = "SnowModel" !------------------------------------------------------------------------- ! Landcover sources @@ -229,6 +231,7 @@ module LDT_pluginIndices character*50, public, parameter :: LDT_usgslcNATId = "USGS_Native" character*50, public, parameter :: LDT_modislcLISId = "MODIS_LIS" character*50, public, parameter :: LDT_modislcNATId = "MODIS_Native" + character*50, public, parameter :: LDT_mcd12q1Id = "MCD12Q1" character*50, public, parameter :: LDT_modislcPFTId = "MODIS_Native_PFT" character*50, public, parameter :: LDT_ukmoigbpPFTId = "UKMO_IGBP_Native_PFT" character*50, public, parameter :: LDT_UM_ancillaryId = "UM_Native_Ancillary" @@ -238,6 +241,8 @@ module LDT_pluginIndices character*50, public, parameter :: LDT_vic411lcId = "VIC411" character*50, public, parameter :: LDT_vic412lcId = "VIC412" character*50, public, parameter :: LDT_clm45lcId = "CLM45" + character*50, public, parameter :: LDT_nalcmsSMlcId = "NALCMS_SM" + character*50, public, parameter :: LDT_nalcmsSMIGBPlcId = "NALCMS_SM_IGBPNCEP" character*50, public, parameter :: LDT_constId = "CONSTANT" !------------------------------------------------------------------------- @@ -266,6 +271,7 @@ module LDT_pluginIndices character*50, public, parameter :: LDT_srtmLISId = "SRTM_LIS" character*50, public, parameter :: LDT_srtmNATId = "SRTM_Native" character*50, public, parameter :: LDT_merit1KId = "MERIT_1K" + character*50, public, parameter :: LDT_nedSMId = "NED_SM" !------------------------------------------------------------------------- ! Soils sources diff --git a/ldt/plugins/LDT_runmode_pluginMod.F90 b/ldt/plugins/LDT_runmode_pluginMod.F90 index dc9165e1b..c2675f487 100644 --- a/ldt/plugins/LDT_runmode_pluginMod.F90 +++ b/ldt/plugins/LDT_runmode_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/plugins/LDT_statDscale_pluginMod.F90 b/ldt/plugins/LDT_statDscale_pluginMod.F90 index 9786a64bf..ef249b501 100644 --- a/ldt/plugins/LDT_statDscale_pluginMod.F90 +++ b/ldt/plugins/LDT_statDscale_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/ANNproc/LDT_init_ANNproc.F90 b/ldt/runmodes/ANNproc/LDT_init_ANNproc.F90 index 34977ce75..6ef7224bd 100644 --- a/ldt/runmodes/ANNproc/LDT_init_ANNproc.F90 +++ b/ldt/runmodes/ANNproc/LDT_init_ANNproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/ANNproc/LDT_run_ANNproc.F90 b/ldt/runmodes/ANNproc/LDT_run_ANNproc.F90 index c3f86c75c..a095c87cc 100644 --- a/ldt/runmodes/ANNproc/LDT_run_ANNproc.F90 +++ b/ldt/runmodes/ANNproc/LDT_run_ANNproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/DApreproc/LDT_init_DApreproc.F90 b/ldt/runmodes/DApreproc/LDT_init_DApreproc.F90 index bda808686..ac34a7262 100644 --- a/ldt/runmodes/DApreproc/LDT_init_DApreproc.F90 +++ b/ldt/runmodes/DApreproc/LDT_init_DApreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/DApreproc/LDT_run_DApreproc.F90 b/ldt/runmodes/DApreproc/LDT_run_DApreproc.F90 index d0620c73a..7bf3ee77b 100644 --- a/ldt/runmodes/DApreproc/LDT_run_DApreproc.F90 +++ b/ldt/runmodes/DApreproc/LDT_run_DApreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/EnsRstpreproc/LDT_init_EnsRstpreproc.F90 b/ldt/runmodes/EnsRstpreproc/LDT_init_EnsRstpreproc.F90 index 8f01dfd24..aa3ad1ecc 100644 --- a/ldt/runmodes/EnsRstpreproc/LDT_init_EnsRstpreproc.F90 +++ b/ldt/runmodes/EnsRstpreproc/LDT_init_EnsRstpreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/EnsRstpreproc/LDT_run_EnsRstpreproc.F90 b/ldt/runmodes/EnsRstpreproc/LDT_run_EnsRstpreproc.F90 index a7e6f1d73..710adcf4c 100644 --- a/ldt/runmodes/EnsRstpreproc/LDT_run_EnsRstpreproc.F90 +++ b/ldt/runmodes/EnsRstpreproc/LDT_run_EnsRstpreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/LISHydropreproc/LDT_init_LISHydropreproc.F90 b/ldt/runmodes/LISHydropreproc/LDT_init_LISHydropreproc.F90 index aacabd3a1..8db60c1ae 100755 --- a/ldt/runmodes/LISHydropreproc/LDT_init_LISHydropreproc.F90 +++ b/ldt/runmodes/LISHydropreproc/LDT_init_LISHydropreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/LISHydropreproc/LDT_run_LISHydropreproc.F90 b/ldt/runmodes/LISHydropreproc/LDT_run_LISHydropreproc.F90 index c7aaede87..407259498 100755 --- a/ldt/runmodes/LISHydropreproc/LDT_run_LISHydropreproc.F90 +++ b/ldt/runmodes/LISHydropreproc/LDT_run_LISHydropreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/LSMparamproc/LDT_init_LSMparamproc.F90 b/ldt/runmodes/LSMparamproc/LDT_init_LSMparamproc.F90 index 629a9292c..886b4c15b 100644 --- a/ldt/runmodes/LSMparamproc/LDT_init_LSMparamproc.F90 +++ b/ldt/runmodes/LSMparamproc/LDT_init_LSMparamproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/LSMparamproc/LDT_run_LSMparamproc.F90 b/ldt/runmodes/LSMparamproc/LDT_run_LSMparamproc.F90 index a16eef36b..a16548899 100644 --- a/ldt/runmodes/LSMparamproc/LDT_run_LSMparamproc.F90 +++ b/ldt/runmodes/LSMparamproc/LDT_run_LSMparamproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/MetTimeDScale/LDT_init_MetTimeDScale.F90 b/ldt/runmodes/MetTimeDScale/LDT_init_MetTimeDScale.F90 index 70a67d6fe..15f24be52 100644 --- a/ldt/runmodes/MetTimeDScale/LDT_init_MetTimeDScale.F90 +++ b/ldt/runmodes/MetTimeDScale/LDT_init_MetTimeDScale.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/MetTimeDScale/LDT_run_MetTimeDScale.F90 b/ldt/runmodes/MetTimeDScale/LDT_run_MetTimeDScale.F90 index b76bc3093..46ddff60f 100644 --- a/ldt/runmodes/MetTimeDScale/LDT_run_MetTimeDScale.F90 +++ b/ldt/runmodes/MetTimeDScale/LDT_run_MetTimeDScale.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/Metforcproc/LDT_final_MetforcProc.F90 b/ldt/runmodes/Metforcproc/LDT_final_MetforcProc.F90 index 068c5f035..eb04064fa 100644 --- a/ldt/runmodes/Metforcproc/LDT_final_MetforcProc.F90 +++ b/ldt/runmodes/Metforcproc/LDT_final_MetforcProc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/Metforcproc/LDT_init_MetforcProc.F90 b/ldt/runmodes/Metforcproc/LDT_init_MetforcProc.F90 index 49b79c7d7..4d552886b 100644 --- a/ldt/runmodes/Metforcproc/LDT_init_MetforcProc.F90 +++ b/ldt/runmodes/Metforcproc/LDT_init_MetforcProc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/Metforcproc/LDT_run_MetforcProc.F90 b/ldt/runmodes/Metforcproc/LDT_run_MetforcProc.F90 index 6d58ad428..63c5c361f 100644 --- a/ldt/runmodes/Metforcproc/LDT_run_MetforcProc.F90 +++ b/ldt/runmodes/Metforcproc/LDT_run_MetforcProc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/NUWRFpreproc/LDT_init_NUWRFpreproc.F90 b/ldt/runmodes/NUWRFpreproc/LDT_init_NUWRFpreproc.F90 index 1d56a1135..16cdad526 100644 --- a/ldt/runmodes/NUWRFpreproc/LDT_init_NUWRFpreproc.F90 +++ b/ldt/runmodes/NUWRFpreproc/LDT_init_NUWRFpreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/NUWRFpreproc/LDT_run_NUWRFpreproc.F90 b/ldt/runmodes/NUWRFpreproc/LDT_run_NUWRFpreproc.F90 index 207b8d988..af98950fe 100644 --- a/ldt/runmodes/NUWRFpreproc/LDT_run_NUWRFpreproc.F90 +++ b/ldt/runmodes/NUWRFpreproc/LDT_run_NUWRFpreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/OPTUEproc/LDT_init_OPTUEparamproc.F90 b/ldt/runmodes/OPTUEproc/LDT_init_OPTUEparamproc.F90 index edcaea468..5cae0f270 100644 --- a/ldt/runmodes/OPTUEproc/LDT_init_OPTUEparamproc.F90 +++ b/ldt/runmodes/OPTUEproc/LDT_init_OPTUEparamproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/OPTUEproc/LDT_run_OPTUEparamproc.F90 b/ldt/runmodes/OPTUEproc/LDT_run_OPTUEparamproc.F90 index ed7f65dc1..abca8e8f9 100644 --- a/ldt/runmodes/OPTUEproc/LDT_run_OPTUEparamproc.F90 +++ b/ldt/runmodes/OPTUEproc/LDT_run_OPTUEparamproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/SMAP_E_OPL/LDT_init_smap_e_opl.F90 b/ldt/runmodes/SMAP_E_OPL/LDT_init_smap_e_opl.F90 index b1b95f6fe..fe2eeefdc 100644 --- a/ldt/runmodes/SMAP_E_OPL/LDT_init_smap_e_opl.F90 +++ b/ldt/runmodes/SMAP_E_OPL/LDT_init_smap_e_opl.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/SMAP_E_OPL/LDT_run_smap_e_opl.F90 b/ldt/runmodes/SMAP_E_OPL/LDT_run_smap_e_opl.F90 index 5dc1e95d2..4d09a29c2 100644 --- a/ldt/runmodes/SMAP_E_OPL/LDT_run_smap_e_opl.F90 +++ b/ldt/runmodes/SMAP_E_OPL/LDT_run_smap_e_opl.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/StatDscaleMetForc/LDT_init_StatDscaleMetForc.F90 b/ldt/runmodes/StatDscaleMetForc/LDT_init_StatDscaleMetForc.F90 index 77341f045..b6c7e4900 100644 --- a/ldt/runmodes/StatDscaleMetForc/LDT_init_StatDscaleMetForc.F90 +++ b/ldt/runmodes/StatDscaleMetForc/LDT_init_StatDscaleMetForc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/StatDscaleMetForc/LDT_run_StatDscaleMetForc.F90 b/ldt/runmodes/StatDscaleMetForc/LDT_run_StatDscaleMetForc.F90 index ce6b0e1b5..223c922fb 100644 --- a/ldt/runmodes/StatDscaleMetForc/LDT_run_StatDscaleMetForc.F90 +++ b/ldt/runmodes/StatDscaleMetForc/LDT_run_StatDscaleMetForc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/USAFSI/LDT_init_usafsi.F90 b/ldt/runmodes/USAFSI/LDT_init_usafsi.F90 index de2f0ac61..18e27116f 100644 --- a/ldt/runmodes/USAFSI/LDT_init_usafsi.F90 +++ b/ldt/runmodes/USAFSI/LDT_init_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/USAFSI/LDT_run_usafsi.F90 b/ldt/runmodes/USAFSI/LDT_run_usafsi.F90 index c400d15df..b82ea1690 100644 --- a/ldt/runmodes/USAFSI/LDT_run_usafsi.F90 +++ b/ldt/runmodes/USAFSI/LDT_run_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/climoRstproc/LDT_init_climoRstproc.F90 b/ldt/runmodes/climoRstproc/LDT_init_climoRstproc.F90 index 830a493b9..f6b6c375c 100755 --- a/ldt/runmodes/climoRstproc/LDT_init_climoRstproc.F90 +++ b/ldt/runmodes/climoRstproc/LDT_init_climoRstproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/climoRstproc/LDT_run_climoRstproc.F90 b/ldt/runmodes/climoRstproc/LDT_run_climoRstproc.F90 index 936069477..8ae5fb4d9 100755 --- a/ldt/runmodes/climoRstproc/LDT_run_climoRstproc.F90 +++ b/ldt/runmodes/climoRstproc/LDT_run_climoRstproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/obsSim/LDT_init_obsSim.F90 b/ldt/runmodes/obsSim/LDT_init_obsSim.F90 index a65c33ad6..61a711bb0 100644 --- a/ldt/runmodes/obsSim/LDT_init_obsSim.F90 +++ b/ldt/runmodes/obsSim/LDT_init_obsSim.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/obsSim/LDT_run_obsSim.F90 b/ldt/runmodes/obsSim/LDT_run_obsSim.F90 index 9aa39cea3..86e172528 100644 --- a/ldt/runmodes/obsSim/LDT_run_obsSim.F90 +++ b/ldt/runmodes/obsSim/LDT_run_obsSim.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/rstTransformProc/LDT_init_rstTransformProc.F90 b/ldt/runmodes/rstTransformProc/LDT_init_rstTransformProc.F90 index 65e8ace94..cc1448c25 100644 --- a/ldt/runmodes/rstTransformProc/LDT_init_rstTransformProc.F90 +++ b/ldt/runmodes/rstTransformProc/LDT_init_rstTransformProc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/runmodes/rstTransformProc/LDT_run_rstTransformProc.F90 b/ldt/runmodes/rstTransformProc/LDT_run_rstTransformProc.F90 index e1bf70bdf..568c9ea4f 100644 --- a/ldt/runmodes/rstTransformProc/LDT_run_rstTransformProc.F90 +++ b/ldt/runmodes/rstTransformProc/LDT_run_rstTransformProc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/statDscale/BayesianMerging/BayesianMergingMod.F90 b/ldt/statDscale/BayesianMerging/BayesianMergingMod.F90 index e4e91e01e..08518f46e 100644 --- a/ldt/statDscale/BayesianMerging/BayesianMergingMod.F90 +++ b/ldt/statDscale/BayesianMerging/BayesianMergingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/statDscale/Climo/forcingClimoMod.F90 b/ldt/statDscale/Climo/forcingClimoMod.F90 index 288870744..2d474f0b7 100644 --- a/ldt/statDscale/Climo/forcingClimoMod.F90 +++ b/ldt/statDscale/Climo/forcingClimoMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/ldt/testcases/DAobs_LSM_pclimo_transfer/README b/ldt/testcases/DAobs_LSM_pclimo_transfer/README new file mode 100644 index 000000000..8a261ad3b --- /dev/null +++ b/ldt/testcases/DAobs_LSM_pclimo_transfer/README @@ -0,0 +1,15 @@ +LSM Soil Moisture Test Case for Precip Climo and Relocating CDFs + +This testcase processes LIS LSM data (Noah.4.0.1) to generate a CDF. + +This directory contains: + +* This README file. +* The ldt.config file used for this test case. (This file should be + edited to make sure that the locations of the parameter and forcing + files are specified correctly.) + +To run this test case: +* Generate the LDT executable. +* Run the LDT executable using the ldt.config file and the sample input + data. diff --git a/ldt/testcases/DAobs_LSM_pclimo_transfer/ldt.config b/ldt/testcases/DAobs_LSM_pclimo_transfer/ldt.config new file mode 100755 index 000000000..0ed463e6e --- /dev/null +++ b/ldt/testcases/DAobs_LSM_pclimo_transfer/ldt.config @@ -0,0 +1,308 @@ +# == LDT Main Entry Options == + +LDT running mode: "DA preprocessing" # LDT type of run-mode (top-level option) +Processed LSM parameter filename: ../procLSM/lis_input.d01.nc # Final output file read by LIS-7 + +LIS number of nests: 1 # Total number of nests run by LIS +Number of surface model types: 1 # Total number of desired surface model types +Surface model types: "LSM" # Surface models: LSM | Openwater +Land surface model: "Noah-MP.4.0.1" # Enter LSM(s) of choice +Routing model: "none" # "HYMAP" # "none" +Lake model: "none" # Enter Lake model(s) of choice +Water fraction cutoff value: 0.5 # Fraction at which gridcell is designated as 'water' +#Glacier fraction cutoff value: 0.2 + +Number of met forcing sources: 0 # Enter number of forcing types +Met forcing sources: "NLDAS2" # Enter 'none' if no forcing selected +Met spatial transform methods: neighbor # bilinear | budget-bilinear | neighbor | average +Topographic correction method (met forcing): "none" # none | lapse-rate + +LDT diagnostic file: ldtlog.strat.p.climo.15bins # Log-based diagnostic output file +Undefined value: -9999.0 # Universal undefined value +LDT output directory: LDTOUT.strat.p.climo.15bins # If metrics or stats are written out +Number of ensembles per tile: 1 # The number of ensemble members per tile + +#LIS domain: +Map projection of the LIS domain: latlon +Run domain lower left lat: 25.0625 +Run domain lower left lon: -124.9375 +Run domain upper right lat: 52.9375 +Run domain upper right lon: -67.0625 +Run domain resolution (dx): 0.125 +Run domain resolution (dy): 0.125 + +# == Landcover, Landmask and Soil Texture Parameters == + +#Landcover/Mask Parameter Inputs # +Landcover data source: "AVHRR" #"MODIS_Native" # +Landcover classification: "UMD" # "IGBPNCEP" # # Enter land cover classification type +Landcover file: ../input/LS_PARAMETERS/NLDAS_0.125/umdveg_dom_nldas.1gd4r # ./input/LS_PARAMETERS/noah_2dparms/igbp.bin # # Landcover map path +Landcover spatial transform: none +Landcover fill option: neighbor +Landcover fill radius: 5 +Landcover fill value: 4 +Landcover map projection: latlon +Landcover lower left lat: 25.0625 +Landcover lower left lon: -124.9375 +Landcover upper right lat: 52.9375 +Landcover upper right lon: -67.0625 +Landcover resolution (dx): 0.125 +Landcover resolution (dy): 0.125 + +Create or readin landmask: "readin" +Landmask data source: "AVHRR" # If 'created', recommended to put Landcover source name here +Landmask file: ../input/LS_PARAMETERS/irrigation/conus_modis/IRR_N125_mask.1gd4r +Landmask spatial transform: none +Landmask map projection: latlon +Landmask lower left lat: 25.0625 +Landmask lower left lon: -124.9375 +Landmask upper right lat: 52.9375 +Landmask upper right lon: -67.0625 +Landmask resolution (dx): 0.125 +Landmask resolution (dy): 0.125 + + +#Soil texture map: +Soil texture data source: ISRIC # STATSGOFAO_LIS +Soil texture map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/TEXMHT_M_sl1_250m.tif # ./input/LS_PARAMETERS/NLDAS_0.125/soil_texture_statsgo_nldas.1gd4r # Enter soil texture map +Soil texture spatial transform: mode # none # none | mode | neighbor | tile +Soil texture fill option: neighbor # none | neighbor +Soil texture fill radius: 5 # Number of pixels to search for neighbor +Soil texture fill value: 6 # Static value to fill where missing +Soil texture map projection: latlon +Soil texture lower left lat: 25.0625 +Soil texture lower left lon: -124.9375 +Soil texture upper right lat: 52.9375 +Soil texture upper right lon: -67.0625 +Soil texture resolution (dx): 0.125 +Soil texture resolution (dy): 0.125 + + +# Soil fraction +#Porosity map: # ../LS_PARAMETERS/UMD/25KM/porosity_FAO +Porosity data source: CONSTANT +Porosity fill value: 0.32 # Porosity fill is currently locked with Soils fill options + +Soil fraction data source: none # ISRIC # none +Soil fraction number of bands: 1 +Sand fraction map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/SNDPPT_M_sl1_250m_ll.tif +Clay fraction map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/CLYPPT_M_sl1_250m_ll.tif +Silt fraction map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/SLTPPT_M_sl1_250m_ll.tif +Soils spatial transform: average +Soils fill option: neighbor # none +Soils fill radius: 1 +Soils fill value: 0.333 +Sand fraction fill value: 0.30 +Clay fraction fill value: 0.35 +Silt fraction fill value: 0.35 + +Soils map projection: latlon +Soils lower left lat: -56.008104 +Soils lower left lon: -180.00 +Soils upper right lat: 83.9991672 +Soils upper right lon: 179.9999424 +Soils resolution (dx): 0.0020833 +Soils resolution (dy): 0.0020833 + + +#Topography maps +#Elevation data source: GTOPO30_Native +#Elevation number of bands: 1 +#Elevation map: ./input/LS_PARAMETERS/topo_parms/GTOPO30/raw_updated +#Elevation fill option: neighbor +#Elevation fill radius: 3 +#Elevation fill value: 287 +# SRTM Elevation data entries: +Elevation data source: "SRTM_LIS" +Elevation map: ../input/LS_PARAMETERS/topo_parms/SRTM/SRTM30/srtm_elev1km.1gd4r +Elevation number of bands: 1 +Slope data source: "SRTM_LIS" +Slope map: ../input/LS_PARAMETERS/topo_parms/SRTM/SRTM30/srtm_slope1km.1gd4r +Slope number of bands: 1 +Aspect data source: "SRTM_LIS" +Aspect map: ../input/LS_PARAMETERS/topo_parms/SRTM/SRTM30/srtm_aspect1km.1gd4r +Aspect number of bands: 1 + + +Topography spatial transform: average +Elevation fill option: average +Elevation fill radius: 5 +Elevation fill value: 0 +Slope fill option: average +Slope fill radius: 5 +Slope fill value: 0.1 +Aspect fill option: average +Aspect fill radius: 5 +Aspect fill value: 0 +Topography map projection: latlon +Topography lower left lat: -59.995 +Topography lower left lon: -179.995 +Topography upper right lat: 89.995 +Topography upper right lon: 179.995 +Topography resolution (dx): 0.01 +Topography resolution (dy): 0.01 + + +# Albedo maps: +Albedo data source: NCEP_Native # NCEP_LIS +Albedo map: ../input/LS_PARAMETERS/noah_2dparms/albedo # ./input/LS_PARAMETERS/NLDAS_0.125/albedo_nldas # Albedo files +Albedo climatology interval: monthly # monthly | quarterly +Albedo spatial transform: bilinear # average | neighbor | bilinear | budget-bilinear +Albedo fill option: neighbor # none | neighbor | average +Albedo fill radius: 1 # Number of pixels to search for neighbor +Albedo fill value: 0.14 # Static value to fill where missing +Albedo map projection: latlon +Albedo lower left lat: 25.0625 +Albedo lower left lon: -124.9375 +Albedo upper right lat: 52.9375 +Albedo upper right lon: -67.0625 +Albedo resolution (dx): 0.125 +Albedo resolution (dy): 0.12.5 + +Max snow albedo data source: NCEP_Native # NCEP_LIS +Max snow albedo map: ../input/LS_PARAMETERS/noah_2dparms/maxsnoalb.asc #./input/LS_PARAMETERS/NLDAS_0.125/maxsnalb_nldas.1gd4r # Max. snow albedo map +Max snow albedo spatial transform: budget-bilinear # none # average | neighbor | bilinear | budget-bilinear +Max snow albedo fill option: neighbor # none | neighbor | average +Max snow albedo fill radius: 3 # Number of pixels to search for neighbor +Max snow albedo fill value: 0.65 # Static value to fill where missing +Max snow albedo map projection: latlon +Max snow albedo lower left lat: 25.0625 +Max snow albedo lower left lon: -124.9375 +Max snow albedo upper right lat: 52.9375 +Max snow albedo upper right lon: -67.0625 +Max snow albedo resolution (dx): 0.125 +Max snow albedo resolution (dy): 0.125 + +# Greenness fraction maps: +Greenness data source: NCEP_Native #NCEP_LIS +Greenness fraction map: ../input/LS_PARAMETERS/noah_2dparms/gfrac # ./input/LS_PARAMETERS/NLDAS_0.125/gfrac_nldas # Greenness fraction map +Greenness climatology interval: monthly # monthly +Calculate min-max greenness fraction: .false. +Greenness maximum map: ../input/LS_PARAMETERS/noah_2dparms/gfrac_max.asc # ./input/LS_PARAMETERS/NLDAS_0.125/gfrac_nldas.MAX.1gd4r # Maximum greenness fraction map +Greenness minimum map: ../input/LS_PARAMETERS/noah_2dparms/gfrac_min.asc # ./input/LS_PARAMETERS/NLDAS_0.125/gfrac_nldas.MIN.1gd4r # Minimum greenness fraction map +Greenness spatial transform: bilinear #none # average | neighbor | bilinear | budget-bilinear +Greenness fill option: neighbor # none | neighbor | average +Greenness fill radius: 1 # Number of pixels to search for neighbor +Greenness fill value: 0.30 # Static value to fill where missing +Greenness maximum fill value: 0.40 # Static value to fill where missing +Greenness minimum fill value: 0.20 # Static value to fill where missing +Greenness map projection: latlon +Greenness lower left lat: 25.0625 +Greenness lower left lon: -124.9375 +Greenness upper right lat: 52.9375 +Greenness upper right lon: -67.0625 +Greenness resolution (dx): 0.125 +Greenness resolution (dy): 0.125 + +# Slope type map: +Slope type data source: NCEP_Native # NCEP_LIS +Slope type map: ../input/LS_PARAMETERS/noah_2dparms/islope #./input/LS_PARAMETERS/NLDAS_0.125/noah_slope_nldas.1gd4r # Slope type map +Slope type spatial transform: neighbor # none # none | neighbor | mode +Slope type fill option: neighbor # none | neighbor +Slope type fill radius: 1 # Number of pixels to search for neighbor +Slope type fill value: 3. # Static value to fill where missing +Slope type map projection: latlon +Slope type lower left lat: 25.0625 +Slope type lower left lon: -124.9375 +Slope type upper right lat: 52.9375 +Slope type upper right lon: -67.0625 +Slope type resolution (dx): 0.125 +Slope type resolution (dy): 0.125 + +# Bottom temperature map (lapse-rate correction option): +Bottom temperature data source: NCEP_LIS +Bottom temperature map: ../input/LS_PARAMETERS/NLDAS_0.125/tbot_nldas.1gd4r +Bottom temperature spatial transform: none # none | average | neighbor | bilinear | budget-bilinear +Bottom temperature fill option: none # none | average | neighbor +Bottom temperature fill radius: 1 # Number of pixels to search for neighbor +Bottom temperature fill value: 287. # Static value to fill where missing +Bottom temperature topographic downscaling: "none" # none | lapse-rate +Bottom temperature map projection: latlon # Projection type +Bottom temperature lower left lat: 25.0625 +Bottom temperature lower left lon: -124.9375 +Bottom temperature upper right lat: 52.9375 +Bottom temperature upper right lon: -67.0625 +Bottom temperature resolution (dx): 0.125 +Bottom temperature resolution (dy): 0.125 + +# ======================================================= +#Forcing elevation +NLDAS2 forcing directory: /discover/nobackup/projects/lis/MET_FORCING/NLDAS2.FORCING +NLDAS2 data center source: "GES-DISC" +NLDAS2 use model level data: 0 +NLDAS2 use model based swdown: 0 +NLDAS2 use model based precip: 0 +NLDAS2 use model based pressure: 0 +Forcing variables list file: ./ldt_forcing_vars.txt + +NLDAS2 elevation difference map: ../input/LS_PARAMETERS/NLDAS_0.125/NARR_elev-diff.1gd4r +NARR terrain height map: ../input/LS_PARAMETERS/NLDAS_0.125/NARR_elevation.1gd4r + +#Noah-MP LSM inputs +Noah-MP PBL Height Value: 900. + +# ----------------------------------------------------------------------------- +# Model-based CDF file generation: +#------------------------------------------------------------------------------ +DA preprocessing method: "CDF generation" +DA observation source: "LIS LSM soil moisture" # "LSM soil moisture" +Name of the preprocessed DA file: "cdf_noahmp401" +Apply anomaly correction to obs: 0 +Temporal resolution of CDFs: "monthly" # yearly | monthly +Number of bins to use in the CDF: 100 +Observation count threshold: 30 +Temporal averaging interval: "1da" +Apply external mask: 0 +External mask directory: none + +LIS soil moisture output model name: "Noah.4.0.1" +LIS soil moisture output directory: ../sim/output.ol/ +LIS soil moisture output format: "netcdf" +LIS soil moisture output methodology: "2d gridspace" +LIS soil moisture output naming style: "3 level hierarchy" +LIS soil moisture output nest index: 1 +LIS soil moisture output map projection: "latlon" +LIS soil moisture domain lower left lat: 25.0625 +LIS soil moisture domain upper right lat: 52.9375 +LIS soil moisture domain lower left lon: -124.9375 +LIS soil moisture domain upper right lon: -67.0625 +LIS soil moisture domain resolution (dx): 0.125 +LIS soil moisture domain resolution (dy): 0.125 + + +Starting year: 2015 +Starting month: 03 +Starting day: 01 +Starting hour: 0 +Starting minute: 0 +Starting second: 0 +Ending year: 2022 +Ending month: 01 +Ending day: 01 +Ending hour: 0 +Ending minute: 0 +Ending second: 0 +LIS output timestep: "6hr" + + +Maximum number of surface type tiles per grid: 1 +Minimum cutoff percentage (surface type tiles): 0.05 +Maximum number of soil texture tiles per grid: 1 +Minimum cutoff percentage (soil texture tiles): 0.05 +Maximum number of soil fraction tiles per grid: 1 +Minimum cutoff percentage (soil fraction tiles): 0.05 +Maximum number of elevation bands per grid: 1 +Minimum cutoff percentage (elevation bands): 0.05 +Maximum number of slope bands per grid: 1 +Minimum cutoff percentage (slope bands): 0.05 +Maximum number of aspect bands per grid: 1 +Minimum cutoff percentage (aspect bands): 0.05 + +# ----------------------------------------------------------------------------- +# Stratification based on precipitation: +#------------------------------------------------------------------------------ +Stratify CDFs by external data: 1 +Number of bins to use for stratification: 15 +Stratification data source: "LIS LSM total precipitation" +External stratification file: "LVT_MEAN_FINAL.202201010000.d01.nc" # "../Precip_climatology/Precip.climo.us.nldas2/LVT_MEAN_FINAL.202109010000.d01.nc" +Write stratified geolocation independent CDFs: 1 diff --git a/ldt/testcases/DAobs_SMAP_pclimo_transfer/README b/ldt/testcases/DAobs_SMAP_pclimo_transfer/README new file mode 100644 index 000000000..aca2520d4 --- /dev/null +++ b/ldt/testcases/DAobs_SMAP_pclimo_transfer/README @@ -0,0 +1,15 @@ +SMAP Soil Moisture Test Case for Precip Climo and Relocating CDFs + +This testcase processes SMAP data to generate a CDF. + +This directory contains: + +* This README file. +* The ldt.config file used for this test case. (This file should be + edited to make sure that the locations of the parameter and forcing + files are specified correctly.) + +To run this test case: +* Generate the LDT executable. +* Run the LDT executable using the ldt.config file and the sample input + data. diff --git a/ldt/testcases/DAobs_SMAP_pclimo_transfer/ldt.config b/ldt/testcases/DAobs_SMAP_pclimo_transfer/ldt.config new file mode 100755 index 000000000..456ea0382 --- /dev/null +++ b/ldt/testcases/DAobs_SMAP_pclimo_transfer/ldt.config @@ -0,0 +1,316 @@ +# == LDT Main Entry Options == + +LDT running mode: "DA preprocessing" # LDT type of run-mode (top-level option) +Processed LSM parameter filename: ../procLSM/lis_input.d01.nc # Final output file read by LIS-7 + +LIS number of nests: 1 # Total number of nests run by LIS +Number of surface model types: 1 # Total number of desired surface model types +Surface model types: "LSM" # Surface models: LSM | Openwater +Land surface model: "Noah-MP.4.0.1" # Enter LSM(s) of choice +Routing model: "none" # "HYMAP" # "none" +Lake model: "none" # Enter Lake model(s) of choice +Water fraction cutoff value: 0.5 # Fraction at which gridcell is designated as 'water' +#Glacier fraction cutoff value: 0.2 + +Number of met forcing sources: 0 # Enter number of forcing types +Met forcing sources: "NLDAS2" # Enter 'none' if no forcing selected +Met spatial transform methods: neighbor # bilinear | budget-bilinear | neighbor | average +Topographic correction method (met forcing): "none" # none | lapse-rate + +LDT diagnostic file: ldtlog.strat.p.climo.15bins # Log-based diagnostic output file +Undefined value: -9999.0 # Universal undefined value +LDT output directory: LDTOUT.strat.p.climo.15bins # If metrics or stats are written out +Number of ensembles per tile: 1 # The number of ensemble members per tile + +#LIS domain: +Map projection of the LIS domain: latlon +Run domain lower left lat: 25.0625 +Run domain lower left lon: -124.9375 +Run domain upper right lat: 52.9375 +Run domain upper right lon: -67.0625 +Run domain resolution (dx): 0.125 +Run domain resolution (dy): 0.125 + +# == Landcover, Landmask and Soil Texture Parameters == + +#Landcover/Mask Parameter Inputs # +Landcover data source: "AVHRR" #"MODIS_Native" # +Landcover classification: "UMD" # "IGBPNCEP" # # Enter land cover classification type +Landcover file: ../input/LS_PARAMETERS/NLDAS_0.125/umdveg_dom_nldas.1gd4r # ./input/LS_PARAMETERS/noah_2dparms/igbp.bin # # Landcover map path +Landcover spatial transform: none +Landcover fill option: neighbor +Landcover fill radius: 5 +Landcover fill value: 4 +Landcover map projection: latlon +Landcover lower left lat: 25.0625 +Landcover lower left lon: -124.9375 +Landcover upper right lat: 52.9375 +Landcover upper right lon: -67.0625 +Landcover resolution (dx): 0.125 +Landcover resolution (dy): 0.125 + +Create or readin landmask: "readin" +Landmask data source: "AVHRR" # If 'created', recommended to put Landcover source name here +Landmask file: ../input/LS_PARAMETERS/irrigation/conus_modis/IRR_N125_mask.1gd4r +Landmask spatial transform: none +Landmask map projection: latlon +Landmask lower left lat: 25.0625 +Landmask lower left lon: -124.9375 +Landmask upper right lat: 52.9375 +Landmask upper right lon: -67.0625 +Landmask resolution (dx): 0.125 +Landmask resolution (dy): 0.125 + + +#Soil texture map: +Soil texture data source: ISRIC # STATSGOFAO_LIS +Soil texture map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/TEXMHT_M_sl1_250m.tif # ./input/LS_PARAMETERS/NLDAS_0.125/soil_texture_statsgo_nldas.1gd4r # Enter soil texture map +Soil texture spatial transform: mode # none # none | mode | neighbor | tile +Soil texture fill option: neighbor # none | neighbor +Soil texture fill radius: 5 # Number of pixels to search for neighbor +Soil texture fill value: 6 # Static value to fill where missing +Soil texture map projection: latlon +Soil texture lower left lat: 25.0625 +Soil texture lower left lon: -124.9375 +Soil texture upper right lat: 52.9375 +Soil texture upper right lon: -67.0625 +Soil texture resolution (dx): 0.125 +Soil texture resolution (dy): 0.125 + + +# Soil fraction +#Porosity map: # ../LS_PARAMETERS/UMD/25KM/porosity_FAO +Porosity data source: CONSTANT +Porosity fill value: 0.32 # Porosity fill is currently locked with Soils fill options + +Soil fraction data source: none # ISRIC # none +Soil fraction number of bands: 1 +Sand fraction map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/SNDPPT_M_sl1_250m_ll.tif +Clay fraction map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/CLYPPT_M_sl1_250m_ll.tif +Silt fraction map: ../input/LS_PARAMETERS/soil_parms/ISRIC/v2017/SLTPPT_M_sl1_250m_ll.tif +Soils spatial transform: average +Soils fill option: neighbor # none +Soils fill radius: 1 +Soils fill value: 0.333 +Sand fraction fill value: 0.30 +Clay fraction fill value: 0.35 +Silt fraction fill value: 0.35 + +Soils map projection: latlon +Soils lower left lat: -56.008104 +Soils lower left lon: -180.00 +Soils upper right lat: 83.9991672 +Soils upper right lon: 179.9999424 +Soils resolution (dx): 0.0020833 +Soils resolution (dy): 0.0020833 + + +#Topography maps +#Elevation data source: GTOPO30_Native +#Elevation number of bands: 1 +#Elevation map: ./input/LS_PARAMETERS/topo_parms/GTOPO30/raw_updated +#Elevation fill option: neighbor +#Elevation fill radius: 3 +#Elevation fill value: 287 +# SRTM Elevation data entries: +Elevation data source: "SRTM_LIS" +Elevation map: ../input/LS_PARAMETERS/topo_parms/SRTM/SRTM30/srtm_elev1km.1gd4r +Elevation number of bands: 1 +Slope data source: "SRTM_LIS" +Slope map: ../input/LS_PARAMETERS/topo_parms/SRTM/SRTM30/srtm_slope1km.1gd4r +Slope number of bands: 1 +Aspect data source: "SRTM_LIS" +Aspect map: ../input/LS_PARAMETERS/topo_parms/SRTM/SRTM30/srtm_aspect1km.1gd4r +Aspect number of bands: 1 + + +Topography spatial transform: average +Elevation fill option: average +Elevation fill radius: 5 +Elevation fill value: 0 +Slope fill option: average +Slope fill radius: 5 +Slope fill value: 0.1 +Aspect fill option: average +Aspect fill radius: 5 +Aspect fill value: 0 +Topography map projection: latlon +Topography lower left lat: -59.995 +Topography lower left lon: -179.995 +Topography upper right lat: 89.995 +Topography upper right lon: 179.995 +Topography resolution (dx): 0.01 +Topography resolution (dy): 0.01 + + +# Albedo maps: +Albedo data source: NCEP_Native # NCEP_LIS +Albedo map: ../input/LS_PARAMETERS/noah_2dparms/albedo # ./input/LS_PARAMETERS/NLDAS_0.125/albedo_nldas # Albedo files +Albedo climatology interval: monthly # monthly | quarterly +Albedo spatial transform: bilinear # average | neighbor | bilinear | budget-bilinear +Albedo fill option: neighbor # none | neighbor | average +Albedo fill radius: 1 # Number of pixels to search for neighbor +Albedo fill value: 0.14 # Static value to fill where missing +Albedo map projection: latlon +Albedo lower left lat: 25.0625 +Albedo lower left lon: -124.9375 +Albedo upper right lat: 52.9375 +Albedo upper right lon: -67.0625 +Albedo resolution (dx): 0.125 +Albedo resolution (dy): 0.12.5 + +Max snow albedo data source: NCEP_Native # NCEP_LIS +Max snow albedo map: ../input/LS_PARAMETERS/noah_2dparms/maxsnoalb.asc #./input/LS_PARAMETERS/NLDAS_0.125/maxsnalb_nldas.1gd4r # Max. snow albedo map +Max snow albedo spatial transform: budget-bilinear # none # average | neighbor | bilinear | budget-bilinear +Max snow albedo fill option: neighbor # none | neighbor | average +Max snow albedo fill radius: 3 # Number of pixels to search for neighbor +Max snow albedo fill value: 0.65 # Static value to fill where missing +Max snow albedo map projection: latlon +Max snow albedo lower left lat: 25.0625 +Max snow albedo lower left lon: -124.9375 +Max snow albedo upper right lat: 52.9375 +Max snow albedo upper right lon: -67.0625 +Max snow albedo resolution (dx): 0.125 +Max snow albedo resolution (dy): 0.125 + +# Greenness fraction maps: +Greenness data source: NCEP_Native #NCEP_LIS +Greenness fraction map: ../input/LS_PARAMETERS/noah_2dparms/gfrac # ./input/LS_PARAMETERS/NLDAS_0.125/gfrac_nldas # Greenness fraction map +Greenness climatology interval: monthly # monthly +Calculate min-max greenness fraction: .false. +Greenness maximum map: ../input/LS_PARAMETERS/noah_2dparms/gfrac_max.asc # ./input/LS_PARAMETERS/NLDAS_0.125/gfrac_nldas.MAX.1gd4r # Maximum greenness fraction map +Greenness minimum map: ../input/LS_PARAMETERS/noah_2dparms/gfrac_min.asc # ./input/LS_PARAMETERS/NLDAS_0.125/gfrac_nldas.MIN.1gd4r # Minimum greenness fraction map +Greenness spatial transform: bilinear #none # average | neighbor | bilinear | budget-bilinear +Greenness fill option: neighbor # none | neighbor | average +Greenness fill radius: 1 # Number of pixels to search for neighbor +Greenness fill value: 0.30 # Static value to fill where missing +Greenness maximum fill value: 0.40 # Static value to fill where missing +Greenness minimum fill value: 0.20 # Static value to fill where missing +Greenness map projection: latlon +Greenness lower left lat: 25.0625 +Greenness lower left lon: -124.9375 +Greenness upper right lat: 52.9375 +Greenness upper right lon: -67.0625 +Greenness resolution (dx): 0.125 +Greenness resolution (dy): 0.125 + +# Slope type map: +Slope type data source: NCEP_Native # NCEP_LIS +Slope type map: ../input/LS_PARAMETERS/noah_2dparms/islope #./input/LS_PARAMETERS/NLDAS_0.125/noah_slope_nldas.1gd4r # Slope type map +Slope type spatial transform: neighbor # none # none | neighbor | mode +Slope type fill option: neighbor # none | neighbor +Slope type fill radius: 1 # Number of pixels to search for neighbor +Slope type fill value: 3. # Static value to fill where missing +Slope type map projection: latlon +Slope type lower left lat: 25.0625 +Slope type lower left lon: -124.9375 +Slope type upper right lat: 52.9375 +Slope type upper right lon: -67.0625 +Slope type resolution (dx): 0.125 +Slope type resolution (dy): 0.125 + +# Bottom temperature map (lapse-rate correction option): +Bottom temperature data source: NCEP_LIS +Bottom temperature map: ../input/LS_PARAMETERS/NLDAS_0.125/tbot_nldas.1gd4r +Bottom temperature spatial transform: none # none | average | neighbor | bilinear | budget-bilinear +Bottom temperature fill option: none # none | average | neighbor +Bottom temperature fill radius: 1 # Number of pixels to search for neighbor +Bottom temperature fill value: 287. # Static value to fill where missing +Bottom temperature topographic downscaling: "none" # none | lapse-rate +Bottom temperature map projection: latlon # Projection type +Bottom temperature lower left lat: 25.0625 +Bottom temperature lower left lon: -124.9375 +Bottom temperature upper right lat: 52.9375 +Bottom temperature upper right lon: -67.0625 +Bottom temperature resolution (dx): 0.125 +Bottom temperature resolution (dy): 0.125 + +# ======================================================= +#Forcing elevation +NLDAS2 forcing directory: /discover/nobackup/projects/lis/MET_FORCING/NLDAS2.FORCING +NLDAS2 data center source: "GES-DISC" +NLDAS2 use model level data: 0 +NLDAS2 use model based swdown: 0 +NLDAS2 use model based precip: 0 +NLDAS2 use model based pressure: 0 +Forcing variables list file: ./ldt_forcing_vars.txt + +NLDAS2 elevation difference map: ../input/LS_PARAMETERS/NLDAS_0.125/NARR_elev-diff.1gd4r +NARR terrain height map: ../input/LS_PARAMETERS/NLDAS_0.125/NARR_elevation.1gd4r + +#Noah-MP LSM inputs +Noah-MP PBL Height Value: 900. + +# ----------------------------------------------------------------------------- +# SMAP SM L3 CDF Generation: +#------------------------------------------------------------------------------ +DA preprocessing method: "CDF generation" +DA observation source: "NASA SMAP soil moisture" +Name of the preprocessed DA file: "cdf_smapobs" + +Apply anomaly correction to obs: 0 +Temporal resolution of CDFs: "monthly" # monthly | yearly +Number of bins to use in the CDF: 100 +Observation count threshold: 30 +Temporal averaging interval: "1da" +Apply external mask: 0 +External mask directory: none + +NASA SMAP soil moisture observation directory: ../input/RS_DATA/SMAP/SPL3SMP.007 +NASA SMAP soil moisture data designation: SPL3SMP +NASA SMAP search radius for openwater proximity detection: 3 +SMAP(NASA) soil moisture Composite Release ID (e.g., R16): "R17" + + +Starting year: 2015 +Starting month: 03 +Starting day: 01 +Starting hour: 0 +Starting minute: 0 +Starting second: 0 +Ending year: 2022 +Ending month: 01 +Ending day: 01 +Ending hour: 0 +Ending minute: 0 +Ending second: 0 +LIS output timestep: "6hr" + + +Maximum number of surface type tiles per grid: 1 +Minimum cutoff percentage (surface type tiles): 0.05 +Maximum number of soil texture tiles per grid: 1 +Minimum cutoff percentage (soil texture tiles): 0.05 +Maximum number of soil fraction tiles per grid: 1 +Minimum cutoff percentage (soil fraction tiles): 0.05 +Maximum number of elevation bands per grid: 1 +Minimum cutoff percentage (elevation bands): 0.05 +Maximum number of slope bands per grid: 1 +Minimum cutoff percentage (slope bands): 0.05 +Maximum number of aspect bands per grid: 1 +Minimum cutoff percentage (aspect bands): 0.05 + +# ----------------------------------------------------------------------------- +# Stratification based on precipitation: +#------------------------------------------------------------------------------ +Stratify CDFs by external data: 1 +Number of bins to use for stratification: 15 +Stratification data source: "LIS LSM total precipitation" +External stratification file: "LVT_MEAN_FINAL.202201010000.d01.nc" # "../Precip_climatology/Precip.climo.eu.merra/LVT_MEAN_FINAL.202201010000.d01.nc" +Write stratified geolocation independent CDFs: 1 + +#LIS precipitation output model name: "Noah.4.0.1" +#LIS precipitation output directory: output.precip +#LIS precipitation output format: "netcdf" +#LIS precipitation output methodology: "2d gridspace" +#LIS precipitation output naming style: "3 level hierarchy" +#LIS precipitation output nest index: 1 +#LIS precipitation output map projection: "lambert" +#LIS precipitation domain lower left lat: 24.01347 #25.20226 +#LIS precipitation domain lower left lon: -13.1299 #-12.5475 +#LIS precipitation domain true lat1: 66.0 +#LIS precipitation domain true lat2: 29.0 +#LIS precipitation domain standard lon: 15.108 +#LIS precipitation domain resolution: 15.0 #5.0 # 1.0 +#LIS precipitation domain x-dimension size: 385 #1114 +#LIS precipitation domain y-dimension size: 289 #826 # 780 diff --git a/ldt/utils/usaf/SMAP_E_OPL/customize_ldt_smapeopl_config.py b/ldt/utils/usaf/SMAP_E_OPL/customize_ldt_smapeopl_config.py new file mode 100755 index 000000000..074671132 --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/customize_ldt_smapeopl_config.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python3 + +""" +SCRIPT: customize_ldt_smapeopl_config.py + +Creates a customized ldt.config file for generating SMAP_E_OPL soil +moisture retrieval with LDT. + +User must provide template ldt.config file, valid date/time, and +filelist suffix number via command line arguments. + +To see usage statement, run script on command line w/o arguments. + +REVISION HISTORY: +25 Jan 2024: Eric Kemp. Initial specification. +26 Jan 2024: Eric Kemp. Added filelist suffix number. +""" + +import datetime +import os +import sys + +def _usage(): + """Prints usage statement for script""" + stmt = f"USAGE: {sys.argv[0]} YYYYMMDDHH ldt_config_tmpl_name" + stmt += " filelist_suffix_number" + print(stmt) + +def _proc_valid_datetime(): + """Process command line argument for valid time""" + if len(sys.argv[1]) != 10: + print("ERR, invalid date/time for SMAP_E_OPL!") + print(f"ERR, received {sys.argv[1]}") + _usage() + sys.exit(1) + + yyyymmddhh = sys.argv[1] + try: + yyyy = int(yyyymmddhh[0:4]) + mm = int(yyyymmddhh[4:6]) + dd = int(yyyymmddhh[6:8]) + hh = int(yyyymmddhh[8:]) + validdt = \ + datetime.datetime(year=yyyy, + month=mm, + day=dd, + hour=hh) + except (TypeError, ValueError): + print("ERR, invalid date/time for SMAP_E_OPL!") + print(f"ERR, received {sys.argv[1]}") + _usage() + sys.exit(1) + + return validdt + +def _proc_ldt_config_tmpl_name(): + """Process command line for ldt config template file name""" + ldt_config_tmpl = sys.argv[2] + if not os.path.exists(ldt_config_tmpl): + print(f"ERR, cannot file template file {ldt_config_tmpl}") + _usage() + sys.exit(1) + return ldt_config_tmpl + +def _proc_filelist_suffix_number(): + """Process command line for filelist suffix number""" + suffix_number = sys.argv[3] + try: + int_value = int(suffix_number) + except ValueError: + print("ERR, did not receive valid filelist suffix number!") + _usage() + sys.exit(1) + if int_value < 0: + print("ERR, filelist suffix must be nonnegative!") + _usage() + sys.exit(1) + return int_value + +def _proc_cmd_line(): + """Process command line and return valid datetime for SMAP_E_OPL""" + if len(sys.argv) != 4: + print("ERR, invalid number of command line arguments!") + _usage() + sys.exit(1) + validdt = _proc_valid_datetime() + ldt_config_tmpl = _proc_ldt_config_tmpl_name() + filelist_suffix_number = _proc_filelist_suffix_number() + return validdt, ldt_config_tmpl, filelist_suffix_number + +def _create_new_ldt_config(validdt, ldt_config_tmpl, \ + filelist_suffix_number): + """Create new ldt.config customized to valid date""" + with open(ldt_config_tmpl, "r", encoding='ascii') as file: + lines = file.readlines() + yyyymmddhh = f"{validdt.year:04d}{validdt.month:02d}" + \ + f"{validdt.day:02d}{validdt.hour:02d}" + newfile = f"ldt.config.smapeopl.{yyyymmddhh}" + with open(newfile, "w", encoding='ascii') as file: + for line in lines: + if "SMAP_E_OPL valid date (YYYYMMDDHH):" in line: + newline = "SMAP_E_OPL valid date (YYYYMMDDHH): " + newline += f"{yyyymmddhh}\n" + file.write(newline) + continue + if "LDT diagnostic file:" in line: + newline = "LDT diagnostic file: " + newline += f"ldtlog.{yyyymmddhh}\n" + file.write(newline) + continue + if "SMAP_E_OPL filelist suffix number:" in line: + newline = "SMAP_E_OPL filelist suffix number: " + newline += f"{filelist_suffix_number}\n" + file.write(newline) + continue + # Pass through all other lines + file.write(line) + continue + +def _main(): + """Main driver""" + validdt, ldt_config_tmpl, filelist_suffix_number = _proc_cmd_line() + _create_new_ldt_config(validdt, ldt_config_tmpl, \ + filelist_suffix_number) + +if __name__ == "__main__": + _main() diff --git a/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.jules.tmpl b/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.jules.tmpl new file mode 100755 index 000000000..f692e8636 --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.jules.tmpl @@ -0,0 +1,53 @@ +# == LDT Main Entry Options == + +LDT running mode: "OPL E SMAP soil moisture retrieval" #"LSM parameter processing" # LDT type of run-mode (top-level option) +LDT diagnostic file: ldtlog.2021070200 + + +# Rotated GALWEM 10-km domain +Map projection of the LIS domain: latlon +Run domain lower left lat: -89.9531250 +Run domain lower left lon: -179.9296875 +Run domain upper right lat: 89.9531250 +Run domain upper right lon: 179.9296875 +Run domain resolution (dx): 0.1406250 +Run domain resolution (dy): 0.0937500 + +# ------------------------ +# Section for Operational enhanced SMAP soil moisture retrieval +SMAP_E_OPL valid date (YYYYMMDDHH): 2021070200 +SMAP_E_OPL soil moisture output directory: output/SM_retrieval +SMAP_E_OPL L1B data directory: input/SMAP_L1B_TB_NRT +SMAP_E_OPL L1B data type: 1 #1: NRT; 2: Historical(for evaluations) +SMAP_E_OPL write L1B resampled output: 0 #0: off; 1: on +SMAP_E_OPL L1B resampled output directory: output/ARFS_RESAMPLE +SMAP_E_OPL LIS soil temperature directory: input/jules50/jul2021 +#SMAP_E_OPL LIS soil temperature directory: input/jules50/dec2021 +#SMAP_E_OPL LIS soil temperature directory: input/Jules50_OL + +SMAP_E_OPL apply soil temperature bias correction: 1 #0: off; 1: on +SMAP_E_OPL reference Teff daily statistics file: input/geos_daily_statistics_15obs.nc +SMAP_E_OPL LIS Teff daily statistics file: input/jules50_daily_statistics_15obs.nc +SMAP_E_OPL LIS snow directory: input/USAFSI +SMAP_E_OPL snow depth threshold: 0.05 #unit: m +SMAP_E_OPL TAU directory: input/TAU_ARFS_DAILY +SMAP_E_OPL OMEGA file: input/PRMS_RETRIEVAL_ARFS/omega_arfs.dat +SMAP_E_OPL soil bulk density file: input/PRMS_RETRIEVAL_ARFS/bd_arfs_006.dat +SMAP_E_OPL soil clay fraction file: input/PRMS_RETRIEVAL_ARFS/clay_arfs_006.dat +SMAP_E_OPL roughness file: input/PRMS_RETRIEVAL_ARFS/hvalue_arfs.dat +SMAP_E_OPL landcover file: input/PRMS_RETRIEVAL_ARFS/SMAP_LC_ARFS.bin + +# Settings for USAF NRT GHI history files +SMAP_E_OPL LIS ensemble size: 12 +SMAP_E_OPL LIS total number of tiles (including ensembles): 58982400 +SMAP_E_OPL LIS number of tiles per grid point: 1 +SMAP_E_OPL filelist suffix number: 1 + +# Legacy settings that must be in config file +Processed LSM parameter filename: lis_input.10k.global.ps41.nc +LIS number of nests: 1 +Number of surface model types: 2 +Surface model types: "LSM" "Openwater" +Number of met forcing sources: 0 +LDT output directory: LDTOUT +Undefined value: -9999.0 diff --git a/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.noah.tmpl b/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.noah.tmpl new file mode 100755 index 000000000..0bd086692 --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.noah.tmpl @@ -0,0 +1,55 @@ + +LDT running mode: "OPL E SMAP soil moisture retrieval" +LDT diagnostic file: ldtlog.2021071519 + +#Rotated GALWEM 10-km domain +Map projection of the LIS domain: latlon +Run domain lower left lat: -89.9531250 +Run domain lower left lon: -179.9296875 +Run domain upper right lat: 89.9531250 +Run domain upper right lon: 179.9296875 +Run domain resolution (dx): 0.1406250 +Run domain resolution (dy): 0.0937500 + +# ------------------------ +# Section for Operational enhanced SMAP soil moisture retrieval +SMAP_E_OPL valid date (YYYYMMDDHH): 2021071519 +SMAP_E_OPL soil moisture output directory: output/SM_retrieval +#SMAP_E_OPL L1B data directory: input/SMAP_L1B_historical +SMAP_E_OPL L1B data directory: input/SMAP_L1B_TB_NRT +#SMAP_E_OPL L1B data directory: input/SMAP_L1B_fake +#SMAP_E_OPL L1B data type: 2 #1: NRT; 2: Historical(for evaluations) +SMAP_E_OPL L1B data type: 1 #1: NRT; 2: Historical(for evaluations) + +SMAP_E_OPL write L1B resampled output: 0 #0: off; 1: on +SMAP_E_OPL L1B resampled output directory: output/ARFS_RESAMPLE +#SMAP_E_OPL LIS soil temperature directory: input/Noah39_OL +SMAP_E_OPL LIS soil temperature directory: input/noah39/jul2021 +#SMAP_E_OPL LIS soil temperature directory: input/noah39/dec2021 +SMAP_E_OPL apply soil temperature bias correction: 1 #0: off; 1: on +SMAP_E_OPL reference Teff daily statistics file: input/geos_daily_statistics_15obs.nc +SMAP_E_OPL LIS Teff daily statistics file: input/noah39_daily_statistics_15obs.nc +#SMAP_E_OPL LIS snow directory: input/Noah39_snow +SMAP_E_OPL LIS snow directory: input/USAFSI +SMAP_E_OPL snow depth threshold: 0.05 #unit: m +SMAP_E_OPL TAU directory: input/TAU_ARFS_DAILY +SMAP_E_OPL OMEGA file: input/PRMS_RETRIEVAL_ARFS/omega_arfs.dat +SMAP_E_OPL soil bulk density file: input/PRMS_RETRIEVAL_ARFS/bd_arfs_006.dat +SMAP_E_OPL soil clay fraction file: input/PRMS_RETRIEVAL_ARFS/clay_arfs_006.dat +SMAP_E_OPL roughness file: input/PRMS_RETRIEVAL_ARFS/hvalue_arfs.dat +SMAP_E_OPL landcover file: input/PRMS_RETRIEVAL_ARFS/SMAP_LC_ARFS.bin + +# Settings for USAF NRT GHI history files +SMAP_E_OPL LIS ensemble size: 12 +SMAP_E_OPL LIS total number of tiles (including ensembles): 58982400 +SMAP_E_OPL LIS number of tiles per grid point: 1 +SMAP_E_OPL filelist suffix number: 0 + +# Legacy settings that must in the config file. +Processed LSM parameter filename: input/lis_input.global.noah39.nc +LIS number of nests: 1 +Number of surface model types: 2 +Surface model types: "LSM" "Openwater" +Number of met forcing sources: 0 +LDT output directory: LDTOUT +Undefined value: -9999.0 diff --git a/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.noahmp.tmpl b/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.noahmp.tmpl new file mode 100755 index 000000000..dfb0c594f --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/ldt.config.smapeopl.noahmp.tmpl @@ -0,0 +1,53 @@ +#Overall driver options +LDT running mode: "OPL E SMAP soil moisture retrieval" + +#Rotated GALWEM 10-km domain +Map projection of the LIS domain: latlon +Run domain lower left lat: -89.9531250 +Run domain lower left lon: -179.9296875 +Run domain upper right lat: 89.9531250 +Run domain upper right lon: 179.9296875 +Run domain resolution (dx): 0.1406250 +Run domain resolution (dy): 0.0937500 + + +# ------------------------ +# Section for Operational enhanced SMAP soil moisture retrieval +SMAP_E_OPL valid date (YYYYMMDDHH): 2021071519 +SMAP_E_OPL soil moisture output directory: output/SM_retrieval +SMAP_E_OPL L1B data directory: input/SMAP_L1B_TB_NRT +SMAP_E_OPL L1B data type: 1 #1: NRT; 2: Historical(for evaluations) +SMAP_E_OPL write L1B resampled output: 0 #0: off; 1: on +SMAP_E_OPL L1B resampled output directory: output/ARFS_RESAMPLE +SMAP_E_OPL LIS soil temperature directory: input/noahmp401/jul2021 +#SMAP_E_OPL LIS soil temperature directory: input/noahmp401/dec2021 +#SMAP_E_OPL LIS soil temperature directory: input/Noahmp401_OL + +SMAP_E_OPL apply soil temperature bias correction: 1 #0: off; 1: on +SMAP_E_OPL reference Teff daily statistics file: input/geos_daily_statistics_15obs.nc +SMAP_E_OPL LIS Teff daily statistics file: input/noahmp401_daily_statistics_15obs.nc +SMAP_E_OPL LIS snow directory: input/USAFSI + +SMAP_E_OPL snow depth threshold: 0.05 #unit: m +SMAP_E_OPL TAU directory: input/TAU_ARFS_DAILY +SMAP_E_OPL OMEGA file: input/PRMS_RETRIEVAL_ARFS/omega_arfs.dat +SMAP_E_OPL soil bulk density file: input/PRMS_RETRIEVAL_ARFS/bd_arfs_006.dat +SMAP_E_OPL soil clay fraction file: input/PRMS_RETRIEVAL_ARFS/clay_arfs_006.dat +SMAP_E_OPL roughness file: input/PRMS_RETRIEVAL_ARFS/hvalue_arfs.dat +SMAP_E_OPL landcover file: input/PRMS_RETRIEVAL_ARFS/SMAP_LC_ARFS.bin + +# Settings for USAF NRT GHI history files +SMAP_E_OPL LIS ensemble size: 12 +SMAP_E_OPL LIS total number of tiles (including ensembles): 58982400 +SMAP_E_OPL LIS number of tiles per grid point: 1 +SMAP_E_OPL filelist suffix number: 1 + +# Legacy entries that must be in the file. +Processed LSM parameter filename: ./output/lis_input.global.noahmp401.nc +LIS number of nests: 1 +Number of surface model types: 2 +Surface model types: "LSM" "Openwater" +Number of met forcing sources: 0 +LDT diagnostic file: ldtlog.2021071519 +LDT output directory: LDTOUT +Undefined value: -9999.0 diff --git a/ldt/utils/usaf/SMAP_E_OPL/new.run_smap_e_opl_discover.sh b/ldt/utils/usaf/SMAP_E_OPL/new.run_smap_e_opl_discover.sh new file mode 100755 index 000000000..654c97344 --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/new.run_smap_e_opl_discover.sh @@ -0,0 +1,186 @@ +#!/bin/sh +#SBATCH --job-name=smapeopl +#SBATCH --time=0:20:00 +#SBATCH --account s1189 +#SBATCH --output smapeopl.slurm.out +#SBATCH --ntasks=13 --ntasks-per-node=1 +#SBATCH --mail-type=ALL +#SBATCH --qos=debug +#-------------------------------------------------------------------------- +# +# SCRIPT: run_smap_e_opl_discover.sh +# +# Batch script for running LDT to generate SMAP_E_OPL retrievals with +# LDT. Customized for NASA Discover supercomputer running SLURM batch +# queueing system. +# +# USAGE: run_smap_e_opl_discover.sh $startdate $starthour $enddate \ +# $endhour $lsm +# where $startdate and $enddate specify the inclusive UTC +# date range to run SMAP_E_OPL retrievals (formatted YYYY-MM-DD); +# $starthour and $endhour specify the hours of the respective +# dates (formatted HH); and $lsm is the LSM name, used to select +# the ldt.config template file. +# +# Based on Korn shell script provided by Pang-Wei Liu. +# +# REVISION HISTORY: +# 25 Jan 2024: Eric Kemp. Initial specification. +# 26 Jan 2024: Eric Kemp. Added in-script parallelization following +# autotuning scripts. +# +#-------------------------------------------------------------------------- + +ulimit -s unlimited + +# When a batch script is started, it starts in the user's home directory. +# Change to the directory where job was submitted. +if [ ! -z $SLURM_SUBMIT_DIR ] ; then + cd $SLURM_SUBMIT_DIR || exit 1 +fi + +# Environment +module purge +unset LD_LIBRARY_PATH +module use --append /home/emkemp/privatemodules +module load lisf_7.5_intel_2021.4.0_s2s + +# Paths on local system +SCRIPTDIR=/discover/nobackup/projects/usaf_lis/emkemp/AFWA/lis76_smap_e_opl_scripting/scripts +BINDIR=/discover/nobackup/projects/usaf_lis/emkemp/AFWA/lis76_smap_e_opl_scripting/bin +TMPLDIR=/discover/nobackup/projects/usaf_lis/emkemp/AFWA/lis76_smap_e_opl_scripting/tmpl + +# Get the command line arguments to specify the training period +if [ -z "$1" ] ; then + echo "ERROR, Missing start date for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$2" ] ; then + echo "ERROR, Missing start hour for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$3" ] ; then + echo "ERROR, Missing end date for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$4" ] ; then + echo "ERROR, Missing end hour for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$5" ] ; then + echo "ERROR, missing LSM option!" && exit 1 +fi + +# Use the command line arguments to set start and end datetime limits. +# Sanity check and report errors if found. + +istart="$1 $2" +iend="$3 $4" +start_dt=$(date "+%F %H" -d "$istart") +if [ "$?" -ne 0 ] ; then + echo "ERR, Bad startdate and hour" && exit 1 +fi +end_dt=$(date "+%F %H" -d "$iend") +if [ "$?" -ne 0 ] ; then + echo "ERR, Bad enddate and hour" && exit 1 +fi +d="$start_dt" +cur_yyyymmddhh=$(date -d "$start_dt" +%Y%m%d%H) +end_yyyymmddhh=$(date -d "$end_dt" +%Y%m%d%H) + +# Use the LSM command line argument to select the appropriate ldt.config +# template. +lsm="$5" +if [ "$lsm" = "noah" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.noah.tmpl" +elif [ "$lsm" = "noahmp" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.noahmp.tmpl" +elif [ "$lsm" = "jules" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.jules.tmpl" +else + echo "ERR, invalid LSM option, must be noah, noahmp, or jules" + exit 1 +fi +if [ ! -e $tmplfile ] ; then + echo "ERR, $tmplfile not found!" && exit 1 +fi + +# Other sanity checks +if [ ! -e $BINDIR/LDT ] ; then + echo "ERR, $BINDIR/LDT does not exist!" && exit 1 +fi +if [ ! -e $SCRIPTDIR/customize_ldt_smapeopl_config.py ] ; then + echo "ERR, $SCRIPTDIR/customize_ldt_smapeopl_config.py not found!" + exit 1 +fi + +# Loop through all times. This requires parallel invocations using +# srun. +echo "INFO, started SMAP_E_OPL retrievals at `date`" +i=0 +while [ "$cur_yyyymmddhh" -le "$end_yyyymmddhh" ] ; do + + echo "INFO, working on $cur_yyyymmddhh at `date`" + + # Update ldt.config file + $SCRIPTDIR/customize_ldt_smapeopl_config.py "$cur_yyyymmddhh" \ + "$tmplfile" $i || exit 1 + + # Run LDT + srun --ntasks=1 --nodes=1 --exclusive \ + $BINDIR/LDT ldt.config.smapeopl."$cur_yyyymmddhh" & + PIDS+=($!) + actives+=(1) + yyyymmddhh+=("$cur_yyyymmddhh") + ((i+=1)) + sleep 1 # Don't overwhelm SLURM + + # Update valid time + d=$(date -d "$d + 1 hours") + cur_yyyymmddhh=$(date -d "$d" +%Y%m%d%H) + +done + +# Wait until all the jobs complete +count=$i +echo "INFO, waiting for $count task(s) to complete..." +while true; do + for i in "${!PIDS[@]}"; do + if [ "${actives[$i]}" -eq 0 ] ; then + continue + fi + pid="${PIDS[$i]}" + # See if pid is still running + ps --pid "$pid" > /dev/null + if [ "$?" -ne 0 ] ; then # ps doesn't see it, so it terminated + wait "$pid" + return_code="$?" + actives[$i]=0 + count=$((count-1)) + if [ "${return_code}" -ne 0 ] ; then + echo "WARN, SMAP_E_OPL ${yyyymmddhh[$i]} failed around `date`" + else + echo "INFO, SMAP_E_OPL ${yyyymmddhh[$i]} finished with no reported error at `date`" + fi + if [ "$count" -gt 0 ] ; then + echo "INFO, Waiting for $count task(s) to complete..." + fi + fi + done + # See if we are all done. Assume we are, and correct if we are not. + alldone=1 + for i in "${!actives[@]}"; do + if [ "${actives[$i]}" -eq 1 ] ; then + alldone=0 + fi + done + if [ "${alldone}" -eq 1 ] ; then + break + fi +done +unset PIDS +unset actives +unset yyyymmddhh + +# The end +exit 0 diff --git a/ldt/utils/usaf/SMAP_E_OPL/run_smap_e_opl_discover.sh b/ldt/utils/usaf/SMAP_E_OPL/run_smap_e_opl_discover.sh new file mode 100755 index 000000000..e8251557a --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/run_smap_e_opl_discover.sh @@ -0,0 +1,189 @@ +#!/bin/sh +#SBATCH --job-name=smapeopl +#SBATCH --time=0:20:00 +#SBATCH --account s1189 +#SBATCH --output smapeopl.slurm.out +#SBATCH --ntasks=13 --ntasks-per-node=13 --constraint="[mil]" +#SBATCH --mail-type=ALL +#SBATCH --qos=debug +#-------------------------------------------------------------------------- +# +# SCRIPT: run_smap_e_opl_discover.sh +# +# Batch script for running LDT to generate SMAP_E_OPL retrievals with +# LDT. Customized for NASA Discover supercomputer running SLURM batch +# queueing system. +# +# USAGE: run_smap_e_opl_discover.sh $startdate $starthour $enddate \ +# $endhour $lsm +# where $startdate and $enddate specify the inclusive UTC +# date range to run SMAP_E_OPL retrievals (formatted YYYY-MM-DD +# or YYYYMMDD); $starthour and $endhour specify the hours of the +# respective dates (formatted HH); and $lsm is the LSM name, used +# to select the ldt.config template file. +# +# Based on Korn shell script provided by Pang-Wei Liu. +# +# REVISION HISTORY: +# 25 Jan 2024: Eric Kemp. Initial specification. +# 26 Jan 2024: Eric Kemp. Added in-script parallelization following +# autotuning scripts. +# 28 Feb 2024: Eric Kemp. Now uses single node. +# +#-------------------------------------------------------------------------- + +ulimit -s unlimited + +# When a batch script is started, it starts in the user's home directory. +# Change to the directory where job was submitted. +if [ ! -z $SLURM_SUBMIT_DIR ] ; then + cd $SLURM_SUBMIT_DIR || exit 1 +fi + +# Environment +module purge +unset LD_LIBRARY_PATH +module use --append /home/emkemp/privatemodules/sles15 +module load lisf_7.5_intel_2023.2.1 + +# Paths on local system +SCRIPTDIR=/discover/nobackup/projects/usaf_lis/emkemp/AFWA/ldt76_smap_e_opl/scripts +BINDIR=/discover/nobackup/projects/usaf_lis/emkemp/AFWA/ldt76_smap_e_opl/bin +TMPLDIR=/discover/nobackup/projects/usaf_lis/emkemp/AFWA/ldt76_smap_e_opl/tmpl + +# Get the command line arguments to specify the training period +if [ -z "$1" ] ; then + echo "ERROR, Missing start date for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$2" ] ; then + echo "ERROR, Missing start hour for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$3" ] ; then + echo "ERROR, Missing end date for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$4" ] ; then + echo "ERROR, Missing end hour for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$5" ] ; then + echo "ERROR, missing LSM option!" && exit 1 +fi + +# Use the command line arguments to set start and end datetime limits. +# Sanity check and report errors if found. + +istart="$1 $2" +iend="$3 $4" +start_dt=$(date "+%F %H" -d "$istart") +if [ "$?" -ne 0 ] ; then + echo "ERR, Bad startdate and hour" && exit 1 +fi +end_dt=$(date "+%F %H" -d "$iend") +if [ "$?" -ne 0 ] ; then + echo "ERR, Bad enddate and hour" && exit 1 +fi +d="$start_dt" +cur_yyyymmddhh=$(date -d "$start_dt" +%Y%m%d%H) +end_yyyymmddhh=$(date -d "$end_dt" +%Y%m%d%H) + +# Use the LSM command line argument to select the appropriate ldt.config +# template. +lsm="$5" +if [ "$lsm" = "noah" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.noah.tmpl" +elif [ "$lsm" = "noahmp" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.noahmp.tmpl" +elif [ "$lsm" = "jules" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.jules.tmpl" +else + echo "ERR, invalid LSM option, expected noah, noahmp, or jules; got $lsm" + exit 1 +fi +if [ ! -e $tmplfile ] ; then + echo "ERR, $tmplfile not found!" && exit 1 +fi + +# Other sanity checks +if [ ! -e $BINDIR/LDT ] ; then + echo "ERR, $BINDIR/LDT does not exist!" && exit 1 +fi +if [ ! -e $SCRIPTDIR/customize_ldt_smapeopl_config.py ] ; then + echo "ERR, $SCRIPTDIR/customize_ldt_smapeopl_config.py not found!" + exit 1 +fi + +# Loop through all times. This requires parallel invocations using +# srun. +echo "INFO, started SMAP_E_OPL retrievals at `date`" +i=0 +while [ "$cur_yyyymmddhh" -le "$end_yyyymmddhh" ] ; do + + echo "INFO, working on $cur_yyyymmddhh at `date`" + + # Update ldt.config file + $SCRIPTDIR/customize_ldt_smapeopl_config.py "$cur_yyyymmddhh" \ + "$tmplfile" $i || exit 1 + + # Run LDT + srun --ntasks=1 --cpus-per-task=1 \ + $BINDIR/LDT ldt.config.smapeopl."$cur_yyyymmddhh" & + + PIDS+=($!) + actives+=(1) + yyyymmddhh+=("$cur_yyyymmddhh") + ((i+=1)) + sleep 1 # Don't overwhelm SLURM + + # Update valid time + d=$(date -d "$d + 1 hours") + cur_yyyymmddhh=$(date -d "$d" +%Y%m%d%H) + +done + +# Wait until all the jobs complete +count=$i +echo "INFO, waiting for $count task(s) to complete..." +while true; do + for i in "${!PIDS[@]}"; do + if [ "${actives[$i]}" -eq 0 ] ; then + continue + fi + pid="${PIDS[$i]}" + # See if pid is still running + ps --pid "$pid" > /dev/null + if [ "$?" -ne 0 ] ; then # ps doesn't see it, so it terminated + wait "$pid" + return_code="$?" + actives[$i]=0 + count=$((count-1)) + if [ "${return_code}" -ne 0 ] ; then + echo "WARN, SMAP_E_OPL ${yyyymmddhh[$i]} failed around `date`" + else + echo "INFO, SMAP_E_OPL ${yyyymmddhh[$i]} finished with no reported error at `date`" + fi + if [ "$count" -gt 0 ] ; then + echo "INFO, Waiting for $count task(s) to complete..." + fi + fi + done + # See if we are all done. Assume we are, and correct if we are not. + alldone=1 + for i in "${!actives[@]}"; do + if [ "${actives[$i]}" -eq 1 ] ; then + alldone=0 + fi + done + if [ "${alldone}" -eq 1 ] ; then + break + fi +done +unset PIDS +unset actives +unset yyyymmddhh + +# The end +touch smapeopl.job.done +exit 0 diff --git a/ldt/utils/usaf/SMAP_E_OPL/run_smap_e_opl_hpc11.sh b/ldt/utils/usaf/SMAP_E_OPL/run_smap_e_opl_hpc11.sh new file mode 100755 index 000000000..9fabdeb6d --- /dev/null +++ b/ldt/utils/usaf/SMAP_E_OPL/run_smap_e_opl_hpc11.sh @@ -0,0 +1,188 @@ +#!/bin/sh +#SBATCH --job-name=smapeopl +#SBATCH --time=0:30:00 +#SBATCH --account=NWP601 +#SBATCH --output smapeopl.slurm.out +#SBATCH --ntasks=13 --ntasks-per-node=13 +#SBATCH --cluster-constraint=blue +#SBATCH --exclusive +#SBATCH --mem=0 +#-------------------------------------------------------------------------- +# +# SCRIPT: run_smap_e_opl_hpc11.sh +# +# Batch script for running LDT to generate SMAP_E_OPL retrievals with +# LDT. Customized for USAF HPC11 supercomputer running SLURM batch +# queueing system. +# +# USAGE: run_smap_e_opl_hpc11.sh $startdate $starthour $enddate \ +# $endhour $lsm +# where $startdate and $enddate specify the inclusive UTC +# date range to run SMAP_E_OPL retrievals (formatted YYYY-MM-DD +# or YYYYMMDD); $starthour and $endhour specify the hours of the +# respective dates (formatted HH); and $lsm is the LSM name, used +# to select the ldt.config template file. +# +# Based on Korn shell script provided by Pang-Wei Liu. +# +# REVISION HISTORY: +# 29 Mar 2024: Eric Kemp. Initial specification, based on Discover script. +# +#-------------------------------------------------------------------------- + +ulimit -s unlimited + +# When a batch script is started, it starts in the user's home directory. +# Change to the directory where job was submitted. +if [ ! -z $SLURM_SUBMIT_DIR ] ; then + cd $SLURM_SUBMIT_DIR || exit 1 +fi + +# Environment +module use --append /ccs/home/emkemp/hpc11/privatemodules +module load lisf_7.6_prgenv_cray_8.5.0_cpe_23.12_draft +module load afw-python/3.10-202312 + +# Paths on local system +SCRIPTDIR=/lustre/storm/nwp601/proj-shared/emkemp/lis76_smap_e_opl/scripts +BINDIR=/lustre/storm/nwp601/proj-shared/emkemp/lis76_smap_e_opl/bin +TMPLDIR=/lustre/storm/nwp601/proj-shared/emkemp/lis76_smap_e_opl/tmpl + +# Get the command line arguments to specify the training period +if [ -z "$1" ] ; then + echo "ERROR, Missing start date for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$2" ] ; then + echo "ERROR, Missing start hour for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$3" ] ; then + echo "ERROR, Missing end date for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$4" ] ; then + echo "ERROR, Missing end hour for SMAP_E_OPL retrievals!" + exit 1 +fi +if [ -z "$5" ] ; then + echo "ERROR, missing LSM option!" && exit 1 +fi + +# Use the command line arguments to set start and end datetime limits. +# Sanity check and report errors if found. + +istart="$1 $2" +iend="$3 $4" +start_dt=$(date "+%F %H" -d "$istart") +if [ "$?" -ne 0 ] ; then + echo "ERR, Bad startdate and hour" && exit 1 +fi +end_dt=$(date "+%F %H" -d "$iend") +if [ "$?" -ne 0 ] ; then + echo "ERR, Bad enddate and hour" && exit 1 +fi +d="$start_dt" +cur_yyyymmddhh=$(date -d "$start_dt" +%Y%m%d%H) +end_yyyymmddhh=$(date -d "$end_dt" +%Y%m%d%H) + +# Use the LSM command line argument to select the appropriate ldt.config +# template. +lsm="$5" +if [ "$lsm" = "noah" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.noah.tmpl" +elif [ "$lsm" = "noahmp" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.noahmp.tmpl" +elif [ "$lsm" = "jules" ] ; then + tmplfile="$TMPLDIR/ldt.config.smapeopl.jules.tmpl" +else + echo "ERR, invalid LSM option, expected noah, noahmp, or jules; got $lsm" + exit 1 +fi +if [ ! -e $tmplfile ] ; then + echo "ERR, $tmplfile not found!" && exit 1 +fi + +# Other sanity checks +if [ ! -e $BINDIR/LDT ] ; then + echo "ERR, $BINDIR/LDT does not exist!" && exit 1 +fi +if [ ! -e $SCRIPTDIR/customize_ldt_smapeopl_config.py ] ; then + echo "ERR, $SCRIPTDIR/customize_ldt_smapeopl_config.py not found!" + exit 1 +fi + +# Loop through all times. This requires parallel invocations using +# srun. +echo "INFO, started SMAP_E_OPL retrievals at `date`" +i=0 +while [ "$cur_yyyymmddhh" -le "$end_yyyymmddhh" ] ; do + + echo "INFO, working on $cur_yyyymmddhh at `date`" + + # Update ldt.config file + $SCRIPTDIR/customize_ldt_smapeopl_config.py "$cur_yyyymmddhh" \ + "$tmplfile" $i || exit 1 + + # Run LDT + srun --ntasks=1 --cpus-per-task=1 \ + $BINDIR/LDT ldt.config.smapeopl."$cur_yyyymmddhh" & + + PIDS+=($!) + actives+=(1) + yyyymmddhh+=("$cur_yyyymmddhh") + ((i+=1)) + sleep 1 # Don't overwhelm SLURM + + # Update valid time + d=$(date -d "$d + 1 hours") + cur_yyyymmddhh=$(date -d "$d" +%Y%m%d%H) + +done + +# Wait until all the jobs complete +count=$i +echo "INFO, waiting for $count task(s) to complete..." +while true; do + for i in "${!PIDS[@]}"; do + if [ "${actives[$i]}" -eq 0 ] ; then + continue + fi + pid="${PIDS[$i]}" + # See if pid is still running + echo `ps --pid "$pid"` + + ps --pid "$pid" > /dev/null + if [ "$?" -ne 0 ] ; then # ps doesn't see it, so it terminated + wait "$pid" + return_code="$?" + actives[$i]=0 + count=$((count-1)) + if [ "${return_code}" -ne 0 ] ; then + echo "WARN, SMAP_E_OPL ${yyyymmddhh[$i]} failed around `date`" + else + echo "INFO, SMAP_E_OPL ${yyyymmddhh[$i]} finished with no reported error at `date`" + fi + if [ "$count" -gt 0 ] ; then + echo "INFO, Waiting for $count task(s) to complete..." + fi + fi + done + # See if we are all done. Assume we are, and correct if we are not. + alldone=1 + for i in "${!actives[@]}"; do + if [ "${actives[$i]}" -eq 1 ] ; then + alldone=0 + fi + done + if [ "${alldone}" -eq 1 ] ; then + break + fi +done +unset PIDS +unset actives +unset yyyymmddhh + +# The end +touch smapeopl.job.done +exit 0 diff --git a/lis/LICENSES/CNRS_CECILL_C_v1_Crocus8.1.txt b/lis/LICENSES/CNRS_CECILL_C_v1_Crocus8.1.txt new file mode 100644 index 000000000..35e5d9776 --- /dev/null +++ b/lis/LICENSES/CNRS_CECILL_C_v1_Crocus8.1.txt @@ -0,0 +1,540 @@ +Component name(s): Crocus snowpack model v8.1 + +Contributing organization/individuals: National Centre for Scientific Research (CNRS) and Météo-France + +POC: + +Marie Minvielle +Météo-France CNRM/GMME/SURFACE +42, av. G. Coriolis +31057 Toulouse Cedex - France +tph : +33 (0) 5 61 07 93 55 +fax : +33 (0) 5 61 07 96 26 +email: marie.minvielle at meteo.fr + +Patrick Le Moigne +Météo-France CNRM/GMME/SURFACE +42, av. G. Coriolis +31057 Toulouse Cedex - France +tph : +33 (0) 5 61 07 98 24 +fax : +33 (0) 5 61 07 96 26 +email: patrick.lemoigne at meteo.fr + +License: + +CeCILL-C FREE SOFTWARE LICENSE AGREEMENT + + + Notice + +This Agreement is a Free Software license agreement that is the result +of discussions between its authors in order to ensure compliance with +the two main principles guiding its drafting: + + * firstly, compliance with the principles governing the distribution + of Free Software: access to source code, broad rights granted to + users, + * secondly, the election of a governing law, French law, with which + it is conformant, both as regards the law of torts and + intellectual property law, and the protection that it offers to + both authors and holders of the economic rights over software. + +The authors of the CeCILL-C (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) +license are: + +Commissariat à l'Energie Atomique - CEA, a public scientific, technical +and industrial research establishment, having its principal place of +business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. + +Centre National de la Recherche Scientifique - CNRS, a public scientific +and technological establishment, having its principal place of business +at 3 rue Michel-Ange, 75794 Paris cedex 16, France. + +Institut National de Recherche en Informatique et en Automatique - +INRIA, a public scientific and technological establishment, having its +principal place of business at Domaine de Voluceau, Rocquencourt, BP +105, 78153 Le Chesnay cedex, France. + + + Preamble + +The purpose of this Free Software license agreement is to grant users +the right to modify and re-use the software governed by this license. + +The exercising of this right is conditional upon the obligation to make +available to the community the modifications made to the source code of +the software so as to contribute to its evolution. + +In consideration of access to the source code and the rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors only have limited liability. + +In this respect, the risks associated with loading, using, modifying +and/or developing or reproducing the software by the user are brought to +the user's attention, given its Free Software status, which may make it +complicated to use, with the result that its use is reserved for +developers and experienced professionals having in-depth computer +knowledge. Users are therefore encouraged to load and test the +suitability of the software as regards their requirements in conditions +enabling the security of their systems and/or data to be ensured and, +more generally, to use and operate it in the same conditions of +security. This Agreement may be freely reproduced and published, +provided it is not altered, and that no provisions are either added or +removed herefrom. + +This Agreement may apply to any or all software for which the holder of +the economic rights decides to submit the use thereof to its provisions. + + + Article 1 - DEFINITIONS + +For the purpose of this Agreement, when the following expressions +commence with a capital letter, they shall have the following meaning: + +Agreement: means this license agreement, and its possible subsequent +versions and annexes. + +Software: means the software in its Object Code and/or Source Code form +and, where applicable, its documentation, "as is" when the Licensee +accepts the Agreement. + +Initial Software: means the Software in its Source Code and possibly its +Object Code form and, where applicable, its documentation, "as is" when +it is first distributed under the terms and conditions of the Agreement. + +Modified Software: means the Software modified by at least one +Integrated Contribution. + +Source Code: means all the Software's instructions and program lines to +which access is required so as to modify the Software. + +Object Code: means the binary files originating from the compilation of +the Source Code. + +Holder: means the holder(s) of the economic rights over the Initial +Software. + +Licensee: means the Software user(s) having accepted the Agreement. + +Contributor: means a Licensee having made at least one Integrated +Contribution. + +Licensor: means the Holder, or any other individual or legal entity, who +distributes the Software under the Agreement. + +Integrated Contribution: means any or all modifications, corrections, +translations, adaptations and/or new functions integrated into the +Source Code by any or all Contributors. + +Related Module: means a set of sources files including their +documentation that, without modification to the Source Code, enables +supplementary functions or services in addition to those offered by the +Software. + +Derivative Software: means any combination of the Software, modified or +not, and of a Related Module. + +Parties: mean both the Licensee and the Licensor. + +These expressions may be used both in singular and plural form. + + + Article 2 - PURPOSE + +The purpose of the Agreement is the grant by the Licensor to the +Licensee of a non-exclusive, transferable and worldwide license for the +Software as set forth in Article 5 hereinafter for the whole term of the +protection granted by the rights over said Software. + + + Article 3 - ACCEPTANCE + +3.1 The Licensee shall be deemed as having accepted the terms and +conditions of this Agreement upon the occurrence of the first of the +following events: + + * (i) loading the Software by any or all means, notably, by + downloading from a remote server, or by loading from a physical + medium; + * (ii) the first time the Licensee exercises any of the rights + granted hereunder. + +3.2 One copy of the Agreement, containing a notice relating to the +characteristics of the Software, to the limited warranty, and to the +fact that its use is restricted to experienced users has been provided +to the Licensee prior to its acceptance as set forth in Article 3.1 +hereinabove, and the Licensee hereby acknowledges that it has read and +understood it. + + + Article 4 - EFFECTIVE DATE AND TERM + + + 4.1 EFFECTIVE DATE + +The Agreement shall become effective on the date when it is accepted by +the Licensee as set forth in Article 3.1. + + + 4.2 TERM + +The Agreement shall remain in force for the entire legal term of +protection of the economic rights over the Software. + + + Article 5 - SCOPE OF RIGHTS GRANTED + +The Licensor hereby grants to the Licensee, who accepts, the following +rights over the Software for any or all use, and for the term of the +Agreement, on the basis of the terms and conditions set forth hereinafter. + +Besides, if the Licensor owns or comes to own one or more patents +protecting all or part of the functions of the Software or of its +components, the Licensor undertakes not to enforce the rights granted by +these patents against successive Licensees using, exploiting or +modifying the Software. If these patents are transferred, the Licensor +undertakes to have the transferees subscribe to the obligations set +forth in this paragraph. + + + 5.1 RIGHT OF USE + +The Licensee is authorized to use the Software, without any limitation +as to its fields of application, with it being hereinafter specified +that this comprises: + + 1. permanent or temporary reproduction of all or part of the Software + by any or all means and in any or all form. + + 2. loading, displaying, running, or storing the Software on any or + all medium. + + 3. entitlement to observe, study or test its operation so as to + determine the ideas and principles behind any or all constituent + elements of said Software. This shall apply when the Licensee + carries out any or all loading, displaying, running, transmission + or storage operation as regards the Software, that it is entitled + to carry out hereunder. + + + 5.2 RIGHT OF MODIFICATION + +The right of modification includes the right to translate, adapt, +arrange, or make any or all modifications to the Software, and the right +to reproduce the resulting software. It includes, in particular, the +right to create a Derivative Software. + +The Licensee is authorized to make any or all modification to the +Software provided that it includes an explicit notice that it is the +author of said modification and indicates the date of the creation thereof. + + + 5.3 RIGHT OF DISTRIBUTION + +In particular, the right of distribution includes the right to publish, +transmit and communicate the Software to the general public on any or +all medium, and by any or all means, and the right to market, either in +consideration of a fee, or free of charge, one or more copies of the +Software by any means. + +The Licensee is further authorized to distribute copies of the modified +or unmodified Software to third parties according to the terms and +conditions set forth hereinafter. + + + 5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION + +The Licensee is authorized to distribute true copies of the Software in +Source Code or Object Code form, provided that said distribution +complies with all the provisions of the Agreement and is accompanied by: + + 1. a copy of the Agreement, + + 2. a notice relating to the limitation of both the Licensor's + warranty and liability as set forth in Articles 8 and 9, + +and that, in the event that only the Object Code of the Software is +redistributed, the Licensee allows effective access to the full Source +Code of the Software at a minimum during the entire period of its +distribution of the Software, it being understood that the additional +cost of acquiring the Source Code shall not exceed the cost of +transferring the data. + + + 5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE + +When the Licensee makes an Integrated Contribution to the Software, the +terms and conditions for the distribution of the resulting Modified +Software become subject to all the provisions of this Agreement. + +The Licensee is authorized to distribute the Modified Software, in +source code or object code form, provided that said distribution +complies with all the provisions of the Agreement and is accompanied by: + + 1. a copy of the Agreement, + + 2. a notice relating to the limitation of both the Licensor's + warranty and liability as set forth in Articles 8 and 9, + +and that, in the event that only the object code of the Modified +Software is redistributed, the Licensee allows effective access to the +full source code of the Modified Software at a minimum during the entire +period of its distribution of the Modified Software, it being understood +that the additional cost of acquiring the source code shall not exceed +the cost of transferring the data. + + + 5.3.3 DISTRIBUTION OF DERIVATIVE SOFTWARE + +When the Licensee creates Derivative Software, this Derivative Software +may be distributed under a license agreement other than this Agreement, +subject to compliance with the requirement to include a notice +concerning the rights over the Software as defined in Article 6.4. +In the event the creation of the Derivative Software required modification +of the Source Code, the Licensee undertakes that: + + 1. the resulting Modified Software will be governed by this Agreement, + 2. the Integrated Contributions in the resulting Modified Software + will be clearly identified and documented, + 3. the Licensee will allow effective access to the source code of the + Modified Software, at a minimum during the entire period of + distribution of the Derivative Software, such that such + modifications may be carried over in a subsequent version of the + Software; it being understood that the additional cost of + purchasing the source code of the Modified Software shall not + exceed the cost of transferring the data. + + + 5.3.4 COMPATIBILITY WITH THE CeCILL LICENSE + +When a Modified Software contains an Integrated Contribution subject to +the CeCILL license agreement, or when a Derivative Software contains a +Related Module subject to the CeCILL license agreement, the provisions +set forth in the third item of Article 6.4 are optional. + + + Article 6 - INTELLECTUAL PROPERTY + + + 6.1 OVER THE INITIAL SOFTWARE + +The Holder owns the economic rights over the Initial Software. Any or +all use of the Initial Software is subject to compliance with the terms +and conditions under which the Holder has elected to distribute its work +and no one shall be entitled to modify the terms and conditions for the +distribution of said Initial Software. + +The Holder undertakes that the Initial Software will remain ruled at +least by this Agreement, for the duration set forth in Article 4.2. + + + 6.2 OVER THE INTEGRATED CONTRIBUTIONS + +The Licensee who develops an Integrated Contribution is the owner of the +intellectual property rights over this Contribution as defined by +applicable law. + + + 6.3 OVER THE RELATED MODULES + +The Licensee who develops a Related Module is the owner of the +intellectual property rights over this Related Module as defined by +applicable law and is free to choose the type of agreement that shall +govern its distribution under the conditions defined in Article 5.3.3. + + + 6.4 NOTICE OF RIGHTS + +The Licensee expressly undertakes: + + 1. not to remove, or modify, in any manner, the intellectual property + notices attached to the Software; + + 2. to reproduce said notices, in an identical manner, in the copies + of the Software modified or not; + + 3. to ensure that use of the Software, its intellectual property + notices and the fact that it is governed by the Agreement is + indicated in a text that is easily accessible, specifically from + the interface of any Derivative Software. + +The Licensee undertakes not to directly or indirectly infringe the +intellectual property rights of the Holder and/or Contributors on the +Software and to take, where applicable, vis-à-vis its staff, any and all +measures required to ensure respect of said intellectual property rights +of the Holder and/or Contributors. + + + Article 7 - RELATED SERVICES + +7.1 Under no circumstances shall the Agreement oblige the Licensor to +provide technical assistance or maintenance services for the Software. + +However, the Licensor is entitled to offer this type of services. The +terms and conditions of such technical assistance, and/or such +maintenance, shall be set forth in a separate instrument. Only the +Licensor offering said maintenance and/or technical assistance services +shall incur liability therefor. + +7.2 Similarly, any Licensor is entitled to offer to its licensees, under +its sole responsibility, a warranty, that shall only be binding upon +itself, for the redistribution of the Software and/or the Modified +Software, under terms and conditions that it is free to decide. Said +warranty, and the financial terms and conditions of its application, +shall be subject of a separate instrument executed between the Licensor +and the Licensee. + + + Article 8 - LIABILITY + +8.1 Subject to the provisions of Article 8.2, the Licensee shall be +entitled to claim compensation for any direct loss it may have suffered +from the Software as a result of a fault on the part of the relevant +Licensor, subject to providing evidence thereof. + +8.2 The Licensor's liability is limited to the commitments made under +this Agreement and shall not be incurred as a result of in particular: +(i) loss due the Licensee's total or partial failure to fulfill its +obligations, (ii) direct or consequential loss that is suffered by the +Licensee due to the use or performance of the Software, and (iii) more +generally, any consequential loss. In particular the Parties expressly +agree that any or all pecuniary or business loss (i.e. loss of data, +loss of profits, operating loss, loss of customers or orders, +opportunity cost, any disturbance to business activities) or any or all +legal proceedings instituted against the Licensee by a third party, +shall constitute consequential loss and shall not provide entitlement to +any or all compensation from the Licensor. + + + Article 9 - WARRANTY + +9.1 The Licensee acknowledges that the scientific and technical +state-of-the-art when the Software was distributed did not enable all +possible uses to be tested and verified, nor for the presence of +possible defects to be detected. In this respect, the Licensee's +attention has been drawn to the risks associated with loading, using, +modifying and/or developing and reproducing the Software which are +reserved for experienced users. + +The Licensee shall be responsible for verifying, by any or all means, +the suitability of the product for its requirements, its good working +order, and for ensuring that it shall not cause damage to either persons +or properties. + +9.2 The Licensor hereby represents, in good faith, that it is entitled +to grant all the rights over the Software (including in particular the +rights set forth in Article 5). + +9.3 The Licensee acknowledges that the Software is supplied "as is" by +the Licensor without any other express or tacit warranty, other than +that provided for in Article 9.2 and, in particular, without any warranty +as to its commercial value, its secured, safe, innovative or relevant +nature. + +Specifically, the Licensor does not warrant that the Software is free +from any error, that it will operate without interruption, that it will +be compatible with the Licensee's own equipment and software +configuration, nor that it will meet the Licensee's requirements. + +9.4 The Licensor does not either expressly or tacitly warrant that the +Software does not infringe any third party intellectual property right +relating to a patent, software or any other property right. Therefore, +the Licensor disclaims any and all liability towards the Licensee +arising out of any or all proceedings for infringement that may be +instituted in respect of the use, modification and redistribution of the +Software. Nevertheless, should such proceedings be instituted against +the Licensee, the Licensor shall provide it with technical and legal +assistance for its defense. Such technical and legal assistance shall be +decided on a case-by-case basis between the relevant Licensor and the +Licensee pursuant to a memorandum of understanding. The Licensor +disclaims any and all liability as regards the Licensee's use of the +name of the Software. No warranty is given as regards the existence of +prior rights over the name of the Software or as regards the existence +of a trademark. + + + Article 10 - TERMINATION + +10.1 In the event of a breach by the Licensee of its obligations +hereunder, the Licensor may automatically terminate this Agreement +thirty (30) days after notice has been sent to the Licensee and has +remained ineffective. + +10.2 A Licensee whose Agreement is terminated shall no longer be +authorized to use, modify or distribute the Software. However, any +licenses that it may have granted prior to termination of the Agreement +shall remain valid subject to their having been granted in compliance +with the terms and conditions hereof. + + + Article 11 - MISCELLANEOUS + + + 11.1 EXCUSABLE EVENTS + +Neither Party shall be liable for any or all delay, or failure to +perform the Agreement, that may be attributable to an event of force +majeure, an act of God or an outside cause, such as defective +functioning or interruptions of the electricity or telecommunications +networks, network paralysis following a virus attack, intervention by +government authorities, natural disasters, water damage, earthquakes, +fire, explosions, strikes and labor unrest, war, etc. + +11.2 Any failure by either Party, on one or more occasions, to invoke +one or more of the provisions hereof, shall under no circumstances be +interpreted as being a waiver by the interested Party of its right to +invoke said provision(s) subsequently. + +11.3 The Agreement cancels and replaces any or all previous agreements, +whether written or oral, between the Parties and having the same +purpose, and constitutes the entirety of the agreement between said +Parties concerning said purpose. No supplement or modification to the +terms and conditions hereof shall be effective as between the Parties +unless it is made in writing and signed by their duly authorized +representatives. + +11.4 In the event that one or more of the provisions hereof were to +conflict with a current or future applicable act or legislative text, +said act or legislative text shall prevail, and the Parties shall make +the necessary amendments so as to comply with said act or legislative +text. All other provisions shall remain effective. Similarly, invalidity +of a provision of the Agreement, for any reason whatsoever, shall not +cause the Agreement as a whole to be invalid. + + + 11.5 LANGUAGE + +The Agreement is drafted in both French and English and both versions +are deemed authentic. + + + Article 12 - NEW VERSIONS OF THE AGREEMENT + +12.1 Any person is authorized to duplicate and distribute copies of this +Agreement. + +12.2 So as to ensure coherence, the wording of this Agreement is +protected and may only be modified by the authors of the License, who +reserve the right to periodically publish updates or new versions of the +Agreement, each with a separate number. These subsequent versions may +address new issues encountered by Free Software. + +12.3 Any Software distributed under a given version of the Agreement may +only be subsequently distributed under the same version of the Agreement +or a subsequent version. + + + Article 13 - GOVERNING LAW AND JURISDICTION + +13.1 The Agreement is governed by French law. The Parties agree to +endeavor to seek an amicable solution to any disagreements or disputes +that may arise during the performance of the Agreement. + +13.2 Failing an amicable solution within two (2) months as from their +occurrence, and unless emergency proceedings are necessary, the +disagreements or disputes shall be referred to the Paris Courts having +jurisdiction, by the more diligent Party. + + +Version 1.0 dated 2006-09-05. diff --git a/lis/LICENSES/EIS_Visualization_Portal/Font_Awesome_Free_v5.0.13-v5.0.14-v5.0.15_CC_BY_4.0_License.txt b/lis/LICENSES/EIS_Visualization_Portal/Font_Awesome_Free_v5.0.13-v5.0.14-v5.0.15_CC_BY_4.0_License.txt new file mode 100644 index 000000000..e3ce215b6 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/Font_Awesome_Free_v5.0.13-v5.0.14-v5.0.15_CC_BY_4.0_License.txt @@ -0,0 +1,116 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Font Awesome Free + +POC: + +https://fontawesome.com +https://github.com/FortAwesome/Font-Awesome + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/icons.css +lis/utils/eis_visualization_portal/eis-freshwater/css/icons.css +lis/utils/eis_visualization_portal/eis-sealevel/css/icons.css +lis/utils/eis_visualization_portal/eis-toplanding/css/all.css +lis/utils/eis_visualization_portal/eis-toplanding/css/animate.min.css +lis/utils/eis_visualization_portal/eis-toplanding/css/application.css + +License: + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + Licensor means the individual(s) or entity(ies) granting rights under this Public License. + Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + License grant. + Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + reproduce and Share the Licensed Material, in whole or in part; and + produce, reproduce, and Share Adapted Material. + Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + Term. The term of this Public License is specified in Section 6(a). + Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + Downstream recipients. + Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + Other rights. + Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + Patent and trademark rights are not licensed under this Public License. + To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + Attribution. + + If You Share the Licensed Material (including in modified form), You must: + retain the following if it is supplied by the Licensor with the Licensed Material: + identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + a copyright notice; + a notice that refers to this Public License; + a notice that refers to the disclaimer of warranties; + a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + upon express reinstatement by the Licensor. + For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + diff --git a/lis/LICENSES/EIS_Visualization_Portal/Font_Awesome_Free_v5.9.0_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/Font_Awesome_Free_v5.9.0_MIT_License.txt new file mode 100644 index 000000000..f40ad92c9 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/Font_Awesome_Free_v5.9.0_MIT_License.txt @@ -0,0 +1,29 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Font Awesome Free + +POC: + +https://fontawesome.com +https://github.com/FortAwesome/Font-Awesome + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/all.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/all.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/brands.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/brands.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/fontawesome.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/fontawesome.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/regular.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/regular.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/solid.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/solid.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/svg-with-js.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/svg-with-js.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/v4-shims.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/fontawesome-free/css/v4-shims.min.css + +License: + +MIT License (https://opensource.org/licenses/MIT) diff --git a/lis/LICENSES/EIS_Visualization_Portal/GIBS-leaflet_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/GIBS-leaflet_MIT_License.txt new file mode 100644 index 000000000..a19135c20 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/GIBS-leaflet_MIT_License.txt @@ -0,0 +1,44 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: gcoro/GIBS-leaflet + +POC: + +https://github.com/gcoro/gibs-leaflet + +Files: + +lis/utils/eis_visualization_portal/eis-fire/js/GIBSLayer.js +lis/utils/eis_visualization_portal/eis-fire/js/GIBSMetadata.js +lis/utils/eis_visualization_portal/eis-fire/js/GeoMixerGIBSLayer.js +lis/utils/eis_visualization_portal/eis-freshwater/js/GIBSLayer.js +lis/utils/eis_visualization_portal/eis-freshwater/js/GIBSMetadata.js +lis/utils/eis_visualization_portal/eis-freshwater/js/GeoMixerGIBSLayer.js +lis/utils/eis_visualization_portal/eis-sealevel/js/GIBSLayer.js +lis/utils/eis_visualization_portal/eis-sealevel/js/GIBSMetadata.js +lis/utils/eis_visualization_portal/eis-sealevel/js/GeoMixerGIBSLayer.js + +License: + +MIT License + +Copyright (c) 2018 Giulia + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/lis/LICENSES/EIS_Visualization_Portal/Ionic_Framework_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/Ionic_Framework_MIT_License.txt new file mode 100644 index 000000000..2f01b8f6e --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/Ionic_Framework_MIT_License.txt @@ -0,0 +1,35 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Ionic Framework + +POC: + +https://github.com/ionic-team/ionicons + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/css/ionicons.min.css + +License: + +The MIT License (MIT) + +Copyright (c) 2015-present Ionic (http://ionic.io/) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/Labelgun_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/Labelgun_MIT_License.txt new file mode 100644 index 000000000..0c0a1a8ff --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/Labelgun_MIT_License.txt @@ -0,0 +1,21 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Geovation/Labelgun + + +POC: + +https://github.com/Geovation/labelgun + +Files: + +lis/utils/eis_visualization_portal/eis-fire/js/labelgun.min.js +lis/utils/eis_visualization_portal/eis-fire/js/labels.js +lis/utils/eis_visualization_portal/eis-freshwater/js/labelgun.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/labels.js +lis/utils/eis_visualization_portal/eis-sealevel/js/labelgun.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/labels.js + +License: + +MIT License (https://opensource.org/licenses/MIT) diff --git a/lis/LICENSES/EIS_Visualization_Portal/Leaflet_BSD_License.txt b/lis/LICENSES/EIS_Visualization_Portal/Leaflet_BSD_License.txt new file mode 100644 index 000000000..ff4eae7f9 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/Leaflet_BSD_License.txt @@ -0,0 +1,93 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Leaflet + +POC: + +https://leafletjs.com +https://github.com/Leaflet/Leaflet + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/styledLayerControl.css +lis/utils/eis_visualization_portal/eis-fire/js/Autolinker.min.js +lis/utils/eis_visualization_portal/eis-fire/js/Control.Opacity.js +lis/utils/eis_visualization_portal/eis-fire/js/OSMBuildings-Leaflet.js +lis/utils/eis_visualization_portal/eis-fire/js/createLayersList.js +lis/utils/eis_visualization_portal/eis-fire/js/multi-style-layer.js +lis/utils/eis_visualization_portal/eis-fire/js/slidercontrol.js +lis/utils/eis_visualization_portal/eis-fire/js/spin.min.js +lis/utils/eis_visualization_portal/eis-fire/js/styledLayerControl.js +lis/utils/eis_visualization_portal/eis-freshwater/css/L.Control.Opacity.css +lis/utils/eis_visualization_portal/eis-freshwater/css/Leaflet.Coordinates-0.1.3.css +lis/utils/eis_visualization_portal/eis-freshwater/css/MarkerCluster.Default.css +lis/utils/eis_visualization_portal/eis-freshwater/css/MarkerCluster.css +lis/utils/eis_visualization_portal/eis-freshwater/css/leaflet-panel-layers.css +lis/utils/eis_visualization_portal/eis-freshwater/css/leaflet-search.css +lis/utils/eis_visualization_portal/eis-freshwater/css/leaflet.css +lis/utils/eis_visualization_portal/eis-freshwater/css/leaflet.fullscreen.css +lis/utils/eis_visualization_portal/eis-freshwater/css/styledLayerControl.css +lis/utils/eis_visualization_portal/eis-freshwater/js/Autolinker.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/Control.Opacity.js +lis/utils/eis_visualization_portal/eis-freshwater/js/L.Control.HtmlLegend.js +lis/utils/eis_visualization_portal/eis-freshwater/js/L.Control.Opacity.js +lis/utils/eis_visualization_portal/eis-freshwater/js/Leaflet.Coordinates-0.1.3.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/Leaflet.VectorGrid.js +lis/utils/eis_visualization_portal/eis-freshwater/js/OSMBuildings-Leaflet.js +lis/utils/eis_visualization_portal/eis-freshwater/js/createLayersList.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-hash.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-heat.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-search.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-side-by-side.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-side-by-side_overlays.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-svg-shape-markers.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet-tilelayer-wmts.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet.canvaslayer.field.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet.markercluster.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet.pattern.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet.rotatedMarker.js +lis/utils/eis_visualization_portal/eis-freshwater/js/leaflet.wms.js +lis/utils/eis_visualization_portal/eis-freshwater/js/multi-style-layer.js +lis/utils/eis_visualization_portal/eis-freshwater/js/slidercontrol.js +lis/utils/eis_visualization_portal/eis-freshwater/js/spin.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/styledLayerControl.js +lis/utils/eis_visualization_portal/eis-sealevel/css/styledLayerControl.css +lis/utils/eis_visualization_portal/eis-sealevel/js/Autolinker.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/Control.Opacity.js +lis/utils/eis_visualization_portal/eis-sealevel/js/OSMBuildings-Leaflet.js +lis/utils/eis_visualization_portal/eis-sealevel/js/createLayersList.js +lis/utils/eis_visualization_portal/eis-sealevel/js/multi-style-layer.js +lis/utils/eis_visualization_portal/eis-sealevel/js/slidercontrol.js +lis/utils/eis_visualization_portal/eis-sealevel/js/spin.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/styledLayerControl.js + +License: + +BSD 2-Clause License + +Copyright (c) 2010-2023, Volodymyr Agafonkin +Copyright (c) 2010-2011, CloudMade +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/lis/LICENSES/EIS_Visualization_Portal/MDBootstrap_v4.7.5_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/MDBootstrap_v4.7.5_MIT_License.txt new file mode 100644 index 000000000..786aace1f --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/MDBootstrap_v4.7.5_MIT_License.txt @@ -0,0 +1,36 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: MDBootstrap + +POC: + +https://mdbootstrap.com/ +https://github.com/mdbootstrap/mdb-ui-kit + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/css/mdb.css + +License: + +MIT License + +Copyright (c) 2021 MDBootstrap + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/RBush_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/RBush_MIT_License.txt new file mode 100644 index 000000000..24c89db6d --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/RBush_MIT_License.txt @@ -0,0 +1,37 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: mourner/RBush + +POC: + +https://github.com/mourner/rbush + +Files: + +lis/utils/eis_visualization_portal/eis-fire/js/rbush.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/rbush.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/rbush.min.js + +License: + +MIT License + +Copyright (c) 2016 Vladimir Agafonkin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/ReactiveRaven_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/ReactiveRaven_MIT_License.txt new file mode 100644 index 000000000..f9da0ce91 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/ReactiveRaven_MIT_License.txt @@ -0,0 +1,38 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: ReactiveRaven/jqBootstrapValidation + +POC: + +https://reactiveraven.github.io/jqBootstrapValidation +https://github.com/ReactiveRaven/jqBootstrapValidation + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/js/jqBootstrapValidation.js + +License: + +Copyright (c) 2013 David Godfrey + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + diff --git a/lis/LICENSES/EIS_Visualization_Portal/W3.CSS_v.15_Free_License.txt b/lis/LICENSES/EIS_Visualization_Portal/W3.CSS_v.15_Free_License.txt new file mode 100644 index 000000000..535b2227a --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/W3.CSS_v.15_Free_License.txt @@ -0,0 +1,21 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: W3.CSS + +POC: + +https://www.w3schools.com/w3css/default.asp + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/w3.css +lis/utils/eis_visualization_portal/eis-freshwater/css/w3.css +lis/utils/eis_visualization_portal/eis-sealevel/css/w3.css + +License: + +From website https://www.w3schools.com/w3css/default.asp: + +W3.CSS is Free + +W3.CSS is free to use. No license is necessary. diff --git a/lis/LICENSES/EIS_Visualization_Portal/boodstrap_v4.2.1_v4.3.1_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/boodstrap_v4.2.1_v4.3.1_MIT_License.txt new file mode 100644 index 000000000..82e38d11e --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/boodstrap_v4.2.1_v4.3.1_MIT_License.txt @@ -0,0 +1,49 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Bootstap + +POC: + +https://getbootstrap.com +https://github.com/twbs/bootstrap + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/Control.Opacity.css +lis/utils/eis_visualization_portal/eis-freshwater/css/Control.Opacity.css +lis/utils/eis_visualization_portal/eis-sealevel/css/Control.Opacity.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/css/bootstrap-grid.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/css/bootstrap-grid.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/css/bootstrap-reboot.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/css/bootstrap-reboot.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/css/bootstrap.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/css/bootstrap.min.css +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/js/bootstrap.bundle.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/js/bootstrap.bundle.min.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/js/bootstrap.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/bootstrap/js/bootstrap.min.js +lis/utils/eis_visualization_portal/eis-toplanding/js/jqBootstrapValidation.js + +License: + +The MIT License (MIT) + +Copyright (c) 2011-2023 The Bootstrap Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/gmaps-labels_Free_License.txt b/lis/LICENSES/EIS_Visualization_Portal/gmaps-labels_Free_License.txt new file mode 100644 index 000000000..197703fc4 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/gmaps-labels_Free_License.txt @@ -0,0 +1,17 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: iamcal/gmaps-labels + +POC: + +https://github.com/iamcal/gmaps-labels + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/gmaps-labels.css +lis/utils/eis_visualization_portal/eis-freshwater/css/gmaps-labels.css +lis/utils/eis_visualization_portal/eis-sealevel/css/gmaps-labels.css + +License: + +None provided. This is a public GitHub repository. diff --git a/lis/LICENSES/EIS_Visualization_Portal/jQuery_Easing_v1.4.1_BSD_License.txt b/lis/LICENSES/EIS_Visualization_Portal/jQuery_Easing_v1.4.1_BSD_License.txt new file mode 100644 index 000000000..8c85a0a16 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/jQuery_Easing_v1.4.1_BSD_License.txt @@ -0,0 +1,51 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: gdsmith/jquery.easing + +POC: + +http://gsgd.co.uk/sandbox/jquery/easing +https://github.com/gdsmith/jquery.easing + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery-easing/jquery.easing.compatibility.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery-easing/jquery.easing.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery-easing/jquery.easing.min.js + +License: + +jQuery Easing - http://gsgd.co.uk/sandbox/jquery/easing/ + +Uses the built in easing capabilities added In jQuery 1.1 +to offer multiple easing options + +TERMS OF USE - jQuery Easing + +Open source under the 3-Clause BSD License. + +Copyright © 2008 George McGinley Smith +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this list +of conditions and the following disclaimer in the documentation and/or other +materials provided with the distribution. Neither the name of the author nor the +names of contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/jQuery_v3.3.1_v3.4.1_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/jQuery_v3.3.1_v3.4.1_MIT_License.txt new file mode 100644 index 000000000..be4727510 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/jQuery_v3.3.1_v3.4.1_MIT_License.txt @@ -0,0 +1,40 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: jQuery + +POC: + +https://openjsf.org +https://github.com/jquery/jquery + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/js/jquery-3.js +lis/utils/eis_visualization_portal/eis-toplanding/js/mdb.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery/jquery.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery/jquery.min.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery/jquery.slim.js +lis/utils/eis_visualization_portal/eis-toplanding/vendor/jquery/jquery.slim.min.js + +License: + +Copyright OpenJS Foundation and other contributors, https://openjsf.org/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/popper_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/popper_MIT_License.txt new file mode 100644 index 000000000..906ad6186 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/popper_MIT_License.txt @@ -0,0 +1,19 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: Federico Zivolo / floating-ui/floating-ui / mdbootstrap/mdb-ui-kit + +POC: + +https://popper.js.org +https://github.com/floating-ui/floating-ui +https://github.com/mdbootstrap/mdb-ui-kit +https://github.com/FezVrasta + +Files: + +lis/utils/eis_visualization_portal/eis-toplanding/js/popper.js +../..//utils/eis_visualization_portal/eis-toplanding/js/popper.js + +License: + +Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT). diff --git a/lis/LICENSES/EIS_Visualization_Portal/qgis2web_GPL_License.txt b/lis/LICENSES/EIS_Visualization_Portal/qgis2web_GPL_License.txt new file mode 100644 index 000000000..78ff94e50 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/qgis2web_GPL_License.txt @@ -0,0 +1,300 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: tomchadwin/qgis2web + +POC: + +https://github.com/tomchadwin/qgis2web + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/qgis2web.css +lis/utils/eis_visualization_portal/eis-fire/js/qgis2web_expressions.js +lis/utils/eis_visualization_portal/eis-freshwater/css/qgis2web.css +lis/utils/eis_visualization_portal/eis-freshwater/js/qgis2web_expressions.js +lis/utils/eis_visualization_portal/eis-sealevel/css/qgis2web.css +lis/utils/eis_visualization_portal/eis-sealevel/js/qgis2web_expressions.js + +License: + +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + diff --git a/lis/LICENSES/EIS_Visualization_Portal/skel.js_v2.0.2_MIT_License.txt b/lis/LICENSES/EIS_Visualization_Portal/skel.js_v2.0.2_MIT_License.txt new file mode 100644 index 000000000..074477af9 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/skel.js_v2.0.2_MIT_License.txt @@ -0,0 +1,26 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: ajlkn/skel + +POC: + +https://github.com/ajlkn/skel + +Files: + +lis/utils/eis_visualization_portal/eis-fire/js/skel-layers.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/skel-layers.min.js +lis/utils/eis_visualization_portal/eis-fire/js/skel.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/skel.min.js + +License: + +Skel, Layout, Viewport, and Skel.scss are released under the MIT license. + +Copyright (c) skel.io + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/lis/LICENSES/EIS_Visualization_Portal/templatedco_CC_BY_3_License.txt b/lis/LICENSES/EIS_Visualization_Portal/templatedco_CC_BY_3_License.txt new file mode 100644 index 000000000..75122ea64 --- /dev/null +++ b/lis/LICENSES/EIS_Visualization_Portal/templatedco_CC_BY_3_License.txt @@ -0,0 +1,108 @@ +Component name(s): EIS Freshwater Visualization Portal support files + +Contributing organization/individuals: templated.co + +POC: + +templated.co + +Files: + +lis/utils/eis_visualization_portal/eis-fire/css/sidebar-main.css +lis/utils/eis_visualization_portal/eis-fire/css/sidebar-themes.css +lis/utils/eis_visualization_portal/eis-fire/css/skel.css +lis/utils/eis_visualization_portal/eis-fire/css/style-large.css +lis/utils/eis_visualization_portal/eis-fire/css/style-medium.css +lis/utils/eis_visualization_portal/eis-fire/css/style-xlarge.css +lis/utils/eis_visualization_portal/eis-fire/css/style-xsmall.css +lis/utils/eis_visualization_portal/eis-fire/css/style.css +lis/utils/eis_visualization_portal/eis-fire/css/style__.css +lis/utils/eis_visualization_portal/eis-fire/js/init.js +lis/utils/eis_visualization_portal/eis-fire/js/jquery.min.js +lis/utils/eis_visualization_portal/eis-fire/js/sidebar-main.js +lis/utils/eis_visualization_portal/eis-freshwater/css/sidebar-main.css +lis/utils/eis_visualization_portal/eis-freshwater/css/sidebar-themes.css +lis/utils/eis_visualization_portal/eis-freshwater/css/skel.css +lis/utils/eis_visualization_portal/eis-freshwater/css/style-large.css +lis/utils/eis_visualization_portal/eis-freshwater/css/style-medium.css +lis/utils/eis_visualization_portal/eis-freshwater/css/style-xlarge.css +lis/utils/eis_visualization_portal/eis-freshwater/css/style-xsmall.css +lis/utils/eis_visualization_portal/eis-freshwater/css/style.css +lis/utils/eis_visualization_portal/eis-freshwater/css/style__.css +lis/utils/eis_visualization_portal/eis-freshwater/js/init.js +lis/utils/eis_visualization_portal/eis-freshwater/js/jquery.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/sidebar-main.js +lis/utils/eis_visualization_portal/eis-freshwater/js/skel-layers.min.js +lis/utils/eis_visualization_portal/eis-freshwater/js/skel.min.js +lis/utils/eis_visualization_portal/eis-sealevel/css/sidebar-main.css +lis/utils/eis_visualization_portal/eis-sealevel/css/sidebar-themes.css +lis/utils/eis_visualization_portal/eis-sealevel/css/skel.css +lis/utils/eis_visualization_portal/eis-sealevel/css/style-large.css +lis/utils/eis_visualization_portal/eis-sealevel/css/style-medium.css +lis/utils/eis_visualization_portal/eis-sealevel/css/style-xlarge.css +lis/utils/eis_visualization_portal/eis-sealevel/css/style-xsmall.css +lis/utils/eis_visualization_portal/eis-sealevel/css/style.css +lis/utils/eis_visualization_portal/eis-sealevel/css/style__.css +lis/utils/eis_visualization_portal/eis-sealevel/js/init.js +lis/utils/eis_visualization_portal/eis-sealevel/js/jquery.min.js +lis/utils/eis_visualization_portal/eis-sealevel/js/sidebar-main.js + +License: + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. + "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. + "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; + to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; + to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + to Distribute and Publicly Perform Adaptations. + + For the avoidance of doubt: + Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, + Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. + If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/lis/LICENSES/Noah_v2.7.1_v3.2_v3.3_v3.4_v3.6_v3.9.1_vMP_License.docx b/lis/LICENSES/Noah_v2.7.1_v3.2_v3.3_v3.4_v3.6_v3.9.1_vMP_License.docx deleted file mode 100644 index 4b746e55b..000000000 Binary files a/lis/LICENSES/Noah_v2.7.1_v3.2_v3.3_v3.4_v3.6_v3.9.1_vMP_License.docx and /dev/null differ diff --git a/lis/LICENSES/Noah_v2.7.1_v3.2_v3.3_v3.6_v3.9.1_vMP_License.docx b/lis/LICENSES/Noah_v2.7.1_v3.2_v3.3_v3.6_v3.9.1_vMP_License.docx new file mode 100644 index 000000000..9d8b4ae9e Binary files /dev/null and b/lis/LICENSES/Noah_v2.7.1_v3.2_v3.3_v3.6_v3.9.1_vMP_License.docx differ diff --git a/lis/apps/landslide/GLS/GLSMod.F90 b/lis/apps/landslide/GLS/GLSMod.F90 index 099e2e133..18c63c260 100644 --- a/lis/apps/landslide/GLS/GLSMod.F90 +++ b/lis/apps/landslide/GLS/GLSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/GLS/pe_raint/GLS_getpeobspred_raint.F90 b/lis/apps/landslide/GLS/pe_raint/GLS_getpeobspred_raint.F90 index 2380470c8..3aa13d579 100644 --- a/lis/apps/landslide/GLS/pe_raint/GLS_getpeobspred_raint.F90 +++ b/lis/apps/landslide/GLS/pe_raint/GLS_getpeobspred_raint.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/GLS/pe_raint/GLS_param_reset.F90 b/lis/apps/landslide/GLS/pe_raint/GLS_param_reset.F90 index 5d8a79a21..872ce647d 100644 --- a/lis/apps/landslide/GLS/pe_raint/GLS_param_reset.F90 +++ b/lis/apps/landslide/GLS/pe_raint/GLS_param_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/GLS/pe_raint/GLS_qcdec_raint.F90 b/lis/apps/landslide/GLS/pe_raint/GLS_qcdec_raint.F90 index e0053319b..808ebf759 100644 --- a/lis/apps/landslide/GLS/pe_raint/GLS_qcdec_raint.F90 +++ b/lis/apps/landslide/GLS/pe_raint/GLS_qcdec_raint.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/GLS/pe_raint/GLS_setdec_raint.F90 b/lis/apps/landslide/GLS/pe_raint/GLS_setdec_raint.F90 index de55c8064..00f49fb6a 100644 --- a/lis/apps/landslide/GLS/pe_raint/GLS_setdec_raint.F90 +++ b/lis/apps/landslide/GLS/pe_raint/GLS_setdec_raint.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/GLS/pe_raint/GLS_setupobspred_raint.F90 b/lis/apps/landslide/GLS/pe_raint/GLS_setupobspred_raint.F90 index bdded64cd..daabc14ff 100644 --- a/lis/apps/landslide/GLS/pe_raint/GLS_setupobspred_raint.F90 +++ b/lis/apps/landslide/GLS/pe_raint/GLS_setupobspred_raint.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/TRIGRS/TRIGRSMod.F90 b/lis/apps/landslide/TRIGRS/TRIGRSMod.F90 index c8cfe8ba7..f2b45fe98 100644 --- a/lis/apps/landslide/TRIGRS/TRIGRSMod.F90 +++ b/lis/apps/landslide/TRIGRS/TRIGRSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/TRIGRS/grids.F90 b/lis/apps/landslide/TRIGRS/grids.F90 index 5ceba8c74..c5af9dd69 100755 --- a/lis/apps/landslide/TRIGRS/grids.F90 +++ b/lis/apps/landslide/TRIGRS/grids.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/TRIGRS/input_file_defs.F90 b/lis/apps/landslide/TRIGRS/input_file_defs.F90 index 64f0537cc..e0f56d231 100755 --- a/lis/apps/landslide/TRIGRS/input_file_defs.F90 +++ b/lis/apps/landslide/TRIGRS/input_file_defs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/TRIGRS/input_vars.F90 b/lis/apps/landslide/TRIGRS/input_vars.F90 index e824acf6f..72303cdcc 100644 --- a/lis/apps/landslide/TRIGRS/input_vars.F90 +++ b/lis/apps/landslide/TRIGRS/input_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/apps/landslide/TRIGRS/model_vars.F90 b/lis/apps/landslide/TRIGRS/model_vars.F90 index b9cadde9b..3431d2f3d 100755 --- a/lis/apps/landslide/TRIGRS/model_vars.F90 +++ b/lis/apps/landslide/TRIGRS/model_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/arch/Config.pl b/lis/arch/Config.pl index 4e3357efc..9f8f72b9c 100755 --- a/lis/arch/Config.pl +++ b/lis/arch/Config.pl @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -165,9 +165,11 @@ $sys_c_opt .= " -Wunused-function -Wunused-parameter"; $sys_c_opt .= " -Wunused-variable -Wwrite-strings"; # Run-time flags - $sys_c_opt .= " -check=conversions,stack,uninit"; + #EMK 20231109...Disabled several flags that are rejected by the new ICX + #compiler on Narwhal. + #$sys_c_opt .= " -check=conversions,stack,uninit"; $sys_c_opt .= " -fp-stack-check -fp-trap=common -fp-trap-all=common"; - $sys_c_opt .= " -ftrapuv"; + #$sys_c_opt .= " -ftrapuv"; } elsif($sys_arch eq "linux_pgi") { print "Optimization level $opt_lev is not defined for $sys_arch.\n"; @@ -188,7 +190,7 @@ #print "Using '-g'\n"; #$sys_opt = "-g"; $sys_opt = "-g -Wall -Wcharacter-truncation"; - $sys_opt .= " -Wconversion-extra -Wextra -Wpedantic -Wrealloc-lhs"; + $sys_opt .= " -Wconversion-extra -Wextra -Wrealloc-lhs"; $sys_opt .= " -Wrealloc-lhs-all"; # Run-time options $sys_opt .= " -ffpe-trap=invalid,zero,overflow"; @@ -802,7 +804,7 @@ } } -print "Use LIS-LAPACK? (1-yes, 0-no, default=0): "; +print "Use LIS-LAPACK? (0-no, 1-mkl, 2-lapack/blas, 3-lapack/refblas, default=0): "; $use_lapack=; $use_lapack=~s/ *#.*$//; chomp($use_lapack); @@ -810,7 +812,7 @@ $use_lapck=0; } -if($use_lapack == 1) { +if($use_lapack != 0) { if(defined($ENV{LIS_LAPACK})){ $sys_lapack_path = $ENV{LIS_LAPACK}; $lib = "/"; @@ -826,29 +828,6 @@ } } -print "Use LIS-MKL-LAPACK? (1-yes, 0-no, default=0): "; -$use_mkllapack=; -chomp($use_mkllapack); -if($use_mkllapack eq ""){ - $use_mkllapck=0; -} - -if($use_mkllapack == 1) { - if(defined($ENV{LIS_MKL_LAPACK})){ - $sys_lapack_path = $ENV{LIS_MKL_LAPACK}; - $lib = "/"; - $lib_lapack=$sys_lapack_path.$lib; - } - else { - print "--------------ERROR---------------------\n"; - print "Please specify the MKL-LAPACK path using\n"; - print "the LIS_MKL_LAPACK variable.\n"; - print "Configuration exiting ....\n"; - print "--------------ERROR---------------------\n"; - exit 1; - } -} - print "Use PETSc? (1-yes, 0-no, default=0): "; $use_petsc=; chomp($use_petsc); @@ -1024,6 +1003,12 @@ $lib_flags= $lib_flags." -lmfhdf -ldf ".$libjpeg." -lz"; $lib_paths= $lib_paths." -L\$(LIB_HDF4)" } + +if($use_petsc == 1){ + $fflags = $fflags." -I\$(INC_PETSC)"; + $ldflags = $ldflags." -L\$(LIB_PETSC) -lpetsc -lm -ldl"; +} + if($use_hdf5 == 1){ $fflags77 = $fflags77." -I\$(INC_HDF5)"; $fflags = $fflags." -I\$(INC_HDF5)"; @@ -1058,19 +1043,19 @@ } if($use_lapack == 1){ + $ldflags = $ldflags." -L\$(LIB_LAPACK) -lmkl_rt"; + $lib_flags= $lib_flags." -lmkl_rt"; + $lib_paths= $lib_paths." -L\$(LIB_LAPACK)"; +} +elsif($use_lapack == 2){ $ldflags = $ldflags." -L\$(LIB_LAPACK) -llapack -lblas"; $lib_flags= $lib_flags." -llapack -lblas"; $lib_paths= $lib_paths." -L\$(LIB_LAPACK)"; } - -if($use_mkllapack == 1){ - #Changed to be able to use mkl Wendy Sharples - $ldflags = $ldflags." -L\$(LIB_LAPACK) -lmkl_rt"; -} - -if($use_petsc == 1){ - $fflags = $fflags." -I\$(INC_PETSC)"; - $ldflags = $ldflags." -L\$(LIB_PETSC) -lpetsc -lm"; +elsif($use_lapack == 3){ + $ldflags = $ldflags." -L\$(LIB_LAPACK) -llapack -lrefblas"; + $lib_flags= $lib_flags." -llapack -lrefblas"; + $lib_paths= $lib_paths." -L\$(LIB_LAPACK)"; } if($use_esmf_trace == 1){ @@ -1241,20 +1226,6 @@ printf misc_file "%s\n","#undef RTMS "; } -if($use_lapack == 1) { - printf misc_file "%s\n","#define LAPACK "; -} -else{ - printf misc_file "%s\n","#undef LAPACK "; -} - -if($use_mkllapack == 1) { - printf misc_file "%s\n","#define MKL_LAPACK "; -} -else{ - printf misc_file "%s\n","#undef MKL_LAPACK "; -} - if($use_petsc == 1) { printf misc_file "%s\n","#define PETSc "; } diff --git a/lis/compile b/lis/compile index 0d429d2e9..21b6df505 100755 --- a/lis/compile +++ b/lis/compile @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/configs/557WW-7.3-FOC/JULES/single_snow_layer/gen_time.py b/lis/configs/557WW-7.3-FOC/JULES/single_snow_layer/gen_time.py index 859bcf0d3..538048d7d 100755 --- a/lis/configs/557WW-7.3-FOC/JULES/single_snow_layer/gen_time.py +++ b/lis/configs/557WW-7.3-FOC/JULES/single_snow_layer/gen_time.py @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/configs/557WW-7.4-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py b/lis/configs/557WW-7.4-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py index 859bcf0d3..538048d7d 100755 --- a/lis/configs/557WW-7.4-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py +++ b/lis/configs/557WW-7.4-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py b/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py index 859bcf0d3..538048d7d 100755 --- a/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py +++ b/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/JULES/single_snow_layer/gen_time.py @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/JULES/single_snow_layer/gen_time.py b/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/JULES/single_snow_layer/gen_time.py index 859bcf0d3..538048d7d 100755 --- a/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/JULES/single_snow_layer/gen_time.py +++ b/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/JULES/single_snow_layer/gen_time.py @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/configs/MODEL_OUTPUT_LIST.TBL.adoc b/lis/configs/MODEL_OUTPUT_LIST.TBL.adoc index c643ac3dd..385ea8f72 100644 --- a/lis/configs/MODEL_OUTPUT_LIST.TBL.adoc +++ b/lis/configs/MODEL_OUTPUT_LIST.TBL.adoc @@ -414,5 +414,27 @@ mleaf: 1 kg/m2 - 0 0 0 2 0 1 # leaf biomass for each hru s0_avg: 1 mm - 0 0 0 1 0 1 # water storage in the surface soil layer ss_avg: 1 mm - 0 0 0 1 0 1 # water content of the shallow soil store sd_avg: 1 mm - 0 0 0 1 0 1 # water content of the deep soil store + +# SnowModel-specific fields: +SM_SWE: 1 m - 0 0 0 1 65 1000 # Snow Water Equivalent (kg/m2) +SM_SnowDepth: 1 m - 0 0 0 1 66 1000 # Snow depth (m) +SM_SnowDensity: 1 kg/m3 - 0 0 0 1 900 10 # Snow density (kg/m3) +SM_Snowcover: 0 - - 0 0 0 1 238 100 # Snow cover (-) +SM_SLiqFrac: 0 - - 0 0 0 1 185 1000 # Fraction of SWE in the liquid phase +SM_SWEVeg: 0 kg/m2 - 1 0 0 1 139 1000 # SWE intercepted by vegetation (kg/m2) +SM_Albedo: 1 - - 1 0 0 1 84 100 # Surface albedo (-) +SM_SAlbedo: 0 - - 0 0 0 1 184 1000 # Albedo of the snow-covered area (-) +# Other fields -- summed output: +SM_Qs: 0 m OUT 3 0 0 1 235 10000 # Surface runoff from snowpack / top-soil (m/timestep) +SM_Qsm: 0 m S2L 3 0 0 1 99 10000 # Snowmelt (kg/m2s) +SM_SubSnow: 0 m - 3 0 0 1 198 1000 # Snow sublimation (m) +SM_Snowf: 1 m DN 3 0 0 1 161 10000 # Snowfall rate (m/timestep) +SM_Rainf: 1 m DN 3 0 0 1 162 10000 # Rainfall rate (m/timestep) +SM_TotalPrecip: 1 m DN 3 0 0 1 61 10000 # Total precipitation rate (m/timestep) +# SnowModel-modified forcings: +SM_SWdown: 1 W/m2 DN 1 0 0 1 204 10 # SnowModel-modified SWdown +SM_LWdown: 1 W/m2 DN 1 0 0 1 205 10 # SnowModel-modified LWdown +SM_NWind: 1 m/s N 1 0 0 1 34 10 # SnowModel-modified NWind +SM_EWind: 1 m/s E 1 0 0 1 33 10 # SnowModel-modified EWind .... diff --git a/lis/configs/lis.config.adoc b/lis/configs/lis.config.adoc index 72d6cf6f0..39cb41f6c 100644 --- a/lis/configs/lis.config.adoc +++ b/lis/configs/lis.config.adoc @@ -188,6 +188,32 @@ endif::devonly[] Land surface model: Noah.2.7.1 .... +`Number of subLSMs:` specifies the number of sub-level LSMs +or specialized models that may interface with other LSMs in LIS. +Entry here can be set to 1 with having a surface model type +specified, such as "LSM", and set to 1. + +.Example _lis.config_ entry +.... +Number of subLSMs: 1 +.... + +`subLSM models:` specifies the sub-level land surface model to run. +Acceptable values are: + +|==== +|Value | Description + +|none | template lsm +|Crocus8.1 | Crocus version 8.1 snow model +|SnowModel | Glen Liston's SnowModel snow model +|==== + +.Example _lis.config_ entry +.... +subLSM models: "Crocus8.1" +.... + `Lake model:` specifies the lake model to run. Acceptable values are: @@ -324,6 +350,7 @@ Acceptable values for the sources are: |"`GLDAS`" | GLDAS |"`GFS`" | GFS |"`MERRA2`" | MERRA2 +|"`GEOS-IT`" | GEOS-IT |"`CMAP`" | CMAP |"`TRMM 3B42RT`" | TRMM 3B42RT |"`TRMM 3B42RTV7`" | TRMM 3B42RTV7 @@ -386,6 +413,8 @@ Acceptable values are: |"`none`" | Do not apply topographic correction for forcing |"`lapse-rate`" | Use lapse rate correction for forcing |"`slope-aspect`" | Apply slope-aspect correction for forcing +|"`lapse-rate and slope-aspect`" | Apply both lapse-rate and slope-aspect corrections +|"`micromet`" | Apply Glen Liston's MicroMet corrections to forcing fields |==== .Example _lis.config_ entry @@ -636,6 +665,18 @@ AGRMET area of data: GLOBAL .... ==== +`Number of dimensions in the lat/lon output fields:` specifies the number of dimensions to use when writing the latitude and longitude fields of the LIS output. This is an optional entry. If this entry is not used, LIS will attempt to write the lat/lon fields in 1D. If the projection being used is not compatible with 1D, LIS will write in 2D. +Acceptable values are: +|==== +|Value | Description +|"1D" | 1 dimensional latitude and longitude output + (Note: Only the latlon projection supports 1D output) +|"2D" | 2 dimensional latitude and longitude output +|==== +.Example _lis.config_ entry +.... +Number of dimensions in the lat/lon output fields: "1D" +.... `Enable output statistics:` specifies whether to write the ASCII statistics file for the output data. @@ -3021,9 +3062,11 @@ and observation standard deviation. `SMAP(NASA) model CDF file:` specifies the name of the model CDF file (observations will be scaled into this climatology). +Note: Soil moisture CDF grouped (stratified) by land cover or precipitation climatology or both simultaneously also can be used here. `SMAP(NASA) observation CDF file:` specifies the name of the observation CDF file. +Note: Soil moisture CDF grouped (stratified) by land cover or precipitation climatology or both simultaneously also can be used here. `SMAP(NASA) soil moisture number of bins in the CDF:` specifies the number of bins in the CDF. @@ -3098,6 +3141,32 @@ SMAP(NRT) soil moisture number of bins in the CDF: SMAP(NRT) CDF read option: .... +[[sssec_cdftransfersmda,Transfering stratified CDFs from one domain to another]] +==== Transfering stratified CDFs from one domain to another + +`Use CDF transfer for soil moisture data assimilation:` specifies +whether to use CDF transfer method. + +`Reference domain model CDF file:` specifies the reference domain model CDF name and data directory. + +`Reference domain obs CDF file:` specifies the reference domain obs CDF name and data directory. + +`Number of bins in the soil moisture CDF:` specifies the number of bins in the CDF. + +`Reference domain precipitation climatology data source:` specifies the reference domain precipitation climatology generated by LVT. + +`Target domain precipitation climatology data source:` specifies the target domain precipitation climatology generated by LVT. + + +.Example _lis.config_ entry +.... +Use CDF transfer for soil moisture data assimilation: +Reference domain model CDF file: ref_model_cdf_forcing_diff/stratified_cdf_noahmp401.nc +Reference domain obs CDF file: ref_obs_cdf_forcing_diff/stratified_cdf_smapobs.nc +Number of bins in the soil moisture CDF: 100 +Reference domain precipitation climatology data source: Precip.climo.us.nldas2/LVT_MEAN_FINAL.202201010000.d01.nc +Target domain precipitation climatology data source: Precip.climo.eu.merra/LVT_MEAN_FINAL.202201010000.d01.nc +.... [[sssec_smapnasavodda,SMAP (NASA) vegetation optical depth assimilation]] ==== SMAP (NASA) vegetation optical depth assimilation @@ -5578,7 +5647,6 @@ GFS domain y-dimension size: 256 GFS number of forcing variables: 10 .... - [[sssec_forcings_MERRA2,MERRA2]] ==== MERRA2 @@ -5634,6 +5702,50 @@ MERRA2 use 2m wind fields: 0 MERRA2 use corrected total precipitation: 1 .... +[[sssec_forcings_GEOS-IT,GEOS-IT]] +==== GEOS-IT + +`GEOS-IT forcing directory:` specifies the location of +the GEOS-IT forcing files. + +Please note that GEOS-IT is currently in production and is +not complete for all calendar years. Also, it is not yet +available outside of NASA`'s NCCS computing platforms. +Also, the topographic or elevation correction option is +supported through the MERRA-2 geopotential terrain height +file. Please also see the latest LDT notes for updates on +how to use this option. + +`GEOS-IT use lowest model level forcing:` specifies whether +to use the lowest model level forcing. +Acceptable values are: + +|==== +|Value | Description + +|0 | Do not use the lowest model level forcing. +|1 | Use the lowest model level forcing. +|==== + +`GEOS-IT use 2m wind fields:` specifies whether to use the +2m diagnosed wind fields. This option will only work if +the lowest model level forcing option is turned off. +Acceptable values are: + +|==== +|Value | Description + +|0 | Do not use the 2m diagnosed wind speed fields. +|1 | Use the 2m diagnosed wind speed fields. +|==== + +.Example _lis.config_ entry +.... +GEOS-IT forcing directory: ./GEOS-IT +GEOS-IT use lowest model level forcing: 1 +GEOS-IT use 2m wind fields: 0 +.... + [[sssec_forcings_ERA5,ERA5]] ==== ERA5 @@ -5888,8 +6000,18 @@ default to the "`final`" product of GPM IMERG. `IMERG version:` specifies the version of the GPM IMERG precipitation forcing files. If no version is specified, -the reader will default to the latest version of GPM IMERG. -(Currently V06B). +the reader will default to "`V06B`". + +The supported versions of GPM IMERG are: + +|==== +|Version | Product + +|V06B | early, late, final +|V06C | early, late, final +|V06D | early, late, final +|V07A | preliminary support for final +|==== .Example _lis.config_ entry .... @@ -6511,8 +6633,40 @@ of the GALWEM-GE forecast forcing data. GALWEM-GE forecast forcing directory: ./GALWEM_GE GALWEM-GE forecast run mode: forecast # forecast | analysis GALWEM-GE forecast number of ensemble members: 21 +.... + +[[sssec_mogrepsgforecast,MOGREPS-G forecast]] +==== MOGREPS-G Forecast +`MOGREPS-G forecast forcing directory:` specifies the location +of the MOGREPS-G forecast forcing files. +`MOGREPS-G forecast run mode:` specifies the run mode related +to the MOGREPS-G dataset, which can either be forecast or analysis +run mode. Currently, only the forecast mode is supported. + +`MOGREPS-G forecast number of ensemble members:` specifies the number of ensembles +of the MOGREPS-G forecast forcing data. + +`Apply MOGREPS-G precipitation bias correction:` specifies whether to enable the precipitation +bias correction. Acceptable values are: + +|==== +|Value | Description + +|0 | Do not enable +|1 | Enable +|==== + +`MOGREPS-G model CDF file:` specifies the location of the MOGREPS-G model CDF file. + +.Example _lis.config_ entry +.... +MOGREPS-G forecast forcing directory: ./MOGREPS-G +MOGREPS-G forecast run mode: forecast # forecast | analysis +MOGREPS-G forecast number of ensemble members: 18 +Apply MOGREPS-G precipitation bias correction: 1 #enter 1 - use; or 0 +MOGREPS-G model CDF file: ./input/cdf/MOGREPS_G_leadtime_cdf_10km.nc .... [[ssec_lsm,Land surface models]] @@ -9517,6 +9671,102 @@ AWRAL600 initial sd: 0.5 0.5 AWRAL600 initial mleaf: 0.67 0.2 .... +[[ssec_sublsm,Sublevel land surface models]] +=== Sublevel land surface models + + +[[sssec_sublsm_snowmodel,SnowModel]] +==== SnowModel, Liston + +`SnowModel model timestep:` specifies the timestep for the run. + +See Section <> for a description +of how to specify a time interval. + +`SnowModel restart output interval:` defines the restart +writing interval for Glen Liston's SnowModel model. The typical +value used in the LIS runs is 24 hours (1da). + +See Section <> for a description +of how to specify a time interval. + +`SnowModel restart file:` specifies the SnowModel active +restart file. + +`SnowModel restart file format:` specifies the restart file +format for SnowModel. + +`SnowModel parameter file:` specifies the main SnowModel-specific +input and option parameter configuration file, which is needed +to run SnowModel. + +`SnowModel parameters source option:` specifies if SnowModel will +read in its native binary parameter files from within the SnowModel +code or what is preprocessed in LDT. LDT option supports parallel runs +Acceptable values are: + +|==== +|Value | Description + +|SnowModel | Use SnowModel built-in routines to read in +|LDT | Use the LIS SnowModel main driver to load parameters from LDT. +|==== + +`SnowModel MicroMet input source:` specifies if SnowModel will +read in its own specifically formatted binary or ASCII table forcing +files, or if LIS meteorological forcing fields will be passed in, +with the option to turn on MicroMet topographic-downscaling options +on the LIS metforcing layer side. To turn on "micromet" option in LIS, +set Topographic correction method (met forcing) to micromet. +Acceptable values are: + +|==== +|Value | Description + +|SnowModel | Readin specific SnowModel forcing files +|LIS | LIS-based meteorological forcing fields +|==== + +`SnowModel preprocess code option:` specifies the turning on +of the SnowModel built-in preprocess code module, which performs +initial preprocessing of gridded data for running the model. +Currently, only option supported is 1 (on). + +`Write out SnowModel forcing file fields:` specifies if you +want to write out SnowModel forcing fields generated by reading +in SnowModel-specific forcing files. This option is mainly +used when SnowModel MicroMet input source is set to SnowModel +and you run SnowModel in offline subLSM mode (no other LSMs or models +run with this submodel). Selecting 1 activates this option, and +0 indicates off. + +`SnowModel number of snow layers:` specifies the number of snow +layers that would be allowed to build within the SnowModel runtime. +This option is currently set to 1 within LIS, and must also be +activated and increased by setting the multiple layer snow model +scheme in the SnowModel option parameter file (snowmodel.par). + +`SnowModel initial snow water equivalent:` specifies the initial +snow water equivalent (SWE) value. This is currently set to +default values found in the coldstart mode for model restart reads, +based on a SnowModel initialization approach. + +.Example _lis.config_ entry +.... +SnowModel model timestep: 1hr +SnowModel restart file: ./none +SnowModel restart output interval: 1mo +SnowModel restart file format: "netcdf" +SnowModel parameter file: ./snowmodel.par +SnowModel parameters source option: LDT +SnowModel MicroMet input source: LIS +Write out SnowModel forcing file fields: 1 +SnowModel preprocess code option: 1 +SnowModel number of snow layers: 1 +SnowModel initial snow water equivalent: 0.0 +.... + + [[ssec_lakes,Lake models]] === Lake models @@ -10539,7 +10789,6 @@ Acceptable values are: `CROCUS81 initial SNOWMAK_dz:` specifies the initial depth from snow making process. - .Example _lis.config_ entry .... CROCUS81 model timestep: 15mn @@ -10821,7 +11070,6 @@ sample MODEL_OUTPUT_LIST.TBL file for the complete specification. Model output attributes file: './MODEL_OUTPUT_LIST.TBL' .... - [[ssec_timeinterval,Defining a time interval]] === Defining a time interval diff --git a/lis/configure b/lis/configure index 9afecd763..42dca1626 100755 --- a/lis/configure +++ b/lis/configure @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/0Intro_core.txt b/lis/core/0Intro_core.txt index 9c673cf5f..f330bd8c8 100644 --- a/lis/core/0Intro_core.txt +++ b/lis/core/0Intro_core.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/FTable.c b/lis/core/FTable.c index 32c1e02d5..016fbc30a 100644 --- a/lis/core/FTable.c +++ b/lis/core/FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/FTable.h b/lis/core/FTable.h index acdd97c69..82ef91480 100644 --- a/lis/core/FTable.h +++ b/lis/core/FTable.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_DAobservationsMod.F90 b/lis/core/LIS_DAobservationsMod.F90 index 49b61cde5..0b14ac791 100644 --- a/lis/core/LIS_DAobservationsMod.F90 +++ b/lis/core/LIS_DAobservationsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_FORC_AttributesMod.F90 b/lis/core/LIS_FORC_AttributesMod.F90 index 8650cbded..d4d595af8 100644 --- a/lis/core/LIS_FORC_AttributesMod.F90 +++ b/lis/core/LIS_FORC_AttributesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_LMLCMod.F90 b/lis/core/LIS_LMLCMod.F90 index fd8b1724f..cc7aa1999 100644 --- a/lis/core/LIS_LMLCMod.F90 +++ b/lis/core/LIS_LMLCMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_PE_HandlerMod.F90 b/lis/core/LIS_PE_HandlerMod.F90 index e9892f88b..bcc83346f 100644 --- a/lis/core/LIS_PE_HandlerMod.F90 +++ b/lis/core/LIS_PE_HandlerMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_PRIV_gridMod.F90 b/lis/core/LIS_PRIV_gridMod.F90 index a15e00c91..94e1faf41 100644 --- a/lis/core/LIS_PRIV_gridMod.F90 +++ b/lis/core/LIS_PRIV_gridMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_PRIV_rcMod.F90 b/lis/core/LIS_PRIV_rcMod.F90 index 30d3cef2a..6a69fe61f 100644 --- a/lis/core/LIS_PRIV_rcMod.F90 +++ b/lis/core/LIS_PRIV_rcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -67,6 +67,8 @@ module LIS_PRIV_rcMod ! Total number of land tiles in the catchment-based parameter files per nest. ! \item[lis\_map\_proj] ! Choice of map projection used in LIS. +! \item[nlatlon\_dimensions] +! Choice of the dimension for output lat/lon variables ('1D' or '2D') ! \item[lsm] ! Choice of the land surface model in LIS. ! \item[param\_proj] @@ -613,6 +615,7 @@ module LIS_PRIV_rcMod ! 14 Oct 2003; Sujay Kumar; Removed LSM specific variables. ! 19 Jan 2007; Chuck Alonge; Added Flag to output parameters ! 17 Jan 2011: David Mocko, added max/min greenness & slope type +! 02 May 2023: Sujay Kumar; Add lat/lon dimension variable ! !EOP use LIS_constantsMod, only : LIS_CONST_PATH_LEN @@ -675,6 +678,7 @@ module LIS_PRIV_rcMod integer, allocatable :: obs_haloy(:) character*50 :: lis_map_proj + character*50 :: nlatlon_dimensions character*50, allocatable :: lis_obs_map_proj(:) character*50 :: lsm character*50 :: lakemodel diff --git a/lis/core/LIS_PRIV_tileMod.F90 b/lis/core/LIS_PRIV_tileMod.F90 index 01d364272..17cb309b2 100644 --- a/lis/core/LIS_PRIV_tileMod.F90 +++ b/lis/core/LIS_PRIV_tileMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -68,7 +68,7 @@ module LIS_PRIV_tileMod real :: elev real :: slope real :: aspect - real :: curv + real :: curvature integer :: tile_id integer :: d2g !local tile count to global tile count diff --git a/lis/core/LIS_RTMMod.F90 b/lis/core/LIS_RTMMod.F90 index fa9dc23fd..aed335a96 100644 --- a/lis/core/LIS_RTMMod.F90 +++ b/lis/core/LIS_RTMMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_RTM_FTable.c b/lis/core/LIS_RTM_FTable.c index a58ca909e..cca203585 100644 --- a/lis/core/LIS_RTM_FTable.c +++ b/lis/core/LIS_RTM_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_String_Utility.F90 b/lis/core/LIS_String_Utility.F90 index 137b4ebc1..02ad37869 100755 --- a/lis/core/LIS_String_Utility.F90 +++ b/lis/core/LIS_String_Utility.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_XMRG_Reader.F90 b/lis/core/LIS_XMRG_Reader.F90 index 3e82856f3..720d98568 100644 --- a/lis/core/LIS_XMRG_Reader.F90 +++ b/lis/core/LIS_XMRG_Reader.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_alb_FTable.c b/lis/core/LIS_alb_FTable.c index a075346ba..01e1add20 100644 --- a/lis/core/LIS_alb_FTable.c +++ b/lis/core/LIS_alb_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_albedoMod.F90 b/lis/core/LIS_albedoMod.F90 index cf124e2c1..17ba0a13c 100644 --- a/lis/core/LIS_albedoMod.F90 +++ b/lis/core/LIS_albedoMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_appMod.F90 b/lis/core/LIS_appMod.F90 index 15499799c..8e5294cad 100644 --- a/lis/core/LIS_appMod.F90 +++ b/lis/core/LIS_appMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_biasestim_FTable.c b/lis/core/LIS_biasestim_FTable.c index 5c06675d6..d8401bc66 100755 --- a/lis/core/LIS_biasestim_FTable.c +++ b/lis/core/LIS_biasestim_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_constantsMod.F90 b/lis/core/LIS_constantsMod.F90 index 32dc0f86c..175db4a4f 100644 --- a/lis/core/LIS_constantsMod.F90 +++ b/lis/core/LIS_constantsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_coreMod.F90 b/lis/core/LIS_coreMod.F90 index 80e551c6f..0b4b93dfc 100644 --- a/lis/core/LIS_coreMod.F90 +++ b/lis/core/LIS_coreMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -462,10 +462,14 @@ end subroutine LIS_ticktime ! \label{LIS_endofrun} ! ! !INTERFACE: - function LIS_endofrun() result(finish) + function LIS_endofrun(override_end_time) result(finish) -! !ARGUMENTS: + use LIS_logMod, only: LIS_logunit + + ! !ARGUMENTS: + logical, optional, intent(in) :: override_end_time logical :: finish + ! !DESCRIPTION: ! This function checks to see if the runtime clock has reached the ! specified stop time of the simulation. @@ -483,9 +487,19 @@ function LIS_endofrun() result(finish) ! \end{description} !EOP integer :: ierr + logical, save :: force_end = .false. ! EMK + ! EMK: Allows a metforcing reader to override + if (present(override_end_time)) then + force_end = override_end_time + end if if(LIS_masterproc) then finish = LIS_is_last_step(LIS_rc) + ! EMK: Allows a metforcing reader to override + if (force_end) then + finish = .true. + write(LIS_logunit,*)'[INFO] LIS will terminate early!' + end if endif #if (defined SPMD) call MPI_BCAST(finish, 1, MPI_LOGICAL, 0, & diff --git a/lis/core/LIS_create_subdirs.c b/lis/core/LIS_create_subdirs.c index 13772b8bb..79b8043cf 100644 --- a/lis/core/LIS_create_subdirs.c +++ b/lis/core/LIS_create_subdirs.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_dataAssimMod.F90 b/lis/core/LIS_dataAssimMod.F90 index 4a3a6bbb3..f1e77dddb 100644 --- a/lis/core/LIS_dataAssimMod.F90 +++ b/lis/core/LIS_dataAssimMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -52,6 +52,11 @@ module LIS_dataAssimMod ! 7 Sep 2017 Mahdi Navari; set a condition to deal the skewness of the both model and obs CDF ! 1 Apr 2019 Yonghwan Kwon; include an option to read soil moisture CDF information for each month separately ! 5 Mar 2021 Eric Kemp; reduced memory usage in read_CDFdata_month +! 25 Feb 2022 Mahdi Navari; added LIS_getCDFtransferattributes +! LIS_rescale_with_stratified_CDF +! read_CDFtransferdata_all +! read_Precip_climo_maxval +! read_Precip_climo ! 1 Oct 2022 Yeosang Yoon; excluded RAPID from 'Routing_DAinst' ! ! !USES: @@ -60,6 +65,7 @@ module LIS_dataAssimMod use LIS_logMod use LIS_historyMod use LIS_DAobservationsMod + use LIS_mpiMod #if(defined USE_NETCDF3 || defined USE_NETCDF4) use netcdf @@ -83,6 +89,11 @@ module LIS_dataAssimMod public :: LIS_readCDFdata !read the CDF files generated by LDT public :: LIS_readMeanSigmaData public :: LIS_forwardEstimate_with_ANN + public :: LIS_getCDFtransferattributes + public :: LIS_rescale_with_stratified_CDF + public :: read_CDFtransferdata_all + public :: read_Precip_climo + public :: read_Precip_climo_maxval !EOP public :: LIS_DA_struc @@ -987,6 +998,174 @@ subroutine LIS_rescale_with_anomaly(& TRACE_EXIT("DA_rescaleAno") end subroutine LIS_rescale_with_anomaly !------------------------------------------------------------------kyh20210422 +! +!MN 2022.02.24 +!BOP +! +! !ROUTINE: LIS_rescale_with_stratified_CDF +! \label{LIS_rescale_with_stratified_CDF} + +! !REVISION HISTORY: +! 3 March 2022: Mahdi Navari ; Initial Specification +! +! !INTERFACE: + subroutine LIS_rescale_with_stratified_CDF(& + n, & + k, & + nbins, & + ntimes, & + max_obs_value, & + min_obs_value, & + model_xrange, & + obs_xrange, & + model_cdf, & + obs_cdf, & + ref_precip_climo_maxval, & + target_precip_climo,& + n_strat_bins,& + obs_value) + + + implicit none +! +! !ARGUMENTS: + integer :: n + integer :: k + integer :: nbins + integer :: n_strat_bins + integer :: ntimes + real :: max_obs_value + real :: min_obs_value + real :: model_xrange(n_strat_bins,ntimes, nbins) + real :: obs_xrange(n_strat_bins,ntimes, nbins) + real :: model_cdf(n_strat_bins,ntimes, nbins) + real :: obs_cdf(n_strat_bins,ntimes, nbins) + real :: obs_value(LIS_rc%obs_lnc(k),LIS_rc%obs_lnr(k)) + real :: ref_precip_climo_maxval(ntimes) + real :: target_precip_climo(LIS_rc%obs_lnc(k),LIS_rc%obs_lnr(k),ntimes) +! +! !DESCRIPTION: +! +! This routine rescales the input observation data to the model's +! climatology so that the cumulative distribution functions (CDFs) +! of the observations and the model match (But we use geolocation +! independent CDF, therefore we match the input observation data to +! model's climatology for each stratified bins not for each grid point). +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[nbins] number of bins used to compute the model and obs CDFs +! \item[max\_obs\_value] maximum allowable value of observation +! \item[min\_obs\_value] minimum allowable value of observation +! \item[model\_xrange] x-axis values corresponding to the model CDF +! \item[obs\_xrange] x-axis values corresponding to the obs CDF +! \item[model\_cdf] y-axis (CDF) values corresponding to the model CDF +! \item[obs\_cdf] y-axis (CDF) values corresponding to the obs CDF +! \item[obs\_value] observation value to be rescaled. +! \end{description} +!EOP + + real :: model_delta(n_strat_bins) + real :: obs_delta(n_strat_bins) + real :: ref_p_min, ref_p_max,delta_p_ref + integer :: t,i,kk + integer :: binval, strat_binval + integer :: col,row + real :: cdf_obsval + real :: obs_tmp, obs_in + integer, dimension (1) :: index_25 , index_75 + real :: Lb_xrange, Ub_xrange, iqr_obs, iqr_model + + if(ntimes.gt.1) then + kk = LIS_rc%mo + else + kk = 1 + endif + do t=1,n_strat_bins + model_delta(t) = model_xrange(t,kk,2)-model_xrange(t,kk,1) + obs_delta(t) = obs_xrange(t,kk,2)-obs_xrange(t,kk,1) + enddo + do t=1,LIS_rc%obs_ngrid(k) + + col = LIS_obs_domain(n,k)%col(t) + row = LIS_obs_domain(n,k)%row(t) + + ! find the reference CDF stratification bin value for each grid cell + if(target_precip_climo(col,row,kk).ne.-9999.0) then + ref_p_min = 0. !minval returns -9999. minval(ref_precip_climo(:,:,j)) ! min value over the entire domain + ref_p_max = ref_precip_climo_maxval(kk) ! max value over the entire domain + delta_p_ref = (ref_p_max-ref_p_min)/& + n_strat_bins + strat_binval = nint( (target_precip_climo(col,row,kk)-ref_p_min)/& + delta_p_ref)+1 + if(strat_binval.gt.n_strat_bins) strat_binval = n_strat_bins + if(strat_binval.le.0) strat_binval = 1 + endif + + index_25 = minloc(abs(obs_cdf(strat_binval,kk,:) - 0.25)) + index_75 = minloc(abs(obs_cdf(strat_binval,kk,:) - 0.75)) + Lb_xrange = obs_xrange(strat_binval,kk,index_25(1)) + Ub_xrange = obs_xrange(strat_binval,kk,index_75(1)) + iqr_obs = Ub_xrange - Lb_xrange + + index_25 = minloc(abs(model_cdf(strat_binval,kk,:) - 0.25)) + index_75 = minloc(abs(model_cdf(strat_binval,kk,:) - 0.75)) + Lb_xrange = model_xrange(strat_binval,kk,index_25(1)) + Ub_xrange = model_xrange(strat_binval,kk,index_75(1)) + iqr_model = Ub_xrange - Lb_xrange + + if( iqr_obs .lt. 0.05 * (obs_xrange(strat_binval,kk,nbins)-obs_xrange(strat_binval,kk,1)) .or. & + iqr_model .lt. 0.05 * (model_xrange(strat_binval,kk,nbins)-model_xrange(strat_binval,kk,1)) ) then + obs_delta(strat_binval) = 0 + endif + + if(obs_value(col,row).ne.-9999.0) then + obs_in = obs_value(col,row) + if(obs_delta(strat_binval).gt.0) then + binval = nint((obs_value(col,row)-obs_xrange(strat_binval,kk,1))/& + obs_delta(strat_binval))+1 + if(binval.gt.nbins) binval = nbins + if(binval.le.0) binval = 1 + cdf_obsval = obs_cdf(strat_binval,kk,binval) + if(cdf_obsval.gt.1.0) cdf_obsval = 1.0 + if(cdf_obsval .gt.0)then + i=1 + do while((model_cdf(strat_binval,kk,i).lt.cdf_obsval).and.& + (i.le.nbins)) + i = i+1 + if(i.gt.nbins) exit + enddo + if(i.gt.nbins) i = i-1 + obs_tmp = model_xrange(strat_binval,kk,i) + + if(obs_tmp.gt.max_obs_value) then + obs_tmp = LIS_rc%udef + endif + + if(obs_tmp.le.min_obs_value) then + obs_tmp = LIS_rc%udef + endif + obs_value(col,row) = obs_tmp + else + obs_value(col,row) = LIS_rc%udef + endif + else + obs_value(col,row) = LIS_rc%udef + endif + if(obs_value(col,row).le.min_obs_value.and.& + obs_value(col,row).ne.-9999.0) then + write(LIS_logunit,*) '[ERR] Problem in CDF scaling of observations in the DA instance ',k + write(LIS_logunit,*) '[ERR] ',col,row,obs_value(col,row), obs_in + call LIS_endrun() + endif + else + obs_value(col,row) = LIS_rc%udef + endif + enddo + !TRACE_EXIT("DA_rescaleCDF") + end subroutine LIS_rescale_with_stratified_CDF +!MN 2022.02.24 !BOP @@ -1046,6 +1225,58 @@ subroutine LIS_getCDFattributes(k,filename, ntimes, ngrid) end subroutine LIS_getCDFattributes +!BOP +! !ROUTINE: LIS_getCDFtransferattributes +! \label{LIS_getCDFtransferattributes} + +! !REVISION HISTORY: +! 3 March 2022: Mahdi Navari ; Initial Specification +! +! !INTERFACE: + subroutine LIS_getCDFtransferattributes(k,filename, n_strat_bins, ntimes) + + implicit none +! !ARGUMENTS: + integer :: k + character(len=*), intent(in) :: filename + integer :: ntimes + integer :: n_strat_bins +! +! !DESCRIPTION: +! This routine reads the number of stratification bins abd other CDF attribute from the +! CDF file +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[ntimes] temporal resolution of the CDFs +! \end{description} +!EOP + + integer :: nid, binid + + !TRACE_ENTER("DA_getCDFatt") +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + call LIS_verify(nf90_open(path=trim(filename),mode=NF90_NOWRITE,& + ncid=nid),'failed to open file '//trim(filename)) + + call LIS_verify(nf90_inq_dimid(nid, 'n_strat_bins',binId), & + 'Error nf90_inq_dimid: n_strat_bins') + + call LIS_verify(nf90_inquire_dimension(nid, binId, len=n_strat_bins), & + 'Error nf90_inquire_dimension:n_strat_bins') + + call LIS_verify(nf90_get_att(nid, NF90_GLOBAL, & + 'temporal_resolution_CDF', & + ntimes), & + 'Error in nf90_get_att: temporal_resolution_CDF') + + call LIS_verify(nf90_close(nid)) +#endif + !TRACE_EXIT("DA_getCDFatt") + + end subroutine LIS_getCDFtransferattributes + !BOP ! !ROUTINE: read_CDFdata_all @@ -1472,6 +1703,286 @@ subroutine read_MeanSigmaData_month(n, k, ntimes, ngrid, filename, varname, mu, TRACE_EXIT("DA_readSigma") end subroutine read_MeanSigmaData_month + +!BOP +! !ROUTINE: read_CDFtransferdata_all +! \label{read_CDFtransferdata_all} +! !REVISION HISTORY: +! 1 March 2022: Mahdi Navari ; Initial Specification +! +! !INTERFACE: + subroutine read_CDFtransferdata_all(n, k, nbins, ntimes, n_strat_bins, & + filename, varname, xrange, cdf) + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: k + integer, intent(in) :: nbins + integer, intent(in) :: ntimes + integer, intent(in) :: n_strat_bins + character(len=*) :: filename + character(len=*) :: varname + real :: xrange(n_strat_bins,ntimes, nbins) + real :: cdf(n_strat_bins,ntimes, nbins) + +! +! !DESCRIPTION: +! This routine reads the input CDF file (generated by LDT in NETCDF format) +! The xrange values and the corresponding CDFs are read for each stratification bin. +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[nbins] number of bins used to compute the model and obs CDFs +! \item[filename] name of the CDF file +! \item[varname] name of the variable being extracted. +! \item[xrange] x-axis values corresponding to the CDF +! \item[cdf] y-axis (CDF) values corresponding to the CDF +! \end{description} +!EOP + integer :: j,kk + integer :: nstratbinId, nbinsId, nlevsId + integer :: nstratbin_file, nbins_file, nlevs_file + integer :: xid, cdfid + real, allocatable :: xrange_file(:,:,:,:) + real, allocatable :: cdf_file(:,:,:,:) + integer :: nid + + !TRACE_ENTER("DA_readCDF") +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + write(LIS_logunit,*) '[INFO] Reading stratified geolocation independent reference CDF file ',trim(filename) + call LIS_verify(nf90_open(path=trim(filename),mode=NF90_NOWRITE,& + ncid=nid),'failed to open file '//trim(filename)) + + call LIS_verify(nf90_inq_dimid(nid,"n_strat_bins",nstratbinId), & + 'nf90_inq_dimid failed for n_strat_bins') + call LIS_verify(nf90_inq_dimid(nid,"nbins",nbinsId), & + 'nf90_inq_dimid failed for nbins') + call LIS_verify(nf90_inq_dimid(nid,trim(varname)//"_levels",nlevsId), & + 'nf90_inq_dimid failed for '//trim(varname)//"_levels") + + call LIS_verify(nf90_inquire_dimension(nid,nstratbinId, len=nstratbin_file),& + 'nf90_inquire_dimension failed for n_strat_bins') + call LIS_verify(nf90_inquire_dimension(nid,nbinsId, len=nbins_file),& + 'nf90_inquire_dimension failed for nbins') + call LIS_verify(nf90_inquire_dimension(nid,nlevsId, len=nlevs_file),& + 'nf90_inquire_dimension failed for nlevels') + + if(nbins.ne.nbins_file) then + write(LIS_logunit,*) '[ERR] The number of bins specified in the file '//& + trim(filename) + write(LIS_logunit,*) '[ERR] (',nbins_file, & + ') is different from the number of bins specified' + write(LIS_logunit,*) '[ERR] in the lis.config file (',nbins,')' + call LIS_endrun() + endif + + allocate(xrange_file(nstratbin_file,ntimes,nlevs_file,nbins)) + allocate(cdf_file(nstratbin_file,ntimes,nlevs_file,nbins)) + + call LIS_verify(nf90_inq_varid(nid,trim(varname)//'_xrange_stratified',xid),& + 'nf90_inq_varid failed for for '//trim(varname)//'_xrange_stratified') + call LIS_verify(nf90_inq_varid(nid,trim(varname)//'_CDF_stratified',cdfid),& + 'nf90_inq_varid failed for '//trim(varname)//'_CDF_stratified') + + call LIS_verify(nf90_get_var(nid,xid,xrange_file, & + start=(/1,1,1,1/), count=(/nstratbin_file,ntimes,nlevs_file,nbins/)),& + 'nf90_get_var failed for '//trim(varname)//'_xrange_stratified') + call LIS_verify(nf90_get_var(nid,cdfid,cdf_file,& + start=(/1,1,1,1/), count=(/nstratbin_file,ntimes,nlevs_file,nbins/)),& + 'nf90_get_var failed for '//trim(varname)//'_CDF_stratified') + + xrange = xrange_file(:,:,1,:) + cdf = cdf_file(:,:,1,:) + + deallocate(xrange_file) + deallocate(cdf_file) + + call LIS_verify(nf90_close(nid),& + 'failed to close file '//trim(filename)) + write(LIS_logunit,*) '[INFO] Successfully read CDF file ',trim(filename) +#endif + ! TRACE_EXIT("DA_readCDF") + end subroutine read_CDFtransferdata_all + +!BOP +! !ROUTINE: read_Precip_climo +! \label{read_Precip_climo} + +! !REVISION HISTORY: +! 28 Feb 2022: Mahdi Navari ; Initial Specification +! +! !INTERFACE: +subroutine read_Precip_climo(n,k, filename, precip) + use LIS_coreMod + use LIS_logMod + use LIS_historyMod +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: k + character(len=*), intent(in) :: filename + real, allocatable, intent(inout) :: precip(:,:,:) + logical :: file_exists +! +! !DESCRIPTION: +! This routine reads the input CDF file (generated by LVT in NETCDF format) +! +! The arguments are: +! \begin{description} +! \item[filename] name of the CDF file +! \item[varname] name of the variable being extracted. +! \end{description} +!EOP + integer :: ios,nid,ncId,nrId,varId + integer :: gnc,gnr,gr,gc,nc,nr,i,c,r + character*3 :: month_name(12) + integer :: gindex,gid + integer :: ierr + + month_name = (/"JAN","FEB","MAR","APR","MAY","JUN",& + "JUL","AUG","SEP","OCT","NOV","DEC"/) + +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + inquire(file=trim(filename), exist=file_exists) + if(file_exists) then + write(LIS_logunit,*) '[INFO] Reading Precipitation climatology form CDF file ',trim(filename) + + call LIS_verify(nf90_open(path=trim(filename),mode=NF90_NOWRITE,& + ncid=nid),'failed to open file '//trim(filename)) + + ios = nf90_inq_dimid(nid,"east_west",ncId) + call LIS_verify(ios,'Error in nf90_inq_dimid in read_precip_climo') + + ios = nf90_inq_dimid(nid,"north_south",nrId) + call LIS_verify(ios,'Error in nf90_inq_dimid in read_precip_climo') + + ios = nf90_inquire_dimension(nid,ncId, len=gnc) + call LIS_verify(ios,'Error in nf90_inquire_dimension in read_precip_climo') + + ios = nf90_inquire_dimension(nid,nrId, len=gnr) + call LIS_verify(ios,'Error in nf90_inquire_dimension in read_precip_climo') + + if (gnc .ne. LIS_rc%gnc(n) .or. gnr .ne. LIS_rc%gnr(n)) then + write(LIS_logunit,*) '[ERR] domain dimension mismatch. Number of rows and columns in the ' + write(LIS_logunit,*) 'precipitation climatology file differs from that in the LIS domain ' + call LIS_endrun() + endif + + allocate(precip(gnc,gnr,12)) + do i=1,12 + ios = nf90_inq_varid(nid,'TotalPrecip_'//trim(month_name(i)),varId) + call LIS_verify(ios,'Precipitation climo field not found in the file') + + ios = nf90_get_var(nid,varId,precip(:,:,i)) ! precip_climo(:,:,i)) + call LIS_verify(ios,'Error in nf90_get_var in read_Precip_climo') + enddo + + ios = nf90_close(nid) + call LIS_verify(ios,'Error in nf90_close in read_Precip_climo') + write(LIS_logunit,*) '[INFO] Successfully read Precipitation climo file ',trim(filename) + endif + +! end USE_NETCDF4 +#endif + +end subroutine read_Precip_climo + +!BOP +! !ROUTINE: read_Precip_climo +! \label{read_Precip_climo} + +! !REVISION HISTORY: +! 28 Feb 2022: Mahdi Navari ; Initial Specification +! +! !INTERFACE: +subroutine read_Precip_climo_maxval(n,filename, strat_cdfs_max) + + use LIS_coreMod + use LIS_logMod + use LIS_historyMod +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + character(len=*), intent(in) :: filename + real :: strat_cdfs_max(12) + logical :: file_exists +! +! !DESCRIPTION: +! This routine reads the input CDF file (generated by LVT in NETCDF format) +! +! The arguments are: +! \begin{description} +! \item[filename] name of the CDF file +! \item[varname] name of the variable being extracted. +! \end{description} +!EOP + real, allocatable :: precip_climo(:,:,:) + integer :: ios,nid,ncId,nrId,varId + integer :: gnc,gnr,gr,gc,nc,nr,i,c,r + character*3 :: month_name(12) + integer :: gindex + + month_name = (/"JAN","FEB","MAR","APR","MAY","JUN",& + "JUL","AUG","SEP","OCT","NOV","DEC"/) + +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + inquire(file=trim(filename), exist=file_exists) + if(file_exists) then + write(LIS_logunit,*) '[INFO] Reading Precipitation climatology form CDF file ',trim(filename) + + call LIS_verify(nf90_open(path=trim(filename),mode=NF90_NOWRITE,& + ncid=nid),'failed to open file '//trim(filename)) + + ios = nf90_inq_dimid(nid,"east_west",ncId) + call LIS_verify(ios,'Error in nf90_inq_dimid in read_precip_climo_maxval') + + ios = nf90_inq_dimid(nid,"north_south",nrId) + call LIS_verify(ios,'Error in nf90_inq_dimid in read_precip_climo_maxval') + + ios = nf90_inquire_dimension(nid,ncId, len=gnc) + call LIS_verify(ios,'Error in nf90_inquire_dimension in read_precip_climo_maxval') + + ios = nf90_inquire_dimension(nid,nrId, len=gnr) + call LIS_verify(ios,'Error in nf90_inquire_dimension in read_precip_climo_maxval') + + allocate(precip_climo(gnc,gnr,12)) + + do i=1,12 + ios = nf90_inq_varid(nid,'TotalPrecip_'//trim(month_name(i)),varId) + call LIS_verify(ios,'Precipitation climo field not found in the file') + + ios = nf90_get_var(nid,varId,precip_climo(:,:,i)) + call LIS_verify(ios,'Error in nf90_get_var in read_Precip_climo_maxval') + enddo + + ios = nf90_close(nid) + call LIS_verify(ios,'Error in nf90_close in read_Precip_climo_maxval') + write(LIS_logunit,*) '[INFO] Successfully read Precipitation climo file ',trim(filename) + endif + + ! Note: we just need Max and min values for each month (Min is zero) + do i=1,12 ! number of month + strat_cdfs_max(i) = maxval(precip_climo(:,:,i)) ! max value over the entire domain + enddo + + deallocate(precip_climo) + +! end USE_NETCDF4 +#endif + +end subroutine read_Precip_climo_maxval + + !BOP ! ! !ROUTINE: LIS_forwardEstimate_with_ANN diff --git a/lis/core/LIS_dataassim_FTable.c b/lis/core/LIS_dataassim_FTable.c index 51bef70ef..fc3d2403b 100644 --- a/lis/core/LIS_dataassim_FTable.c +++ b/lis/core/LIS_dataassim_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_domainMod.F90 b/lis/core/LIS_domainMod.F90 index f5a445970..d263be277 100644 --- a/lis/core/LIS_domainMod.F90 +++ b/lis/core/LIS_domainMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -52,6 +52,7 @@ module LIS_domainMod ! 17 Feb 2004 Sujay Kumar Initial Specification ! 24 Aug 2008 Sujay Kumar Implemented halo support ! 3 Aug 2012 Sujay Kumar Added support for flexible tiling +! 3 Mar 2022 Kristi Arsenault Added support for curvature tiles ! use ESMF use LIS_coreMod @@ -171,6 +172,10 @@ subroutine LIS_domain_init deallocate(LIS_topo(n)%aspect) deallocate(LIS_topo(n)%aspectfgrd) endif + if(LIS_rc%usecurvaturemap(n).ne."none") then + deallocate(LIS_topo(n)%curvature) + deallocate(LIS_topo(n)%curvfgrd) + endif enddo do n=1,LIS_rc%nnest @@ -392,15 +397,22 @@ subroutine LIS_domain_setup(n) TRACE_ENTER("dom_setup") allocate(LIS_domain(n)%ntiles_pergrid(LIS_rc%gnc(n)*LIS_rc%gnr(n))) + LIS_domain(n)%ntiles_pergrid = 0 ! EMK TEST allocate(LIS_domain(n)%str_tind(LIS_rc%gnc(n)*LIS_rc%gnr(n))) + LIS_domain(n)%str_tind = 0 ! EMK TEST allocate(ntiles_pergrid(LIS_rc%lnc(n)*LIS_rc%lnr(n)),stat=ierr) + ntiles_pergrid = 0 allocate(ntiles_pergrid_red(LIS_rc%lnc_red(n)*LIS_rc%lnr_red(n)),stat=ierr) - + ntiles_pergrid_red = 0 allocate(npatch_pergrid(LIS_rc%lnc(n)*LIS_rc%lnr(n),LIS_rc%max_model_types)) + npatch_pergrid = 0 allocate(npatch_pergrid_red(LIS_rc%lnc(n)*LIS_rc%lnr(n),LIS_rc%max_model_types)) + npatch_pergrid_red = 0 do m=1,LIS_rc%max_model_types allocate(LIS_surface(n,m)%npatch_pergrid(LIS_rc%gnc(n)*LIS_rc%gnr(n))) + LIS_surface(n,m)%npatch_pergrid = 0 allocate(LIS_surface(n,m)%str_patch_ind(LIS_rc%gnc(n)*LIS_rc%gnr(n))) + LIS_surface(n,m)%str_patch_ind = 0 enddo do t=1,LIS_rc%ntiles(n) @@ -881,6 +893,7 @@ subroutine make_domain() logical :: elev_selected logical :: slope_selected logical :: aspect_selected + logical :: curvature_selected do n=1,LIS_rc%nnest if(LIS_rc%usetexturemap(n).ne."none") then @@ -917,6 +930,13 @@ subroutine make_domain() else aspect_selected = .false. endif + + if(LIS_rc%usecurvaturemap(n).ne."none") then + curvature_selected = .true. + else + curvature_selected = .false. + endif + !----------------------------------------------------------------------- ! normalize the parameter data distributions !----------------------------------------------------------------------- @@ -957,8 +977,8 @@ subroutine make_domain() LIS_rc%aspect_minp, LIS_rc%aspect_maxt, LIS_topo(n)%aspectfgrd) endif - call create_tilespace(n,soilt_selected, soilf_selected, elev_selected, & - slope_selected, aspect_selected) + call create_tilespace(n, soilt_selected, soilf_selected, elev_selected, & + slope_selected, aspect_selected, curvature_selected) enddo end subroutine make_domain @@ -1268,7 +1288,7 @@ end subroutine calculate_domdistribution ! ! !INTERFACE: subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& - slope_selected, aspect_selected) + slope_selected, aspect_selected, curvature_selected) implicit none ! !ARGUMENTS: @@ -1278,6 +1298,7 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& logical, intent(in) :: elev_selected logical, intent(in) :: slope_selected logical, intent(in) :: aspect_selected + logical, intent(in) :: curvature_selected ! !DESCRIPTION: ! This routine creates the tilespace based on the specified dimensions @@ -1294,23 +1315,23 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& ! flag to indicate if soil texture based tiling is used ! \item[soilf\_selected] ! flag to indicate if soil fraction based tiling is used -! \item[soilf\_selected] -! flag to indicate if soil fraction based tiling is used ! \item[elev\_selected] ! flag to indicate if elevation based tiling is used ! \item[slope\_selected] ! flag to indicate if slope based tiling is used ! \item[aspect\_selected] ! flag to indicate if aspect based tiling is used +! \item[curvature\_selected] +! flag to indicate if curvature based tiling is used ! \end{description} !EOP real :: locallat, locallon integer :: c, r, t, m - integer :: iv, it, ie, is, ia + integer :: iv, it, ie, is, ia, ic integer :: vegt integer :: soilt real :: sand, clay, silt - real :: elev, slope, aspect + real :: elev, slope, aspect, curvature integer :: sf_index integer :: gnc, gnr integer :: kk @@ -1324,6 +1345,7 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& integer :: ntiles_elev integer :: ntiles_slope integer :: ntiles_aspect + integer :: ntiles_curvature integer :: ntiles_land_landmask integer :: gid real :: temp @@ -1331,6 +1353,7 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& integer :: elev_index integer :: slope_index integer :: aspect_index + integer :: curvature_index gnc = LIS_rc%lnc(n) @@ -1349,6 +1372,7 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& ntiles_elev = compute_ntiles_elev(n,c,r,elev_selected) ntiles_slope = compute_ntiles_slope(n,c,r,slope_selected) ntiles_aspect = compute_ntiles_aspect(n,c,r,aspect_selected) + ntiles_curvature = compute_ntiles_curvature(n,c,r,curvature_selected) if(soilf_selected) then LIS_rc%ntiles(n) = LIS_rc%ntiles(n)+& @@ -1364,7 +1388,6 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& ntiles_elev*& ntiles_slope*& ntiles_aspect - endif do t=1,LIS_rc%nsurfacetypes @@ -1531,6 +1554,7 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& ntiles_elev = compute_ntiles_elev(n,c,r,elev_selected) ntiles_slope = compute_ntiles_slope(n,c,r,slope_selected) ntiles_aspect = compute_ntiles_aspect(n,c,r,aspect_selected) + ntiles_curvature = compute_ntiles_curvature(n,c,r,curvature_selected) if(soilf_selected) then ntiles_soil = ntiles_soilf @@ -1564,6 +1588,8 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& do ia=1, ntiles_aspect call get_aspect_value(n,c,r,ia,aspect_selected,& aspect, aspect_index) + call get_curvature_value(n,c,r,ia,curvature_selected,& + curvature, curvature_index) kk = kk+1 @@ -1585,6 +1611,8 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& slope LIS_domain(n)%tile(kk)%aspect = & aspect + LIS_domain(n)%tile(kk)%curvature = & + curvature LIS_domain(n)%tile(kk)%fgrd = & LIS_LMLC(n)%landcover(c,r,vegt) @@ -1615,6 +1643,12 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& LIS_domain(n)%tile(kk)%fgrd*& LIS_topo(n)%aspectfgrd(c,r,aspect_index) endif + +! if(curvature_selected) then +! LIS_domain(n)%tile(kk)%fgrd=& +! LIS_domain(n)%tile(kk)%fgrd*& +! LIS_topo(n)%curvfgrd(c,r,curvature_index) +! endif if(sf_index.gt.0) then kk_sf(sf_index) = kk_sf(sf_index) + 1 @@ -1649,6 +1683,7 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& LIS_surface(n,sf_index)%tile(& kk_sf(sf_index))%fgrd=& LIS_LMLC(n)%landcover(c,r,vegt) + if(soilt_selected) then LIS_surface(n,sf_index)%tile(& kk_sf(sf_index))%fgrd = & @@ -1684,6 +1719,14 @@ subroutine create_tilespace(n,soilt_selected, soilf_selected, elev_selected,& kk_sf(sf_index))%fgrd * & LIS_topo(n)%aspectfgrd(c,r,aspect_index) endif + if(curvature_selected) then + LIS_surface(n,sf_index)%tile(& + kk_sf(sf_index))%fgrd = & + LIS_surface(n,sf_index)%tile(& + kk_sf(sf_index))%fgrd * & + LIS_topo(n)%curvfgrd(c,r,curvature_index) + endif + endif enddo @@ -2042,6 +2085,42 @@ function compute_ntiles_aspect(n,c,r,flag) end function compute_ntiles_aspect +!BOP +! +! !ROUTINE: compute_ntiles_curvature +! \label{compute_ntiles_curvature} +! +! !INTERFACE: + function compute_ntiles_curvature(n,c,r,flag) +! !ARGUMENTS: + integer :: n + integer :: c + integer :: r + logical :: flag +! +! !DESCRIPTION: +! This function computes the number of tiles based on the +! distribution of curvature tiles in a given grid cell +!EOP + integer :: kk + integer :: compute_ntiles_curvature + integer :: t + + kk = 0 + + if(flag) then +! do t=1,LIS_rc%ncurvbands + do t=1,1 + if(LIS_topo(n)%curvfgrd(c,r,t).gt.0.0) then + kk = kk + 1 + endif + enddo + endif + compute_ntiles_curvature = max(1,kk) + + end function compute_ntiles_curvature + + !BOP ! ! !ROUTINE: get_vegt_value @@ -2313,6 +2392,47 @@ subroutine get_aspect_value(n,c,r,i,aspect_selected,aspect,aspect_index) end subroutine get_aspect_value +!BOP +! !ROUTINE: get_curvature_value +! \label{get_curvature_value} +! +! !INTERFACE: + subroutine get_curvature_value(n,c,r,i,curvature_selected,curvature,curvature_index) +! !ARGUMENTS: + integer :: n + integer :: c + integer :: r + integer :: i + logical :: curvature_selected + real :: curvature + integer :: curvature_index +! +! !DESCRIPTION: +! This routine computes the curvature value for given tile number +! and grid cell. +!EOP + integer :: t + integer :: kk + + curvature = -1 + curvature = -1 + if(curvature_selected) then + kk = 0 +! do t=1, LIS_rc%naspectbands + do t=1, 1 + if(LIS_topo(n)%curvfgrd(c,r,t).gt.0.0) then + kk = kk + 1 + if(kk.eq.i) then + curvature = LIS_topo(n)%curvature(c,r,t) + curvature_index = t + return + endif + end if + enddo + endif + + end subroutine get_curvature_value + !BOP ! !ROUTINE: readDomainInput ! \label{readDomainInput} @@ -2649,6 +2769,15 @@ subroutine readDomainInput() elseif(map_proj.eq."LAMBERT CONFORMAL") then LIS_rc%lis_map_proj = "lambert" + ! CM Ensure that the number of lat/lon dimensions is 2D for this projection + if(LIS_rc%nlatlon_dimensions == '1D') then + write(LIS_logunit,*) & + '[ERR] The lambert map projection cannot be written with 1D lat/lon fields.' + write(LIS_logunit,*) & + '[WARN] The lat/lon fields will be written in 2D' + LIS_rc%nlatlon_dimensions = '2D' + end if + ios = nf90_get_att(ftn, NF90_GLOBAL, 'TRUELAT1',LIS_domain(n)%truelat1) call LIS_verify(ios, 'Error in nf90_get_att: TRUELAT1') @@ -2680,6 +2809,15 @@ subroutine readDomainInput() elseif(map_proj.eq."MERCATOR") then + ! CM Ensure that the number of lat/lon dimensions is 2D for this projection + if(LIS_rc%nlatlon_dimensions == '1D') then + write(LIS_logunit,*) & + '[ERR] The MERCATOR map projection cannot be written with 1D lat/lon fields.' + write(LIS_logunit,*) & + '[WARN] The lat/lon fields will be written in 2D' + LIS_rc%nlatlon_dimensions = '2D' + end if + ios = nf90_get_att(ftn, NF90_GLOBAL, 'TRUELAT1',LIS_domain(n)%truelat1) call LIS_verify(ios, 'Error in nf90_get_att: TRUELAT1') @@ -2707,6 +2845,15 @@ subroutine readDomainInput() elseif(map_proj.eq."POLAR STEREOGRAPHIC") then + ! CM Ensure that the number of lat/lon dimensions is 2D for this projection + if(LIS_rc%nlatlon_dimensions == '1D') then + write(LIS_logunit,*) & + '[ERR] The polar stereographic map projection cannot be written with 1D lat/lon fields.' + write(LIS_logunit,*) & + '[WARN] The lat/lon fields will be written in 2D' + LIS_rc%nlatlon_dimensions = '2D' + end if + ios = nf90_get_att(ftn, NF90_GLOBAL, 'TRUELAT1',LIS_domain(n)%truelat1) call LIS_verify(ios, 'Error in nf90_get_att: TRUELAT1') @@ -2736,6 +2883,15 @@ subroutine readDomainInput() elseif(map_proj.eq."GAUSSIAN") then + ! CM Ensure that the number of lat/lon dimensions is 2D for this projection + if(LIS_rc%nlatlon_dimensions == '1D') then + write(LIS_logunit,*) & + '[ERR] The gaussian map projection cannot be written with 1D lat/lon fields.' + write(LIS_logunit,*) & + '[WARN] The lat/lon fields will be written in 2D' + LIS_rc%nlatlon_dimensions = '2D' + end if + ios = nf90_get_att(ftn, NF90_GLOBAL, 'NUMBER OF LAT CIRCLES',& LIS_domain(n)%nlatcircles) call LIS_verify(ios, 'Error in nf90_get_att: NUMBER_OF_LAT_CIRCLES') @@ -2758,6 +2914,15 @@ subroutine readDomainInput() LIS_rc%gridDesc(n,20) = 64 elseif(map_proj.eq."HRAP") then + + ! CM Ensure that the number of lat/lon dimensions is 2D for this projection + if(LIS_rc%nlatlon_dimensions == '1D') then + write(LIS_logunit,*) & + '[ERR] The HRAP map projection cannot be written with 1D lat/lon fields.' + write(LIS_logunit,*) & + '[WARN] The lat/lon fields will be written in 2D' + LIS_rc%nlatlon_dimensions = '2D' + end if LIS_rc%gridDesc(n,1) = 8 LIS_rc%gridDesc(n,2) = LIS_rc%lnc(n) @@ -2778,6 +2943,16 @@ subroutine readDomainInput() 0.0,LIS_rc%lnc(n),LIS_rc%lnr(n),LIS_domain(n)%lisproj) elseif(map_proj.eq."UTM") then + + ! CM Ensure that the number of lat/lon dimensions is 2D for this projection + if(LIS_rc%nlatlon_dimensions == '1D') then + write(LIS_logunit,*) & + '[ERR] The UTM map projection cannot be written with 1D lat/lon fields.' + write(LIS_logunit,*) & + '[WARN] The lat/lon fields will be written in 2D' + LIS_rc%nlatlon_dimensions = '2D' + end if + LIS_rc%gridDesc(n,1) = 7 LIS_rc%gridDesc(n,2) = LIS_rc%lnc(n) diff --git a/lis/core/LIS_domain_FTable.c b/lis/core/LIS_domain_FTable.c index 35f3282be..cade1177e 100644 --- a/lis/core/LIS_domain_FTable.c +++ b/lis/core/LIS_domain_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_emissMod.F90 b/lis/core/LIS_emissMod.F90 index 8bd0969ad..eaa8453a7 100644 --- a/lis/core/LIS_emissMod.F90 +++ b/lis/core/LIS_emissMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_emiss_FTable.c b/lis/core/LIS_emiss_FTable.c index a89059926..6ddbc020c 100644 --- a/lis/core/LIS_emiss_FTable.c +++ b/lis/core/LIS_emiss_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_fileIOMod.F90 b/lis/core/LIS_fileIOMod.F90 index 35bb586dd..6ea72f840 100644 --- a/lis/core/LIS_fileIOMod.F90 +++ b/lis/core/LIS_fileIOMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_forecastAlg_FTable.c b/lis/core/LIS_forecastAlg_FTable.c index b982bfd39..1f854502b 100644 --- a/lis/core/LIS_forecastAlg_FTable.c +++ b/lis/core/LIS_forecastAlg_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_forecastMod.F90 b/lis/core/LIS_forecastMod.F90 index fc4112988..081f54c2d 100644 --- a/lis/core/LIS_forecastMod.F90 +++ b/lis/core/LIS_forecastMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_gfrac_FTable.c b/lis/core/LIS_gfrac_FTable.c index f728e2360..30ac8cb64 100644 --- a/lis/core/LIS_gfrac_FTable.c +++ b/lis/core/LIS_gfrac_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_glacierModelMod.F90 b/lis/core/LIS_glacierModelMod.F90 index 1d5b5a0d2..057e8f128 100644 --- a/lis/core/LIS_glacierModelMod.F90 +++ b/lis/core/LIS_glacierModelMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_glaciermodel_FTable.c b/lis/core/LIS_glaciermodel_FTable.c index ca3568979..b991c6f2d 100644 --- a/lis/core/LIS_glaciermodel_FTable.c +++ b/lis/core/LIS_glaciermodel_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_gridmappingMod.F90 b/lis/core/LIS_gridmappingMod.F90 index 28b4c2412..004751fab 100644 --- a/lis/core/LIS_gridmappingMod.F90 +++ b/lis/core/LIS_gridmappingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_gswpMod.F90 b/lis/core/LIS_gswpMod.F90 index bd6699242..c79d81836 100644 --- a/lis/core/LIS_gswpMod.F90 +++ b/lis/core/LIS_gswpMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_histDataMod.F90 b/lis/core/LIS_histDataMod.F90 index fa69a5dd2..30b7f15ad 100644 --- a/lis/core/LIS_histDataMod.F90 +++ b/lis/core/LIS_histDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -487,6 +487,26 @@ module LIS_histDataMod public :: LIS_MOC_SNOWSURFACEQ !public :: LIS_MOC_SNOWWIND_DIR +! SnowModel outputs: + public :: LIS_MOC_SWE_SM + public :: LIS_MOC_SNOWDEPTH_SM + public :: LIS_MOC_SNOWDENSITY_SM + public :: LIS_MOC_QSM_SM + public :: LIS_MOC_SUBSNOW_SM + public :: LIS_MOC_QS_SM + public :: LIS_MOC_TOTALPRECIP_SM + public :: LIS_MOC_RAINF_SM + public :: LIS_MOC_SNOWF_SM + public :: LIS_MOC_ALBEDO_SM + public :: LIS_MOC_ELEVATION_SM + public :: LIS_MOC_LANDCOVER_SM + + public :: LIS_MOC_SWDOWNFORC_SM + public :: LIS_MOC_LWDOWNFORC_SM + public :: LIS_MOC_EWINDFORC_SM + public :: LIS_MOC_NWINDFORC_SM +! ....... + integer :: LIS_MOC_SNOW_SOOT = -9999 integer :: LIS_MOC_GRND_SNOW = -9999 integer :: LIS_MOC_SURFT_SNOW = -9999 @@ -973,6 +993,25 @@ module LIS_histDataMod integer :: LIS_MOC_SNOWDELTAHEAT = -9999 integer :: LIS_MOC_SNOWSURFACEQ = -9999 +! SnowModel outputs: + integer :: LIS_MOC_SWE_SM = -9999 + integer :: LIS_MOC_SNOWDEPTH_SM = -9999 + integer :: LIS_MOC_SNOWDENSITY_SM = -9999 + integer :: LIS_MOC_QSM_SM = -9999 + integer :: LIS_MOC_SUBSNOW_SM = -9999 + integer :: LIS_MOC_QS_SM = -9999 + integer :: LIS_MOC_TOTALPRECIP_SM = -9999 + integer :: LIS_MOC_RAINF_SM = -9999 + integer :: LIS_MOC_SNOWF_SM = -9999 + integer :: LIS_MOC_ALBEDO_SM = -9999 + integer :: LIS_MOC_ELEVATION_SM = -9999 + integer :: LIS_MOC_LANDCOVER_SM = -9999 + integer :: LIS_MOC_SWDOWNFORC_SM = -9999 + integer :: LIS_MOC_LWDOWNFORC_SM = -9999 + integer :: LIS_MOC_EWINDFORC_SM = -9999 + integer :: LIS_MOC_NWINDFORC_SM = -9999 +! ....... + #if 0 ! SPECIAL CASE INDICES @@ -1481,7 +1520,8 @@ subroutine LIS_histDataInit(n, ntiles) if ( rc == 1 ) then call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SNOWF,& LIS_histData(n)%head_lsm_list,& - n,2,ntiles,(/"kg/m2s","kg/m2 "/),& +! n,2,ntiles,(/"kg/m2s","kg/m2 "/),& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA 2,(/"UP","DN"/),2,1,1,& model_patch=.true.) endif @@ -1494,7 +1534,8 @@ subroutine LIS_histDataInit(n, ntiles) if ( rc == 1 ) then call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_RAINF,& LIS_histData(n)%head_lsm_list,& - n,2,ntiles,(/"kg/m2s","kg/m2 "/),& +! n,2,ntiles,(/"kg/m2s","kg/m2 "/),& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA 2,(/"UP","DN"/),2,1,1,& model_patch=.true.) endif @@ -1533,7 +1574,8 @@ subroutine LIS_histDataInit(n, ntiles) if ( rc == 1 ) then call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QS,& LIS_histData(n)%head_lsm_list,& - n,2,ntiles,(/"kg/m2s","kg/m2 "/),& +! n,2,ntiles,(/"kg/m2s","kg/m2 "/),& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA 2,(/"IN ","OUT"/),2,1,1,& model_patch=.true.) endif @@ -1577,7 +1619,8 @@ subroutine LIS_histDataInit(n, ntiles) if ( rc == 1 ) then call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QSM,& LIS_histData(n)%head_lsm_list,& - n,2,ntiles,(/"kg/m2s","kg/m2 "/),& +! n,2,ntiles,(/"kg/m2s","kg/m2 "/),& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA 2,(/"S2L","L2S"/),2,1,1,& model_patch=.true.) endif @@ -2184,7 +2227,8 @@ subroutine LIS_histDataInit(n, ntiles) if ( rc == 1 ) then call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SUBSNOW,& LIS_histData(n)%head_lsm_list,n,& - 5,ntiles,(/"kg/m2s","mm/hr ","W/m2 ","mm ", "kg/m2 "/),& +! 5,ntiles,(/"kg/m2s","mm/hr ","W/m2 ","mm ", "kg/m2 "/),& + 6,ntiles,(/"kg/m2s","mm/hr ","W/m2 ","mm ", "kg/m2 ","m "/),& ! KRA 1,(/"-"/),2,1,1,& model_patch=.true.) endif @@ -4164,7 +4208,8 @@ subroutine LIS_histDataInit(n, ntiles) if ( rc == 1 ) then call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_TOTALPRECIP,& LIS_histData(n)%head_lsm_list,& - n,2,ntiles,(/"kg/m2s","kg/m2 "/),& +! n,2,ntiles,(/"kg/m2s","kg/m2 "/),& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA 2,(/"UP","DN"/),2,1,1,& model_patch=.true.) endif @@ -5200,7 +5245,223 @@ subroutine LIS_histDataInit(n, ntiles) model_patch=.true.) endif -! snow model +!<-- SnowModel outputs --> +! integer :: LIS_MOC_SWE_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_SWE:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_SWE",& + "liquid_water_content_of_surface_snow",& + "snow water equivalent",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SWE_SM,& + LIS_histData(n)%head_lsm_list,& + n,2,ntiles,(/"kg/m2","m "/),1,(/"-"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_SNOWDEPTH_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_SnowDepth:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_SnowDepth",& + "snow_depth",& + "snow depth",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SNOWDEPTH_SM,& + LIS_histData(n)%head_lsm_list,& + n,3,ntiles,(/"m ", "cm", "mm"/),1,(/"-"/),1,1,1,& + model_patch=.true.) + ! cm is added for VIC, Shugong Wang 02/20/2012 + endif + +! integer :: LIS_MOC_SNOWDENSITY_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_SnowDensity:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_SnowDensity",& + "snow_density_for_each_layer",& + "snow density for each layer",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SNOWDENSITY_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"kg/m3"/),1,(/"-"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_QSM_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Qsm:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_Qsm",& + "snowmelt",& + "snowmelt",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QSM_SM,& + LIS_histData(n)%head_lsm_list,& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA + 2,(/"S2L","L2S"/),2,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_QS_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Qs:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_Qs",& + "surface_runoff_amount",& + "surface runoff",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QS_SM,& + LIS_histData(n)%head_lsm_list,& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA + 2,(/"IN ","OUT"/),2,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_SUBSNOW_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_SubSnow:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_SubSnow",& + "snow_sublimation",& + "snow sublimation",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SUBSNOW,& + LIS_histData(n)%head_lsm_list,n,& + 6,ntiles,(/"kg/m2s","mm/hr ","W/m2 ","mm ", "kg/m2 ","m "/),& ! KRA + 1,(/"-"/),2,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_TOTALPRECIP_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_TotalPrecip:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_TotalPrecip",& + "total_precipitation_amount",& + "total precipitation amount",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_TOTALPRECIP_SM,& + LIS_histData(n)%head_lsm_list,& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA + 2,(/"UP","DN"/),2,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_RAINF_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Rainf:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_Rainf",& + "precipitation_rate",& + "precipitation rate",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_RAINF_SM,& + LIS_histData(n)%head_lsm_list,& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA + 2,(/"UP","DN"/),2,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_SNOWF_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Snowf:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_Snowf",& + "snowfall_rate",& + "snowfall rate",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SNOWF_SM,& + LIS_histData(n)%head_lsm_list,& + n,3,ntiles,(/"kg/m2s","kg/m2 ","m "/),& ! KRA + 2,(/"UP","DN"/),2,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_ALBEDO_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Albedo:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_Albedo",& + "surface_albedo",& + "surface albedo",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_ALBEDO_SM,& + LIS_histData(n)%head_lsm_list,& + n,2,ntiles,(/"-","%"/),1,(/"-"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_ELEVATION_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Elevation:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, & + "SM_Elevation",& + "elevation",& + "elevation",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_ELEVATION_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"m"/),1,(/"-"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_LANDCOVER_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_Landcover:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list,& + "SM_Landcover",& + "landcover",& + "landcover",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_LANDCOVER_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"-"/),1,(/"-"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_SWDOWNFORC_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_SWdown:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list,& + "SM_SWdown",& + "sm_swdown",& + "Snowmodel-modified shortwave radiation",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SWDOWNFORC_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"W/m2"/),2,(/"UP", "DN"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_LWDOWNFORC_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_LWdown:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list,& + "SM_LWdown",& + "sm_lwdown",& + "Snowmodel-modified longwave radiation",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_LWDOWNFORC_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"W/m2"/),2,(/"UP", "DN"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_NWINDFORC_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_NWind:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list,& + "SM_NWind",& + "sm_nwind",& + "Snowmodel-modified N-S wind direction",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_NWINDFORC_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"m/s"/),2,(/"E", "N"/),1,1,1,& + model_patch=.true.) + endif + +! integer :: LIS_MOC_EWINDFORC_SM = -9999 + call ESMF_ConfigFindLabel(modelSpecConfig,"SM_EWind:",rc=rc) + call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list,& + "SM_EWind",& + "sm_ewind",& + "Snowmodel-modified E-W wind direction",rc) + if ( rc == 1 ) then + call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_EWINDFORC_SM,& + LIS_histData(n)%head_lsm_list,& + n,1,ntiles,(/"m/s"/),2,(/"E", "N"/),1,1,1,& + model_patch=.true.) + endif + +! ......... !<- RUC addition -> diff --git a/lis/core/LIS_historyMod.F90 b/lis/core/LIS_historyMod.F90 index 844ca6064..eafc2f03a 100644 --- a/lis/core/LIS_historyMod.F90 +++ b/lis/core/LIS_historyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -2079,15 +2079,15 @@ subroutine writeNetcdfOutput(n, group, ftn, ftn_stats, outInterval, & endif ! LIS output is always writing output for a single time - call LIS_verify(nf90_def_dim(ftn,'time',1,tdimID),& + call LIS_verify(nf90_def_dim(ftn,'time',NF90_UNLIMITED,tdimID),& 'nf90_def_dim for time failed in LIS_historyMod') call LIS_verify(nf90_put_att(ftn,NF90_GLOBAL,"missing_value", LIS_rc%udef),& 'nf90_put_att for missing_value failed in LIS_historyMod') call defineNETCDFheaderVar(n,ftn,dimID, xlat,& - non_model_fields = .true. ) + non_model_fields = 1 ) call defineNETCDFheaderVar(n,ftn,dimID, xlong, & - non_model_fields = .true. ) + non_model_fields = 2 ) ! defining time field call LIS_verify(nf90_def_var(ftn,'time',& @@ -2259,8 +2259,8 @@ subroutine writeNetcdfOutput(n, group, ftn, ftn_stats, outInterval, & xlat%modelOutput(1,t,1) = LIS_domain(n)%grid(index1)%lat xlong%modelOutput(1,t,1) = LIS_domain(n)%grid(index1)%lon enddo - call writeSingleNETCDFvar(ftn,ftn_stats,n,xlat,non_model_fields = .true.) - call writeSingleNETCDFvar(ftn,ftn_stats,n,xlong, non_model_fields = .true.) + call writeSingleNETCDFvar(ftn,ftn_stats,n,xlat,non_model_fields =1) + call writeSingleNETCDFvar(ftn,ftn_stats,n,xlong, non_model_fields = 2) if(LIS_masterproc) then call LIS_verify(nf90_put_var(ftn,xtimeID,0.0),& @@ -2443,15 +2443,15 @@ subroutine writeRoutingNetcdfOutput(n, group, ftn, ftn_stats, outInterval, & endif ! LIS output is always writing output for a single time - call LIS_verify(nf90_def_dim(ftn,'time',1,tdimID),& + call LIS_verify(nf90_def_dim(ftn,'time',NF90_UNLIMITED,tdimID),& 'nf90_def_dim for time failed in LIS_historyMod') call LIS_verify(nf90_put_att(ftn,NF90_GLOBAL,"missing_value", LIS_rc%udef),& 'nf90_put_att for missing_value failed in LIS_historyMod') call defineNETCDFheaderVar(n,ftn,dimID, xlat,& - non_model_fields = .true. ) + non_model_fields = 1 ) call defineNETCDFheaderVar(n,ftn,dimID, xlong, & - non_model_fields = .true. ) + non_model_fields = 2 ) ! defining time field call LIS_verify(nf90_def_var(ftn,'time',& @@ -2621,9 +2621,9 @@ subroutine writeRoutingNetcdfOutput(n, group, ftn, ftn_stats, outInterval, & enddo call writeSingleRoutingNETCDFvar(ftn,ftn_stats,n,xlat,& - non_model_fields = .true.) + non_model_fields = 1) call writeSingleRoutingNETCDFvar(ftn,ftn_stats,n,xlong, & - non_model_fields = .true.) + non_model_fields = 2) if(LIS_masterproc) then call LIS_verify(nf90_put_var(ftn,xtimeID,0.0),& @@ -2673,7 +2673,7 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) integer :: n integer :: ftn type(LIS_metadataEntry), pointer :: dataEntry - logical, optional :: non_model_fields + integer, optional :: non_model_fields integer :: dimID(4) ! ! !DESCRIPTION: @@ -2700,7 +2700,7 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) ! call to check if the return value is valid or not. ! \end{description} !EOP - logical :: nmodel_status + integer :: nmodel_status integer :: data_index integer :: shuffle, deflate, deflate_level character*100 :: short_name @@ -2713,7 +2713,7 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) #if(defined USE_NETCDF3 || defined USE_NETCDF4) - nmodel_status = .false. + nmodel_status = 0 if(present(non_model_fields)) then nmodel_status = non_model_fields endif @@ -2912,7 +2912,7 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) endif else - if(.not.nmodel_status) then + if(nmodel_status==0) then if(dataEntry%timeAvgOpt.eq.0) then short_name = trim(dataEntry%short_name)//'_inst' elseif(dataEntry%timeAvgOpt.eq.1) then @@ -3202,7 +3202,7 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) endif else - if(.not.nmodel_status) then + if(nmodel_status==0) then if(dataEntry%timeAvgOpt.eq.0) then short_name = trim(dataEntry%short_name)//'_inst' elseif(dataEntry%timeAvgOpt.eq.1) then @@ -3270,11 +3270,37 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) #endif endif else ! 1 vertical level - call LIS_verify(nf90_def_var(ftn,trim(short_name),& - nf90_float,& - dimids = dimID(1:2), varID=dataEntry%varId_def),& - 'nf90_def_var for '//trim(short_name)//& - 'failed in defineNETCDFheadervar') + ! lat/lon fields will write in 1D + if(LIS_rc%nlatlon_dimensions == '1D') then + if(nmodel_status.eq.1) then + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(2), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + elseif(nmodel_status.eq.2) then + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + else + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1:2), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + endif + ! lat/lon fields will write in 2D + else + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1:2), varID=dataEntry%varID_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + endif + + #if(defined USE_NETCDF4) call LIS_verify(nf90_def_var_fill(ftn,& dataEntry%varId_def, & @@ -3411,11 +3437,38 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) !EMK END else ! 1 vertical level - call LIS_verify(nf90_def_var(ftn,trim(dataEntry%short_name)//'_tavg',& - nf90_float,& - dimids = dimID(1:3), varID=dataEntry%varId_def),& - 'nf90_def_var for '//trim(dataEntry%short_name)//& - 'failed in defineNETCDFheadervar') + ! lat/lon field output will write in 1D + if(LIS_rc%nlatlon_dimensions == '1D') then + if(nmodel_status.eq.1) then + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(2), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + elseif(nmodel_status.eq.2) then + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + else + call LIS_verify(nf90_def_var(ftn,trim(dataEntry%short_name)//'_tavg',& + nf90_float,& + dimids = dimID(1:3), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(dataEntry%short_name)//& + 'failed in defineNETCDFheadervar') + endif + ! latlon field output will write in 2D + else + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1:2), varID=dataEntry%varID_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + endif + + + #if(defined USE_NETCDF4) call LIS_verify(nf90_def_var_fill(ftn,& @@ -3489,7 +3542,7 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) endif else - if(.not.nmodel_status) then + if(nmodel_status==0) then if(dataEntry%timeAvgOpt.eq.0) then short_name = trim(dataEntry%short_name)//'_inst' elseif(dataEntry%timeAvgOpt.eq.1) then @@ -3557,18 +3610,42 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields) #endif endif else - if(.not.nmodel_status) then + if(nmodel_status==0) then call LIS_verify(nf90_def_var(ftn,trim(short_name),& nf90_float,& dimids = dimID(1:3), varID=dataEntry%varId_def),& 'nf90_def_var for '//trim(short_name)//& 'failed in defineNETCDFheadervar') else - call LIS_verify(nf90_def_var(ftn,trim(short_name),& - nf90_float,& - dimids = dimID(1:2), varID=dataEntry%varId_def),& - 'nf90_def_var for '//trim(short_name)//& - 'failed in defineNETCDFheadervar') + ! lat/lon field output will write in 1D + if(LIS_rc%nlatlon_dimensions == '1D') then + if(nmodel_status.eq.1) then + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(2), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + elseif(nmodel_status.eq.2) then + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + else + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1:2), varID=dataEntry%varId_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + endif + ! lat/lon field output will write in 2D + else + call LIS_verify(nf90_def_var(ftn,trim(short_name),& + nf90_float,& + dimids = dimID(1:2), varID=dataEntry%varID_def),& + 'nf90_def_var for '//trim(short_name)//& + 'failed in defineNETCDFheadervar') + endif endif #if(defined USE_NETCDF4) call LIS_verify(nf90_def_var_fill(ftn,& @@ -3764,7 +3841,7 @@ subroutine writeSingleNETCDFvar(ftn,ftn_stats,n,dataEntry,& integer, intent(in) :: ftn integer, intent(in) :: ftn_stats type(LIS_metadataEntry), pointer :: dataEntry - logical, optional :: non_model_fields + integer, optional :: non_model_fields ! ! !DESCRIPTION: ! This routine writes a single variable to a NETCDF file @@ -3785,19 +3862,19 @@ subroutine writeSingleNETCDFvar(ftn,ftn_stats,n,dataEntry,& ! \end{description} !EOP integer :: i,k,m,t - logical :: nmodel_status + integer :: nmodel_status - nmodel_status = .false. + nmodel_status = 0 if(present(non_model_fields)) then nmodel_status = non_model_fields endif if(dataEntry%selectOpt.eq.1) then - if(.not.nmodel_status) then + if(nmodel_status==0) then do t=1,LIS_rc%ntiles(n) - if(nmodel_status) then + if(nmodel_status==0) then m = 1 else m = LIS_domain(n)%tile(t)%sftype @@ -3884,7 +3961,7 @@ subroutine writeSingleRoutingNETCDFvar(ftn,ftn_stats,n,dataEntry,& integer, intent(in) :: ftn integer, intent(in) :: ftn_stats type(LIS_metadataEntry), pointer :: dataEntry - logical, optional :: non_model_fields + integer, optional :: non_model_fields ! ! !DESCRIPTION: ! This routine writes a single variable to a NETCDF file @@ -3905,16 +3982,16 @@ subroutine writeSingleRoutingNETCDFvar(ftn,ftn_stats,n,dataEntry,& ! \end{description} !EOP integer :: i,k,t - logical :: nmodel_status + integer :: nmodel_status - nmodel_status = .false. + nmodel_status = 0 if(present(non_model_fields)) then nmodel_status = non_model_fields endif if(dataEntry%selectOpt.eq.1) then - if(.not.nmodel_status) then + if(nmodel_status==0) then do t=1,LIS_rc%nroutinggrid(n)*LIS_rc%nensem(n) do k=1,dataEntry%vlevels @@ -4552,7 +4629,7 @@ subroutine LIS_closeHeader_restart(ftn,n,m,dimID, rstInterval) "vmax",0.0),& 'nf90_put_att failed for xlong:vmax') !defining time field - call LIS_verify(nf90_def_dim(ftn,'time',1,tdimID),& + call LIS_verify(nf90_def_dim(ftn,'time',NF90_UNLIMITED,tdimID),& 'nf90_def_dim failed for time') call LIS_verify(nf90_def_var(ftn,'time',& @@ -6522,8 +6599,9 @@ subroutine writevar_netcdf_withstats_real(ftn,ftn_stats, n, var,varid, mvar,& real, intent(in) :: var(LIS_rc%ntiles(n)) character (len=*) :: mvar integer, intent(in) :: form - logical, intent(in) :: nmodel_status + integer, intent(in) :: nmodel_status integer, intent(in), optional :: dim1 + integer :: gindex ! ! !DESCRIPTION: ! Write a real variable to a netcdf output file with some diagnostic @@ -6562,6 +6640,7 @@ subroutine writevar_netcdf_withstats_real(ftn,ftn_stats, n, var,varid, mvar,& real, allocatable :: var1(:) real, allocatable :: var1_ens(:,:) real, allocatable :: gtmp(:,:) + real, allocatable :: gtmplat(:),gtmplon(:) real, allocatable :: gtmp_ens(:,:,:) real, allocatable :: gtmp1(:) real, allocatable :: gtmp1_ens(:,:) @@ -6601,7 +6680,8 @@ subroutine writevar_netcdf_withstats_real(ftn,ftn_stats, n, var,varid, mvar,& endif ! Write output in 2d grid space: - elseif(LIS_rc%wopt.eq."2d gridspace") then + elseif(LIS_rc%wopt.eq."2d gridspace") then + allocate(var1(LIS_rc%ngrid(n))) if(LIS_masterproc) then allocate(gtmp(LIS_rc%gnc(n),LIS_rc%gnr(n))) @@ -6656,13 +6736,61 @@ subroutine writevar_netcdf_withstats_real(ftn,ftn_stats, n, var,varid, mvar,& enddo enddo enddo - if(PRESENT(dim1)) then - iret = nf90_put_var(ftn,varid,gtmp,(/1,1,dim1/),& - (/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)) - else - iret = nf90_put_var(ftn,varid,gtmp,(/1,1/),& - (/LIS_rc%gnc(n),LIS_rc%gnr(n)/)) - endif + + ! The latlon fields are written to 1D + if(LIS_rc%nlatlon_dimensions == '1D') then + if(nmodel_status.eq.1) then ! lat + allocate(gtmplat(LIS_rc%gnr(n))) + gtmplat = LIS_rc%udef + + do r=1,LIS_rc%gnr(n) + do c=1,LIS_rc%gnc(n) + gindex = c+(r-1)*LIS_rc%gnc(n) + gtmplat(r) = LIS_domain(n)%glat(gindex) + enddo + enddo + + iret = nf90_put_var(ftn,varid,gtmplat,(/1/),& + (/LIS_rc%gnr(n)/)) + deallocate(gtmplat) + + elseif(nmodel_status.eq.2) then !lon + allocate(gtmplon(LIS_rc%gnc(n))) + gtmplon = LIS_rc%udef + + do r=1,LIS_rc%gnr(n) + do c=1,LIS_rc%gnc(n) + gindex = c+(r-1)*LIS_rc%gnc(n) + gtmplon(c) = LIS_domain(n)%glon(gindex) + enddo + enddo + + iret = nf90_put_var(ftn,varid,gtmplon,(/1/),& + (/LIS_rc%gnc(n)/)) + deallocate(gtmplon) + + else + if(PRESENT(dim1)) then + iret = nf90_put_var(ftn,varid,gtmp,(/1,1,dim1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)) + else + iret = nf90_put_var(ftn,varid,gtmp,(/1,1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n)/)) + endif + endif + + ! The latlon fields are written to 2D + else + if(PRESENT(dim1)) then + iret = nf90_put_var(ftn,varid,gtmp,(/1,1,dim1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)) + else + iret = nf90_put_var(ftn,varid,gtmp,(/1,1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n)/)) + endif + endif + + if(ftn_stats.ne.-1) then if ( LIS_rc%sout ) then call stats(gtmp,LIS_rc%udef,LIS_rc%gnc(n)*LIS_rc%gnr(n),& @@ -6683,7 +6811,7 @@ subroutine writevar_netcdf_withstats_real(ftn,ftn_stats, n, var,varid, mvar,& elseif(LIS_rc%wopt.eq."2d ensemble gridspace") then ! Non-model output field status (T=non-model; F=model-based): - if(nmodel_status) then ! non-model output field status + if(nmodel_status.ne.0) then ! non-model output field status allocate(var1(LIS_rc%ngrid(n))) if(LIS_masterproc) then allocate(gtmp(LIS_rc%gnc(n),LIS_rc%gnr(n))) @@ -6738,13 +6866,60 @@ subroutine writevar_netcdf_withstats_real(ftn,ftn_stats, n, var,varid, mvar,& enddo enddo enddo - if(PRESENT(dim1)) then - iret = nf90_put_var(ftn,varid,gtmp,(/1,1,dim1/),& - (/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)) - else - iret = nf90_put_var(ftn,varid,gtmp,(/1,1/),& - (/LIS_rc%gnc(n),LIS_rc%gnr(n)/)) + + ! The lat/lon fields are written to 1D + if(LIS_rc%nlatlon_dimensions == '1D') then + if(nmodel_status.eq.1) then ! lat + allocate(gtmplat(LIS_rc%gnr(n))) + gtmplat = LIS_rc%udef + + do r=1,LIS_rc%gnr(n) + do c=1,LIS_rc%gnc(n) + gindex = c+(r-1)*LIS_rc%gnc(n) + gtmplat(r) = LIS_domain(n)%glat(gindex) + enddo + enddo + + iret = nf90_put_var(ftn,varid,gtmplat,(/1/),& + (/LIS_rc%gnr(n)/)) + deallocate(gtmplat) + + elseif(nmodel_status.eq.2) then !lon + allocate(gtmplon(LIS_rc%gnc(n))) + gtmplon = LIS_rc%udef + + do r=1,LIS_rc%gnr(n) + do c=1,LIS_rc%gnc(n) + gindex = c+(r-1)*LIS_rc%gnc(n) + gtmplon(c) = LIS_domain(n)%glon(gindex) + enddo + enddo + + iret = nf90_put_var(ftn,varid,gtmplon,(/1/),& + (/LIS_rc%gnc(n)/)) + deallocate(gtmplon) + + else + if(PRESENT(dim1)) then + iret = nf90_put_var(ftn,varid,gtmp,(/1,1,dim1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)) + else + iret = nf90_put_var(ftn,varid,gtmp,(/1,1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n)/)) + endif + endif + + ! The latlon fields are written to 2D + else + if(PRESENT(dim1)) then + iret = nf90_put_var(ftn,varid,gtmp,(/1,1,dim1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)) + else + iret = nf90_put_var(ftn,varid,gtmp,(/1,1/),& + (/LIS_rc%gnc(n),LIS_rc%gnr(n)/)) + endif endif + if(ftn_stats.ne.-1) then if ( LIS_rc%sout ) then call stats(gtmp,LIS_rc%udef,LIS_rc%gnc(n)*LIS_rc%gnr(n),& @@ -6887,7 +7062,7 @@ subroutine writeroutingvar_netcdf_real(ftn,ftn_stats, n, var,varid, mvar,& real, intent(in) :: var(LIS_rc%nroutinggrid(n)*LIS_rc%nensem(n)) character (len=*) :: mvar integer, intent(in) :: form - logical, intent(in) :: nmodel_status + integer, intent(in) :: nmodel_status integer, intent(in), optional :: dim1 ! ! !DESCRIPTION: @@ -7017,7 +7192,7 @@ subroutine writeroutingvar_netcdf_real(ftn,ftn_stats, n, var,varid, mvar,& elseif(LIS_rc%wopt.eq."2d ensemble gridspace") then ! Non-model output field status (T=non-model; F=model-based): - if(nmodel_status) then ! non-model output field status + if(nmodel_status.ne.0) then ! non-model output field status allocate(var1(LIS_rc%nroutinggrid(n))) if(LIS_masterproc) then allocate(gtmp(LIS_rc%gnc(n),LIS_rc%gnr(n))) diff --git a/lis/core/LIS_initialize_registries.F90 b/lis/core/LIS_initialize_registries.F90 index fbf8e9874..b92f66656 100644 --- a/lis/core/LIS_initialize_registries.F90 +++ b/lis/core/LIS_initialize_registries.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_irrigationMod.F90 b/lis/core/LIS_irrigationMod.F90 index 80c953a7d..3232071ef 100644 --- a/lis/core/LIS_irrigationMod.F90 +++ b/lis/core/LIS_irrigationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_irrigation_FTable.c b/lis/core/LIS_irrigation_FTable.c index f51424520..6a81b9659 100644 --- a/lis/core/LIS_irrigation_FTable.c +++ b/lis/core/LIS_irrigation_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_laisai_FTable.c b/lis/core/LIS_laisai_FTable.c index 8c18c778a..3de36b9f7 100644 --- a/lis/core/LIS_laisai_FTable.c +++ b/lis/core/LIS_laisai_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_lakemodelMod.F90 b/lis/core/LIS_lakemodelMod.F90 index b93a673ad..0c8effb04 100644 --- a/lis/core/LIS_lakemodelMod.F90 +++ b/lis/core/LIS_lakemodelMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_lakemodel_FTable.c b/lis/core/LIS_lakemodel_FTable.c index 36482703d..194890152 100644 --- a/lis/core/LIS_lakemodel_FTable.c +++ b/lis/core/LIS_lakemodel_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_landslideMod.F90 b/lis/core/LIS_landslideMod.F90 index 7885fd3ab..43163de38 100644 --- a/lis/core/LIS_landslideMod.F90 +++ b/lis/core/LIS_landslideMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_landslide_FTable.c b/lis/core/LIS_landslide_FTable.c index a94d0d01e..3ec7b788c 100644 --- a/lis/core/LIS_landslide_FTable.c +++ b/lis/core/LIS_landslide_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_logMod.F90 b/lis/core/LIS_logMod.F90 index 5c763b624..f6988dde7 100644 --- a/lis/core/LIS_logMod.F90 +++ b/lis/core/LIS_logMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -390,7 +390,7 @@ subroutine LIS_warning(ierr,msg) if ( ierr /= 0 ) then write(LIS_logunit,*) '[WARN] ****************WARNING*********************' - write(LIS_logunit,*) '[WARN] ',msg + write(LIS_logunit,*) '[WARN] ', trim(msg) write(LIS_logunit,*) '[WARN] ****************WARNING*********************' endif diff --git a/lis/core/LIS_log_msgC.c b/lis/core/LIS_log_msgC.c index d3b0ddfbe..b9ced730e 100644 --- a/lis/core/LIS_log_msgC.c +++ b/lis/core/LIS_log_msgC.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_lsmMod.F90 b/lis/core/LIS_lsmMod.F90 index 6c9095374..f47f6e08e 100644 --- a/lis/core/LIS_lsmMod.F90 +++ b/lis/core/LIS_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_lsm_FTable.c b/lis/core/LIS_lsm_FTable.c index 29e14dc40..46271d765 100644 --- a/lis/core/LIS_lsm_FTable.c +++ b/lis/core/LIS_lsm_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_mapSoilType.F90 b/lis/core/LIS_mapSoilType.F90 index dced4aa66..3a3c0f133 100644 --- a/lis/core/LIS_mapSoilType.F90 +++ b/lis/core/LIS_mapSoilType.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_mapSurfaceModelType.F90 b/lis/core/LIS_mapSurfaceModelType.F90 index 91122b96f..df1ddb3fe 100644 --- a/lis/core/LIS_mapSurfaceModelType.F90 +++ b/lis/core/LIS_mapSurfaceModelType.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_memory_managementC.c b/lis/core/LIS_memory_managementC.c index a86c852c0..600400332 100644 --- a/lis/core/LIS_memory_managementC.c +++ b/lis/core/LIS_memory_managementC.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_metforcingMod.F90 b/lis/core/LIS_metforcingMod.F90 index 25bea6cc1..5e4e8cf0f 100644 --- a/lis/core/LIS_metforcingMod.F90 +++ b/lis/core/LIS_metforcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -1077,7 +1077,7 @@ subroutine LIS_get_met_forcing(n) ! \item[LIS\_slopeAspectCorrection](\ref{LIS_slopeAspectCorrection}) \newline ! method to apply slope aspect based topographical corrections ! \item[LIS\_microMetCorrection](\ref{LIS_microMetCorrection}) \newline -! method to apply topographical corrections (not currently supported) +! method to apply topographical corrections (updated with latest code) ! \end{description} !EOP @@ -1132,10 +1132,35 @@ subroutine LIS_get_met_forcing(n) call LIS_lapseRateCorrection(n, LIS_forc(n,m)%modelelev,& LIS_FORC_Base_State(n,m)) call LIS_slopeAspectCorrection(n, LIS_FORC_Base_State(n,m)) + + ! New MicroMet option: + elseif(LIS_rc%met_ecor(m).eq."micromet") then + + if( LIS_rc%useelevationmap(n) == "none" .or. & + LIS_rc%useslopemap(n) == "none" .or. & + LIS_rc%useaspectmap(n) == "none" .or. & + LIS_rc%usecurvaturemap(n) == "none" ) then + + write(LIS_logunit,*) "[ERR] 'micromet' turned on for" + write(LIS_logunit,*) "[ERR] the forcing dataset, ",trim(LIS_rc%metforc(m)),"," + write(LIS_logunit,*) "[ERR] ... Though NO LDT-generated topo fields read in ... " + write(LIS_logunit,*) "[ERR] This LIS run is ending ..." + call LIS_endrun + endif + + call LIS_MicroMetCorrection(n, LIS_forc(n,m)%modelelev,& + LIS_FORC_Base_State(n,m)) + + elseif( LIS_rc%met_ecor(m) .eq. "micromet and slope-aspect" ) then + write(LIS_logunit,*) "[ERR] Slope-aspect correction option not supported " + write(LIS_logunit,*) "[ERR] with micromet, since the micromet option accounts" + write(LIS_logunit,*) "[ERR] for slope, aspect and curvature corrections." + write(LIS_logunit,*) "[ERR] Please check lis.config.adoc for options." + call LIS_endrun end if enddo -!blending algorithms (overlay, forcing ensembles, bias correction..) + ! Blending algorithms (overlay, forcing ensembles, bias correction..) if(LIS_rc%metforc_blend_alg.eq."overlay") then ! simple overlays call overlayForcings(n) elseif(LIS_rc%metforc_blend_alg.eq."ensemble") then !forcing ensembles diff --git a/lis/core/LIS_metforcing_FTable.c b/lis/core/LIS_metforcing_FTable.c index 1c9eae115..7e74b9c73 100644 --- a/lis/core/LIS_metforcing_FTable.c +++ b/lis/core/LIS_metforcing_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_microMetCorrection.F90 b/lis/core/LIS_microMetCorrection.F90 index 73d923cae..d6620c478 100644 --- a/lis/core/LIS_microMetCorrection.F90 +++ b/lis/core/LIS_microMetCorrection.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -14,120 +14,812 @@ ! !REVISION HISTORY: ! ! 21 Dec 2004: Sujay Kumar; Initial Specification +! 21 Jan 2021: Kristi Arsenault; Update to the code, based on SnowModel +! 22 Mar 2022: Kristi Arsenault; Completed code updates ! ! !INTERFACE: -subroutine LIS_microMetCorrection(nest) +subroutine LIS_microMetCorrection(n, modelelev, LIS_FORC_Base_State) ! !USES: - use LIS_logMod, only : LIS_logunit + use LIS_logMod + use ESMF + use LIS_mpiMod + use LIS_constantsMod + use LIS_coreMod + use LIS_FORC_AttributesMod implicit none ! !ARGUMENTS: - integer, intent(in) :: nest + integer, intent(in) :: n ! Nest index + real :: modelelev(LIS_rc%ngrid(n)) + type(ESMF_State) :: LIS_FORC_Base_State +! ! !DESCRIPTION: -! Corrects Temperature, Pressure, Humidity and Longwave Radiation -! values for topography (based on Liston et al; 2005) +! Uses the MicroMet topographic downscaling methods to correct +! temperature, pressure, humidity, shortwave +! and longwave radiation, and wind field redistribution, +! based on: ! -! WARNING: This routine is not currently implemented +! Ref: +! Liston, G. E., & Elder, K. (2006). A Meteorological Distribution System for High-Resolution +! Terrestrial Modeling (MicroMet), Journal of Hydrometeorology, 7(2), 217-234. +! https://journals.ametsoc.org/view/journals/hydr/7/2/jhm486_1.xml ! ! The arguments are: ! \begin{description} -! \item[nest] -! index of the nest +! \item[n] +! index of the n +! \item [modelelev] +! forcing elevation ! \end{description} !EOP -#if 0 - real, parameter ::a=611.21,b=22.452, c=240.97, pi = 3.14 - real, parameter :: grav = 9.81, rdry = 287., Sstar=1367.0 - real, parameter :: sigma = 5.67E-8 - integer :: t - real :: lapse(12),tdlapse(12) - real :: force_tmp,force_hum,force_prs,elevdiff - real :: force_pcp,force_swd, hcforce - real :: pcforce,Td,tcforce,tbar,e - real :: theta, omegas, thetad, wind, Ww,force_u, force_v - real :: sigma_c, zenith, dec,tau,mu,cosi, psi_dir,psi_dif - real :: lhour,czenith - real :: force_lwd, ea, epsilona,epsilonb - integer :: zone - real :: elev700, T700, Td700,Rh700,es - data lapse/0.0044,0.0059,0.0071,0.0078,0.0081,0.0082,0.0081,& - 0.0081,0.0077,0.0068,0.0055,0.0047/ - data tdlapse/0.00041,0.00042,0.00040,0.00039,0.00038,0.00036,& - 0.00033,0.00033,0.00036,0.00037,0.00040,0.00040/ - - do t=1,lis%ngrid(nest) - force_tmp = lisdom(nest)%grid(t)%forcing(1) - force_hum = lisdom(nest)%grid(t)%forcing(2) - force_v = lisdom(nest)%grid(t)%forcing(6) - force_u = lisdom(nest)%grid(t)%forcing(5) - force_swd = lisdom(nest)%grid(t)%forcing(3) - force_prs = lisdom(nest)%grid(t)%forcing(7) - force_pcp = lisdom(nest)%grid(t)%forcing(8) - elevdiff = lisdom(nest)%grid(t)%elev-modelelev(t) - tcforce = force_tmp-lapse(lis%mo)*elevdiff - tbar=(force_tmp+tcforce)/2. - - pcforce =force_prs/(exp((grav*elevdiff)/(rdry*tbar))) - e = force_hum*force_prs/(0.622+force_hum*0.378) - Td = c*log((e/a))/(b-log((e/a))) - Td = Td -tdlapse(lis%mo)*c*elevdiff/b - e = a*exp((b*Td)/(c+Td)) - hcforce = 0.622*e/(pcforce - 0.378*e) - theta = 3*pi/2-atan(force_v/force_u) - omegas = grid(t)%slope*cos(theta-grid(t)%aspect) - Ww = 1+0.5*omegas+0.5*grid(t)%curv - wind = Ww*sqrt(force_u*force_u + force_v*force_v) - thetad = -0.5*omegas*sin(2*(grid(t)%aspect-theta)) - force_u = -wind*sin(theta+thetad) - force_v = -wind*cos(theta+thetad) - force_pcp = force_pcp*((1+0.00035*elevdiff)/(1-0.00035*elevdiff)) - -! Longwave similar to agrmet implementation. - ea = e * 0.01 - epsilona = 0.70 + (5.95e-5 * ea * exp(1500 / tcforce)) - epsilonb = -0.792 + (3.161 * epsilona) - (1.573 * epsilona * epsilona) - force_lwd = epsilonb*5.67E-8*(tcforce)**4 - -!shortwave - elev700 = modelelev(t)+(70000-force_prs)/(1.29*9.8) -! elev700 = rdry*force_tmp*log(force_prs/70000)/grav -! elev700 = 5537.0986-modelelev(t) - elev700 = elev700-modelelev(t) - T700 = force_tmp-lapse(lis%mo)*elev700-273.16 - e = force_hum*force_prs/(0.622) - Td = c*log((e/a))/(b-log((e/a))) - Td700 = Td -tdlapse(lis%mo)*c*elev700/b - e = a*exp(b*Td700/(c+Td700)) - es = a*exp(b*T700/(c+T700)) - Rh700 = 100* e/es - sigma_c = 0.832*exp((Rh700-100)/41.6) - if(sigma_c > 1) sigma_c = 1.0 - call localtime(lis%gmt,lisdom(nest)%grid(t)%lon,lhour,zone) - call coszenith(lisdom(nest)%grid(t)%lon,lisdom(nest)%grid(t)%lat,lhour,zone,lis%doy,& - czenith,dec,tau) - zenith = acos(czenith) - mu = asin(cos(dec)*sin(tau)/sin(zenith)) - cosi = cos(lisdom(nest)%grid(t)%slope)*cos(zenith)+sin(lisdom(nest)%grid(t)%slope)*sin(zenith)*& - cos(mu-lisdom(nest)%grid(t)%aspect) -! psi_dir = (1-sigma_c)*(0.6-0.2*cos(zenith)) -! psi_dif = sigma_c*(0.3-0.1*cos(zenith)) - psi_dir = 0.85-0.65*sigma_c - psi_dif = 0.15+0.65*sigma_c -! force_swd = Sstar*(psi_dir*cosi+psi_dif*cos(zenith)) - force_swd = force_swd*(psi_dir*cos(grid(t)%slope)+psi_dir*& - sin(grid(t)%slope)*tan(zenith)*cos(mu-grid(t)%aspect)+& - psi_dif) - - lisdom(nest)%grid(t)%forcing(1) = tcforce - lisdom(nest)%grid(t)%forcing(2) = hcforce - lisdom(nest)%grid(t)%forcing(3) = force_swd - lisdom(nest)%grid(t)%forcing(4) = force_lwd - lisdom(nest)%grid(t)%forcing(7) = pcforce - lisdom(nest)%grid(t)%forcing(5) = force_u - lisdom(nest)%grid(t)%forcing(6) = force_v - lisdom(nest)%grid(t)%forcing(8) = force_pcp - enddo + + integer :: t, k, row, col, i, j, gindex, gid + real :: force_tmp, tcforce ! Input, corrected temperature + real :: force_hum, hcforce ! Input, corrected spec humidity + real :: force_prs, pcforce ! Input, corrected pressure + real :: force_lwd, lcforce ! Input, corrected LW down rad + real :: force_swd, scforce ! Input, corrected SW down rad + real :: force_pcp, pptforce ! Input, corrected precip + real :: force_u, uwcforce ! Input, corrected U-wind comp. + real :: force_v, vwcforce ! Input, corrected U-wind comp. + + real :: elevdiff, elevdiff2 + real :: Td, tbar, e, Tdcforce + + integer :: mbefore, mafter + real :: xlat, xlon, weight + real :: T_lapse_rate, Td_lapse_rate + real :: precip_lapse_rate, precip_lapse_rate_m, alfa + real :: theta, omegas, thetad, wind, Ww + real :: sigma_c, zenith, dec,tau,mu,cosi, psi_dir,psi_dif + real :: lhour,czenith + real :: ea, epsilona,epsilonb + real :: mee, mfe, ee, fe, ratio + real :: femiss,emiss + real :: elev700, T700, Td700, Rh700, es + real :: deg2rad, rad2deg + real :: wslope_max, wslopemax_glb, curve_max, curvemax_glb + real :: slope, aspect, curvature + real :: dirdiff, xmult + real :: deltax, deltay, deltaxy, inc, topo + +! B1=17.502 ==> over water, following Buck (1981) reference +! B2=22.452 ==> over ice + real, parameter :: A=611.21, B1=17.502, B2=22.452, C=240.97 + real, parameter :: grav = 9.81, rdry = 287., Sstar=1367.0 + real, parameter :: sigma = 5.67E-8 + real, parameter :: Tf = 273.16 + integer, parameter :: bb=2016 + + ! Cloud-cover parameters: + real, parameter :: topo_ref_cloud = 3000. + real, parameter :: press_ratio = 0.7 + real, parameter :: dx_walcek = 80.0 + real :: f_max, one_minus_RHe, f_1 + real :: delta_topo700, Td_700, Tair_700, rh_700 + real :: e_700, es_700, cloud_frac + + ! Longwave radiation parameters: + real, parameter :: Stef_Boltz = 5.6696e-8 + real, parameter :: alfa_lw = 1.083 + ! - Constants required for Iziomon et al. (2003). + real, parameter :: E1 = 200.0, X1 = 0.35, Y1 = 0.100, Z1 = 0.224 + real, parameter :: E2 = 1500.0, X2 = 0.43, Y2 = 0.115, Z2 = 0.320 + real, parameter :: E3 = 3000.0, X3 = 0.51, Y3 = 0.130, Z3 = 1.100 + ! - Assume the X and Y coefficients increase linearly to 3000 m, + ! and adjust Z to create a best fit to the CLPX data. + real :: Xs, Ys, Zs, emiss_cloud + + ! Shortwave radiation parameters: + real, parameter :: solar_const = 1370. + real, parameter :: days_yr = 365.25 + real, parameter :: Trop_Can = 0.41 + real, parameter :: solstice = 173. + real :: xhour, xxhour ! model decimal hour + real :: sol_dec, hr_angl, cos_Z, sin_Z, cos_i + real :: sun_azimuth, slope_az_S0 + real :: trans_direct, trans_diffuse + real :: Qsi_trans_dir, Qsi_trans_dif, Qsi_direct, Qsi_diffuse + + + ! Month parameters: + integer, parameter :: months = 12 + integer lastday(months) + data lastday/31,28,31,30,31,30,31,31,30,31,30,31/ + + ! MicroMet monthly lapse rates (Liston and Kelly, 2006): + real lapse_rate(months) + real lapse_rate_nohem(months) + real lapse_rate_sohem(months) + data lapse_rate_nohem /0.0044,0.0059,0.0071,0.0078,0.0081,0.0082,& + 0.0081,0.0081,0.0077,0.0068,0.0055,0.0047/ + data lapse_rate_sohem /0.0081,0.0081,0.0077,0.0068,0.0055,0.0047,& + 0.0044,0.0059,0.0071,0.0078,0.0081,0.0082/ + ! Atmospheric vapor pressure coeffs are in units of km-1 + ! Following Liston and Kelly (2006) + real am(months) + real am_nohem(months) + real am_sohem(months) + data am_nohem /0.41,0.42,0.40,0.39,0.38,0.36,& + 0.33,0.33,0.36,0.37,0.40,0.40/ + data am_sohem /0.33,0.33,0.36,0.37,0.40,0.40,& + 0.41,0.42,0.40,0.39,0.38,0.36/ + + ! The precipitation lapse rate units are in km-1. + real prec_lapse_rate(months) + real precip_lapse_rate_nohem(months) + real precip_lapse_rate_sohem(months) + data precip_lapse_rate_nohem /0.35,0.35,0.35,0.30,0.25,0.20,& + & 0.20,0.20,0.20,0.25,0.30,0.35/ + data precip_lapse_rate_sohem /0.20,0.20,0.20,0.25,0.30,0.35,& + & 0.35,0.35,0.35,0.30,0.25,0.20/ + + ! Avoid problems of zero (low) winds (for example, turbulence + ! theory, log wind profile, etc., says that we must have some + ! wind. Thus, some equations blow up when the wind speed gets + ! very small). This number defines the value that any wind speed + ! below this gets set to. From snowmodel.par file ... + real, parameter :: windspd_min = 0.1 + + ! The curvature and wind_slope values range between -0.5 and +0.5. + ! Valid slopewt and curvewt values are between 0 and 1, with + ! values of 0.5 giving approximately equal weight to slope and + ! curvature. Glen Liston suggests that slopewt and curvewt be set such + ! that slopewt + curvewt = 1.0. This will limit the total + ! wind weight to between 0.5 and 1.5 (but this is not required). + real, parameter :: slopewt = 0.58 + real, parameter :: curvewt = 0.42 + integer :: loops_windwt_smoother + + ! The curvature is used as part of the wind model. Define a length + ! scale that the curvature calculation will be performed on. This + ! has units of meters, and should be approximately one-half the + ! wavelength of the topographic features within the domain. + real, parameter :: curve_len_scale = 300.0 + + ! 2D wind fields to apply smoother: + real, allocatable :: windspd(:,:), winddir(:,:) + real, allocatable :: wind_slope(:,:), windwt(:,:) + real, allocatable :: curv2d(:,:) + + ! ESMF metforcing states: + integer :: status, ierr + type(ESMF_Field) :: tmpField, q2Field, lwdField, psurfField + type(ESMF_Field) :: swdField, pcpField, uField, vField + real, pointer :: tmp(:),q2(:),lwd(:),psurf(:) + real, pointer :: swd(:),pcp(:),uwind(:),vwind(:) + +! ............................................................. + + ! ESMF calls for primary metforcing fields + ! Temperature + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_Tair%varname(1)),tmpField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for tmp in LIS_microMetCorrection') + + call ESMF_FieldGet(tmpField,localDE=0, farrayPtr=tmp,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for tmp in LIS_microMetCorrection') + + ! Surface pressure + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_Psurf%varname(1)),psurfField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for psurf in LIS_microMetCorrection') + + call ESMF_FieldGet(psurfField,localDE=0, farrayPtr=psurf,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for psurf in LIS_microMetCorrection') + + ! Spec humidity + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_Qair%varname(1)),q2Field,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for q2air in LIS_microMetCorrection') + + call ESMF_FieldGet(q2Field,localDE=0, farrayPtr=q2,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for q2air in LIS_microMetCorrection') + + ! LW down radiation + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_LWdown%varname(1)),lwdField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for lwdown in LIS_microMetCorrection') + + call ESMF_FieldGet(lwdField,localDE=0, farrayPtr=lwd,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for lwdown in LIS_microMetCorrection') + + ! SW down radiation + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_SWdown%varname(1)),swdField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for swdown in LIS_microMetCorrection') + + call ESMF_FieldGet(swdField,localDE=0, farrayPtr=swd,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for swdown in LIS_microMetCorrection') + + ! Total precip (or rainfall) + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_Rainf%varname(1)),pcpField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for pcp in LIS_microMetCorrection') + + call ESMF_FieldGet(pcpField,localDE=0, farrayPtr=pcp,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for pcp in LIS_microMetCorrection') + + ! U-wind component: + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_Wind_E%varname(1)),uField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for uwind in LIS_microMetCorrection') + + call ESMF_FieldGet(uField,localDE=0, farrayPtr=uwind,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for uwind in LIS_microMetCorrection') + + ! V-wind component: + call ESMF_StateGet(LIS_FORC_Base_State,& + trim(LIS_FORC_Wind_N%varname(1)),vField,& + rc=status) + call LIS_verify(status,'Error in ESMF_StateGet for vwind in LIS_microMetCorrection') + + call ESMF_FieldGet(vField,localDE=0, farrayPtr=vwind,rc=status) + call LIS_verify(status,'Error in ESMF_FieldGet for vwind in LIS_microMetCorrection') + +! ............................................................. + + ! For topographic wind distribution calculation + deg2rad = LIS_CONST_PI / 180.0 + rad2deg = 180.0 / LIS_CONST_PI + + ! Cloud cover fraction calculations (for LWdown and SWdown): + ! Walcek coefficients. + f_max = 78.0 + dx_walcek/15.5 + one_minus_RHe = 0.196 + (0.76-dx_walcek/2834.0) * (1.0 - press_ratio) + f_1 = f_max * (press_ratio - 0.1) / 0.6 / 100.0 + + ! Compute the solar declination angle (radians). + sol_dec = Trop_Can * cos(2.*LIS_CONST_PI * (real(LIS_rc%doy) - solstice)/days_yr) + + ! Find the month before and after the day in question. + ! - For monthly lapse rate selection. + if (LIS_rc%da.le.15) then + mbefore = LIS_rc%mo - 1 + if (mbefore.eq.0) mbefore = 12 + mafter = LIS_rc%mo + weight = (real(lastday(mbefore)) - 15. + real(LIS_rc%da)) / & + & real(lastday(mbefore)) + else + mbefore = LIS_rc%mo + mafter = LIS_rc%mo + 1 + if (mafter.eq.13) mafter = 1 + weight = (real(LIS_rc%da) - 15.) / real(lastday(mbefore)) + endif + +! --- + ! Loop over model-space tiles: + do t=1,LIS_rc%ntiles(n) + + gindex = LIS_domain(n)%tile(t)%index + xlat = LIS_domain(n)%grid(gindex)%lat + xlon = LIS_domain(n)%grid(gindex)%lon + slope = LIS_domain(n)%tile(t)%slope + aspect = LIS_domain(n)%tile(t)%aspect + curvature = LIS_domain(n)%tile(t)%curvature ! Now included in LDT output + + if(tmp(t).gt.0) then + force_tmp = tmp(t) + force_prs = psurf(t) + force_hum = q2(t) + force_pcp = pcp(t) + force_lwd = lwd(t) + force_swd = swd(t) + force_u = uwind(t) + force_v = vwind(t) + + ! Read-in lapse rate correction monthly values: + ! (from MicroMet code: get_lapse_rates routine) + ! Air, dewpoint temperature, and precipitation. + do k=1,months + if( xlat.lt.0.0 ) then ! Southern Hemisphere + lapse_rate(k) = lapse_rate_sohem(k) ! Temp + am(k) = am_sohem(k) ! Td + prec_lapse_rate(k) = precip_lapse_rate_sohem(k) ! Precip + else ! Northern Hemisphere + lapse_rate(k) = lapse_rate_nohem(k) + am(k) = am_nohem(k) + prec_lapse_rate(k) = precip_lapse_rate_nohem(k) + endif + enddo + + ! Define the temperature lapse rate (Kelvin/1000m). + T_lapse_rate = (- (weight * lapse_rate(mafter) + & + (1. - weight) * lapse_rate(mbefore))) + + ! Define the dew-point temperature lapse rate (deg C/m). + Td_lapse_rate = (- ((weight * am(mafter) + & + (1. - weight) * am(mbefore)) * C)) / (B1 * 1000.0) ! MicroMet + + ! Define the precipitation lapse rate (km-1). + precip_lapse_rate = weight * prec_lapse_rate(mafter) + & + (1. - weight) * prec_lapse_rate(mbefore) + + ! Calculate elev diff between hi-res elev and forcing elev + elevdiff = LIS_domain(n)%tile(t)%elev-& + modelelev(gindex) + ! --- + ! (1) T2air (tmp | tcforce) : Perform lapse-rate correction on temperature: + tcforce = force_tmp+(T_lapse_rate*elevdiff) + + ! --- + ! (2) Surface Pressure (psurf | pcforce) + ! Pressure - elevation change (from Cosgrove et. al (2003): + tbar=(force_tmp+tcforce)/2. + pcforce=force_prs/(exp((LIS_CONST_G*elevdiff)/(rdry*tbar))) + + ! --- + ! (3) Relative humidity (q2 | hcforce) + ! Perform lapse-rate correction on humidity fields: + ! Compute water vapor pressure from spec humidity and pressure + e = force_hum*force_prs / (0.622+0.378*force_hum) + + Td = C*log((e/A))/(B1-log((e/A))) + Tf ! matches MicroMet equation + Tdcforce = Td + (Td_lapse_rate*elevdiff) ! final corrected dewpoint temp + + ! Convert back to spec hum from Td (MicroMet) + e = A*exp((B1*(Tdcforce-Tf))/(C+(Tdcforce-Tf))) + hcforce = (0.622*e) / (pcforce - (0.378*e)) + + ! --- + ! (4) Precipitation (pcp | pptforce) + ! Use a precipitation "lapse rate", or adjust the precipitation on + ! the actual elevation grid. The reason the interpolated station elevations + ! are used as the topographic reference surface (instead of something + ! like sea level), is because precip adjustment factor is a non-linear + ! function of elevation difference. + ! + ! The adjustment factor that is used comes from: Thornton, P. E., + ! S. W. Running, and M. A. White, 1997: Generating surfaces of + ! daily meteorological variables over large regions of complex + ! terrain. J. Hydrology, 190, 214-251. + + ! Convert the precipitation "lapse rate" (km-1) to m-1. + precip_lapse_rate_m = precip_lapse_rate / 1000.0 + + ! Apply Glen Liston's original precipitation increase with + ! elevation scheme. Also, we could implement (in the future) + ! Ward van Pelt's scheme (see van Pelt et al. 2016). + ! Don't let the elevation difference be greater than some number + ! (like 1800 meters gives a factor of 4.4). If it is too large + ! you get huge precipitation adjustment, a divide by zero, or + ! even negative adjustments for high elevations). + + elevdiff2 = min(elevdiff,1800.0) + alfa = precip_lapse_rate_m * elevdiff2 + pptforce = force_pcp * (1.0 + alfa)/(1.0 - alfa) + pptforce = max(0.0,pptforce) ! Ensure no negative precip values + + ! --- + ! Incoming/Downward Radiation Fields: + ! --- + ! Cloud cover fraction calculations (for LWdown and SWdown): + delta_topo700 = topo_ref_cloud - LIS_domain(n)%tile(t)%elev + Td_700 = Tdcforce + Td_lapse_rate * delta_topo700 + Tair_700 = tcforce + T_lapse_rate * delta_topo700 + + ! Convert each Td to a gridded relative humidity (0-1). + e_700 = A * exp((B1 * (Td_700 - Tf))/(C + (Td_700 - Tf))) + es_700 = A * exp((B1 * (Tair_700 - Tf))/(C + (Tair_700 - Tf))) + rh_700 = e_700/es_700 + rh_700 = min(1.0,rh_700) + rh_700 = max(0.0,rh_700) + + ! Use this RH at 700 mb to define the cloud fraction (0-1). + cloud_frac = f_1 * exp((rh_700 - 1.0)/one_minus_RHe) + + ! --- + ! (5) Longwave radiation (lwd | lcforce) -- MicroMet: + ! Compute Qli following Iziomon et al. (2003). + if( LIS_domain(n)%tile(t)%elev.lt.E1 ) then + Xs = X1 + Ys = Y1 + Zs = Z1 + elseif( LIS_domain(n)%tile(t)%elev.gt.E2) then + Xs = X3 + Ys = Y3 + Zs = Z3 + else + Xs = X1 + (LIS_domain(n)%tile(t)%elev - E1) * (X3 - X1)/(E3 - E1) + Ys = Y1 + (LIS_domain(n)%tile(t)%elev - E1) * (Y3 - Y1)/(E3 - E1) + Zs = Z1 + (LIS_domain(n)%tile(t)%elev - E1) * (Z3 - Z1)/(E3 - E1) + endif + + emiss_cloud = alfa_lw * & + (1.0 - Xs * exp((- Ys) * e/tcforce)) * & + (1.0 + Zs * cloud_frac**2) + emiss_cloud = min(1.0,emiss_cloud) + + lcforce = emiss_cloud * Stef_Boltz * tcforce**4 +#if 0 + ! From Cogsrove et al. (2003) -- + ee = (force_hum*force_prs)/0.622 + fe = (hcforce*pcforce)/0.622 + mee = ee/100. + mfe = fe/100. + !---------------------------------------------------------------------- + ! correct for negative vapor pressure at very low temperatures at + ! high latitudes + !---------------------------------------------------------------------- + if (mee .le. 0) mee = 1e-08 + if (mfe .le. 0) mfe = 1e-08 + emiss = 1.08*(1-exp(-mee**(force_tmp/bb))) + femiss = 1.08*(1-exp(-mfe**(tcforce/bb))) + ratio = (femiss*(tcforce**4))/(emiss*(force_tmp**4)) + lcforce= force_lwd*ratio +#endif + + ! --- + ! (6) Shortwave radiation (swd | scforce) -- MicroMet: + ! "solar" routine from MicroMet calculates the "local" SWdown, and + ! only set up for radiation values for <= 3 hour model timestep. + + ! In solar radiation, adjust the time to correspond to the + ! local time at this longitude position. + xxhour = LIS_rc%hr + xlon / 15.0 + if (xxhour.ge.24.0) xxhour = xxhour - 24.0 + if (xxhour.lt.0.0) xxhour = xxhour + 24.0 + + ! Compute the sun's hour angle (radians). + hr_angl = (xxhour * 15.0 - 180.0) * deg2rad + + ! Compute cos_Z. Note that the sin of the solar elevation angle, + ! sin_alfa, is equal to the cosine of the solar zenith angle, + ! cos_Z. + cos_Z = sin(sol_dec) * sin(xlat * deg2rad) + & + cos(sol_dec) * cos(xlat * deg2rad) * cos(hr_angl) + cos_Z = max(0.0,cos_Z) + + ! Account for clouds, water vapor, pollution, etc. + trans_direct = (0.6 + 0.2 * cos_Z) * (1.0 - cloud_frac) + trans_diffuse = (0.3 + 0.1 * cos_Z) * cloud_frac + + ! Compute the solar radiation transmitted through the atmosphere. + Qsi_trans_dir = solar_const * trans_direct + Qsi_trans_dif = solar_const * trans_diffuse + + ! COMPUTE THE CORRECTIONS TO ALLOW FOR TOPOGRAPHIC SLOPE AND ASPECT. + ! The sine of the solar zenith angle. + sin_Z = sqrt(1.0 - cos_Z*cos_Z) + + ! Azimuth of the sun, with south having zero azimuth for the + ! northern hemisphere. + sun_azimuth = asin(max(-1.0,min(1.0,cos(sol_dec)*sin(hr_angl)/sin_Z))) + if (xlat.lt.0.0) then + sun_azimuth = - sun_azimuth + endif + + ! Make the corrections so that the angles below the local horizon + ! are still measured from the normal to the slope. + if (xlat.ge.0.0) then + if (hr_angl.lt.0.0) then + if (hr_angl.lt.sun_azimuth) sun_azimuth = - LIS_CONST_PI - sun_azimuth + elseif (hr_angl.gt.0.0) then + if (hr_angl.gt.sun_azimuth) sun_azimuth = LIS_CONST_PI - sun_azimuth + endif + endif + + ! Build, from the variable with north having zero azimuth, a + ! slope_azimuth value with south having zero azimuth. Also + ! make north have zero azimuth if in the southern hemsisphere. + if (xlat.ge.0.0) then + if( aspect.ge.180.0 ) then + slope_az_S0 = aspect - 180.0 + else + slope_az_S0 = aspect + 180.0 + endif + else + slope_az_S0 = aspect + endif + + ! Compute the angle between the normal to the slope and the angle + ! at which the direct solar radiation impinges on the sloping + ! terrain (radians). + cos_i = cos(slope * deg2rad) * cos_Z + & + sin(slope * deg2rad) * sin_Z * & + cos(sun_azimuth - slope_az_S0 * deg2rad) + + ! Adjust the topographic correction due to local slope so that + ! the correction is zero if the sun is below the local horizon + ! (i.e., the slope is in the shade) or if the sun is below the + ! global horizon. + if (cos_i.lt.0.0) cos_i = 0.0 + if (cos_Z.le.0.0) cos_i = 0.0 + + ! Adjust the solar radiation for slope, etc. + Qsi_direct = cos_i * Qsi_trans_dir + Qsi_diffuse = cos_Z * Qsi_trans_dif + + ! Combine the direct and diffuse solar components. + scforce = Qsi_direct + Qsi_diffuse + + ! ------------------------------------ + ! Convert back to LIS-model tile space: + tmp(t) = tcforce + psurf(t) = pcforce + q2(t) = hcforce + pcp(t) = pptforce + lwd(t) = lcforce + swd(t) = scforce + + endif + enddo + + ! --- + ! (7/8) Wind fields (uwind | uwcforce; vwind | vwcforce) + + ! Convert domain dx, dy into meters: + if( LIS_domain(n)%dx <= 1.) then ! Temp. solution for lat/lon dx,dy + deltax = LIS_domain(n)%dx*100000. + deltay = LIS_domain(n)%dy*100000. + else + deltax = LIS_domain(n)%dx*1000. + deltay = LIS_domain(n)%dy*1000. + endif + + ! Smooth the wind weighting factor to eliminate any sharp speed + ! increases resulting from the merging of the curve wt and the + ! slope wt. Define the number of times this is done to be a + ! function of the curvature length scale and the grid increment. + ! The first 0.5 here just means that half of the caclulated + ! number appears to be about right (additional loops with this + ! smoother does not change the results much). If there are + ! unwanted wave features in the snow distribution, this 0.5 + ! factor can be increased to 1.0 or more, to get rid of these + ! waves. Also see "loops_snowd_smoother" in snowtran_code.f90. + ! xmult = 0.5 | xmult = 1.5 + xmult = 1.0 ! Based on MicroMet code + + loops_windwt_smoother = nint(xmult * curve_len_scale / & + (0.5 * (deltax + deltay))) + + ! Set up the 2D wind fields needed: + allocate( windspd(LIS_rc%lnc(n),LIS_rc%lnr(n)),winddir(LIS_rc%lnc(n),LIS_rc%lnr(n)) ) + allocate( wind_slope(LIS_rc%lnc(n),LIS_rc%lnr(n)),windwt(LIS_rc%lnc(n),LIS_rc%lnr(n)) ) + allocate( curv2d(LIS_rc%lnc(n),LIS_rc%lnr(n)) ) + + windspd = LIS_rc%udef + winddir = LIS_rc%udef + wind_slope = LIS_rc%udef + windwt = LIS_rc%udef + curv2d = LIS_rc%udef + + ! Loop over model-space tiles and convert key wind fields to 2D: + do t=1,LIS_rc%ntiles(n) + col = LIS_domain(n)%tile(t)%col + row = LIS_domain(n)%tile(t)%row + + slope = LIS_domain(n)%tile(t)%slope + aspect = LIS_domain(n)%tile(t)%aspect + curvature = LIS_domain(n)%tile(t)%curvature ! Now included in LDT output + curv2d(col,row) = LIS_domain(n)%tile(t)%curvature + + ! Convert these u and v components to speed and directions. + if(tmp(t).gt.0) then + force_u = uwind(t) + force_v = vwind(t) + + ! Some compilers do not allow both u and v to be 0.0 in the atan2 computation. + if( abs(force_u).lt.1e-10 ) force_u = 1e-10 + winddir(col,row) = rad2deg * atan2(force_u,force_v) + if( winddir(col,row).ge.180.0 ) then + winddir(col,row) = winddir(col,row) - 180.0 + else + winddir(col,row) = winddir(col,row) + 180.0 + endif + windspd(col,row) = sqrt(force_u**2 + force_v**2) + + ! Modify the wind speed and direction according to simple wind-topography + ! From "topo_mod_winds" subroutine in micromet_code.f90. + ! + ! Compute the wind modification factor which is a function of + ! topography and wind direction following Liston and Sturm (1998). + + ! Compute the slope in the direction of the wind. + wind_slope(col,row) = deg2rad * slope * & + cos(deg2rad * (winddir(col,row) - aspect)) + + endif + enddo + + ! Scale the wind slope such that the max abs(wind slope) has a value + ! of abs(0.5). Include a 1 mm slope in slope_max to prevent + ! divisions by zero in flat terrain where the slope is zero. + wslope_max = 0.0 + 0.001 + do j=1,LIS_rc%lnr(n) + do i=1,LIS_rc%lnc(n) + wslope_max = max(wslope_max,abs(wind_slope(i,j))) + enddo + enddo + +! Search for global "max" of wslope_max value for all parallel subdomains: +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(wslope_max, wslopemax_glb, 1,& + MPI_REAL, MPI_MAX, LIS_mpi_comm, ierr) + wslope_max = wslopemax_glb #endif - write(LIS_logunit,*) 'This routine is not currently supported' +! ----- + + ! Apply global slope max to 2D wind_slope calculation: + do j=1,LIS_rc%lnr(n) + do i=1,LIS_rc%lnc(n) + + wind_slope(i,j) = wind_slope(i,j) / (2.0 * wslope_max) + + ! Calculate the wind speed and direction adjustments. The + ! curvature and wind_slope values range between -0.5 and +0.5. + ! Valid slopewt and curvewt values are between 0 and 1, with + ! values of 0.5 giving approximately equal weight to slope and + ! curvature. Glen Liston suggests that slopewt and curvewt be set such + ! that slopewt + curvewt = 1.0. This will limit the total + ! wind weight to between 0.5 and 1.5 (but this is not required). + + ! Compute the wind weighting factor -- dependent on wind direction input. + windwt(i,j) = 1.0 + slopewt * wind_slope(i,j) + curvewt * curv2d(i,j) + + enddo + enddo + + ! Don't apply smoothing if the domain is arbitrarily small (<=100 gnc, gnr). + if (LIS_rc%gnc(n).gt.100 .and. LIS_rc%gnr(n).gt.100) then + do k=1,loops_windwt_smoother + call wind_smoother(LIS_rc%lnc(n),LIS_rc%lnr(n),windwt) !<-- windwt(nc,nr) + enddo + endif + + ! Complete final calculations and translation back to 1D tilespace: + do t=1,LIS_rc%ntiles(n) + i = LIS_domain(n)%tile(t)%col + j = LIS_domain(n)%tile(t)%row + aspect = LIS_domain(n)%tile(t)%aspect + + if(tmp(t).gt.0) then + + ! Generate the terrain-modified wind speed. + windspd(i,j) = windwt(i,j) * windspd(i,j) + + ! Modify the wind direction according to Ryan (1977). Note that it + ! is critical that "dirdiff" handles the cases where the slope + ! azimuth and the wind direction are on different sides of the + ! 360-0 line. + if( aspect.gt.270.0 .and. winddir(i,j).lt.90.0 ) then + dirdiff = aspect - winddir(i,j) - 360.0 + elseif( aspect.lt.90.0 .and. winddir(i,j).gt.270.0 ) then + dirdiff = aspect - winddir(i,j) + 360.0 + else + dirdiff = aspect - winddir(i,j) + endif + if( abs(dirdiff).le.90.0 ) then + winddir(i,j) = winddir(i,j) - 0.5 * min(wind_slope(i,j)*rad2deg,45.0) * & + sin(deg2rad * (2.0 * dirdiff)) + if( winddir(i,j).gt.360.0 ) then + winddir(i,j) = winddir(i,j) - 360.0 + elseif( winddir(i,j).lt.0.0 ) then + winddir(i,j) = winddir(i,j) + 360.0 + endif + endif + + ! Avoid problems of zero (low) winds (for example, turbulence theory, + ! log wind profile, etc., says that we must have some wind. Thus, + ! some equations blow up when the wind speed gets very small. + if( windspd(i,j).lt.windspd_min ) then + windspd(i,j) = windspd_min + endif + + ! Final conversion back to corrected uwind and vwind components: + uwcforce = (- windspd(i,j)) * sin(deg2rad*winddir(i,j)) + vwcforce = (- windspd(i,j)) * cos(deg2rad*winddir(i,j)) + + uwind(t) = uwcforce + vwind(t) = vwcforce + + endif + enddo + + deallocate( windspd, winddir ) + deallocate( wind_slope, windwt, curv2d ) + + write(LIS_logunit,*) '[INFO] MicroMet forcing topographic downscaling completed' end subroutine LIS_microMetCorrection + + +subroutine wind_smoother (nx, ny, weight) + + implicit none + +! !ARGUMENTS: + integer, intent(in) :: nx, ny + real, intent(inout) :: weight(nx,ny) +! +! !DESCRIPTION: +! +! Routine performs a 9-point smoothing operation. +! +! The result at each grid point is a weighted average of the grid +! point and the surrounding 8 points. The center point receives +! a weight of 1.0, the points at each side and above and below +! receive a weight of 0.5, and corner points receive a weight of +! 0.3. All points are multiplied by their weights and summed, +! then divided by the total weight. +! +! Ref: +! Liston, G. E., & Elder, K. (2006). A Meteorological Distribution System for High-Resolution +! Terrestrial Modeling (MicroMet), Journal of Hydrometeorology, 7(2), 217-234. +! https://journals.ametsoc.org/view/journals/hydr/7/2/jhm486_1.xml + + integer :: i,j + real :: weight_tmp(nx,ny) + + ! Do the interior. + do i=2,nx-1 + do j=2,ny-1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j-1) + & + weight(i,j+1) + weight(i-1,j) + weight(i+1,j)) + 0.3 *& + (weight(i-1,j-1) + weight(i+1,j+1) + weight(i-1,j+1) +& + weight(i+1,j-1))) / 4.2 + enddo + enddo + + ! Do the sides. + j = 1 + do i=2,nx-1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j+1) + weight(i-1,j) +& + weight(i+1,j)) + 0.3 * (weight(i+1,j+1) + weight(i-1,j+1))) / 3.1 + enddo + + j = ny + do i=2,nx-1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j-1) + weight(i-1,j) +& + weight(i+1,j)) + 0.3 * (weight(i+1,j-1) + weight(i-1,j-1))) / 3.1 + enddo + + i = 1 + do j=2,ny-1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j-1) + weight(i,j+1) +& + weight(i+1,j)) + 0.3 * (weight(i+1,j-1) + weight(i+1,j+1))) / 3.1 + enddo + + i = nx + do j=2,ny-1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j-1) + weight(i,j+1) +& + weight(i-1,j)) + 0.3 * (weight(i-1,j-1) + weight(i-1,j+1))) / 3.1 + enddo + + ! Do the corners. + i = 1 + j = 1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j+1) + weight(i+1,j)) +& + 0.3 * weight(i+1,j+1)) / 2.3 + + i = nx + j = 1 + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j+1) + weight(i-1,j)) +& + 0.3 * weight(i-1,j+1)) / 2.3 + + i = 1 + j = ny + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j-1) + weight(i+1,j)) +& + 0.3 * weight(i+1,j-1)) / 2.3 + + i = nx + j = ny + weight_tmp(i,j) = (weight(i,j) + 0.5 * (weight(i,j-1) + weight(i-1,j)) +& + 0.3 * weight(i-1,j-1)) / 2.3 + + ! Return the smoothed array. + do i=1,nx + do j=1,ny + weight(i,j) = weight_tmp(i,j) + enddo + enddo + +end subroutine diff --git a/lis/core/LIS_mpDecomp.c b/lis/core/LIS_mpDecomp.c index 1f5952278..2142d0270 100644 --- a/lis/core/LIS_mpDecomp.c +++ b/lis/core/LIS_mpDecomp.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_mpiMod.F90 b/lis/core/LIS_mpiMod.F90 index 8f32d334a..f052024c3 100644 --- a/lis/core/LIS_mpiMod.F90 +++ b/lis/core/LIS_mpiMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_numerRecipesMod.F90 b/lis/core/LIS_numerRecipesMod.F90 index 0df44363c..4e281c98b 100644 --- a/lis/core/LIS_numerRecipesMod.F90 +++ b/lis/core/LIS_numerRecipesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_openwater_FTable.c b/lis/core/LIS_openwater_FTable.c index 264af3f02..cdeda93b9 100644 --- a/lis/core/LIS_openwater_FTable.c +++ b/lis/core/LIS_openwater_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_openwatermodelMod.F90 b/lis/core/LIS_openwatermodelMod.F90 index 2ccdf43d7..839abbce1 100644 --- a/lis/core/LIS_openwatermodelMod.F90 +++ b/lis/core/LIS_openwatermodelMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_optUEMod.F90 b/lis/core/LIS_optUEMod.F90 index 19549341f..d638798df 100755 --- a/lis/core/LIS_optUEMod.F90 +++ b/lis/core/LIS_optUEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_optUE_FTable.c b/lis/core/LIS_optUE_FTable.c index 35153c814..9f5fc225d 100755 --- a/lis/core/LIS_optUE_FTable.c +++ b/lis/core/LIS_optUE_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_paramsMod.F90 b/lis/core/LIS_paramsMod.F90 index 095fb9c5e..569c888b0 100644 --- a/lis/core/LIS_paramsMod.F90 +++ b/lis/core/LIS_paramsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_perturbMod.F90 b/lis/core/LIS_perturbMod.F90 index 1f5d097f8..bf603deca 100644 --- a/lis/core/LIS_perturbMod.F90 +++ b/lis/core/LIS_perturbMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_perturb_FTable.c b/lis/core/LIS_perturb_FTable.c index 827dcae8c..d9c1e12a7 100644 --- a/lis/core/LIS_perturb_FTable.c +++ b/lis/core/LIS_perturb_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_precisionMod.F90 b/lis/core/LIS_precisionMod.F90 index e29c66510..00da2e61b 100644 --- a/lis/core/LIS_precisionMod.F90 +++ b/lis/core/LIS_precisionMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_process_cmd_args.F90 b/lis/core/LIS_process_cmd_args.F90 index 270195020..44e1c1244 100644 --- a/lis/core/LIS_process_cmd_args.F90 +++ b/lis/core/LIS_process_cmd_args.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_ran2_gasdev.F90 b/lis/core/LIS_ran2_gasdev.F90 index 0ad111881..2833c94d9 100644 --- a/lis/core/LIS_ran2_gasdev.F90 +++ b/lis/core/LIS_ran2_gasdev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_readConfig.F90 b/lis/core/LIS_readConfig.F90 index 28f4315d6..5ed1627d1 100644 --- a/lis/core/LIS_readConfig.F90 +++ b/lis/core/LIS_readConfig.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -29,6 +29,7 @@ ! and added parameter output option (wparm) ! 29 Dec 2007: Marv Freimund; Used trim on filenames ! 17 Jan 2011: David Mocko, added max/min greenness & slope type +! 15 May 2023 Sujay Kumar, added support for 1D lat/lon output for latlon and merc projections ! ! !INTERFACE: subroutine LIS_readConfig() @@ -134,9 +135,27 @@ subroutine LIS_readConfig() call ESMF_ConfigGetAttribute(LIS_config,LIS_rc%runmode,& label="Running mode:",rc=rc) call LIS_verify(rc,'Running mode: option not specified in the config file') + ! call ESMF_ConfigGetAttribute(LIS_config,LIS_rc%lis_map_proj,& ! label="Map projection of the LIS domain:",rc=rc) ! call LIS_verify(rc,'Map projection of the LIS domain: option not specified in the config file') + + ! CM Grabs new optional lis.config entry for the number of dimensions of the lat/lon fields + call ESMF_ConfigGetAttribute(LIS_config,LIS_rc%nlatlon_dimensions,& + label="Number of dimensions in the lat/lon output fields:",rc=rc) + call LIS_warning(rc, 'Number of dimensions in the lat/lon output fields: option not specified in the config file. Assigning value to "1D"') + + ! CM If the user did not specify the number of dimension for the lat/lon fields, use 1D. In LIS_domainMod, this will switch to 2D for all projections except latlon. + if ( rc /= 0 ) then + LIS_rc%nlatlon_dimensions = "1D" + endif + + ! CM If the user specified an invalid dimension option, assign to "1D" + if ( LIS_rc%nlatlon_dimensions /= "1D" .AND. LIS_rc%nlatlon_dimensions /= "2D" ) then + call LIS_warning(1,'Invalid lis.config entry, "Number of dimensions in the lat/lon output fields:" Assigning value to "1D"') + LIS_rc%nlatlon_dimensions = "1D" + endif + call ESMF_ConfigGetAttribute(LIS_config,LIS_rc%nnest,& label="Number of nests:",rc=rc) call LIS_verify(rc,'Number of nests: option not specified in the config file') @@ -771,11 +790,12 @@ subroutine LIS_readConfig() call LIS_parseTimeString(time,LIS_rc%pertrestartInterval) - if(npert_forc.ne.0.or.npert_state.ne.0) then - call ESMF_ConfigGetAttribute(LIS_config,LIS_rc%pert_bias_corr,& - label="Apply perturbation bias correction:",rc=rc) - call LIS_verify(rc,'Apply perturbation bias correction: not specified') - endif + LIS_rc%pert_bias_corr = 1 +! if(npert_forc.ne.0.or.npert_state.ne.0) then +! call ESMF_ConfigGetAttribute(LIS_config,LIS_rc%pert_bias_corr,& +! label="Apply perturbation bias correction:",rc=rc) +! call LIS_verify(rc,'Apply perturbation bias correction: not specified') +! endif ! if(npert_forc.ne.0.or.npert_state.ne.0.or.npert_obs.ne.0) then call ESMF_ConfigFindLabel(LIS_config,"Perturbations restart filename:",rc=rc) diff --git a/lis/core/LIS_readDAObsAttributes.F90 b/lis/core/LIS_readDAObsAttributes.F90 index b56c75f36..86fdd45d6 100644 --- a/lis/core/LIS_readDAObsAttributes.F90 +++ b/lis/core/LIS_readDAObsAttributes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_readPEDecSpaceAttributes.F90 b/lis/core/LIS_readPEDecSpaceAttributes.F90 index 476c9b857..67c83b1c1 100644 --- a/lis/core/LIS_readPEDecSpaceAttributes.F90 +++ b/lis/core/LIS_readPEDecSpaceAttributes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_roughness_FTable.c b/lis/core/LIS_roughness_FTable.c index 3ae81d1a6..2362550b2 100644 --- a/lis/core/LIS_roughness_FTable.c +++ b/lis/core/LIS_roughness_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_routingMod.F90 b/lis/core/LIS_routingMod.F90 index 1393e8eb9..cfcf172c3 100644 --- a/lis/core/LIS_routingMod.F90 +++ b/lis/core/LIS_routingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_routing_FTable.c b/lis/core/LIS_routing_FTable.c index 69a868970..d4c65b336 100644 --- a/lis/core/LIS_routing_FTable.c +++ b/lis/core/LIS_routing_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_runmode_FTable.c b/lis/core/LIS_runmode_FTable.c index af18bb974..484872587 100644 --- a/lis/core/LIS_runmode_FTable.c +++ b/lis/core/LIS_runmode_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_runoffdata_FTable.c b/lis/core/LIS_runoffdata_FTable.c index 0f4dc26c9..7249c554a 100644 --- a/lis/core/LIS_runoffdata_FTable.c +++ b/lis/core/LIS_runoffdata_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_snowMod.F90 b/lis/core/LIS_snowMod.F90 index 7b1d25c51..31b701d16 100644 --- a/lis/core/LIS_snowMod.F90 +++ b/lis/core/LIS_snowMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_soilsMod.F90 b/lis/core/LIS_soilsMod.F90 index a542db448..c44f275c5 100644 --- a/lis/core/LIS_soilsMod.F90 +++ b/lis/core/LIS_soilsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_spatialDownscalingMod.F90 b/lis/core/LIS_spatialDownscalingMod.F90 index 886371b69..efb2511e5 100644 --- a/lis/core/LIS_spatialDownscalingMod.F90 +++ b/lis/core/LIS_spatialDownscalingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_sublsm_FTable.c b/lis/core/LIS_sublsm_FTable.c index 639ba17e9..3cf5db8c4 100644 --- a/lis/core/LIS_sublsm_FTable.c +++ b/lis/core/LIS_sublsm_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -368,6 +368,80 @@ void FTN(sublsmfinalize)(char *j,int len) current->func(); } +//BOP +// !ROUTINE: registersublsmreset +// \label{registersublsmreset} +// +// !INTERFACE: +void FTN(registersublsmreset)(char *j, void (*func)(),int len) +// +// !DESCRIPTION: +// Creates an entry in the registry for the routine +// to cleanup allocated structures specific to the +// land surface model +// +// \begin{description} +// \item[j] +// name of the LSM +// \end{description} +// +//EOP +{ + int len1; + struct sublsmresetnode* current; + struct sublsmresetnode* pnode; + // create node + + len1 = len + 1; // ensure that there is space for terminating null + pnode=(struct sublsmresetnode*) malloc(sizeof(struct sublsmresetnode)); + pnode->name=(char*) calloc(len1,sizeof(char)); + strncpy(pnode->name,j,len); + pnode->func = func; + pnode->next = NULL; + + if(sublsmreset_table == NULL){ + sublsmreset_table = pnode; + } + else{ + current = sublsmreset_table; + while(current->next!=NULL){ + current = current->next; + } + current->next = pnode; + } +} +//BOP +// !ROUTINE: sublsmreset +// \label{sublsmreset} +// +// !INTERFACE: +void FTN(sublsmreset)(char *j,int len) +// +// !DESCRIPTION: +// Invokes the routine from the registry for cleaning up +// allocated structures specific to the land surface model +// +// \begin{description} +// \item[j] +// name of the LSM +// \end{description} +// +//EOP +{ + struct sublsmresetnode* current; + + current = sublsmreset_table; + while(strcmp(current->name,j)!=0){ + current = current->next; + if(current==NULL) { + printf("****************Error****************************\n"); + printf("reset routine for LSM %s is not defined\n",j); + printf("program will seg fault.....\n"); + printf("****************Error****************************\n"); + } + } + current->func(); +} //BOP // !ROUTINE: registersublsmsetup diff --git a/lis/core/LIS_surfaceModelDataMod.F90 b/lis/core/LIS_surfaceModelDataMod.F90 index e1b980d53..074642a53 100644 --- a/lis/core/LIS_surfaceModelDataMod.F90 +++ b/lis/core/LIS_surfaceModelDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_surfaceModelMod.F90 b/lis/core/LIS_surfaceModelMod.F90 index d556913aa..0839ea430 100644 --- a/lis/core/LIS_surfaceModelMod.F90 +++ b/lis/core/LIS_surfaceModelMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_tbotAdjustMod.F90 b/lis/core/LIS_tbotAdjustMod.F90 index b99164e6a..287854d9f 100644 --- a/lis/core/LIS_tbotAdjustMod.F90 +++ b/lis/core/LIS_tbotAdjustMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -454,9 +454,9 @@ subroutine LIS_readTmnUpdateRestart(n,ftn,wformat) real, allocatable :: tmptilen(:) if ( LIS_rc%tbot_update_lag == 0 ) then - write(LIS_logunit,*) '[WARN] dynamic deep soil temperature updating '//& + write(LIS_logunit,*) '[INFO] dynamic deep soil temperature updating '//& 'was disabled in lis.config file.' - write(LIS_logunit,*) '[WARN] returning from LIS_readTmnUpdateRestart' + write(LIS_logunit,*) '[INFO] returning from LIS_readTmnUpdateRestart' return endif diff --git a/lis/core/LIS_timeMgrMod.F90 b/lis/core/LIS_timeMgrMod.F90 index 4fda9f7e5..b11bb6e9f 100644 --- a/lis/core/LIS_timeMgrMod.F90 +++ b/lis/core/LIS_timeMgrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/LIS_topoMod.F90 b/lis/core/LIS_topoMod.F90 index 8c685f4f9..8118a43b3 100644 --- a/lis/core/LIS_topoMod.F90 +++ b/lis/core/LIS_topoMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -47,6 +47,7 @@ module LIS_topoMod real, allocatable :: aspect(:,:,:) real, allocatable :: aspectfgrd(:,:,:) real, allocatable :: curvature(:,:,:) + real, allocatable :: curvfgrd(:,:,:) end type topo_type_dec type(topo_type_dec), allocatable :: LIS_topo(:) @@ -93,9 +94,9 @@ subroutine LIS_topo_init() call read_aspect(n) endif -! if(LIS_rc%usecurvaturemap(n).ne."none") then -! call read_curvature(n) -! endif + if(LIS_rc%usecurvaturemap(n).ne."none") then + call read_curvature(n) + endif enddo end subroutine LIS_topo_init @@ -500,5 +501,112 @@ subroutine read_aspect(n) end subroutine read_aspect +!BOP +! +! !ROUTINE: read_curvature +! \label{read_curvature} +! +! !REVISION HISTORY: +! 03 Sept 2004: Sujay Kumar; Initial Specification +! 23 Mar 2022: K.R. Arsenault; Added curvature +! +! !INTERFACE: + subroutine read_curvature(n) +! !USES: +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + use LIS_coreMod, only : LIS_rc, LIS_localPet,& + LIS_ews_ind, LIS_ewe_ind,& + LIS_nss_ind, LIS_nse_ind, LIS_ews_halo_ind,LIS_ewe_halo_ind, & + LIS_nss_halo_ind, LIS_nse_halo_ind + use LIS_logMod, only : LIS_logunit, LIS_getNextUnitNumber, & + LIS_releaseUnitNumber, LIS_endrun, LIS_verify + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + +! !DESCRIPTION: +! This subroutine reads the curvature data +! +! The arguments are: +! \begin{description} +! \item[n] +! index of n +! \item[locallc] +! landlc for the region of interest +! \end{description} +! +!EOP + integer :: ios1 + integer :: ios,nid,ntypesId,ncId, nrId + integer :: curvid, curvfgrdId + integer :: nc,nr,c,r + logical :: file_exists + +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + + inquire(file=LIS_rc%paramfile(n), exist=file_exists) + if(file_exists) then + + write(LIS_logunit,*)'[INFO] Reading curvature map from '& + //trim(LIS_rc%paramfile(n)) + + ios = nf90_open(path=LIS_rc%paramfile(n),& + mode=NF90_NOWRITE,ncid=nid) + call LIS_verify(ios,'Error in nf90_open in read_curvature') + + ios = nf90_inq_dimid(nid,"east_west",ncId) + call LIS_verify(ios,'Error in nf90_inq_dimid in read_curvature') + + ios = nf90_inq_dimid(nid,"north_south",nrId) + call LIS_verify(ios,'Error in nf90_inq_dimid in read_curvature') + +! ios = nf90_inq_dimid(nid,"curvbins",ntypesId) +! call LIS_verify(ios,'Error in nf90_inq_dimid in read_curvature') + + ios = nf90_inquire_dimension(nid,ncId, len=nc) + call LIS_verify(ios,'Error in nf90_inquire_dimension in read_curvature') + + ios = nf90_inquire_dimension(nid,nrId, len=nr) + call LIS_verify(ios,'Error in nf90_inquire_dimension in read_curvature') + +! ios = nf90_inquire_dimension(nid,ntypesId, len=LIS_rc%curvbands) +! call LIS_verify(ios,'Error in nf90_inquire_dimension in read_curvature') + + allocate(LIS_topo(n)%curvature(LIS_rc%lnc(n),LIS_rc%lnr(n), & + 1)) + allocate(LIS_topo(n)%curvfgrd(LIS_rc%lnc(n),LIS_rc%lnr(n), & + 1)) + + ios = nf90_inq_varid(nid,'CURVATURE',curvid) + call LIS_verify(ios,'CURVATURE field not found in the LIS param file') + + + ios = nf90_get_var(nid,curvid,LIS_topo(n)%curvature,& + start=(/LIS_ews_halo_ind(n,LIS_localPet+1),& + LIS_nss_halo_ind(n,LIS_localPet+1),1/),& + count=(/LIS_rc%lnc(n),LIS_rc%lnr(n),1/)) + call LIS_verify(ios,'Error in nf90_get_var in read_aspect') + + do r = 1,LIS_rc%lnr(n) + do c = 1,LIS_rc%lnc(n) + if( LIS_topo(n)%curvature(c,r,1) .ne. LIS_rc%udef ) then + LIS_topo(n)%curvfgrd(c,r,1) = 1.0 + else + LIS_topo(n)%curvfgrd(c,r,1) = 0.0 + endif + enddo + enddo + + else + write(LIS_logunit,*) '[ERR] curvature map in: ',LIS_rc%paramfile(n), & + ' does not exist.' + call LIS_endrun + endif +#endif + + end subroutine read_curvature end module LIS_topoMod diff --git a/lis/core/LIS_vegDataMod.F90 b/lis/core/LIS_vegDataMod.F90 index ec5adf3cd..1ccf3eaf9 100644 --- a/lis/core/LIS_vegDataMod.F90 +++ b/lis/core/LIS_vegDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/fbil_module.F90 b/lis/core/fbil_module.F90 index 29acba2e8..21d4e3dae 100644 --- a/lis/core/fbil_module.F90 +++ b/lis/core/fbil_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/readzipf.c b/lis/core/readzipf.c index 5af14f8c8..b2781c0da 100644 --- a/lis/core/readzipf.c +++ b/lis/core/readzipf.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/xmrg_read_data_c.c b/lis/core/xmrg_read_data_c.c index c35130166..4ee5c7681 100644 --- a/lis/core/xmrg_read_data_c.c +++ b/lis/core/xmrg_read_data_c.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/xmrg_read_header_c.c b/lis/core/xmrg_read_header_c.c index 10d20944d..db31b0c38 100644 --- a/lis/core/xmrg_read_header_c.c +++ b/lis/core/xmrg_read_header_c.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/xmrg_reverse_byte.c b/lis/core/xmrg_reverse_byte.c index b1406a6b1..dcf0f013b 100644 --- a/lis/core/xmrg_reverse_byte.c +++ b/lis/core/xmrg_reverse_byte.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/core/xmrg_reverse_byte.h b/lis/core/xmrg_reverse_byte.h index b007ba7be..cb484be66 100644 --- a/lis/core/xmrg_reverse_byte.h +++ b/lis/core/xmrg_reverse_byte.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/0Intro_algorithms.txt b/lis/dataassim/algorithm/0Intro_algorithms.txt index d925c057c..d705e75d1 100644 --- a/lis/dataassim/algorithm/0Intro_algorithms.txt +++ b/lis/dataassim/algorithm/0Intro_algorithms.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/di/0Intro_di.txt b/lis/dataassim/algorithm/di/0Intro_di.txt index 57240fb24..b87556bb8 100644 --- a/lis/dataassim/algorithm/di/0Intro_di.txt +++ b/lis/dataassim/algorithm/di/0Intro_di.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/di/directInsertion_Mod.F90 b/lis/dataassim/algorithm/di/directInsertion_Mod.F90 index 8baa2517d..aa058d1df 100644 --- a/lis/dataassim/algorithm/di/directInsertion_Mod.F90 +++ b/lis/dataassim/algorithm/di/directInsertion_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/ekf/ekf_Mod.F90 b/lis/dataassim/algorithm/ekf/ekf_Mod.F90 index 71c9c24ce..c73e28a53 100644 --- a/lis/dataassim/algorithm/ekf/ekf_Mod.F90 +++ b/lis/dataassim/algorithm/ekf/ekf_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/0Intro_gmaoenkf.txt b/lis/dataassim/algorithm/enkf/0Intro_gmaoenkf.txt index 13444503a..3e0bbe997 100644 --- a/lis/dataassim/algorithm/enkf/0Intro_gmaoenkf.txt +++ b/lis/dataassim/algorithm/enkf/0Intro_gmaoenkf.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/enkf_Mod.F90 b/lis/dataassim/algorithm/enkf/enkf_Mod.F90 index 5e025fd96..afd733b42 100644 --- a/lis/dataassim/algorithm/enkf/enkf_Mod.F90 +++ b/lis/dataassim/algorithm/enkf/enkf_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/enkf_general.F90 b/lis/dataassim/algorithm/enkf/enkf_general.F90 index fceedb862..d94c011e4 100644 --- a/lis/dataassim/algorithm/enkf/enkf_general.F90 +++ b/lis/dataassim/algorithm/enkf/enkf_general.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/enkf_types.F90 b/lis/dataassim/algorithm/enkf/enkf_types.F90 index 23f267c19..21f6fed75 100644 --- a/lis/dataassim/algorithm/enkf/enkf_types.F90 +++ b/lis/dataassim/algorithm/enkf/enkf_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/gmaoenkf_module.F90.public b/lis/dataassim/algorithm/enkf/gmaoenkf_module.F90.public index e58d84a1d..e34dfa00a 100755 --- a/lis/dataassim/algorithm/enkf/gmaoenkf_module.F90.public +++ b/lis/dataassim/algorithm/enkf/gmaoenkf_module.F90.public @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/my_lu_decomp.F90 b/lis/dataassim/algorithm/enkf/my_lu_decomp.F90 index 8c9761614..7937838fe 100644 --- a/lis/dataassim/algorithm/enkf/my_lu_decomp.F90 +++ b/lis/dataassim/algorithm/enkf/my_lu_decomp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/my_matrix_functions.F90 b/lis/dataassim/algorithm/enkf/my_matrix_functions.F90 index eca124bc0..2a915fdaa 100644 --- a/lis/dataassim/algorithm/enkf/my_matrix_functions.F90 +++ b/lis/dataassim/algorithm/enkf/my_matrix_functions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enkf/nr_sort.F90 b/lis/dataassim/algorithm/enkf/nr_sort.F90 index eebb31bd1..8198ee809 100644 --- a/lis/dataassim/algorithm/enkf/nr_sort.F90 +++ b/lis/dataassim/algorithm/enkf/nr_sort.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/enks_general.F90 b/lis/dataassim/algorithm/enksgrace/enks_general.F90 index 8fd9f31df..ff73e9165 100644 --- a/lis/dataassim/algorithm/enksgrace/enks_general.F90 +++ b/lis/dataassim/algorithm/enksgrace/enks_general.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/enks_lu_decomp.F90 b/lis/dataassim/algorithm/enksgrace/enks_lu_decomp.F90 index e17c53a87..6b3ded8b4 100644 --- a/lis/dataassim/algorithm/enksgrace/enks_lu_decomp.F90 +++ b/lis/dataassim/algorithm/enksgrace/enks_lu_decomp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/enks_matrix_functions.F90 b/lis/dataassim/algorithm/enksgrace/enks_matrix_functions.F90 index eefe1b0df..f589b272b 100644 --- a/lis/dataassim/algorithm/enksgrace/enks_matrix_functions.F90 +++ b/lis/dataassim/algorithm/enksgrace/enks_matrix_functions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/enks_types.F90 b/lis/dataassim/algorithm/enksgrace/enks_types.F90 index 7125a5d28..63652e7d5 100644 --- a/lis/dataassim/algorithm/enksgrace/enks_types.F90 +++ b/lis/dataassim/algorithm/enksgrace/enks_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/enksgrace_Mod.F90 b/lis/dataassim/algorithm/enksgrace/enksgrace_Mod.F90 index c13e91078..48db84d36 100644 --- a/lis/dataassim/algorithm/enksgrace/enksgrace_Mod.F90 +++ b/lis/dataassim/algorithm/enksgrace/enksgrace_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/nr_fft.F90 b/lis/dataassim/algorithm/enksgrace/nr_fft.F90 index e66365ef8..0c8f6f502 100644 --- a/lis/dataassim/algorithm/enksgrace/nr_fft.F90 +++ b/lis/dataassim/algorithm/enksgrace/nr_fft.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/enksgrace/random_fields.F90.old b/lis/dataassim/algorithm/enksgrace/random_fields.F90.old index 24282ba63..308869666 100644 --- a/lis/dataassim/algorithm/enksgrace/random_fields.F90.old +++ b/lis/dataassim/algorithm/enksgrace/random_fields.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/ensrf/ensrf_Mod.F90 b/lis/dataassim/algorithm/ensrf/ensrf_Mod.F90 index 28ddc5e92..68e6cae2d 100644 --- a/lis/dataassim/algorithm/ensrf/ensrf_Mod.F90 +++ b/lis/dataassim/algorithm/ensrf/ensrf_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/ensrf/ensrf_general.F90 b/lis/dataassim/algorithm/ensrf/ensrf_general.F90 index cf4699dd1..b3a433c87 100644 --- a/lis/dataassim/algorithm/ensrf/ensrf_general.F90 +++ b/lis/dataassim/algorithm/ensrf/ensrf_general.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/ensrf/ensrf_types.F90 b/lis/dataassim/algorithm/ensrf/ensrf_types.F90 index b14cb7db4..cafb99a3f 100644 --- a/lis/dataassim/algorithm/ensrf/ensrf_types.F90 +++ b/lis/dataassim/algorithm/ensrf/ensrf_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/pf/pf_Mod.F90 b/lis/dataassim/algorithm/pf/pf_Mod.F90 index 1d45cceba..d668e604e 100644 --- a/lis/dataassim/algorithm/pf/pf_Mod.F90 +++ b/lis/dataassim/algorithm/pf/pf_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/pf/pf_general.F90 b/lis/dataassim/algorithm/pf/pf_general.F90 index 8efe0b8bd..af128e4a7 100644 --- a/lis/dataassim/algorithm/pf/pf_general.F90 +++ b/lis/dataassim/algorithm/pf/pf_general.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/algorithm/pf/pf_types.F90 b/lis/dataassim/algorithm/pf/pf_types.F90 index 769dc0797..02005c8fc 100644 --- a/lis/dataassim/algorithm/pf/pf_types.F90 +++ b/lis/dataassim/algorithm/pf/pf_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/biasEstimation/0Intro_biasest.txt b/lis/dataassim/biasEstimation/0Intro_biasest.txt index 1d8949746..5d02bd375 100644 --- a/lis/dataassim/biasEstimation/0Intro_biasest.txt +++ b/lis/dataassim/biasEstimation/0Intro_biasest.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/biasEstimation/gmaoBE/gmaobias_estimationMod.F90 b/lis/dataassim/biasEstimation/gmaoBE/gmaobias_estimationMod.F90 index c22f4cdc1..29181f5f5 100644 --- a/lis/dataassim/biasEstimation/gmaoBE/gmaobias_estimationMod.F90 +++ b/lis/dataassim/biasEstimation/gmaoBE/gmaobias_estimationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/0Intro_obs.txt b/lis/dataassim/obs/0Intro_obs.txt index 2133cca89..c63d2c8ae 100644 --- a/lis/dataassim/obs/0Intro_obs.txt +++ b/lis/dataassim/obs/0Intro_obs.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/AMSRE_SWE/AMSRE_SWE_Mod.F90 b/lis/dataassim/obs/AMSRE_SWE/AMSRE_SWE_Mod.F90 index f2d773e9c..0f26a1519 100644 --- a/lis/dataassim/obs/AMSRE_SWE/AMSRE_SWE_Mod.F90 +++ b/lis/dataassim/obs/AMSRE_SWE/AMSRE_SWE_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/AMSRE_SWE/read_AMSRE_SWE.F90 b/lis/dataassim/obs/AMSRE_SWE/read_AMSRE_SWE.F90 index e868c878a..f07fc1aba 100644 --- a/lis/dataassim/obs/AMSRE_SWE/read_AMSRE_SWE.F90 +++ b/lis/dataassim/obs/AMSRE_SWE/read_AMSRE_SWE.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/AMSRE_SWE/write_AMSRE_SWEobs.F90 b/lis/dataassim/obs/AMSRE_SWE/write_AMSRE_SWEobs.F90 index 28d79eaee..97fc07741 100644 --- a/lis/dataassim/obs/AMSRE_SWE/write_AMSRE_SWEobs.F90 +++ b/lis/dataassim/obs/AMSRE_SWE/write_AMSRE_SWEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SCF/0Intro_ansascf.txt b/lis/dataassim/obs/ANSA_SCF/0Intro_ansascf.txt index 1dd134778..df38845d1 100644 --- a/lis/dataassim/obs/ANSA_SCF/0Intro_ansascf.txt +++ b/lis/dataassim/obs/ANSA_SCF/0Intro_ansascf.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SCF/ANSASCFsnow_Mod.F90 b/lis/dataassim/obs/ANSA_SCF/ANSASCFsnow_Mod.F90 index f43157d0e..3e06cf0d2 100644 --- a/lis/dataassim/obs/ANSA_SCF/ANSASCFsnow_Mod.F90 +++ b/lis/dataassim/obs/ANSA_SCF/ANSASCFsnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SCF/read_ANSASCFsnow.F90 b/lis/dataassim/obs/ANSA_SCF/read_ANSASCFsnow.F90 index 11462afbf..76974389c 100644 --- a/lis/dataassim/obs/ANSA_SCF/read_ANSASCFsnow.F90 +++ b/lis/dataassim/obs/ANSA_SCF/read_ANSASCFsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SCF/write_ANSASCFsnow.F90 b/lis/dataassim/obs/ANSA_SCF/write_ANSASCFsnow.F90 index ed8fdec78..98723f86b 100644 --- a/lis/dataassim/obs/ANSA_SCF/write_ANSASCFsnow.F90 +++ b/lis/dataassim/obs/ANSA_SCF/write_ANSASCFsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SNWD/ANSASNWDsnow_Mod.F90 b/lis/dataassim/obs/ANSA_SNWD/ANSASNWDsnow_Mod.F90 index 718c6fab0..c28bf876f 100644 --- a/lis/dataassim/obs/ANSA_SNWD/ANSASNWDsnow_Mod.F90 +++ b/lis/dataassim/obs/ANSA_SNWD/ANSASNWDsnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SNWD/read_ANSASNWDsnow.F90 b/lis/dataassim/obs/ANSA_SNWD/read_ANSASNWDsnow.F90 index bf9abab7f..4562d7dfc 100644 --- a/lis/dataassim/obs/ANSA_SNWD/read_ANSASNWDsnow.F90 +++ b/lis/dataassim/obs/ANSA_SNWD/read_ANSASNWDsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SNWD/write_ANSASNWDsnow.F90 b/lis/dataassim/obs/ANSA_SNWD/write_ANSASNWDsnow.F90 index 3068ab333..54f67e6a3 100644 --- a/lis/dataassim/obs/ANSA_SNWD/write_ANSASNWDsnow.F90 +++ b/lis/dataassim/obs/ANSA_SNWD/write_ANSASNWDsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SWE/ANSASWEsnow_Mod.F90 b/lis/dataassim/obs/ANSA_SWE/ANSASWEsnow_Mod.F90 index 8384749cc..71e80bc67 100644 --- a/lis/dataassim/obs/ANSA_SWE/ANSASWEsnow_Mod.F90 +++ b/lis/dataassim/obs/ANSA_SWE/ANSASWEsnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SWE/read_ANSASWEsnow.F90 b/lis/dataassim/obs/ANSA_SWE/read_ANSASWEsnow.F90 index 343584ca8..70279d7d7 100644 --- a/lis/dataassim/obs/ANSA_SWE/read_ANSASWEsnow.F90 +++ b/lis/dataassim/obs/ANSA_SWE/read_ANSASWEsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ANSA_SWE/write_ANSASWEsnow.F90 b/lis/dataassim/obs/ANSA_SWE/write_ANSASWEsnow.F90 index b69ab04e8..bb3d2d43d 100644 --- a/lis/dataassim/obs/ANSA_SWE/write_ANSASWEsnow.F90 +++ b/lis/dataassim/obs/ANSA_SWE/write_ANSASWEsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ASCAT_TUW/ASCAT_TUWsm_Mod.F90 b/lis/dataassim/obs/ASCAT_TUW/ASCAT_TUWsm_Mod.F90 index bd1f49d45..9e6abd2ec 100644 --- a/lis/dataassim/obs/ASCAT_TUW/ASCAT_TUWsm_Mod.F90 +++ b/lis/dataassim/obs/ASCAT_TUW/ASCAT_TUWsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ASCAT_TUW/read_ASCAT_TUWsm.F90 b/lis/dataassim/obs/ASCAT_TUW/read_ASCAT_TUWsm.F90 index 5413b58eb..d23336e61 100644 --- a/lis/dataassim/obs/ASCAT_TUW/read_ASCAT_TUWsm.F90 +++ b/lis/dataassim/obs/ASCAT_TUW/read_ASCAT_TUWsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ASCAT_TUW/write_ASCAT_TUWsmobs.F90 b/lis/dataassim/obs/ASCAT_TUW/write_ASCAT_TUWsmobs.F90 index b51335da5..b4d1a8f5d 100644 --- a/lis/dataassim/obs/ASCAT_TUW/write_ASCAT_TUWsmobs.F90 +++ b/lis/dataassim/obs/ASCAT_TUW/write_ASCAT_TUWsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ASO_SWE/ASO_SWE_Mod.F90 b/lis/dataassim/obs/ASO_SWE/ASO_SWE_Mod.F90 index 9423f4e5b..28f95fbde 100755 --- a/lis/dataassim/obs/ASO_SWE/ASO_SWE_Mod.F90 +++ b/lis/dataassim/obs/ASO_SWE/ASO_SWE_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ASO_SWE/read_ASO_SWE.F90 b/lis/dataassim/obs/ASO_SWE/read_ASO_SWE.F90 index ac5ce85fe..2bfb04eb2 100755 --- a/lis/dataassim/obs/ASO_SWE/read_ASO_SWE.F90 +++ b/lis/dataassim/obs/ASO_SWE/read_ASO_SWE.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ASO_SWE/write_ASO_SWEobs.F90 b/lis/dataassim/obs/ASO_SWE/write_ASO_SWEobs.F90 index a700f998d..e4191ca95 100755 --- a/lis/dataassim/obs/ASO_SWE/write_ASO_SWEobs.F90 +++ b/lis/dataassim/obs/ASO_SWE/write_ASO_SWEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/CDFS_GVF/CDFSgvf_Mod.F90 b/lis/dataassim/obs/CDFS_GVF/CDFSgvf_Mod.F90 index 05df435a9..2150d1b59 100644 --- a/lis/dataassim/obs/CDFS_GVF/CDFSgvf_Mod.F90 +++ b/lis/dataassim/obs/CDFS_GVF/CDFSgvf_Mod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/CDFS_GVF/read_CDFSgvf.F90 b/lis/dataassim/obs/CDFS_GVF/read_CDFSgvf.F90 index 4a42d45bf..1423f6f46 100644 --- a/lis/dataassim/obs/CDFS_GVF/read_CDFSgvf.F90 +++ b/lis/dataassim/obs/CDFS_GVF/read_CDFSgvf.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/CDFS_GVF/write_CDFSgvfobs.F90 b/lis/dataassim/obs/CDFS_GVF/write_CDFSgvfobs.F90 index d1835f74f..f8891bfda 100644 --- a/lis/dataassim/obs/CDFS_GVF/write_CDFSgvfobs.F90 +++ b/lis/dataassim/obs/CDFS_GVF/write_CDFSgvfobs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/cdfTransfer_NASASMAPsm_Mod.F90 b/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/cdfTransfer_NASASMAPsm_Mod.F90 new file mode 100644 index 000000000..2f0641188 --- /dev/null +++ b/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/cdfTransfer_NASASMAPsm_Mod.F90 @@ -0,0 +1,537 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !MODULE: cdfTransfer_NASASMAPsm_Mod +! +! !DESCRIPTION: +! This module contains interfaces and subroutines to +! handle +! +! !REVISION HISTORY: +! 2 Mar 2022 Mahdi Navari; initial specification +! +module cdfTransfer_NASASMAPsm_Mod +! !USES: + use ESMF + use map_utils + + implicit none + + PRIVATE + +!----------------------------------------------------------------------------- +! !PUBLIC MEMBER FUNCTIONS: +!----------------------------------------------------------------------------- + public :: cdfTransfer_NASASMAPsm_setup +!----------------------------------------------------------------------------- +! !PUBLIC TYPES: +!----------------------------------------------------------------------------- + public :: cdfT_SMAPsm_struc +!EOP + type, public:: cdfT_SMAPsm_dec + + integer :: useSsdevScal + logical :: startMode + integer :: nc + integer :: nr + real, allocatable :: smobs(:,:) + real*8, allocatable :: smtime(:,:) + + real :: ssdev_inp + integer, allocatable :: n11(:) + real, allocatable :: rlat(:) + real, allocatable :: rlon(:) + + real, allocatable :: model_xrange(:,:,:) + real, allocatable :: obs_xrange(:,:,:) + real, allocatable :: model_cdf(:,:,:) + real, allocatable :: obs_cdf(:,:,:) + real, allocatable :: model_mu(:,:) + real, allocatable :: obs_mu(:,:) + real, allocatable :: model_sigma(:,:) + real, allocatable :: obs_sigma(:,:) + character*20 :: data_designation + character*3 :: release_number + integer :: nbins + integer :: ntimes + + logical :: cdf_read_mon !(for reading monthly CDF when + !LIS_rc%da > 1 but the first model time step, + !e.g., 4/29 13:00:00) + integer :: cdf_read_opt ! 0: read all months at one time + ! 1: read only the current month + character*100 :: modelcdffile + character*100 :: obscdffile + integer :: n_strat_bins + integer :: useCDFtransfer + character*100 :: ref_p_climo_file + character*100 :: target_p_climo_file + real, allocatable :: ref_p_climo_maxval(:) + real, allocatable :: target_p_climo(:,:,:) + + end type cdfT_SMAPsm_dec + + type(cdfT_SMAPsm_dec),allocatable :: cdfT_SMAPsm_struc(:) + +contains + +!BOP +! +! !ROUTINE: cdfTransfer_NASASMAPsm_setup +! \label{cdfTransfer_NASASMAPsm_setup} +! +! !INTERFACE: + subroutine cdfTransfer_NASASMAPsm_setup(k, OBS_State, OBS_Pert_State) +! !USES: + use LIS_coreMod + use LIS_timeMgrMod + use LIS_historyMod + use LIS_dataAssimMod + use LIS_perturbMod + use LIS_DAobservationsMod + use LIS_logmod + + implicit none + +! !ARGUMENTS: + integer :: k + type(ESMF_State) :: OBS_State(LIS_rc%nnest) + type(ESMF_State) :: OBS_Pert_State(LIS_rc%nnest) +! +! !DESCRIPTION: +! +! This routine completes the runtime initializations and +! creation of data strctures required for handling NASASMAP +! soil moisture data. +! +! The arguments are: +! \begin{description} +! \item[OBS\_State] observation state +! \item[OBS\_Pert\_State] observation perturbations state +! \end{description} +!EOP + real, parameter :: minssdev =0.001 + integer :: n,i,t,kk,jj + integer :: ftn + integer :: status + type(ESMF_Field) :: obsField(LIS_rc%nnest) + type(ESMF_ArraySpec) :: intarrspec, realarrspec + type(ESMF_Field) :: pertField(LIS_rc%nnest) + type(ESMF_ArraySpec) :: pertArrSpec + character*100 :: rtsmopssmobsdir + character*100 :: temp + real, allocatable :: obsstd(:) + character*1 :: vid(2) + character*40, allocatable :: vname(:) + real , allocatable :: varmin(:) + real , allocatable :: varmax(:) + type(pert_dec_type) :: obs_pert + real, pointer :: obs_temp(:,:) + real :: gridDesci(50) + real, allocatable :: ssdev(:) + + real, allocatable :: obserr(:,:) + real, allocatable :: lobserr(:,:) + integer :: c,r + real, allocatable :: ssdev_grid(:,:) + integer :: ngrid + real, allocatable :: target_precip_climo(:,:,:) + + allocate(cdfT_SMAPsm_struc(LIS_rc%nnest)) + + call ESMF_ArraySpecSet(intarrspec,rank=1,typekind=ESMF_TYPEKIND_I4,& + rc=status) + call LIS_verify(status) + + call ESMF_ArraySpecSet(realarrspec,rank=1,typekind=ESMF_TYPEKIND_R4,& + rc=status) + call LIS_verify(status) + + call ESMF_ArraySpecSet(pertArrSpec,rank=2,typekind=ESMF_TYPEKIND_R4,& + rc=status) + call LIS_verify(status) + + call ESMF_ConfigFindLabel(LIS_config,"SMAP(NASA) soil moisture data directory:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,rtsmopssmobsdir,& + rc=status) + call LIS_verify(status, 'SMAP(NASA) soil moisture data directory: is missing') + + call ESMF_AttributeSet(OBS_State(n),"Data Directory",& + rtsmopssmobsdir, rc=status) + call LIS_verify(status) + enddo + + call ESMF_ConfigFindLabel(LIS_config,"SMAP(NASA) soil moisture data designation:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%data_designation,& + rc=status) + call LIS_verify(status, 'SMAP(NASA) soil moisture data designation: is missing') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"SMAP(NASA) soil moisture Composite Release ID:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%release_number,& + rc=status) + call LIS_verify(status, 'SMAP(NASA) soil moisture Composite Release ID: is missing') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"SMAP(NASA) soil moisture use scaled standard deviation model:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,cdfT_SMAPsm_struc(n)%useSsdevScal,& + rc=status) + call LIS_verify(status, 'SMAP(NASA) soil moisture use scaled standard deviation model: is missing') + + enddo + + call ESMF_ConfigFindLabel(LIS_config, "SMAP(NASA) soil moisture number of bins in the CDF:", rc=status) + do n=1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,cdfT_SMAPsm_struc(n)%nbins, rc=status) + call LIS_verify(status, "SMAP(NASA) soil moisture number of bins in the CDF: not defined") + enddo + + call ESMF_ConfigFindLabel(LIS_config,"Use CDF transfer for soil moisture data assimilation:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%useCDFtransfer,& + default=0,rc=status) + call LIS_verify(status, 'Use CDF transfer for soil moisture data assimilation: is missing') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"Reference domain model CDF file:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%modelcdffile,& + rc=status) + call LIS_verify(status, 'Reference domain model CDF file: is missing') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"Reference domain obs CDF file:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%obscdffile,& + rc=status) + call LIS_verify(status, 'Reference domain obs CDF file: is missing') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"Reference domain precipitation climatology data source:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%ref_p_climo_file,& + rc=status) + call LIS_verify(status, 'Reference domain precipitation climatology data source: is missing') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"Target domain precipitation climatology data source:",& + rc=status) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,& + cdfT_SMAPsm_struc(n)%target_p_climo_file,& + rc=status) + call LIS_verify(status, 'Target domain precipitation climatology data source: is missing') + enddo + + do n=1,LIS_rc%nnest + call ESMF_AttributeSet(OBS_State(n),"Data Update Status",& + .false., rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(OBS_State(n),"Data Update Time",& + -99.0, rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(OBS_State(n),"Data Assimilate Status",& + .false., rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(OBS_State(n),"Number Of Observations",& + LIS_rc%obs_ngrid(k),rc=status) + call LIS_verify(status) + + enddo + + write(LIS_logunit,*)& + '[INFO] read reference and target domains precipitation climatology data' +!-------------------------------------------------------------------------------- +! Data must be in the local domain +! The stratified CDF is geolocation independent +! Subset the precipition climotology to local space +!------------------------------------------------------------------------------- + do n=1,LIS_rc%nnest + allocate(cdfT_SMAPsm_struc(n)%ref_p_climo_maxval(12)) !cdfT_SMAPsm_struc(n)%ntimes)) + allocate(cdfT_SMAPsm_struc(n)%target_p_climo(LIS_rc%lnc(n), LIS_rc%lnr(n),12)) !cdfT_SMAPsm_struc(n)%ntimes)) + ! Note: we do not need to know the dimenesions of the reference domain precip climatology + ! for allocation so we just extract max value for each month + + call read_Precip_climo_maxval (n,cdfT_SMAPsm_struc(n)%ref_p_climo_file,& + cdfT_SMAPsm_struc(n)%ref_p_climo_maxval) + + call read_Precip_climo (n,k,& + cdfT_SMAPsm_struc(n)%target_p_climo_file,& + target_precip_climo) + + ! subset from the global 2-d space to the local 2-d space + do i=1,12 + cdfT_SMAPsm_struc(n)%target_p_climo(:,:,i) = target_precip_climo(& + LIS_ews_halo_ind(n,LIS_localPet+1):& + LIS_ewe_halo_ind(n,LIS_localPet+1), & + LIS_nss_halo_ind(n,LIS_localPet+1): & + LIS_nse_halo_ind(n,LIS_localPet+1),i) + enddo + enddo + + write(LIS_logunit,*)& + '[INFO] read SMAP(NASA) soil moisture data specifications' + +!---------------------------------------------------------------------------- +! Create the array containers that will contain the observations and +! the perturbations. NASASMAP +! observations are in the grid space. Since there is only one layer +! being assimilated, the array size is LIS_rc%obs_ngrid(k). +! +!---------------------------------------------------------------------------- + + do n=1,LIS_rc%nnest + + write(unit=temp,fmt='(i2.2)') 1 + read(unit=temp,fmt='(2a1)') vid + + obsField(n) = ESMF_FieldCreate(arrayspec=realarrspec,& + grid=LIS_obsvecGrid(n,k),& + name="Observation"//vid(1)//vid(2),rc=status) + call LIS_verify(status) + +!Perturbations State + write(LIS_logunit,*) '[INFO] Opening attributes for observations ',& + trim(LIS_rc%obsattribfile(k)) + ftn = LIS_getNextUnitNumber() + open(ftn,file=trim(LIS_rc%obsattribfile(k)),status='old') + read(ftn,*) + read(ftn,*) LIS_rc%nobtypes(k) + read(ftn,*) + + allocate(vname(LIS_rc%nobtypes(k))) + allocate(varmax(LIS_rc%nobtypes(k))) + allocate(varmin(LIS_rc%nobtypes(k))) + + do i=1,LIS_rc%nobtypes(k) + read(ftn,fmt='(a40)') vname(i) + read(ftn,*) varmin(i),varmax(i) + write(LIS_logunit,*) '[INFO] ',vname(i),varmin(i),varmax(i) + enddo + call LIS_releaseUnitNumber(ftn) + + allocate(ssdev(LIS_rc%obs_ngrid(k))) + + if(trim(LIS_rc%perturb_obs(k)).ne."none") then + allocate(obs_pert%vname(1)) + allocate(obs_pert%perttype(1)) + allocate(obs_pert%ssdev(1)) + allocate(obs_pert%stdmax(1)) + allocate(obs_pert%zeromean(1)) + allocate(obs_pert%tcorr(1)) + allocate(obs_pert%xcorr(1)) + allocate(obs_pert%ycorr(1)) + allocate(obs_pert%ccorr(1,1)) + + call LIS_readPertAttributes(1,LIS_rc%obspertAttribfile(k),& + obs_pert) + +! Set obs err to be uniform (will be rescaled later for each grid point). + ssdev = obs_pert%ssdev(1) + cdfT_SMAPsm_struc(n)%ssdev_inp = obs_pert%ssdev(1) + + pertField(n) = ESMF_FieldCreate(arrayspec=pertArrSpec,& + grid=LIS_obsensOnGrid(n,k),name="Observation"//vid(1)//vid(2),& + rc=status) + call LIS_verify(status) + +! initializing the perturbations to be zero + call ESMF_FieldGet(pertField(n),localDE=0,farrayPtr=obs_temp,rc=status) + call LIS_verify(status) + obs_temp(:,:) = 0 + + call ESMF_AttributeSet(pertField(n),"Perturbation Type",& + obs_pert%perttype(1), rc=status) + call LIS_verify(status) + + if(LIS_rc%obs_ngrid(k).gt.0) then + call ESMF_AttributeSet(pertField(n),"Standard Deviation",& + ssdev,itemCount=LIS_rc%obs_ngrid(k),rc=status) + call LIS_verify(status) + endif + + call ESMF_AttributeSet(pertField(n),"Std Normal Max",& + obs_pert%stdmax(1), rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(pertField(n),"Ensure Zero Mean",& + obs_pert%zeromean(1),rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(pertField(n),"Temporal Correlation Scale",& + obs_pert%tcorr(1),rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(pertField(n),"X Correlation Scale",& + obs_pert%xcorr(1),rc=status) + + call ESMF_AttributeSet(pertField(n),"Y Correlation Scale",& + obs_pert%ycorr(1),rc=status) + + call ESMF_AttributeSet(pertField(n),"Cross Correlation Strength",& + obs_pert%ccorr(1,:),itemCount=1,rc=status) + + endif + + deallocate(vname) + deallocate(varmax) + deallocate(varmin) + deallocate(ssdev) + + enddo + + write(LIS_logunit,*) & + '[INFO] Created the States to hold the SMAP NASA observations data' + do n=1,LIS_rc%nnest + if(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL3SMP") then + cdfT_SMAPsm_struc(n)%nc = 964 + cdfT_SMAPsm_struc(n)%nr = 406 + elseif(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP") then + cdfT_SMAPsm_struc(n)%nc = 964 + cdfT_SMAPsm_struc(n)%nr = 406 + elseif(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL3SMP_E") then + cdfT_SMAPsm_struc(n)%nc = 3856 + cdfT_SMAPsm_struc(n)%nr = 1624 + elseif(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP_E") then + cdfT_SMAPsm_struc(n)%nc = 3856 + cdfT_SMAPsm_struc(n)%nr = 1624 + endif + + allocate(cdfT_SMAPsm_struc(n)%smobs(LIS_rc%obs_lnc(k),LIS_rc%obs_lnr(k))) + allocate(cdfT_SMAPsm_struc(n)%smtime(LIS_rc%obs_lnc(k),LIS_rc%obs_lnr(k))) + + cdfT_SMAPsm_struc(n)%smtime = -1 + + enddo + + write(LIS_logunit,*)& + '[INFO] read cdf transfer data specifications' + + do n=1,LIS_rc%nnest + allocate(ssdev(LIS_rc%obs_ngrid(k))) + ssdev = obs_pert%ssdev(1) + + if(cdfT_SMAPsm_struc(n)%useCDFtransfer.gt.0) then ! LIS_rc%dascaloption(k).eq."CDF matching" .and. & + + call LIS_getCDFtransferattributes(k,cdfT_SMAPsm_struc(n)%modelcdffile,& + cdfT_SMAPsm_struc(n)%n_strat_bins , cdfT_SMAPsm_struc(n)%ntimes) + + allocate(cdfT_SMAPsm_struc(n)%model_xrange(& + cdfT_SMAPsm_struc(n)%n_strat_bins, cdfT_SMAPsm_struc(n)%ntimes, & + cdfT_SMAPsm_struc(n)%nbins)) + allocate(cdfT_SMAPsm_struc(n)%obs_xrange(& + cdfT_SMAPsm_struc(n)%n_strat_bins, cdfT_SMAPsm_struc(n)%ntimes, & + cdfT_SMAPsm_struc(n)%nbins)) + allocate(cdfT_SMAPsm_struc(n)%model_cdf(& + cdfT_SMAPsm_struc(n)%n_strat_bins, cdfT_SMAPsm_struc(n)%ntimes, & + cdfT_SMAPsm_struc(n)%nbins)) + allocate(cdfT_SMAPsm_struc(n)%obs_cdf(& + cdfT_SMAPsm_struc(n)%n_strat_bins, cdfT_SMAPsm_struc(n)%ntimes, & + cdfT_SMAPsm_struc(n)%nbins)) + write(LIS_logunit,*)& + '[INFO] Successfully read cdf transfer data specifications' + endif + + if(cdfT_SMAPsm_struc(n)%useSsdevScal.eq.1) then + write(LIS_logunit,*) '[ERR] "use scaled standard deviation model" does not work ' + write(LIS_logunit,*) '[ERR] for CDF transfer method' + call LIS_endrun() + endif + + if(LIS_rc%obs_ngrid(k).gt.0) then + call ESMF_AttributeSet(pertField(n),"Standard Deviation",& + ssdev,itemCount=LIS_rc%obs_ngrid(k),rc=status) + call LIS_verify(status) + endif + + deallocate(ssdev) + enddo + + + do n=1,LIS_rc%nnest + if(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL3SMP".or.& + cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP") then + gridDesci = 0 + gridDesci(1) = 9 + gridDesci(2) = 964 + gridDesci(3) = 406 + gridDesci(9) = 4 !M36 grid + gridDesci(20) = 64 + gridDesci(10) = 0.36 + gridDesci(11) = 1 !for the global switch + elseif(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL3SMP_E".or.& + cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP_E") then + gridDesci = 0 + gridDesci(1) = 9 + gridDesci(2) = 3856 + gridDesci(3) = 1624 + gridDesci(9) = 5 !M09 grid + gridDesci(20) = 64 + gridDesci(10) = 0.09 + gridDesci(11) = 1 !for the global switch + endif + + allocate(cdfT_SMAPsm_struc(n)%n11(LIS_rc%obs_lnc(k)*& + LIS_rc%obs_lnr(k))) + allocate(cdfT_SMAPsm_struc(n)%rlat(& + LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k))) + allocate(cdfT_SMAPsm_struc(n)%rlon(& + LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k))) + + call neighbor_interp_input_withgrid(gridDesci,& + LIS_rc%obs_gridDesc(k,:),& + LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k),& + cdfT_SMAPsm_struc(n)%rlat, & + cdfT_SMAPsm_struc(n)%rlon, & + cdfT_SMAPsm_struc(n)%n11) + + if(cdfT_SMAPsm_struc(n)%data_designation.eq."SPL3SMP".or.& + cdfT_SMAPsm_struc(n)%data_designation.eq."SPL3SMP_E") then + call LIS_registerAlarm("NASASMAP read alarm",& + 86400.0, 86400.0) + else + call LIS_registerAlarm("NASASMAP read alarm",& + 3600.0, 3600.0) + endif + + cdfT_SMAPsm_struc(n)%startMode = .true. + + call ESMF_StateAdd(OBS_State(n),(/obsField(n)/),rc=status) + call LIS_verify(status) + + call ESMF_StateAdd(OBS_Pert_State(n),(/pertField(n)/),rc=status) + call LIS_verify(status) + + enddo + end subroutine cdfTransfer_NASASMAPsm_setup + +end module cdfTransfer_NASASMAPsm_Mod diff --git a/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/read_cdfTransfer_NASASMAPsm.F90 b/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/read_cdfTransfer_NASASMAPsm.F90 new file mode 100644 index 000000000..0a8c597b8 --- /dev/null +++ b/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/read_cdfTransfer_NASASMAPsm.F90 @@ -0,0 +1,1325 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! !ROUTINE: read_cdfTransfer_NASASMAPsm +! \label{read_cdfTransfer_NASASMAPsm} +! +! !REVISION HISTORY: +! 2 MAR 2022: Mahdi Navari: initial specification based on read_NASASMAPsm.F90 +! +! !INTERFACE: +subroutine read_cdfTransfer_NASASMAPsm(n, k, OBS_State, OBS_Pert_State) +! !USES: + use ESMF + use LIS_mpiMod + use LIS_coreMod + use LIS_logMod + use LIS_timeMgrMod + use LIS_dataAssimMod + use LIS_DAobservationsMod + use map_utils + use LIS_pluginIndices + use cdfTransfer_NASASMAPsm_Mod, only: cdfT_SMAPsm_struc + !use cdfTransfer_NASASMAPsm_Mod, only: cdfT_SMAPsm_struc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: k + type(ESMF_State) :: OBS_State + type(ESMF_State) :: OBS_Pert_State +! +! !DESCRIPTION: +! +! reads the AMSRE soil moisture observations +! from NETCDF files and applies the spatial masking for dense +! vegetation, rain and RFI. The data is then rescaled +! to the land surface model's climatology using rescaling +! algorithms. +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[OBS\_State] observations state +! \end{description} +! +!EOP + real, parameter :: minssdev = 0.05 + real, parameter :: maxssdev = 0.11 + real, parameter :: MAX_SM_VALUE = 0.45, MIN_SM_VALUE = 0.0001 + integer :: status + integer :: grid_index + character*100 :: smobsdir + character*100 :: fname + logical :: alarmCheck, file_exists + integer :: t, c, r, jj + real, pointer :: obsl(:) + type(ESMF_Field) :: smfield, pertField + integer :: gid(LIS_rc%obs_ngrid(k)) + integer :: assimflag(LIS_rc%obs_ngrid(k)) + real :: obs_unsc(LIS_rc%obs_ngrid(k)) + logical :: data_update + logical :: data_upd_flag(LIS_npes) + logical :: data_upd_flag_local + logical :: data_upd + real :: smobs(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + real :: smobs_D(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + real :: smobs_A(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + real :: sm_current(LIS_rc%obs_lnc(k), LIS_rc%obs_lnr(k)) + real :: dt + real :: lon + real :: lhour + real :: gmt + integer :: zone + integer :: fnd + real, allocatable :: ssdev(:) + character*4 :: yyyy + character*8 :: yyyymmdd + character*2 :: mm, dd, hh + integer :: yr, mo, da, hr, mn, ss + integer :: cyr, cmo, cda, chr, cmn, css + integer :: nyr, nmo, nda, nhr, nmn, nss + real*8 :: timenow, time1,time2,time3 + integer :: doy + character*200 :: list_files + integer :: mn_ind + integer :: ftn, ierr + integer :: rc + character(len=3) :: CRID + integer, external :: create_filelist ! C function + + + call ESMF_AttributeGet(OBS_State, "Data Directory", & + smobsdir, rc=status) + call LIS_verify(status) + call ESMF_AttributeGet(OBS_State, "Data Update Status", & + data_update, rc=status) + call LIS_verify(status) + + data_upd = .false. + obs_unsc = LIS_rc%udef + + alarmCheck = LIS_isAlarmRinging(LIS_rc, "NASASMAP read alarm") + + smobs_A = LIS_rc%udef + smobs_D = LIS_rc%udef + + cyr = LIS_rc%yr + cmo = LIS_rc%mo + cda = LIS_rc%da + chr = LIS_rc%hr + cmn = LIS_rc%mn + css = LIS_rc%ss + + call LIS_tick(time1,doy,gmt,cyr,cmo,cda,chr,cmn,css,0.0) + nyr = LIS_rc%yr + nmo = LIS_rc%mo + nda = LIS_rc%da + nhr = LIS_rc%hr + nmn = LIS_rc%mn + nss = LIS_rc%ss + + call LIS_tick(time2,doy,gmt,nyr,nmo,nda,nhr,nmn,nss,3600.0) + nyr = LIS_rc%yr + nmo = LIS_rc%mo + nda = LIS_rc%da + nhr = LIS_rc%hr + nmn = LIS_rc%mn + nss = LIS_rc%ss + + call LIS_tick(time3,doy,gmt,nyr,nmo,nda,nhr,nmn,nss,LIS_rc%ts) + + if (alarmCheck .or. cdfT_SMAPsm_struc(n)%startMode) then + cdfT_SMAPsm_struc(n)%startMode = .false. + if ( (cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP_E") .or. & + (cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP") ) then + + cdfT_SMAPsm_struc(n)%smobs = LIS_rc%udef + cdfT_SMAPsm_struc(n)%smtime = -1.0 + + write(yyyymmdd,'(i4.4,2i2.2)') LIS_rc%yr, LIS_rc%mo, LIS_rc%da + write(yyyy,'(i4.4)') LIS_rc%yr + write(mm,'(i2.2)') LIS_rc%mo + write(dd,'(i2.2)') LIS_rc%da + write(hh,'(i2.2)') LIS_rc%hr + + if(LIS_masterproc) then + list_files = trim(smobsdir)//'/'//trim(yyyy)//'.'//trim(mm)//'.'//& + trim(dd)//'/SMAP_L2_*' & + //trim(yyyy)//trim(mm)//trim(dd)//'T'//trim(hh)//'*.h5' + write(LIS_logunit,*) & + '[INFO] Searching for ',trim(list_files) + rc = create_filelist(trim(list_files)//char(0), & + "SMAP_filelist.sm.dat"//char(0)) + if (rc .ne. 0) then + write(LIS_logunit,*) & + '[WARN] Problem encountered when searching for SMAP files' + write(LIS_logunit,*) & + 'Was searching for ',trim(list_files) + write(LIS_logunit,*) & + 'LIS will continue...' + endif + end if +#if (defined SPMD) + call mpi_barrier(lis_mpi_comm,ierr) +#endif + + ftn = LIS_getNextUnitNumber() + open(ftn,file="./SMAP_filelist.sm.dat",status='old',iostat=ierr) + + do while(ierr.eq.0) + read(ftn,'(a)',iostat=ierr) fname + if(ierr.ne.0) then + exit + endif + + mn_ind = index(fname,trim(yyyymmdd)//'T'//trim(hh))+11 + read(fname(mn_ind:mn_ind+1),'(i2.2)') mn + ss=0 + call LIS_tick(timenow,doy,gmt,LIS_rc%yr, LIS_rc%mo, LIS_rc%da, & + LIS_rc%hr, mn, ss, 0.0) + + write(LIS_logunit,*) '[INFO] reading ',trim(fname) + + call read_SMAPL2sm_data_cdfTransfer(n,k,fname,& + cdfT_SMAPsm_struc(n)%smobs,timenow) + enddo + call LIS_releaseUnitNumber(ftn) + + elseif (cdfT_SMAPsm_struc(n)%data_designation .eq. "SPL3SMP_E") then +!--------------------------------------------------------------------------- +! MN: create filename for 9 km product +!--------------------------------------------------------------------------- + + write (yyyy, '(i4.4)') LIS_rc%yr + write (mm, '(i2.2)') LIS_rc%mo + write (dd, '(i2.2)') LIS_rc%da + write (CRID, '(a)') cdfT_SMAPsm_struc(n)%release_number + + ! EMK...Make sure only one PET calls the file system to determine what + ! SMAP files are available. + if (LIS_masterproc) then + + list_files = trim(smobsdir)//'/'//trim(yyyy)//'.'//trim(mm)//'.'// & + trim(dd)//'/SMAP_L3_SM_P_E_' & + //trim(yyyy)//trim(mm)//trim(dd)//'_'// & + trim(CRID)//'*.h5' + write(LIS_logunit,*) & + '[INFO] Searching for ',trim(list_files) + rc = create_filelist(trim(list_files)//char(0), & + "SMAP_filelist.dat"//char(0)) + if (rc .ne. 0) then + write(LIS_logunit,*) & + '[WARN] Problem encountered when searching for SMAP files' + write(LIS_logunit,*) & + 'Was searching for ',trim(list_files) + write(LIS_logunit,*) & + 'LIS will continue...' + endif + end if +#if (defined SPMD) + call mpi_barrier(lis_mpi_comm, ierr) +#endif + + ftn = LIS_getNextUnitNumber() + open (ftn, file="./SMAP_filelist.dat", & + action='read', status='old', iostat=ierr) + +! if multiple files for the same time and orbits are present, the latest +! one will overwrite older ones, though multiple (redundant) reads occur. +! This assumes that the 'ls command' will list the files in that order. + + do while (ierr .eq. 0) + read (ftn, '(a)', iostat=ierr) fname + if (ierr .ne. 0) then + exit + endif + + write (LIS_logunit, *) '[INFO] Reading descending pass ', trim(fname) + call read_NASASMAP_E_data_cdfTransfer(n, k, 'D', fname, smobs_D) + + write (LIS_logunit, *) '[INFO] Reading ascending pass ', trim(fname) + call read_NASASMAP_E_data_cdfTransfer(n, k, 'A', fname, smobs_A) + enddo + + cdfT_SMAPsm_struc(n)%smobs = LIS_rc%udef + cdfT_SMAPsm_struc(n)%smtime = -1 + call LIS_releaseUnitNumber(ftn) +!------------------------------------------------------------------------- +! Ascending pass assumed to be at 6pm localtime and the descending +! pass is assumed to be at 6am local time +!------------------------------------------------------------------------- + do r = 1, LIS_rc%obs_lnr(k) + do c = 1, LIS_rc%obs_lnc(k) + grid_index = LIS_obs_domain(n, k)%gindex(c, r) + if (grid_index .ne. -1) then + + if (smobs_D(c + (r - 1)*LIS_rc%obs_lnc(k)) .ne. -9999.0) then + cdfT_SMAPsm_struc(n)%smobs(c, r) = & + smobs_D(c + (r - 1)*LIS_rc%obs_lnc(k)) + lon = LIS_obs_domain(n, k)%lon(c + (r - 1)*LIS_rc%obs_lnc(k)) + lhour = 6.0 + call LIS_localtime2gmt(gmt, lon, lhour, zone) + cdfT_SMAPsm_struc(n)%smtime(c, r) = gmt + + endif +!------------------------------------------------------------------------- +! The ascending data is used only over locations where descending data +! doesn't exist. +!------------------------------------------------------------------------- + if (smobs_A(c + (r - 1)*LIS_rc%obs_lnc(k)) .ne. -9999.0 .and. & + cdfT_SMAPsm_struc(n)%smobs(c, r) .eq. -9999.0) then + cdfT_SMAPsm_struc(n)%smobs(c, r) = & + smobs_A(c + (r - 1)*LIS_rc%obs_lnc(k)) + lon = LIS_obs_domain(n, k)%lon(c + (r - 1)*LIS_rc%obs_lnc(k)) + lhour = 18.0 + call LIS_localtime2gmt(gmt, lon, lhour, zone) + cdfT_SMAPsm_struc(n)%smtime(c, r) = gmt + endif + endif + enddo + enddo + + elseif (cdfT_SMAPsm_struc(n)%data_designation .eq. "SPL3SMP") then +!------------------------------------------------------------------------- +! MN: create filename for 36km product (SMAP_L3_SM_P_) +!------------------------------------------------------------------------- + + write (yyyy, '(i4.4)') LIS_rc%yr + write (mm, '(i2.2)') LIS_rc%mo + write (dd, '(i2.2)') LIS_rc%da + write (CRID, '(a)') cdfT_SMAPsm_struc(n)%release_number + + ! EMK...Make sure only one PET calls the file system to determine what + ! SMAP files are available. + if (LIS_masterproc) then + list_files = trim(smobsdir)//'/'//trim(yyyy)//'.'//trim(mm)//'.'// & + trim(dd)//'/SMAP_L3_SM_P_' & + //trim(yyyy)//trim(mm)//trim(dd)//'_'// & + trim(CRID)//'*.h5' + write(LIS_logunit,*) & + '[INFO] Searching for ',trim(list_files) + rc = create_filelist(trim(list_files)//char(0), & + "SMAP_filelist.dat"//char(0)) + if (rc .ne. 0) then + write(LIS_logunit,*) & + '[WARN] Problem encountered when searching for SMAP files' + write(LIS_logunit,*) & + 'Was searching for ',trim(list_files) + write(LIS_logunit,*) & + 'LIS will continue...' + endif + end if +#if (defined SPMD) + call mpi_barrier(lis_mpi_comm, ierr) +#endif + + ftn = LIS_getNextUnitNumber() + open (ftn, file="./SMAP_filelist.dat", & + action='read', status='old', iostat=ierr) + +! if multiple files for the same time and orbits are present, the latest +! one will overwrite older ones, though multiple (redundant) reads occur. +! This assumes that the 'ls command' will list the files in that order. + + do while (ierr .eq. 0) + read (ftn, '(a)', iostat=ierr) fname + if (ierr .ne. 0) then + exit + endif + + write (LIS_logunit, *) '[INFO] Reading descending pass ', trim(fname) + call read_NASASMAP_data_cdfTransfer(n, k, 'D', fname, smobs_D) + + write (LIS_logunit, *) '[INFO] Reading ascending pass ', trim(fname) + call read_NASASMAP_data_cdfTransfer(n, k, 'A', fname, smobs_A) + enddo + + cdfT_SMAPsm_struc(n)%smobs = LIS_rc%udef + cdfT_SMAPsm_struc(n)%smtime = -1 + call LIS_releaseUnitNumber(ftn) +!------------------------------------------------------------------------- +! Ascending pass assumed to be at 6pm localtime and the descending +! pass is assumed to be at 6am local time +!------------------------------------------------------------------------- + do r = 1, LIS_rc%obs_lnr(k) + do c = 1, LIS_rc%obs_lnc(k) + grid_index = LIS_obs_domain(n, k)%gindex(c, r) + if (grid_index .ne. -1) then + + if (smobs_D(c + (r - 1)*LIS_rc%obs_lnc(k)) .ne. -9999.0) then + cdfT_SMAPsm_struc(n)%smobs(c, r) = & + smobs_D(c + (r - 1)*LIS_rc%obs_lnc(k)) + lon = LIS_obs_domain(n, k)%lon(c + (r - 1)*LIS_rc%obs_lnc(k)) + lhour = 6.0 + call LIS_localtime2gmt(gmt, lon, lhour, zone) + cdfT_SMAPsm_struc(n)%smtime(c, r) = gmt + + endif +!------------------------------------------------------------------------- +! The ascending data is used only over locations where descending data +! doesn't exist. +!------------------------------------------------------------------------- + if (smobs_A(c + (r - 1)*LIS_rc%obs_lnc(k)) .ne. -9999.0 .and. & + cdfT_SMAPsm_struc(n)%smobs(c, r) .eq. -9999.0) then + cdfT_SMAPsm_struc(n)%smobs(c, r) = & + smobs_A(c + (r - 1)*LIS_rc%obs_lnc(k)) + lon = LIS_obs_domain(n, k)%lon(c + (r - 1)*LIS_rc%obs_lnc(k)) + lhour = 18.0 + call LIS_localtime2gmt(gmt, lon, lhour, zone) + cdfT_SMAPsm_struc(n)%smtime(c, r) = gmt + endif + endif + enddo + enddo + + endif ! sensor + endif ! alram + + call ESMF_StateGet(OBS_State, "Observation01", smfield, & + rc=status) + call LIS_verify(status, 'Error: StateGet Observation01') + + call ESMF_FieldGet(smfield, localDE=0, farrayPtr=obsl, rc=status) + call LIS_verify(status, 'Error: FieldGet') + + fnd = 0 + sm_current = LIS_rc%udef + + ! dt is not defined as absolute value of the time difference to avoid + ! double counting of the data in assimilation. + + if ( (cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP_E") .or. & + (cdfT_SMAPsm_struc(n)%data_designation.eq."SPL2SMP") ) then + + do r=1,LIS_rc%obs_lnr(k) + do c=1,LIS_rc%obs_lnc(k) + if(LIS_obs_domain(n,k)%gindex(c,r).ne.-1) then + grid_index = c+(r-1)*LIS_rc%obs_lnc(k) + dt = (cdfT_SMAPsm_struc(n)%smtime(c,r)-time1) + if(dt.ge.0.and.dt.lt.(time3-time1)) then + sm_current(c,r) = & + cdfT_SMAPsm_struc(n)%smobs(c,r) + if(LIS_obs_domain(n,k)%gindex(c,r).ne.-1) then + obs_unsc(LIS_obs_domain(n,k)%gindex(c,r)) = & + sm_current(c,r) + endif + if(sm_current(c,r).ne.LIS_rc%udef) then + fnd = 1 + endif + endif + endif + enddo + enddo + + else + + do r = 1, LIS_rc%obs_lnr(k) + do c = 1, LIS_rc%obs_lnc(k) + if (LIS_obs_domain(n, k)%gindex(c, r) .ne. -1) then + grid_index = c + (r - 1)*LIS_rc%obs_lnc(k) + + dt = (LIS_rc%gmt - cdfT_SMAPsm_struc(n)%smtime(c, r))*3600.0 + if (dt .ge. 0 .and. dt .lt. LIS_rc%ts) then + sm_current(c, r) = & + cdfT_SMAPsm_struc(n)%smobs(c, r) + if (LIS_obs_domain(n, k)%gindex(c, r) .ne. -1) then + obs_unsc(LIS_obs_domain(n, k)%gindex(c, r)) = & + sm_current(c, r) + endif + if (sm_current(c, r) .ne. LIS_rc%udef) then + fnd = 1 + endif + endif + endif + enddo + enddo + endif + + +!------------------------------------------------------------------------- +! Transform data to the LSM climatology using a geolocation independent +! CDF-scaling approach +!------------------------------------------------------------------------- + if (cdfT_SMAPsm_struc(n)%useCDFtransfer .gt. 0) then + if (LIS_rc%da .eq. 1 .and. LIS_rc%hr .eq. 0 .and. & + LIS_rc%mn .eq. 0 .and. LIS_rc%ss .eq. 0) then + call read_CDFtransferdata_all(n,k,& + cdfT_SMAPsm_struc(n)%nbins,& + cdfT_SMAPsm_struc(n)%ntimes,& + cdfT_SMAPsm_struc(n)%n_strat_bins, & + cdfT_SMAPsm_struc(n)%modelcdffile, & + "SoilMoist",& + cdfT_SMAPsm_struc(n)%model_xrange,& + cdfT_SMAPsm_struc(n)%model_cdf) + + call read_CDFtransferdata_all(n,k,& + cdfT_SMAPsm_struc(n)%nbins,& + cdfT_SMAPsm_struc(n)%ntimes,& + cdfT_SMAPsm_struc(n)%n_strat_bins, & + cdfT_SMAPsm_struc(n)%obscdffile, & + "SoilMoist",& + cdfT_SMAPsm_struc(n)%obs_xrange,& + cdfT_SMAPsm_struc(n)%obs_cdf) + endif + if (fnd .ne. 0) then + + call LIS_rescale_with_stratified_CDF(& + n, & + k, & + cdfT_SMAPsm_struc(n)%nbins, & + cdfT_SMAPsm_struc(n)%ntimes, & + MAX_SM_VALUE, & + MIN_SM_VALUE, & + cdfT_SMAPsm_struc(n)%model_xrange, & + cdfT_SMAPsm_struc(n)%obs_xrange, & + cdfT_SMAPsm_struc(n)%model_cdf, & + cdfT_SMAPsm_struc(n)%obs_cdf, & + cdfT_SMAPsm_struc(n)%ref_p_climo_maxval, & + cdfT_SMAPsm_struc(n)%target_p_climo,& + cdfT_SMAPsm_struc(n)%n_strat_bins,& + sm_current) + endif + endif + + obsl = LIS_rc%udef + do r = 1, LIS_rc%obs_lnr(k) + do c = 1, LIS_rc%obs_lnc(k) + if (LIS_obs_domain(n, k)%gindex(c, r) .ne. -1) then + obsl(LIS_obs_domain(n, k)%gindex(c, r)) = sm_current(c, r) + endif + enddo + enddo + !------------------------------------------------------------------------- + ! Apply LSM based QC and screening of observations + !------------------------------------------------------------------------- + call lsmdaqcobsstate(trim(LIS_rc%lsm)//"+" & + //trim(LIS_CDFTRANSFERNASASMAPsmobsId)//char(0), n, k, OBS_state) + + call LIS_checkForValidObs(n, k, obsl, fnd, sm_current) + + if (fnd .eq. 0) then + data_upd_flag_local = .false. + else + data_upd_flag_local = .true. + endif + +#if (defined SPMD) + call MPI_ALLGATHER(data_upd_flag_local, 1, & + MPI_LOGICAL, data_upd_flag(:), & + 1, MPI_LOGICAL, LIS_mpi_comm, status) + data_upd = any(data_upd_flag) +#else + data_upd = data_upd_flag_local +#endif + + if (data_upd) then + + do t = 1, LIS_rc%obs_ngrid(k) + gid(t) = t + if (obsl(t) .ne. -9999.0) then + assimflag(t) = 1 + else + assimflag(t) = 0 + endif + enddo + + call ESMF_AttributeSet(OBS_State, "Data Update Status", & + .true., rc=status) + call LIS_verify(status) + + if (LIS_rc%obs_ngrid(k) .gt. 0) then + call ESMF_AttributeSet(smField, "Grid Number", & + gid, itemCount=LIS_rc%obs_ngrid(k), rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(smField, "Assimilation Flag", & + assimflag, itemCount=LIS_rc%obs_ngrid(k), rc=status) + call LIS_verify(status) + + call ESMF_AttributeSet(smfield, "Unscaled Obs", & + obs_unsc, itemCount=LIS_rc%obs_ngrid(k), rc=status) + call LIS_verify(status, 'Error in setting Unscaled Obs attribute') + + endif + + if(cdfT_SMAPsm_struc(n)%useSsdevScal.eq.1) then + write(LIS_logunit,*) '[ERR] "use scaled standard deviation model" does not work ' + write(LIS_logunit,*) '[ERR] for CDF transfer method' + call LIS_endrun() + endif + else + call ESMF_AttributeSet(OBS_State, "Data Update Status", & + .false., rc=status) + call LIS_verify(status) + endif + +end subroutine read_cdfTransfer_NASASMAPsm + +!BOP +! +! !ROUTINE: read_SMAPL2sm_data_cdfTransfer +! \label{read_SMAPL2sm_data_cdfTransfer} +! +! !INTERFACE: +subroutine read_SMAPL2sm_data_cdfTransfer(n, k,fname, smobs_inp, time) +! +! !USES: + + use LIS_coreMod + use LIS_logMod + use LIS_timeMgrMod + use cdfTransfer_NASASMAPsm_Mod, only : cdfT_SMAPsm_struc + +#if (defined USE_HDF5) + use hdf5 +#endif + + implicit none +! +! !INPUT PARAMETERS: +! + integer :: n + integer :: k + character (len=*) :: fname + real :: smobs_inp(LIS_rc%obs_lnc(k),LIS_rc%obs_lnr(k)) + real*8 :: time + +! !OUTPUT PARAMETERS: +! +! +! !DESCRIPTION: +! +! +!EOP + +#if (defined USE_HDF5) + + character*100, parameter :: sm_gr_name = "Soil_Moisture_Retrieval_Data" + character*100, parameter :: sm_field_name = "soil_moisture" + character*100, parameter :: sm_qa_name = "retrieval_qual_flag" +!YK + character*100, parameter :: vwc_field_name = "vegetation_water_content" + + integer(hsize_t), dimension(1) :: dims + integer(hsize_t), dimension(1) :: maxdims + integer(hid_t) :: file_id + integer(hid_t) :: dspace_id + integer(hid_t) :: row_id, col_id + integer(hid_t) :: sm_gr_id,sm_field_id, sm_qa_id + integer(hid_t) :: sm_gr_id_A,sm_field_id_A + integer(hid_t) :: vwc_field_id ! YK + real, allocatable :: sm_field(:) + real, allocatable :: vwc_field(:)! YK + integer, allocatable :: sm_qa(:) + integer, allocatable :: ease_row(:) + integer, allocatable :: ease_col(:) + integer :: c,r,t + logical*1 :: sm_data_b(cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr) + logical*1 :: smobs_b_ip(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + real :: sm_data(cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr) + real :: smobs_ip(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + + integer :: status,ios,iret + + call h5open_f(status) + call LIS_verify(status, 'Error opening HDF fortran interface') + + call h5fopen_f(trim(fname),H5F_ACC_RDONLY_F, file_id, status) + call LIS_verify(status, 'Error opening SMAP L2 file ') + + call h5gopen_f(file_id,sm_gr_name,sm_gr_id, status) + call LIS_verify(status, 'Error opening SM group in SMAP L2 file') + + call h5dopen_f(sm_gr_id,sm_field_name,sm_field_id, status) + call LIS_verify(status, 'Error opening SM field in SMAP L2 file') + + call h5dopen_f(sm_gr_id,"EASE_row_index",row_id, status) + call LIS_verify(status, 'Error opening row index field in SMAP L2 file') + + call h5dopen_f(sm_gr_id,"EASE_column_index",col_id, status) + call LIS_verify(status, 'Error opening column index field in SMAP L2 file') + +!YK + call h5dopen_f(sm_gr_id, sm_qa_name,sm_qa_id, status) + call LIS_verify(status, 'Error opening QA field in SMAP L2 file') + +!YK + call h5dopen_f(sm_gr_id, vwc_field_name,vwc_field_id, status) + call LIS_verify(status, 'Error opening Veg water content field in SMAP L2 file') + + call h5dget_space_f(sm_field_id, dspace_id, status) + call LIS_verify(status, 'Error in h5dget_space_f: reaSMAP L2Obs') + +! Size of the arrays +! This routine returns -1 on failure, rank on success. + call h5sget_simple_extent_dims_f(dspace_id, dims, maxdims, status) + if(status.eq.-1) then + call LIS_verify(status, 'Error in h5sget_simple_extent_dims_f: readSMAP L2Obs') + endif + + allocate(sm_field(maxdims(1))) + allocate(sm_qa(maxdims(1))) !YK + allocate(vwc_field(maxdims(1))) !YK + allocate(ease_row(maxdims(1))) + allocate(ease_col(maxdims(1))) + + call h5dread_f(row_id, H5T_NATIVE_INTEGER,ease_row,dims,status) + call LIS_verify(status, 'Error extracting row index from SMAP L2 file') + + call h5dread_f(col_id, H5T_NATIVE_INTEGER,ease_col,dims,status) + call LIS_verify(status, 'Error extracting col index from SMAP L2 file') + + call h5dread_f(sm_field_id, H5T_NATIVE_REAL,sm_field,dims,status) + call LIS_verify(status, 'Error extracting SM field from SMAP L2 file') + +!YK + call h5dread_f(sm_qa_id, H5T_NATIVE_INTEGER,sm_qa,dims,status) + call LIS_verify(status, 'Error extracting SM field from SMAP L2 file') + +!YK get the vegetation water content + call h5dread_f(vwc_field_id, H5T_NATIVE_REAL,vwc_field,dims,status) + call LIS_verify(status, 'Error extracting Veg water content (AM) field from SMAP L2 file') + +!YK + call h5dclose_f(sm_qa_id,status) + call LIS_verify(status,'Error in H5DCLOSE call') + +!YK + call h5dclose_f(vwc_field_id,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dclose_f(row_id,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dclose_f(col_id,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dclose_f(sm_field_id,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5gclose_f(sm_gr_id,status) + call LIS_verify(status,'Error in H5GCLOSE call') + + call h5fclose_f(file_id,status) + call LIS_verify(status,'Error in H5FCLOSE call') + + call h5close_f(status) + call LIS_verify(status,'Error in H5CLOSE call') + + sm_data = LIS_rc%udef + sm_data_b = .false. + +!--------------------------------------------------------------------YK +!grid the data in EASE projection +! The retrieval_quality_field variable's binary representation consists of bits +! that indicate whether retrieval is performed or not at a given grid cell. +! When retrieval is performed, it contains additional bits to further +! indicate the exit status and quality of the retrieval. The first bit +! indicates the recommended quality (0-means retrieval has recommended quality). + do t=1,maxdims(1) + if(ease_col(t).gt.0.and.ease_row(t).gt.0) then + sm_data(ease_col(t) + & + (ease_row(t)-1)*cdfT_SMAPsm_struc(n)%nc) = sm_field(t) + + if(vwc_field(t).gt.5) then !YK Aply QC : if VWC > 5 kg/m2 + sm_data(ease_col(t) + & + (ease_row(t)-1)*cdfT_SMAPsm_struc(n)%nc) = LIS_rc%udef + else + if(sm_data(ease_col(t) + & + (ease_row(t)-1)*cdfT_SMAPsm_struc(n)%nc).ne.-9999.0) then + if(ibits(sm_qa(t),0,1).eq.0) then + sm_data_b(ease_col(t) + & + (ease_row(t)-1)*cdfT_SMAPsm_struc(n)%nc) = .true. + else + sm_data(ease_col(t) + & + (ease_row(t)-1)*cdfT_SMAPsm_struc(n)%nc) = LIS_rc%udef + endif + endif + endif + endif + enddo +!----------------------------------------------------------------------- + +!-------------------------------------------------------------------------- +! Interpolate to the LIS running domain +!-------------------------------------------------------------------------- + call neighbor_interp(LIS_rc%obs_gridDesc(k,:), sm_data_b, sm_data, & + smobs_b_ip, smobs_ip, & + cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr, & + LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k), & + cdfT_SMAPsm_struc(n)%rlat, cdfT_SMAPsm_struc(n)%rlon,& + cdfT_SMAPsm_struc(n)%n11, LIS_rc%udef, ios) + + + deallocate(sm_field) + deallocate(ease_row) + deallocate(ease_col) + +!overwrite the input data + do r=1,LIS_rc%obs_lnr(k) + do c=1,LIS_rc%obs_lnc(k) + if(smobs_ip(c+(r-1)*LIS_rc%obs_lnc(k)).ne.-9999.0) then + smobs_inp(c,r) = & + smobs_ip(c+(r-1)*LIS_rc%obs_lnc(k)) + + cdfT_SMAPsm_struc(n)%smtime(c,r) = & + time + endif + enddo + enddo +#endif + +end subroutine read_SMAPL2sm_data_cdfTransfer + +!BOP +! +! !ROUTINE: read_NASASMAP_E_data_cdfTransfer +! \label{read_NASASMAP_E_data_cdfTransfer} +! +! !INTERFACE: +subroutine read_NASASMAP_E_data_cdfTransfer(n, k, pass, fname, smobs_ip) +! +! !USES: + + use LIS_coreMod, only : LIS_rc, LIS_domain + use LIS_logMod + use LIS_timeMgrMod + use cdfTransfer_NASASMAPsm_Mod, only : cdfT_SMAPsm_struc +#if (defined USE_HDF5) + use hdf5 +#endif + + implicit none +! +! !INPUT PARAMETERS: +! + integer :: n + integer :: k + character (len=*) :: pass + character (len=*) :: fname + real :: smobs_ip(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + + +! !OUTPUT PARAMETERS: +! +! +! !DESCRIPTION: +! This subroutine reads the SMOS NESDIS binary file and applies the data +! quality flags to filter the data. !\normalsize +! +! tb_time_seconds +! Arithmetic average of the same parameters found in the +! fore- and aft-looking groups in the input SPL1CTB granule. +! The resulting parameter thus describes the average of UTC +! acquisition times of SPL1BTB observations whose boresights +! fall within a 36 km EASE-Grid 2.0 cell. The result is then +! expressed in J2000 seconds (the number of seconds since +! 11:58:55.816 on January 1, 2000 UT). +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[fname] name of the RTNASASMAP AMSR-E file +! \item[smobs\_ip] soil moisture data processed to the LIS domain +! \end{description} +! +! +!EOP + +#if (defined USE_HDF5) + + character*100, parameter :: sm_gr_name_D = "Soil_Moisture_Retrieval_Data_AM" + character*100, parameter :: sm_field_name_D = "soil_moisture" + character*100, parameter :: sm_qa_name_D = "retrieval_qual_flag" + character*100, parameter :: sm_gr_name_A = "Soil_Moisture_Retrieval_Data_PM" + character*100, parameter :: sm_field_name_A = "soil_moisture_pm" + character*100, parameter :: sm_qa_name_A = "retrieval_qual_flag_pm" +! MN + character*100, parameter :: vwc_field_name_D = "vegetation_water_content" + character*100, parameter :: vwc_field_name_A = "vegetation_water_content_pm" + + integer(hsize_t), allocatable :: dims(:) + integer(hsize_t), dimension(2) :: dimsm + integer(hsize_t), dimension(2) :: count_file + integer(hsize_t), dimension(2) :: count_mem + integer(hid_t) :: memspace + integer(hid_t) :: dataspace + integer :: memrank = 2 ! scaler--> rank = 0 ; 2D array--> rank = 2 + integer(hsize_t), dimension(2) :: offset_mem = (/0,0/) + integer(hsize_t), dimension(2) :: offset_file = (/0,0/) + integer(hid_t) :: file_id + integer(hid_t) :: sm_gr_id_D,sm_field_id_D,sm_qa_id_D + integer(hid_t) :: sm_gr_id_A,sm_field_id_A,sm_qa_id_A + integer(hid_t) :: vwc_field_id_D ! MN + integer(hid_t) :: vwc_field_id_A ! MN + real, allocatable :: sm_field(:,:) + real, allocatable :: vwc_field(:,:)! MN + integer, allocatable :: sm_qa(:,:) + integer :: c,r,t + logical*1 :: sm_data_b(cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr) + logical*1 :: smobs_b_ip(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + real :: sm_data(cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr) + integer :: status,ios + + dimsm = (/cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr/) + count_file = (/cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr/) + count_mem = (/cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr/) + + allocate(sm_field(cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr)) + allocate(sm_qa(cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr)) + allocate(vwc_field(cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr)) + allocate(dims(2)) + + dims(1) = cdfT_SMAPsm_struc(n)%nc + dims(2) = cdfT_SMAPsm_struc(n)%nr + + call h5open_f(status) + call LIS_verify(status, 'Error opening HDF fortran interface') + + call h5fopen_f(trim(fname),H5F_ACC_RDONLY_F, file_id, status) + call LIS_verify(status, 'Error opening NASASMAP file ') + + if(pass.eq.'D') then + call h5gopen_f(file_id,sm_gr_name_D,sm_gr_id_D, status) + call LIS_verify(status, 'Error opening SM group in NASASMAP file') + + call h5dopen_f(sm_gr_id_D,sm_field_name_D,sm_field_id_D, status) + call LIS_verify(status, 'Error opening SM field in NASASMAP file') + + call h5dget_space_f(sm_field_id_D, dataspace, status) + call LIS_verify(status, 'Error in h5dget_space_f: readNASASMAPObs') + + call h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, & + start=offset_file, count=count_file, hdferr=status) + call LIS_verify(status, 'Error setting hyperslab dataspace in readNASASMAPObs') + + call h5screate_simple_f(memrank,dimsm, memspace, status) + call LIS_verify(status, 'Error in h5create_simple_f; read_cdfTransfer_NASASMAPsm') + + call h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, & + start=offset_mem, count=count_mem, hdferr=status) + call LIS_verify(status, 'Error in h5sselect_hyperslab_f: read_cdfTransfer_NASASMAPsm') + + call h5dread_f(sm_field_id_D, H5T_NATIVE_REAL,sm_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM field from NASASMAPfile') + + call h5dclose_f(sm_field_id_D,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dopen_f(sm_gr_id_D,sm_qa_name_D,sm_qa_id_D, status) + call LIS_verify(status, 'Error opening SM QA field in NASASMAP file') + + call h5dread_f(sm_qa_id_D, H5T_NATIVE_INTEGER,sm_qa,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM QA field from NASASMAPfile') + + call h5dclose_f(sm_qa_id_D,status) + call LIS_verify(status,'Error in H5DCLOSE call') + +! MN get the vegetation water contnent + call h5dopen_f(sm_gr_id_D,vwc_field_name_D,vwc_field_id_D, status) + call LIS_verify(status, 'Error opening Veg water content field in NASASMAP file') + + call h5dread_f(vwc_field_id_D, H5T_NATIVE_REAL,vwc_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting Veg water content (AM) field from NASASMAPfile') + + call h5dclose_f(vwc_field_id_D,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5gclose_f(sm_gr_id_D,status) + call LIS_verify(status,'Error in H5GCLOSE call') + + else + call h5gopen_f(file_id,sm_gr_name_A,sm_gr_id_A, status) + call LIS_verify(status, 'Error opening SM group in NASASMAP file') + + call h5dopen_f(sm_gr_id_A,sm_field_name_A,sm_field_id_A, status) + call LIS_verify(status, 'Error opening SM field in NASASMAP file') + + call h5dget_space_f(sm_field_id_A, dataspace, status) + call LIS_verify(status, 'Error in h5dget_space_f: readNASASMAPObs') + + call h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, & + start=offset_file, count=count_file, hdferr=status) + call LIS_verify(status, 'Error setting hyperslab dataspace in readNASASMAPObs') + + call h5screate_simple_f(memrank,dimsm, memspace, status) + call LIS_verify(status, 'Error in h5create_simple_f; read_cdfTransfer_NASASMAPsm') + + call h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, & + start=offset_mem, count=count_mem, hdferr=status) + call LIS_verify(status, 'Error in h5sselect_hyperslab_f: read_cdfTransfer_NASASMAPsm') + + call h5dread_f(sm_field_id_A, H5T_NATIVE_REAL,sm_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM field from NASASMAPfile') + + call h5dclose_f(sm_field_id_A,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dopen_f(sm_gr_id_A,sm_qa_name_A,sm_qa_id_A, status) + call LIS_verify(status, 'Error opening SM QA field in NASASMAP file') + + call h5dread_f(sm_qa_id_A, H5T_NATIVE_INTEGER,sm_qa,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM QA field from NASASMAPfile') + + call h5dclose_f(sm_qa_id_A,status) + call LIS_verify(status,'Error in H5DCLOSE call') + +! MN get the vegetation water contnent + call h5dopen_f(sm_gr_id_A,vwc_field_name_A,vwc_field_id_A, status) + call LIS_verify(status, 'Error opening Veg water content field in NASASMAP file') + + call h5dread_f(vwc_field_id_A, H5T_NATIVE_REAL,vwc_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting Veg water content (AM) field from NASASMAPfile') + + call h5dclose_f(vwc_field_id_A,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5gclose_f(sm_gr_id_A,status) + call LIS_verify(status,'Error in H5GCLOSE call') + + endif + + call h5fclose_f(file_id,status) + call LIS_verify(status,'Error in H5FCLOSE call') + + call h5close_f(status) + call LIS_verify(status,'Error in H5CLOSE call') + + sm_data_b = .false. + t = 1 + +! The retrieval_quality_field variable's binary representation consists of bits +! that indicate whether retrieval is performed or not at a given grid cell. +! When retrieval is performed, it contains additional bits to further +! indicate the exit status and quality of the retrieval. The first bit +! indicates the recommended quality (0-means retrieval has recommended quality). + + do r=1,cdfT_SMAPsm_struc(n)%nr + do c=1,cdfT_SMAPsm_struc(n)%nc + sm_data(t) = sm_field(c,r) + + if(vwc_field(c,r).gt. 5 ) then !MN Aply QC : if VWC > 5 kg/m2 + sm_data(t) = LIS_rc%udef + else + + if(sm_data(t).ne.-9999.0) then + if(ibits(sm_qa(c,r),0,1).eq.0) then + sm_data_b(t) = .true. + else + sm_data(t) = -9999.0 + endif + endif + endif + + t = t+1 + enddo + enddo + + deallocate(sm_qa) + +!-------------------------------------------------------------------------- +! Interpolate to the LIS running domain +!-------------------------------------------------------------------------- + call neighbor_interp(LIS_rc%obs_gridDesc(k,:),& + sm_data_b, sm_data, smobs_b_ip, smobs_ip, & + cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr, & + LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k), & + cdfT_SMAPsm_struc(n)%rlat, cdfT_SMAPsm_struc(n)%rlon,& + cdfT_SMAPsm_struc(n)%n11, LIS_rc%udef, ios) + + deallocate(sm_field) + deallocate(dims) + +#endif + +end subroutine read_NASASMAP_E_data_cdfTransfer + +! MN: the data structure in both 36 km and 9 km products is the same therefore +! read_NASASMAP_E_data_cdfTransfer is similar to read_NASASMAP_data_cdfTransfer + +!BOP +! +! !ROUTINE: read_NASASMAP_data_cdfTransfer +! \label{read_NASASMAP_data_cdfTransfer} +! +! !INTERFACE: +subroutine read_NASASMAP_data_cdfTransfer(n, k, pass, fname, smobs_ip) +! +! !USES: + + use LIS_coreMod, only : LIS_rc, LIS_domain + use LIS_logMod + use LIS_timeMgrMod + use cdfTransfer_NASASMAPsm_Mod, only : cdfT_SMAPsm_struc +#if (defined USE_HDF5) + use hdf5 +#endif + + implicit none +! +! !INPUT PARAMETERS: +! + integer :: n + integer :: k + character (len=*) :: pass + character (len=*) :: fname + real :: smobs_ip(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + + +! !OUTPUT PARAMETERS: +! +! +! !DESCRIPTION: +! This subroutine reads the SMOS NESDIS binary file and applies the data +! quality flags to filter the data. !\normalsize +! +! tb_time_seconds +! Arithmetic average of the same parameters found in the +! fore- and aft-looking groups in the input SPL1CTB granule. +! The resulting parameter thus describes the average of UTC +! acquisition times of SPL1BTB observations whose boresights +! fall within a 36 km EASE-Grid 2.0 cell. The result is then +! expressed in J2000 seconds (the number of seconds since +! 11:58:55.816 on January 1, 2000 UT). +! +! The arguments are: +! \begin{description} +! \item[n] index of the nest +! \item[fname] name of the RTNASASMAP AMSR-E file +! \item[smobs\_ip] soil moisture data processed to the LIS domain +! \end{description} +! +! +!EOP + +#if (defined USE_HDF5) + + character*100, parameter :: sm_gr_name_D = "Soil_Moisture_Retrieval_Data_AM" + character*100, parameter :: sm_field_name_D = "soil_moisture" + character*100, parameter :: sm_qa_name_D = "retrieval_qual_flag" + character*100, parameter :: sm_gr_name_A = "Soil_Moisture_Retrieval_Data_PM" + character*100, parameter :: sm_field_name_A = "soil_moisture_pm" + character*100, parameter :: sm_qa_name_A = "retrieval_qual_flag_pm" +! MN + character*100, parameter :: vwc_field_name_D = "vegetation_water_content" + character*100, parameter :: vwc_field_name_A = "vegetation_water_content_pm" + + integer(hsize_t), allocatable :: dims(:) + integer(hsize_t), dimension(2) :: dimsm + integer(hsize_t), dimension(2) :: count_file + integer(hsize_t), dimension(2) :: count_mem + integer(hid_t) :: memspace + integer(hid_t) :: dataspace + integer :: memrank = 2 ! scaler--> rank = 0 ; 2D array--> rank = 2 + integer(hsize_t), dimension(2) :: offset_mem = (/0,0/) + integer(hsize_t), dimension(2) :: offset_file = (/0,0/) + integer(hid_t) :: file_id + integer(hid_t) :: sm_gr_id_D,sm_field_id_D,sm_qa_id_D + integer(hid_t) :: sm_gr_id_A,sm_field_id_A,sm_qa_id_A + integer(hid_t) :: vwc_field_id_D ! MN + integer(hid_t) :: vwc_field_id_A ! MN + real, allocatable :: sm_field(:,:) + real, allocatable :: vwc_field(:,:)! MN + integer, allocatable :: sm_qa(:,:) + integer :: c,r,t + logical*1 :: sm_data_b(cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr) + logical*1 :: smobs_b_ip(LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k)) + real :: sm_data(cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr) + integer :: status,ios + + dimsm = (/cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr/) + count_file = (/cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr/) + count_mem = (/cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr/) + + allocate(sm_field(cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr)) + allocate(sm_qa(cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr)) + allocate(vwc_field(cdfT_SMAPsm_struc(n)%nc, cdfT_SMAPsm_struc(n)%nr)) + allocate(dims(2)) + + dims(1) = cdfT_SMAPsm_struc(n)%nc + dims(2) = cdfT_SMAPsm_struc(n)%nr + + call h5open_f(status) + call LIS_verify(status, 'Error opening HDF fortran interface') + + call h5fopen_f(trim(fname),H5F_ACC_RDONLY_F, file_id, status) + call LIS_verify(status, 'Error opening NASASMAP file ') + + if(pass.eq.'D') then + call h5gopen_f(file_id,sm_gr_name_D,sm_gr_id_D, status) + call LIS_verify(status, 'Error opening SM group in NASASMAP file') + + call h5dopen_f(sm_gr_id_D,sm_field_name_D,sm_field_id_D, status) + call LIS_verify(status, 'Error opening SM field in NASASMAP file') + + call h5dget_space_f(sm_field_id_D, dataspace, status) + call LIS_verify(status, 'Error in h5dget_space_f: readNASASMAPObs') + + call h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, & + start=offset_file, count=count_file, hdferr=status) + call LIS_verify(status, 'Error setting hyperslab dataspace in readNASASMAPObs') + + call h5screate_simple_f(memrank,dimsm, memspace, status) + call LIS_verify(status, 'Error in h5create_simple_f; read_cdfTransfer_NASASMAPsm') + + call h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, & + start=offset_mem, count=count_mem, hdferr=status) + call LIS_verify(status, 'Error in h5sselect_hyperslab_f: read_cdfTransfer_NASASMAPsm') + + call h5dread_f(sm_field_id_D, H5T_NATIVE_REAL,sm_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM field from NASASMAPfile') + + call h5dclose_f(sm_field_id_D,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dopen_f(sm_gr_id_D,sm_qa_name_D,sm_qa_id_D, status) + call LIS_verify(status, 'Error opening SM QA field in NASASMAP file') + + call h5dread_f(sm_qa_id_D, H5T_NATIVE_INTEGER,sm_qa,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM QA field from NASASMAPfile') + + call h5dclose_f(sm_qa_id_D,status) + call LIS_verify(status,'Error in H5DCLOSE call') + +! MN get the vegetation water contnent + call h5dopen_f(sm_gr_id_D,vwc_field_name_D,vwc_field_id_D, status) + call LIS_verify(status, 'Error opening Veg water content field in NASASMAP file') + + call h5dread_f(vwc_field_id_D, H5T_NATIVE_REAL,vwc_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting Veg water content (AM) field from NASASMAPfile') + + call h5dclose_f(vwc_field_id_D,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5gclose_f(sm_gr_id_D,status) + call LIS_verify(status,'Error in H5GCLOSE call') + + else + call h5gopen_f(file_id,sm_gr_name_A,sm_gr_id_A, status) + call LIS_verify(status, 'Error opening SM group in NASASMAP file') + + call h5dopen_f(sm_gr_id_A,sm_field_name_A,sm_field_id_A, status) + call LIS_verify(status, 'Error opening SM field in NASASMAP file') + + call h5dget_space_f(sm_field_id_A, dataspace, status) + call LIS_verify(status, 'Error in h5dget_space_f: readNASASMAPObs') + + call h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, & + start=offset_file, count=count_file, hdferr=status) + call LIS_verify(status, 'Error setting hyperslab dataspace in readNASASMAPObs') + + call h5screate_simple_f(memrank,dimsm, memspace, status) + call LIS_verify(status, 'Error in h5create_simple_f; read_cdfTransfer_NASASMAPsm') + + call h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, & + start=offset_mem, count=count_mem, hdferr=status) + call LIS_verify(status, 'Error in h5sselect_hyperslab_f: read_cdfTransfer_NASASMAPsm') + + call h5dread_f(sm_field_id_A, H5T_NATIVE_REAL,sm_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM field from NASASMAPfile') + + call h5dclose_f(sm_field_id_A,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5dopen_f(sm_gr_id_A,sm_qa_name_A,sm_qa_id_A, status) + call LIS_verify(status, 'Error opening SM QA field in NASASMAP file') + + call h5dread_f(sm_qa_id_A, H5T_NATIVE_INTEGER,sm_qa,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting SM QA field from NASASMAPfile') + + call h5dclose_f(sm_qa_id_A,status) + call LIS_verify(status,'Error in H5DCLOSE call') + +! MN get the vegetation water contnent + call h5dopen_f(sm_gr_id_A,vwc_field_name_A,vwc_field_id_A, status) + call LIS_verify(status, 'Error opening Veg water content field in NASASMAP file') + + call h5dread_f(vwc_field_id_A, H5T_NATIVE_REAL,vwc_field,dims,status, & + memspace, dataspace) + call LIS_verify(status, 'Error extracting Veg water content (AM) field from NASASMAPfile') + + call h5dclose_f(vwc_field_id_A,status) + call LIS_verify(status,'Error in H5DCLOSE call') + + call h5gclose_f(sm_gr_id_A,status) + call LIS_verify(status,'Error in H5GCLOSE call') + + endif + + call h5fclose_f(file_id,status) + call LIS_verify(status,'Error in H5FCLOSE call') + + call h5close_f(status) + call LIS_verify(status,'Error in H5CLOSE call') + + sm_data_b = .false. + t = 1 + +! The retrieval_quality_field variable's binary representation consists of bits +! that indicate whether retrieval is performed or not at a given grid cell. +! When retrieval is performed, it contains additional bits to further +! indicate the exit status and quality of the retrieval. The first bit +! indicates the recommended quality (0-means retrieval has recommended quality). + + do r=1,cdfT_SMAPsm_struc(n)%nr + do c=1,cdfT_SMAPsm_struc(n)%nc + sm_data(t) = sm_field(c,r) + + if(vwc_field(c,r).gt. 5 ) then !MN Aply QC : if VWC > 5 kg/m2 + sm_data(t) = LIS_rc%udef + else + + if(sm_data(t).ne.-9999.0) then + if(ibits(sm_qa(c,r),0,1).eq.0) then + sm_data_b(t) = .true. + else + sm_data(t) = -9999.0 + endif + endif + endif + + t = t+1 + enddo + enddo + + deallocate(sm_qa) + +!-------------------------------------------------------------------------- +! Interpolate to the LIS running domain +!-------------------------------------------------------------------------- + call neighbor_interp(LIS_rc%obs_gridDesc(k,:),& + sm_data_b, sm_data, smobs_b_ip, smobs_ip, & + cdfT_SMAPsm_struc(n)%nc*cdfT_SMAPsm_struc(n)%nr, & + LIS_rc%obs_lnc(k)*LIS_rc%obs_lnr(k), & + cdfT_SMAPsm_struc(n)%rlat, cdfT_SMAPsm_struc(n)%rlon,& + cdfT_SMAPsm_struc(n)%n11, LIS_rc%udef, ios) + + deallocate(sm_field) + deallocate(dims) + +#endif + + +end subroutine read_NASASMAP_data_cdfTransfer + + diff --git a/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/write_cdfTransfer_NASASMAPsmobs.F90 b/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/write_cdfTransfer_NASASMAPsmobs.F90 new file mode 100644 index 000000000..e67e55e48 --- /dev/null +++ b/lis/dataassim/obs/CDF_Transfer_NASA_SMAPsm/write_cdfTransfer_NASASMAPsmobs.F90 @@ -0,0 +1,122 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: write_cdfTransfer_NASASMAPsmobs +! \label{write_cdfTransfer_NASASMAPsmobs} +! +! !REVISION HISTORY: +! 25Jan2008: Sujay Kumar; Initial Specification +! 2 Mar 2022: Mahdi navari; modified for cdf transfer DA +! +! !INTERFACE: +subroutine write_cdfTransfer_NASASMAPsmobs(n, k, OBS_State) +! !USES: + use ESMF + use LIS_coreMod + use LIS_logMod + use LIS_fileIOMod + use LIS_historyMod + use LIS_DAobservationsMod + + implicit none + +! !ARGUMENTS: + + integer, intent(in) :: n + integer, intent(in) :: k + type(ESMF_State) :: OBS_State +! +! !DESCRIPTION: +! +! writes the transformed (interpolated/upscaled/reprojected) +! LPRM AMSRE observations to a file +! +!EOP + type(ESMF_Field) :: smField + logical :: data_update + real, pointer :: smobs(:) + real :: smobs_unsc(LIS_rc%obs_ngrid(k)) + character*100 :: obsname + integer :: ftn + integer :: status + + call ESMF_AttributeGet(OBS_State, "Data Update Status", & + data_update, rc=status) + call LIS_verify(status) + + if(data_update) then + + call ESMF_StateGet(OBS_State, "Observation01",smField, & + rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(smField, localDE=0, farrayPtr=smobs, rc=status) + call LIS_verify(status) + + if(LIS_rc%obs_ngrid(k).gt.0) then + call ESMF_AttributeGet(smfield,"Unscaled Obs",smobs_unsc,& + itemCount=LIS_rc%obs_ngrid(k),rc=status) + call LIS_verify(status, 'Error in AttributeGet-Unscaled Obs') + endif + + if(LIS_masterproc) then + ftn = LIS_getNextUnitNumber() + call cdfTransfer_smobsname(n,k,obsname) + + call LIS_create_output_directory('DAOBS') + open(ftn,file=trim(obsname), form='unformatted') + endif + + call LIS_writevar_gridded_obs(ftn,n,k,smobs_unsc) + call LIS_writevar_gridded_obs(ftn,n,k,smobs) + + if(LIS_masterproc) then + call LIS_releaseUnitNumber(ftn) + endif + + endif + +end subroutine write_cdfTransfer_NASASMAPsmobs + +!BOP +! !ROUTINE: cdfTransfer_smobsname +! \label{cdfTransfer_smobsname} +! +! !INTERFACE: +subroutine cdfTransfer_smobsname(n,k,obsname) +! !USES: + use LIS_coreMod, only : LIS_rc + +! !ARGUMENTS: + integer :: n + integer :: k + character(len=*) :: obsname +! +! !DESCRIPTION: +! +!EOP + + character(len=12) :: cdate1 + character(len=12) :: cdate + character(len=10) :: cda + + write(unit=cdate1, fmt='(i4.4, i2.2, i2.2, i2.2, i2.2)') & + LIS_rc%yr, LIS_rc%mo, & + LIS_rc%da, LIS_rc%hr,LIS_rc%mn + + write(unit=cda, fmt='(a2,i2.2)') '.a',k + write(unit=cdate, fmt='(a2,i2.2)') '.d',n + + obsname = trim(LIS_rc%odir)//'/DAOBS/'//cdate1(1:6)//& + '/LISDAOBS_'//cdate1// & + trim(cda)//trim(cdate)//'.1gs4r' + +end subroutine cdfTransfer_smobsname diff --git a/lis/dataassim/obs/ESACCI_sm/ESACCI_sm_Mod.F90 b/lis/dataassim/obs/ESACCI_sm/ESACCI_sm_Mod.F90 index e7d757c16..7b9d8ce83 100644 --- a/lis/dataassim/obs/ESACCI_sm/ESACCI_sm_Mod.F90 +++ b/lis/dataassim/obs/ESACCI_sm/ESACCI_sm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ESACCI_sm/read_ESACCIsm.F90 b/lis/dataassim/obs/ESACCI_sm/read_ESACCIsm.F90 index 0f8480e5f..ca8fd23eb 100644 --- a/lis/dataassim/obs/ESACCI_sm/read_ESACCIsm.F90 +++ b/lis/dataassim/obs/ESACCI_sm/read_ESACCIsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ESACCI_sm/write_ESACCIsmobs.F90 b/lis/dataassim/obs/ESACCI_sm/write_ESACCIsmobs.F90 index 87d72b78b..c21f0d9ce 100644 --- a/lis/dataassim/obs/ESACCI_sm/write_ESACCIsmobs.F90 +++ b/lis/dataassim/obs/ESACCI_sm/write_ESACCIsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GCOMW_AMSR2L3SND/GCOMW_AMSR2L3SND_Mod.F90 b/lis/dataassim/obs/GCOMW_AMSR2L3SND/GCOMW_AMSR2L3SND_Mod.F90 index bbf4259fa..e2ca6ecf9 100644 --- a/lis/dataassim/obs/GCOMW_AMSR2L3SND/GCOMW_AMSR2L3SND_Mod.F90 +++ b/lis/dataassim/obs/GCOMW_AMSR2L3SND/GCOMW_AMSR2L3SND_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GCOMW_AMSR2L3SND/read_GCOMW_AMSR2L3SND.F90 b/lis/dataassim/obs/GCOMW_AMSR2L3SND/read_GCOMW_AMSR2L3SND.F90 index 690f69c2d..9c532094e 100644 --- a/lis/dataassim/obs/GCOMW_AMSR2L3SND/read_GCOMW_AMSR2L3SND.F90 +++ b/lis/dataassim/obs/GCOMW_AMSR2L3SND/read_GCOMW_AMSR2L3SND.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GCOMW_AMSR2L3SND/write_GCOMW_AMSR2L3SNDobs.F90 b/lis/dataassim/obs/GCOMW_AMSR2L3SND/write_GCOMW_AMSR2L3SNDobs.F90 index 40c56f2fc..1f1395764 100644 --- a/lis/dataassim/obs/GCOMW_AMSR2L3SND/write_GCOMW_AMSR2L3SNDobs.F90 +++ b/lis/dataassim/obs/GCOMW_AMSR2L3SND/write_GCOMW_AMSR2L3SNDobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_Mod.F90 b/lis/dataassim/obs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_Mod.F90 index 1772cc261..57ed492bc 100644 --- a/lis/dataassim/obs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_Mod.F90 +++ b/lis/dataassim/obs/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GCOMW_AMSR2L3sm/read_GCOMW_AMSR2L3sm.F90 b/lis/dataassim/obs/GCOMW_AMSR2L3sm/read_GCOMW_AMSR2L3sm.F90 index b038e2001..544bb08ee 100644 --- a/lis/dataassim/obs/GCOMW_AMSR2L3sm/read_GCOMW_AMSR2L3sm.F90 +++ b/lis/dataassim/obs/GCOMW_AMSR2L3sm/read_GCOMW_AMSR2L3sm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GCOMW_AMSR2L3sm/write_GCOMW_AMSR2L3smobs.F90 b/lis/dataassim/obs/GCOMW_AMSR2L3sm/write_GCOMW_AMSR2L3smobs.F90 index a1a953e93..2b268ac76 100644 --- a/lis/dataassim/obs/GCOMW_AMSR2L3sm/write_GCOMW_AMSR2L3smobs.F90 +++ b/lis/dataassim/obs/GCOMW_AMSR2L3sm/write_GCOMW_AMSR2L3smobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GLASS_Albedo/GLASSalbedo_Mod.F90 b/lis/dataassim/obs/GLASS_Albedo/GLASSalbedo_Mod.F90 index 048629f91..cfd3f6718 100644 --- a/lis/dataassim/obs/GLASS_Albedo/GLASSalbedo_Mod.F90 +++ b/lis/dataassim/obs/GLASS_Albedo/GLASSalbedo_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GLASS_Albedo/read_GLASSalbedo.F90 b/lis/dataassim/obs/GLASS_Albedo/read_GLASSalbedo.F90 index 7a1e57ef5..588e0c8e3 100644 --- a/lis/dataassim/obs/GLASS_Albedo/read_GLASSalbedo.F90 +++ b/lis/dataassim/obs/GLASS_Albedo/read_GLASSalbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GLASS_Albedo/write_GLASSalbedo.F90 b/lis/dataassim/obs/GLASS_Albedo/write_GLASSalbedo.F90 index 3b080780b..893d7e869 100644 --- a/lis/dataassim/obs/GLASS_Albedo/write_GLASSalbedo.F90 +++ b/lis/dataassim/obs/GLASS_Albedo/write_GLASSalbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GLASS_LAI/GLASSlai_Mod.F90 b/lis/dataassim/obs/GLASS_LAI/GLASSlai_Mod.F90 index 9296bb665..56d350082 100644 --- a/lis/dataassim/obs/GLASS_LAI/GLASSlai_Mod.F90 +++ b/lis/dataassim/obs/GLASS_LAI/GLASSlai_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GLASS_LAI/read_GLASSlai.F90 b/lis/dataassim/obs/GLASS_LAI/read_GLASSlai.F90 index dd8ce922f..460db2782 100644 --- a/lis/dataassim/obs/GLASS_LAI/read_GLASSlai.F90 +++ b/lis/dataassim/obs/GLASS_LAI/read_GLASSlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GLASS_LAI/write_GLASSlai.F90 b/lis/dataassim/obs/GLASS_LAI/write_GLASSlai.F90 index 01a5634a1..f5e881032 100644 --- a/lis/dataassim/obs/GLASS_LAI/write_GLASSlai.F90 +++ b/lis/dataassim/obs/GLASS_LAI/write_GLASSlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GRACE/GRACEobs_module.F90 b/lis/dataassim/obs/GRACE/GRACEobs_module.F90 index 54a172e8a..1514d2d67 100644 --- a/lis/dataassim/obs/GRACE/GRACEobs_module.F90 +++ b/lis/dataassim/obs/GRACE/GRACEobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GRACE/read_GRACEobs.F90 b/lis/dataassim/obs/GRACE/read_GRACEobs.F90 index c85988a04..2fe175aab 100644 --- a/lis/dataassim/obs/GRACE/read_GRACEobs.F90 +++ b/lis/dataassim/obs/GRACE/read_GRACEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/GRACE/write_GRACEobs.F90 b/lis/dataassim/obs/GRACE/write_GRACEobs.F90 index a1ba7b639..d4726aa71 100644 --- a/lis/dataassim/obs/GRACE/write_GRACEobs.F90 +++ b/lis/dataassim/obs/GRACE/write_GRACEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/IMS_sca/IMSsca_mod.F90 b/lis/dataassim/obs/IMS_sca/IMSsca_mod.F90 index 779fb8829..b012c76f1 100644 --- a/lis/dataassim/obs/IMS_sca/IMSsca_mod.F90 +++ b/lis/dataassim/obs/IMS_sca/IMSsca_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/IMS_sca/read_IMSsca.F90 b/lis/dataassim/obs/IMS_sca/read_IMSsca.F90 index 847602964..41e3704ea 100644 --- a/lis/dataassim/obs/IMS_sca/read_IMSsca.F90 +++ b/lis/dataassim/obs/IMS_sca/read_IMSsca.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/IMS_sca/write_IMSscaobs.F90 b/lis/dataassim/obs/IMS_sca/write_IMSscaobs.F90 index 708da6645..ba98aff99 100644 --- a/lis/dataassim/obs/IMS_sca/write_IMSscaobs.F90 +++ b/lis/dataassim/obs/IMS_sca/write_IMSscaobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ISCCP_Tskin/ISCCP_Tskin_module.F90 b/lis/dataassim/obs/ISCCP_Tskin/ISCCP_Tskin_module.F90 index 10eb2f898..88f711222 100644 --- a/lis/dataassim/obs/ISCCP_Tskin/ISCCP_Tskin_module.F90 +++ b/lis/dataassim/obs/ISCCP_Tskin/ISCCP_Tskin_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ISCCP_Tskin/read_ISCCP_Tskin.F90 b/lis/dataassim/obs/ISCCP_Tskin/read_ISCCP_Tskin.F90 index 46ae4129a..072dcc746 100644 --- a/lis/dataassim/obs/ISCCP_Tskin/read_ISCCP_Tskin.F90 +++ b/lis/dataassim/obs/ISCCP_Tskin/read_ISCCP_Tskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/ISCCP_Tskin/write_ISCCP_Tskin.F90 b/lis/dataassim/obs/ISCCP_Tskin/write_ISCCP_Tskin.F90 index c51b2efbc..1de5d41cd 100644 --- a/lis/dataassim/obs/ISCCP_Tskin/write_ISCCP_Tskin.F90 +++ b/lis/dataassim/obs/ISCCP_Tskin/write_ISCCP_Tskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/LPRM_AMSREsm/LPRM_AMSREsm_Mod.F90 b/lis/dataassim/obs/LPRM_AMSREsm/LPRM_AMSREsm_Mod.F90 index f0d9579ad..2ed18b44f 100644 --- a/lis/dataassim/obs/LPRM_AMSREsm/LPRM_AMSREsm_Mod.F90 +++ b/lis/dataassim/obs/LPRM_AMSREsm/LPRM_AMSREsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/LPRM_AMSREsm/read_LPRM_AMSREsm.F90 b/lis/dataassim/obs/LPRM_AMSREsm/read_LPRM_AMSREsm.F90 index 313c4a778..6eb11bd0f 100644 --- a/lis/dataassim/obs/LPRM_AMSREsm/read_LPRM_AMSREsm.F90 +++ b/lis/dataassim/obs/LPRM_AMSREsm/read_LPRM_AMSREsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/LPRM_AMSREsm/write_LPRM_AMSREsmobs.F90 b/lis/dataassim/obs/LPRM_AMSREsm/write_LPRM_AMSREsmobs.F90 index 772e9fcb0..2194b663c 100644 --- a/lis/dataassim/obs/LPRM_AMSREsm/write_LPRM_AMSREsmobs.F90 +++ b/lis/dataassim/obs/LPRM_AMSREsm/write_LPRM_AMSREsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MCD15A2H_LAI/MCD15A2Hlai_Mod.F90 b/lis/dataassim/obs/MCD15A2H_LAI/MCD15A2Hlai_Mod.F90 index c2fd6a1c6..121aef196 100755 --- a/lis/dataassim/obs/MCD15A2H_LAI/MCD15A2Hlai_Mod.F90 +++ b/lis/dataassim/obs/MCD15A2H_LAI/MCD15A2Hlai_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MCD15A2H_LAI/read_MCD15A2Hlai.F90 b/lis/dataassim/obs/MCD15A2H_LAI/read_MCD15A2Hlai.F90 index 418c9b3ab..846df80d2 100755 --- a/lis/dataassim/obs/MCD15A2H_LAI/read_MCD15A2Hlai.F90 +++ b/lis/dataassim/obs/MCD15A2H_LAI/read_MCD15A2Hlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MCD15A2H_LAI/write_MCD15A2Hlai.F90 b/lis/dataassim/obs/MCD15A2H_LAI/write_MCD15A2Hlai.F90 index bac4a3ef7..850c4115a 100755 --- a/lis/dataassim/obs/MCD15A2H_LAI/write_MCD15A2Hlai.F90 +++ b/lis/dataassim/obs/MCD15A2H_LAI/write_MCD15A2Hlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODIS_SPORT_LAI/MODISsportLAI_Mod.F90 b/lis/dataassim/obs/MODIS_SPORT_LAI/MODISsportLAI_Mod.F90 index 0f8a31929..05d5bfba6 100644 --- a/lis/dataassim/obs/MODIS_SPORT_LAI/MODISsportLAI_Mod.F90 +++ b/lis/dataassim/obs/MODIS_SPORT_LAI/MODISsportLAI_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODIS_SPORT_LAI/read_MODISsportLAI.F90 b/lis/dataassim/obs/MODIS_SPORT_LAI/read_MODISsportLAI.F90 index b219828c2..25e4df6e7 100644 --- a/lis/dataassim/obs/MODIS_SPORT_LAI/read_MODISsportLAI.F90 +++ b/lis/dataassim/obs/MODIS_SPORT_LAI/read_MODISsportLAI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODIS_SPORT_LAI/write_MODISsportLAI.F90 b/lis/dataassim/obs/MODIS_SPORT_LAI/write_MODISsportLAI.F90 index 15fb93f94..3a007e582 100644 --- a/lis/dataassim/obs/MODIS_SPORT_LAI/write_MODISsportLAI.F90 +++ b/lis/dataassim/obs/MODIS_SPORT_LAI/write_MODISsportLAI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODISsca/0Intro_modissca.txt b/lis/dataassim/obs/MODISsca/0Intro_modissca.txt index b0dbe9cab..77dbd8dbe 100644 --- a/lis/dataassim/obs/MODISsca/0Intro_modissca.txt +++ b/lis/dataassim/obs/MODISsca/0Intro_modissca.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODISsca/MODISscaobs_module.F90 b/lis/dataassim/obs/MODISsca/MODISscaobs_module.F90 index 99076f432..59c33d06f 100644 --- a/lis/dataassim/obs/MODISsca/MODISscaobs_module.F90 +++ b/lis/dataassim/obs/MODISsca/MODISscaobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODISsca/read_MODISscaobs.F90 b/lis/dataassim/obs/MODISsca/read_MODISscaobs.F90 index 2cb20f02b..4d6cc7f99 100644 --- a/lis/dataassim/obs/MODISsca/read_MODISscaobs.F90 +++ b/lis/dataassim/obs/MODISsca/read_MODISscaobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/MODISsca/write_MODISsca.F90 b/lis/dataassim/obs/MODISsca/write_MODISsca.F90 index 1f9c063c0..2a922508b 100644 --- a/lis/dataassim/obs/MODISsca/write_MODISsca.F90 +++ b/lis/dataassim/obs/MODISsca/write_MODISsca.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_AMSREsm/0Intro_nasaamsre.txt b/lis/dataassim/obs/NASA_AMSREsm/0Intro_nasaamsre.txt index c63254ff3..0d88ebe43 100644 --- a/lis/dataassim/obs/NASA_AMSREsm/0Intro_nasaamsre.txt +++ b/lis/dataassim/obs/NASA_AMSREsm/0Intro_nasaamsre.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_AMSREsm/NASA_AMSREsm_Mod.F90 b/lis/dataassim/obs/NASA_AMSREsm/NASA_AMSREsm_Mod.F90 index f3b5a7756..aba594355 100644 --- a/lis/dataassim/obs/NASA_AMSREsm/NASA_AMSREsm_Mod.F90 +++ b/lis/dataassim/obs/NASA_AMSREsm/NASA_AMSREsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_AMSREsm/read_NASA_AMSREsm.F90 b/lis/dataassim/obs/NASA_AMSREsm/read_NASA_AMSREsm.F90 index 18f7b647e..dc479dd81 100644 --- a/lis/dataassim/obs/NASA_AMSREsm/read_NASA_AMSREsm.F90 +++ b/lis/dataassim/obs/NASA_AMSREsm/read_NASA_AMSREsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_AMSREsm/write_NASA_AMSREsmobs.F90 b/lis/dataassim/obs/NASA_AMSREsm/write_NASA_AMSREsmobs.F90 index 506d41ca1..e5385c7fb 100644 --- a/lis/dataassim/obs/NASA_AMSREsm/write_NASA_AMSREsmobs.F90 +++ b/lis/dataassim/obs/NASA_AMSREsm/write_NASA_AMSREsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_SMAPsm/NASASMAPsm_Mod.F90 b/lis/dataassim/obs/NASA_SMAPsm/NASASMAPsm_Mod.F90 index b1623a59d..1e25325d3 100644 --- a/lis/dataassim/obs/NASA_SMAPsm/NASASMAPsm_Mod.F90 +++ b/lis/dataassim/obs/NASA_SMAPsm/NASASMAPsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_SMAPsm/read_NASASMAPsm.F90 b/lis/dataassim/obs/NASA_SMAPsm/read_NASASMAPsm.F90 index bc09f64ae..6022318da 100644 --- a/lis/dataassim/obs/NASA_SMAPsm/read_NASASMAPsm.F90 +++ b/lis/dataassim/obs/NASA_SMAPsm/read_NASASMAPsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_SMAPsm/write_NASASMAPsmobs.F90 b/lis/dataassim/obs/NASA_SMAPsm/write_NASASMAPsmobs.F90 index 41bbe7a56..86af0e4a2 100644 --- a/lis/dataassim/obs/NASA_SMAPsm/write_NASASMAPsmobs.F90 +++ b/lis/dataassim/obs/NASA_SMAPsm/write_NASASMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_SMAPvod/NASASMAPvod_Mod.F90 b/lis/dataassim/obs/NASA_SMAPvod/NASASMAPvod_Mod.F90 index 1d8a46104..d6aa14bcc 100644 --- a/lis/dataassim/obs/NASA_SMAPvod/NASASMAPvod_Mod.F90 +++ b/lis/dataassim/obs/NASA_SMAPvod/NASASMAPvod_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_SMAPvod/read_NASASMAPvod.F90 b/lis/dataassim/obs/NASA_SMAPvod/read_NASASMAPvod.F90 index 7c42ce63a..68efa597f 100644 --- a/lis/dataassim/obs/NASA_SMAPvod/read_NASASMAPvod.F90 +++ b/lis/dataassim/obs/NASA_SMAPvod/read_NASASMAPvod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/NASA_SMAPvod/write_NASASMAPvodobs.F90 b/lis/dataassim/obs/NASA_SMAPvod/write_NASASMAPvodobs.F90 index f996395c1..290be2181 100644 --- a/lis/dataassim/obs/NASA_SMAPvod/write_NASASMAPvodobs.F90 +++ b/lis/dataassim/obs/NASA_SMAPvod/write_NASASMAPvodobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/PMW_snow/0Intro_PMW_snow.txt b/lis/dataassim/obs/PMW_snow/0Intro_PMW_snow.txt index 7883d14a4..3f205fa6a 100755 --- a/lis/dataassim/obs/PMW_snow/0Intro_PMW_snow.txt +++ b/lis/dataassim/obs/PMW_snow/0Intro_PMW_snow.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/PMW_snow/PMW_snow_Mod.F90 b/lis/dataassim/obs/PMW_snow/PMW_snow_Mod.F90 index a510c2877..0a582c5d1 100755 --- a/lis/dataassim/obs/PMW_snow/PMW_snow_Mod.F90 +++ b/lis/dataassim/obs/PMW_snow/PMW_snow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/PMW_snow/read_PMW_snow.F90 b/lis/dataassim/obs/PMW_snow/read_PMW_snow.F90 index b73f21454..a979ee469 100755 --- a/lis/dataassim/obs/PMW_snow/read_PMW_snow.F90 +++ b/lis/dataassim/obs/PMW_snow/read_PMW_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/PMW_snow/write_PMW_snowobs.F90 b/lis/dataassim/obs/PMW_snow/write_PMW_snowobs.F90 index fc8d14c78..13a98b961 100755 --- a/lis/dataassim/obs/PMW_snow/write_PMW_snowobs.F90 +++ b/lis/dataassim/obs/PMW_snow/write_PMW_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMAP_E_OPLsm/SMAPEOPLsm_Mod.F90 b/lis/dataassim/obs/SMAP_E_OPLsm/SMAPEOPLsm_Mod.F90 index ada50c9f1..cba582eac 100644 --- a/lis/dataassim/obs/SMAP_E_OPLsm/SMAPEOPLsm_Mod.F90 +++ b/lis/dataassim/obs/SMAP_E_OPLsm/SMAPEOPLsm_Mod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMAP_E_OPLsm/read_SMAPEOPLsm.F90 b/lis/dataassim/obs/SMAP_E_OPLsm/read_SMAPEOPLsm.F90 index 049de1ce1..cc202e5d3 100644 --- a/lis/dataassim/obs/SMAP_E_OPLsm/read_SMAPEOPLsm.F90 +++ b/lis/dataassim/obs/SMAP_E_OPLsm/read_SMAPEOPLsm.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -14,6 +14,7 @@ ! ! !REVISION HISTORY: ! 6 Jun 2022: Yonghwan Kwon; Updated for use with SMAP_E_OPL soil moisture +! 23 Feb 2023: Eric Kemp; Updated to read netCDF file. ! ! !INTERFACE: subroutine read_SMAPEOPLsm(n, k, OBS_State, OBS_Pert_State) @@ -143,8 +144,11 @@ subroutine read_SMAPEOPLsm(n, k, OBS_State, OBS_Pert_State) write(hh,'(i2.2)') LIS_rc%hr if(LIS_masterproc) then + !list_files = trim(smobsdir)//'/ARFS_SM_*' & + ! //trim(yyyymmdd)//'T'//trim(hh)//'*.dat' + !EMK...Use netCDF list_files = trim(smobsdir)//'/ARFS_SM_*' & - //trim(yyyymmdd)//'T'//trim(hh)//'*.dat' + //trim(yyyymmdd)//'T'//trim(hh)//'*.nc' write(LIS_logunit,*) & '[INFO] Searching for ',trim(list_files) rc = create_filelist(trim(list_files)//char(0), & @@ -426,7 +430,9 @@ end subroutine read_SMAPEOPLsm subroutine read_SMAPEOPLsm_data(n, k,fname, smobs_inp, time) ! ! !USES: - +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif use LIS_coreMod use LIS_logMod use LIS_timeMgrMod @@ -452,28 +458,205 @@ subroutine read_SMAPEOPLsm_data(n, k,fname, smobs_inp, time) integer :: ios, nid integer :: c,r integer :: ftn1 - - ftn1 = LIS_getNextUnitNumber() - open(unit=ftn1,file=fname,form='unformatted',access='direct',recl=4*nc*nr,status='old') - read(ftn1, rec=1) sm_raw - close(1) - call LIS_releaseUnitNumber(ftn1) - + ! EMK + logical :: file_exists + character(255) :: map_projection + integer :: ncid, dim_ids(3), var_id + integer :: ntime, nlat, nlon + real, allocatable :: tmp(:,:,:) + integer :: rc + + ! Old code to use binary data + !ftn1 = LIS_getNextUnitNumber() + !open(unit=ftn1,file=fname,form='unformatted',access='direct',recl=4*nc*nr,status='old') + + ! read(ftn1, rec=1) sm_raw + ! close(1) + ! call LIS_releaseUnitNumber(ftn1) + + ! sm_data_b = .false. + + ! do r=1,SMAPEOPLsm_struc(n)%nr + ! do c=1,SMAPEOPLsm_struc(n)%nc + ! if (sm_raw(c,r)>=0.and.& + ! sm_raw(c,r)<=100) then + + ! sm_in(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = sm_raw(c,r) + ! sm_data_b(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = .true. + ! else + ! sm_in(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = LIS_rc%udef + ! sm_data_b(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = .false. + ! endif + ! enddo + ! enddo + + ! EMK...Read netCDF data + sm_in = LIS_rc%udef sm_data_b = .false. - do r=1,SMAPEOPLsm_struc(n)%nr - do c=1,SMAPEOPLsm_struc(n)%nc - if (sm_raw(c,r)>=0.and.& - sm_raw(c,r)<=100) then +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + + ! See if the file exists. + inquire(file=trim(fname), exist=file_exists) + if (.not. file_exists) then + write(LIS_logunit,*)'[ERR] Cannot find ', trim(fname) + return + end if + + ! Open the file + rc = nf90_open(path=trim(fname), & + mode=NF90_NOWRITE, & + ncid=ncid) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot open ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + return + end if + + ! Read the map projection + rc = nf90_get_att(ncid=ncid, & + varid=NF90_GLOBAL, & + name='MAP_PROJECTION', & + values=map_projection) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read MAP_PROJECTION from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + + ! Sanity check map projection + ! TODO: Support other map projections + if (trim(map_projection) .ne. 'EQUIDISTANT CYLINDRICAL') then + write(LIS_logunit,*) & + '[ERR] Unrecognized map projection found in SMAP file!' + write(LIS_logunit,*) '[ERR] Expected EQUIDISTANT CYLINDRICAL' + write(LIS_logunit,*) '[ERR] Found ',trim(map_projection) + write(LIS_logunit,*) '[ERR] LIS will skip file ', trim(fname) + rc = nf90_close(ncid) + return + end if + + ! Get dimension IDs + rc = nf90_inq_dimid(ncid=ncid, & + name='time', & + dimid=dim_ids(3)) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read time dimension from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + rc = nf90_inq_dimid(ncid=ncid, & + name='lat', & + dimid=dim_ids(2)) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read lat dimension from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + rc = nf90_inq_dimid(ncid=ncid, & + name='lon', & + dimid=dim_ids(1)) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read lon dimension from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + + ! Get actual dimension sizes + rc = nf90_inquire_dimension(ncid=ncid, & + dimid=dim_ids(3), & + len=ntime) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read time dimension from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + rc = nf90_inquire_dimension(ncid=ncid, & + dimid=dim_ids(2), & + len=nlat) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read lat dimension from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + rc = nf90_inquire_dimension(ncid=ncid, & + dimid=dim_ids(1), & + len=nlon) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read lon dimension from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + + ! Sanity check the dimensions + if (ntime .ne. 1) then + write(LIS_logunit,*)'[ERR] Expected time dimension to be 1' + write(LIS_logunit,*)'[ERR] Found ', ntime, ' from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + if (nlat .ne. SMAPEOPLsm_struc(n)%nr) then + write(LIS_logunit,*)'[ERR] Expected lat dimension to be ', & + SMAPEOPLsm_struc(n)%nr + write(LIS_logunit,*)'[ERR] Found ', nlat, ' from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + if (nlon .ne. SMAPEOPLsm_struc(n)%nc) then + write(LIS_logunit,*)'[ERR] Expected lon dimension to be ', & + SMAPEOPLsm_struc(n)%nc + write(LIS_logunit,*)'[ERR] Found ', nlon, ' from ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + + ! Fetch the variable id + rc = nf90_inq_varid(ncid=ncid, & + name='arfs_sm', & + varid=var_id) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read arfs_sm ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + return + end if + + ! Read the retrievals + allocate(tmp(nlon, nlat, ntime)) + rc = nf90_get_var(ncid=ncid, & + varid=var_id, & + values=tmp) + if (rc .ne. 0) then + write(LIS_logunit,*)'[ERR] Cannot read arfs_sm ', trim(fname) + write(LIS_logunit,*)'[ERR] LIS will continue...' + rc = nf90_close(ncid) + deallocate(tmp) + return + end if + rc = nf90_close(ncid) + + do r = 1, nlat + do c = 1, nlon + if (tmp(c,r,1) >= 0 .and. & + tmp(c,r,1) <= 1) then + sm_in(c + (r-1)*nc) = tmp(c,r,1) + sm_data_b(c + (r-1)*nc) = .true. + end if + end do + end do + deallocate(tmp) - sm_in(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = sm_raw(c,r) - sm_data_b(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = .true. - else - sm_in(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = LIS_rc%udef - sm_data_b(c+(r-1)*SMAPEOPLsm_struc(n)%nc) = .false. - endif - enddo - enddo +#endif !-------------------------------------------------------------------------- ! Interpolate to the LIS running domain @@ -495,7 +678,7 @@ subroutine read_SMAPEOPLsm_data(n, k,fname, smobs_inp, time) sm_data_b,sm_in, smobs_b_ip, smobs_ip) endif -!overwrite the input data +!overwrite the input data do r=1,LIS_rc%obs_lnr(k) do c=1,LIS_rc%obs_lnc(k) if(smobs_ip(c+(r-1)*LIS_rc%obs_lnc(k)).ne.-9999.0) then diff --git a/lis/dataassim/obs/SMAP_E_OPLsm/write_SMAPEOPLsmobs.F90 b/lis/dataassim/obs/SMAP_E_OPLsm/write_SMAPEOPLsmobs.F90 index a1b1a948d..9654b1755 100644 --- a/lis/dataassim/obs/SMAP_E_OPLsm/write_SMAPEOPLsmobs.F90 +++ b/lis/dataassim/obs/SMAP_E_OPLsm/write_SMAPEOPLsmobs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMAP_NRTsm/SMAPNRTsm_Mod.F90 b/lis/dataassim/obs/SMAP_NRTsm/SMAPNRTsm_Mod.F90 index 076316fbf..5e4b98ba9 100755 --- a/lis/dataassim/obs/SMAP_NRTsm/SMAPNRTsm_Mod.F90 +++ b/lis/dataassim/obs/SMAP_NRTsm/SMAPNRTsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMAP_NRTsm/create_filelist.c b/lis/dataassim/obs/SMAP_NRTsm/create_filelist.c index 77e9ff5c2..9768569ad 100644 --- a/lis/dataassim/obs/SMAP_NRTsm/create_filelist.c +++ b/lis/dataassim/obs/SMAP_NRTsm/create_filelist.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMAP_NRTsm/read_SMAPNRTsm.F90 b/lis/dataassim/obs/SMAP_NRTsm/read_SMAPNRTsm.F90 index ebebe5ecf..07c15ac0c 100755 --- a/lis/dataassim/obs/SMAP_NRTsm/read_SMAPNRTsm.F90 +++ b/lis/dataassim/obs/SMAP_NRTsm/read_SMAPNRTsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMAP_NRTsm/write_SMAPNRTsmobs.F90 b/lis/dataassim/obs/SMAP_NRTsm/write_SMAPNRTsmobs.F90 index f0b66f24d..435e84f92 100755 --- a/lis/dataassim/obs/SMAP_NRTsm/write_SMAPNRTsmobs.F90 +++ b/lis/dataassim/obs/SMAP_NRTsm/write_SMAPNRTsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMMR_SNWD/SMMRSNWDsnow_Mod.F90 b/lis/dataassim/obs/SMMR_SNWD/SMMRSNWDsnow_Mod.F90 index d7b2ff9cf..db117d7b2 100644 --- a/lis/dataassim/obs/SMMR_SNWD/SMMRSNWDsnow_Mod.F90 +++ b/lis/dataassim/obs/SMMR_SNWD/SMMRSNWDsnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMMR_SNWD/read_SMMRSNWDsnow.F90 b/lis/dataassim/obs/SMMR_SNWD/read_SMMRSNWDsnow.F90 index 271ecfdc4..e93be3691 100644 --- a/lis/dataassim/obs/SMMR_SNWD/read_SMMRSNWDsnow.F90 +++ b/lis/dataassim/obs/SMMR_SNWD/read_SMMRSNWDsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMMR_SNWD/write_SMMRSNWDsnow.F90 b/lis/dataassim/obs/SMMR_SNWD/write_SMMRSNWDsnow.F90 index cb48fd3b1..8819f976a 100644 --- a/lis/dataassim/obs/SMMR_SNWD/write_SMMRSNWDsnow.F90 +++ b/lis/dataassim/obs/SMMR_SNWD/write_SMMRSNWDsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_AMSR2sm/SMOPS_AMSR2sm_Mod.F90 b/lis/dataassim/obs/SMOPS_AMSR2sm/SMOPS_AMSR2sm_Mod.F90 index 1eb06fe4c..4af9b1363 100755 --- a/lis/dataassim/obs/SMOPS_AMSR2sm/SMOPS_AMSR2sm_Mod.F90 +++ b/lis/dataassim/obs/SMOPS_AMSR2sm/SMOPS_AMSR2sm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90 b/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90 index b85046c00..c43a48a25 100755 --- a/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90 +++ b/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90.old b/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90.old index 60d1970a0..380f44324 100755 --- a/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90.old +++ b/lis/dataassim/obs/SMOPS_AMSR2sm/read_SMOPS_AMSR2sm.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_AMSR2sm/write_SMOPS_AMSR2smobs.F90 b/lis/dataassim/obs/SMOPS_AMSR2sm/write_SMOPS_AMSR2smobs.F90 index 4c9508d44..c1c18c646 100755 --- a/lis/dataassim/obs/SMOPS_AMSR2sm/write_SMOPS_AMSR2smobs.F90 +++ b/lis/dataassim/obs/SMOPS_AMSR2sm/write_SMOPS_AMSR2smobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_ASCATsm/SMOPS_ASCATsm_Mod.F90 b/lis/dataassim/obs/SMOPS_ASCATsm/SMOPS_ASCATsm_Mod.F90 index bcd2e8bab..a6bc95603 100755 --- a/lis/dataassim/obs/SMOPS_ASCATsm/SMOPS_ASCATsm_Mod.F90 +++ b/lis/dataassim/obs/SMOPS_ASCATsm/SMOPS_ASCATsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_ASCATsm/read_SMOPS_ASCATsm.F90 b/lis/dataassim/obs/SMOPS_ASCATsm/read_SMOPS_ASCATsm.F90 index 6ab989ec9..c1f382176 100755 --- a/lis/dataassim/obs/SMOPS_ASCATsm/read_SMOPS_ASCATsm.F90 +++ b/lis/dataassim/obs/SMOPS_ASCATsm/read_SMOPS_ASCATsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_ASCATsm/write_SMOPS_ASCATsmobs.F90 b/lis/dataassim/obs/SMOPS_ASCATsm/write_SMOPS_ASCATsmobs.F90 index 77b2aab8d..92398e6a9 100755 --- a/lis/dataassim/obs/SMOPS_ASCATsm/write_SMOPS_ASCATsmobs.F90 +++ b/lis/dataassim/obs/SMOPS_ASCATsm/write_SMOPS_ASCATsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90 b/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90 index 962e1b6c5..8e4603b71 100755 --- a/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90 +++ b/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90.old b/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90.old index b1b1185a1..6b31b933c 100755 --- a/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90.old +++ b/lis/dataassim/obs/SMOPS_SMAPsm/SMOPS_SMAPsm_Mod.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90 b/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90 index 0bdf6a63a..5ef01c296 100755 --- a/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90 +++ b/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90.old b/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90.old index 822ce5791..d7af58971 100755 --- a/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90.old +++ b/lis/dataassim/obs/SMOPS_SMAPsm/read_SMOPS_SMAPsm.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMAPsm/write_SMOPS_SMAPsmobs.F90 b/lis/dataassim/obs/SMOPS_SMAPsm/write_SMOPS_SMAPsmobs.F90 index f999d5c53..2e2fe725f 100755 --- a/lis/dataassim/obs/SMOPS_SMAPsm/write_SMOPS_SMAPsmobs.F90 +++ b/lis/dataassim/obs/SMOPS_SMAPsm/write_SMOPS_SMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMOSsm/SMOPS_SMOSsm_Mod.F90 b/lis/dataassim/obs/SMOPS_SMOSsm/SMOPS_SMOSsm_Mod.F90 index 80f9994f2..837dcb896 100755 --- a/lis/dataassim/obs/SMOPS_SMOSsm/SMOPS_SMOSsm_Mod.F90 +++ b/lis/dataassim/obs/SMOPS_SMOSsm/SMOPS_SMOSsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90 b/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90 index 50ba6dba8..22ee4fab8 100755 --- a/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90 +++ b/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90.old b/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90.old index 77d6da2d6..be936a5f4 100755 --- a/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90.old +++ b/lis/dataassim/obs/SMOPS_SMOSsm/read_SMOPS_SMOSsm.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOPS_SMOSsm/write_SMOPS_SMOSsmobs.F90 b/lis/dataassim/obs/SMOPS_SMOSsm/write_SMOPS_SMOSsmobs.F90 index 390617b6a..b4956ffeb 100755 --- a/lis/dataassim/obs/SMOPS_SMOSsm/write_SMOPS_SMOSsmobs.F90 +++ b/lis/dataassim/obs/SMOPS_SMOSsm/write_SMOPS_SMOSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_L2sm/SMOSL2sm_Mod.F90 b/lis/dataassim/obs/SMOS_L2sm/SMOSL2sm_Mod.F90 index 4a4cbf9ab..75e8bdef5 100644 --- a/lis/dataassim/obs/SMOS_L2sm/SMOSL2sm_Mod.F90 +++ b/lis/dataassim/obs/SMOS_L2sm/SMOSL2sm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_L2sm/read_SMOSL2sm.F90 b/lis/dataassim/obs/SMOS_L2sm/read_SMOSL2sm.F90 index 321d70d5c..b285861cc 100644 --- a/lis/dataassim/obs/SMOS_L2sm/read_SMOSL2sm.F90 +++ b/lis/dataassim/obs/SMOS_L2sm/read_SMOSL2sm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_L2sm/write_SMOSL2smobs.F90 b/lis/dataassim/obs/SMOS_L2sm/write_SMOSL2smobs.F90 index 127f4528d..bcfc49968 100644 --- a/lis/dataassim/obs/SMOS_L2sm/write_SMOSL2smobs.F90 +++ b/lis/dataassim/obs/SMOS_L2sm/write_SMOSL2smobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NESDIS/SMOSNESDISsm_Mod.F90 b/lis/dataassim/obs/SMOS_NESDIS/SMOSNESDISsm_Mod.F90 index 8c28c37fb..312774a7e 100644 --- a/lis/dataassim/obs/SMOS_NESDIS/SMOSNESDISsm_Mod.F90 +++ b/lis/dataassim/obs/SMOS_NESDIS/SMOSNESDISsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NESDIS/read_SMOSNESDISsm.F90 b/lis/dataassim/obs/SMOS_NESDIS/read_SMOSNESDISsm.F90 index 97aae6c0d..ee4de495c 100644 --- a/lis/dataassim/obs/SMOS_NESDIS/read_SMOSNESDISsm.F90 +++ b/lis/dataassim/obs/SMOS_NESDIS/read_SMOSNESDISsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NESDIS/write_SMOSNESDISsmobs.F90 b/lis/dataassim/obs/SMOS_NESDIS/write_SMOSNESDISsmobs.F90 index ec1122613..752372f25 100644 --- a/lis/dataassim/obs/SMOS_NESDIS/write_SMOSNESDISsmobs.F90 +++ b/lis/dataassim/obs/SMOS_NESDIS/write_SMOSNESDISsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_Mod.F90 b/lis/dataassim/obs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_Mod.F90 index 0b58b6af1..71ac96ac5 100644 --- a/lis/dataassim/obs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_Mod.F90 +++ b/lis/dataassim/obs/SMOS_NRTNN_L2sm/SMOSNRTNNL2sm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_SMOSNRTNNL2sm.F90 b/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_SMOSNRTNNL2sm.F90 index a3918cbbe..41fe0d2cc 100644 --- a/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_SMOSNRTNNL2sm.F90 +++ b/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_SMOSNRTNNL2sm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_dgg_lookup_table.F90 b/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_dgg_lookup_table.F90 index b554a9c58..39d70e26b 100644 --- a/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_dgg_lookup_table.F90 +++ b/lis/dataassim/obs/SMOS_NRTNN_L2sm/read_dgg_lookup_table.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SMOS_NRTNN_L2sm/write_SMOSNRTNNL2smobs.F90 b/lis/dataassim/obs/SMOS_NRTNN_L2sm/write_SMOSNRTNNL2smobs.F90 index 5ef2a45fa..5b0bc5ce5 100644 --- a/lis/dataassim/obs/SMOS_NRTNN_L2sm/write_SMOSNRTNNL2smobs.F90 +++ b/lis/dataassim/obs/SMOS_NRTNN_L2sm/write_SMOSNRTNNL2smobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SNODAS/SNODAS_Mod.F90 b/lis/dataassim/obs/SNODAS/SNODAS_Mod.F90 index d9864d730..799ded36e 100755 --- a/lis/dataassim/obs/SNODAS/SNODAS_Mod.F90 +++ b/lis/dataassim/obs/SNODAS/SNODAS_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SNODAS/read_SNODAS.F90 b/lis/dataassim/obs/SNODAS/read_SNODAS.F90 index 9e18673fb..f70415625 100755 --- a/lis/dataassim/obs/SNODAS/read_SNODAS.F90 +++ b/lis/dataassim/obs/SNODAS/read_SNODAS.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SNODAS/write_SNODAS.F90 b/lis/dataassim/obs/SNODAS/write_SNODAS.F90 index 7161e9a79..57dd256b2 100755 --- a/lis/dataassim/obs/SNODAS/write_SNODAS.F90 +++ b/lis/dataassim/obs/SNODAS/write_SNODAS.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SNODEP/SNODEPobs_Mod.F90 b/lis/dataassim/obs/SNODEP/SNODEPobs_Mod.F90 index f68935355..9bed12a9c 100644 --- a/lis/dataassim/obs/SNODEP/SNODEPobs_Mod.F90 +++ b/lis/dataassim/obs/SNODEP/SNODEPobs_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SNODEP/read_SNODEPobs.F90 b/lis/dataassim/obs/SNODEP/read_SNODEPobs.F90 index b191dac02..3841eb93c 100644 --- a/lis/dataassim/obs/SNODEP/read_SNODEPobs.F90 +++ b/lis/dataassim/obs/SNODEP/read_SNODEPobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SNODEP/write_SNODEPobs.F90 b/lis/dataassim/obs/SNODEP/write_SNODEPobs.F90 index b17bdec7a..371a04094 100644 --- a/lis/dataassim/obs/SNODEP/write_SNODEPobs.F90 +++ b/lis/dataassim/obs/SNODEP/write_SNODEPobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SSMI_SNWD/SSMISNWDsnow_Mod.F90 b/lis/dataassim/obs/SSMI_SNWD/SSMISNWDsnow_Mod.F90 index 0fe3be7d0..b5e5bfb05 100644 --- a/lis/dataassim/obs/SSMI_SNWD/SSMISNWDsnow_Mod.F90 +++ b/lis/dataassim/obs/SSMI_SNWD/SSMISNWDsnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SSMI_SNWD/read_SSMISNWDsnow.F90 b/lis/dataassim/obs/SSMI_SNWD/read_SSMISNWDsnow.F90 index 51cae7968..ccd82c0d4 100644 --- a/lis/dataassim/obs/SSMI_SNWD/read_SSMISNWDsnow.F90 +++ b/lis/dataassim/obs/SSMI_SNWD/read_SSMISNWDsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SSMI_SNWD/write_SSMISNWDsnow.F90 b/lis/dataassim/obs/SSMI_SNWD/write_SSMISNWDsnow.F90 index 2777176c5..b006541c7 100644 --- a/lis/dataassim/obs/SSMI_SNWD/write_SSMISNWDsnow.F90 +++ b/lis/dataassim/obs/SSMI_SNWD/write_SSMISNWDsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SYN_LBAND_TB/SYN_LBAND_TB_Mod.F90 b/lis/dataassim/obs/SYN_LBAND_TB/SYN_LBAND_TB_Mod.F90 index 6bb02d647..f01fda03a 100644 --- a/lis/dataassim/obs/SYN_LBAND_TB/SYN_LBAND_TB_Mod.F90 +++ b/lis/dataassim/obs/SYN_LBAND_TB/SYN_LBAND_TB_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SYN_LBAND_TB/read_SYN_LBAND_TB.F90 b/lis/dataassim/obs/SYN_LBAND_TB/read_SYN_LBAND_TB.F90 index f7400d4eb..1fba808fc 100644 --- a/lis/dataassim/obs/SYN_LBAND_TB/read_SYN_LBAND_TB.F90 +++ b/lis/dataassim/obs/SYN_LBAND_TB/read_SYN_LBAND_TB.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/SYN_LBAND_TB/write_SYN_LBAND_TB.F90 b/lis/dataassim/obs/SYN_LBAND_TB/write_SYN_LBAND_TB.F90 index 076a11e75..6fd841614 100644 --- a/lis/dataassim/obs/SYN_LBAND_TB/write_SYN_LBAND_TB.F90 +++ b/lis/dataassim/obs/SYN_LBAND_TB/write_SYN_LBAND_TB.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/THySM/THySM_Mod.F90 b/lis/dataassim/obs/THySM/THySM_Mod.F90 index 2ce4b18c1..4d33ba397 100644 --- a/lis/dataassim/obs/THySM/THySM_Mod.F90 +++ b/lis/dataassim/obs/THySM/THySM_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/THySM/read_THySM.F90 b/lis/dataassim/obs/THySM/read_THySM.F90 index 0ab2e4fcc..5c085d0e8 100644 --- a/lis/dataassim/obs/THySM/read_THySM.F90 +++ b/lis/dataassim/obs/THySM/read_THySM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/THySM/write_THySM.F90 b/lis/dataassim/obs/THySM/write_THySM.F90 index 0d14d67e5..c0b2e6817 100644 --- a/lis/dataassim/obs/THySM/write_THySM.F90 +++ b/lis/dataassim/obs/THySM/write_THySM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/USAFSI/USAFSIobs_Mod.F90 b/lis/dataassim/obs/USAFSI/USAFSIobs_Mod.F90 index c5001481c..1f90e4101 100644 --- a/lis/dataassim/obs/USAFSI/USAFSIobs_Mod.F90 +++ b/lis/dataassim/obs/USAFSI/USAFSIobs_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/USAFSI/read_USAFSIobs.F90 b/lis/dataassim/obs/USAFSI/read_USAFSIobs.F90 index acbf18357..58f6a6982 100644 --- a/lis/dataassim/obs/USAFSI/read_USAFSIobs.F90 +++ b/lis/dataassim/obs/USAFSI/read_USAFSIobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/USAFSI/write_USAFSIobs.F90 b/lis/dataassim/obs/USAFSI/write_USAFSIobs.F90 index 2e326b39f..838e25755 100644 --- a/lis/dataassim/obs/USAFSI/write_USAFSIobs.F90 +++ b/lis/dataassim/obs/USAFSI/write_USAFSIobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/VIIRS_GVF/VIIRSgvf_Mod.F90 b/lis/dataassim/obs/VIIRS_GVF/VIIRSgvf_Mod.F90 index 059ae39d6..0c1744825 100644 --- a/lis/dataassim/obs/VIIRS_GVF/VIIRSgvf_Mod.F90 +++ b/lis/dataassim/obs/VIIRS_GVF/VIIRSgvf_Mod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/VIIRS_GVF/read_VIIRSgvf.F90 b/lis/dataassim/obs/VIIRS_GVF/read_VIIRSgvf.F90 index 51e0c9613..962dd08b7 100644 --- a/lis/dataassim/obs/VIIRS_GVF/read_VIIRSgvf.F90 +++ b/lis/dataassim/obs/VIIRS_GVF/read_VIIRSgvf.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/VIIRS_GVF/write_VIIRSgvfobs.F90 b/lis/dataassim/obs/VIIRS_GVF/write_VIIRSgvfobs.F90 index edc3452a1..0396170b4 100644 --- a/lis/dataassim/obs/VIIRS_GVF/write_VIIRSgvfobs.F90 +++ b/lis/dataassim/obs/VIIRS_GVF/write_VIIRSgvfobs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WUS_UCLAsnow/WUS_UCLAsnowMod.F90 b/lis/dataassim/obs/WUS_UCLAsnow/WUS_UCLAsnowMod.F90 index 9e5655821..571558607 100755 --- a/lis/dataassim/obs/WUS_UCLAsnow/WUS_UCLAsnowMod.F90 +++ b/lis/dataassim/obs/WUS_UCLAsnow/WUS_UCLAsnowMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WUS_UCLAsnow/read_WUS_UCLAsnow.F90 b/lis/dataassim/obs/WUS_UCLAsnow/read_WUS_UCLAsnow.F90 index 5fb3bccd5..b21308c1f 100755 --- a/lis/dataassim/obs/WUS_UCLAsnow/read_WUS_UCLAsnow.F90 +++ b/lis/dataassim/obs/WUS_UCLAsnow/read_WUS_UCLAsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WUS_UCLAsnow/write_WUS_UCLAsnow.F90 b/lis/dataassim/obs/WUS_UCLAsnow/write_WUS_UCLAsnow.F90 index 1f84bf86e..e6c751d1c 100755 --- a/lis/dataassim/obs/WUS_UCLAsnow/write_WUS_UCLAsnow.F90 +++ b/lis/dataassim/obs/WUS_UCLAsnow/write_WUS_UCLAsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_Cband_sm/WindSatCsm_Mod.F90 b/lis/dataassim/obs/WindSat_Cband_sm/WindSatCsm_Mod.F90 index 6c6a329fc..3dcfa32f4 100644 --- a/lis/dataassim/obs/WindSat_Cband_sm/WindSatCsm_Mod.F90 +++ b/lis/dataassim/obs/WindSat_Cband_sm/WindSatCsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_Cband_sm/read_WindSatCsm.F90 b/lis/dataassim/obs/WindSat_Cband_sm/read_WindSatCsm.F90 index 20102aa5e..83857c281 100644 --- a/lis/dataassim/obs/WindSat_Cband_sm/read_WindSatCsm.F90 +++ b/lis/dataassim/obs/WindSat_Cband_sm/read_WindSatCsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_Cband_sm/write_WindSatCsmobs.F90 b/lis/dataassim/obs/WindSat_Cband_sm/write_WindSatCsmobs.F90 index 6d8c8a37e..74328c767 100644 --- a/lis/dataassim/obs/WindSat_Cband_sm/write_WindSatCsmobs.F90 +++ b/lis/dataassim/obs/WindSat_Cband_sm/write_WindSatCsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_sm/0Intro_windsat.txt b/lis/dataassim/obs/WindSat_sm/0Intro_windsat.txt index 625b2f49e..bde1a75db 100644 --- a/lis/dataassim/obs/WindSat_sm/0Intro_windsat.txt +++ b/lis/dataassim/obs/WindSat_sm/0Intro_windsat.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_sm/WindSatsm_Mod.F90 b/lis/dataassim/obs/WindSat_sm/WindSatsm_Mod.F90 index e235807d8..bdf5c5c11 100644 --- a/lis/dataassim/obs/WindSat_sm/WindSatsm_Mod.F90 +++ b/lis/dataassim/obs/WindSat_sm/WindSatsm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_sm/read_WindSatsm.F90 b/lis/dataassim/obs/WindSat_sm/read_WindSatsm.F90 index 85f7e824a..0f691f12f 100644 --- a/lis/dataassim/obs/WindSat_sm/read_WindSatsm.F90 +++ b/lis/dataassim/obs/WindSat_sm/read_WindSatsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/WindSat_sm/write_WindSatsmobs.F90 b/lis/dataassim/obs/WindSat_sm/write_WindSatsmobs.F90 index dd74b3450..f7a10d678 100644 --- a/lis/dataassim/obs/WindSat_sm/write_WindSatsmobs.F90 +++ b/lis/dataassim/obs/WindSat_sm/write_WindSatsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/hydrowebWL/hydrowebWLobs_module.F90 b/lis/dataassim/obs/hydrowebWL/hydrowebWLobs_module.F90 index e95e13b8b..c4eaa03b2 100755 --- a/lis/dataassim/obs/hydrowebWL/hydrowebWLobs_module.F90 +++ b/lis/dataassim/obs/hydrowebWL/hydrowebWLobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/hydrowebWL/read_hydrowebWLobs.F90 b/lis/dataassim/obs/hydrowebWL/read_hydrowebWLobs.F90 index 3a2b71a72..0bb91ddb7 100755 --- a/lis/dataassim/obs/hydrowebWL/read_hydrowebWLobs.F90 +++ b/lis/dataassim/obs/hydrowebWL/read_hydrowebWLobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/hydrowebWL/write_hydrowebWLobs.F90 b/lis/dataassim/obs/hydrowebWL/write_hydrowebWLobs.F90 index c41a4a581..a0125edb6 100755 --- a/lis/dataassim/obs/hydrowebWL/write_hydrowebWLobs.F90 +++ b/lis/dataassim/obs/hydrowebWL/write_hydrowebWLobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/multisynsmobs/multisynsmobs_Mod.F90 b/lis/dataassim/obs/multisynsmobs/multisynsmobs_Mod.F90 index 5fc1791e8..b4cf4d49c 100644 --- a/lis/dataassim/obs/multisynsmobs/multisynsmobs_Mod.F90 +++ b/lis/dataassim/obs/multisynsmobs/multisynsmobs_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/multisynsmobs/read_multisynsmobs.F90 b/lis/dataassim/obs/multisynsmobs/read_multisynsmobs.F90 index cf8ac4e42..cb849ce0f 100644 --- a/lis/dataassim/obs/multisynsmobs/read_multisynsmobs.F90 +++ b/lis/dataassim/obs/multisynsmobs/read_multisynsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/pildas/pildassmobs_module.F90 b/lis/dataassim/obs/pildas/pildassmobs_module.F90 index 5e040a568..e5b214c4b 100644 --- a/lis/dataassim/obs/pildas/pildassmobs_module.F90 +++ b/lis/dataassim/obs/pildas/pildassmobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/pildas/read_pildassmobs.F90 b/lis/dataassim/obs/pildas/read_pildassmobs.F90 index 2258b81bb..ee1904b60 100644 --- a/lis/dataassim/obs/pildas/read_pildassmobs.F90 +++ b/lis/dataassim/obs/pildas/read_pildassmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/pildas/write_pildassmobs.F90 b/lis/dataassim/obs/pildas/write_pildassmobs.F90 index 6a014fc86..4db10a3d7 100644 --- a/lis/dataassim/obs/pildas/write_pildassmobs.F90 +++ b/lis/dataassim/obs/pildas/write_pildassmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/simGRACE_JPL/read_simGRACEJPLobs.F90 b/lis/dataassim/obs/simGRACE_JPL/read_simGRACEJPLobs.F90 index 88ece79a3..9d963e478 100644 --- a/lis/dataassim/obs/simGRACE_JPL/read_simGRACEJPLobs.F90 +++ b/lis/dataassim/obs/simGRACE_JPL/read_simGRACEJPLobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/simGRACE_JPL/simGRACEJPLobs_module.F90 b/lis/dataassim/obs/simGRACE_JPL/simGRACEJPLobs_module.F90 index 81bb11386..6961f5db9 100644 --- a/lis/dataassim/obs/simGRACE_JPL/simGRACEJPLobs_module.F90 +++ b/lis/dataassim/obs/simGRACE_JPL/simGRACEJPLobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/simGRACE_JPL/write_simGRACEJPLobs.F90 b/lis/dataassim/obs/simGRACE_JPL/write_simGRACEJPLobs.F90 index 466afabfd..8a1abaafe 100644 --- a/lis/dataassim/obs/simGRACE_JPL/write_simGRACEJPLobs.F90 +++ b/lis/dataassim/obs/simGRACE_JPL/write_simGRACEJPLobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticSnowTb/read_syntheticSnowTbObs.F90 b/lis/dataassim/obs/syntheticSnowTb/read_syntheticSnowTbObs.F90 index 1abb8a97a..9998db0f5 100755 --- a/lis/dataassim/obs/syntheticSnowTb/read_syntheticSnowTbObs.F90 +++ b/lis/dataassim/obs/syntheticSnowTb/read_syntheticSnowTbObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticSnowTb/syntheticSnowTbObs_Mod.F90 b/lis/dataassim/obs/syntheticSnowTb/syntheticSnowTbObs_Mod.F90 index ae585393e..f5667f830 100755 --- a/lis/dataassim/obs/syntheticSnowTb/syntheticSnowTbObs_Mod.F90 +++ b/lis/dataassim/obs/syntheticSnowTb/syntheticSnowTbObs_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticSnowTb/write_syntheticSnowTbObs.F90 b/lis/dataassim/obs/syntheticSnowTb/write_syntheticSnowTbObs.F90 index 5b3a81326..022b49223 100755 --- a/lis/dataassim/obs/syntheticSnowTb/write_syntheticSnowTbObs.F90 +++ b/lis/dataassim/obs/syntheticSnowTb/write_syntheticSnowTbObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticlst/read_syntheticlstobs.F90 b/lis/dataassim/obs/syntheticlst/read_syntheticlstobs.F90 index c38ebd59f..56bea06e0 100755 --- a/lis/dataassim/obs/syntheticlst/read_syntheticlstobs.F90 +++ b/lis/dataassim/obs/syntheticlst/read_syntheticlstobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticlst/syntheticlstobs_module.F90 b/lis/dataassim/obs/syntheticlst/syntheticlstobs_module.F90 index eb27853ac..29818e8cd 100755 --- a/lis/dataassim/obs/syntheticlst/syntheticlstobs_module.F90 +++ b/lis/dataassim/obs/syntheticlst/syntheticlstobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsf/read_syntheticsfobs.F90 b/lis/dataassim/obs/syntheticsf/read_syntheticsfobs.F90 index cb17efa39..f56ba540c 100644 --- a/lis/dataassim/obs/syntheticsf/read_syntheticsfobs.F90 +++ b/lis/dataassim/obs/syntheticsf/read_syntheticsfobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsf/syntheticsfobs_module.F90 b/lis/dataassim/obs/syntheticsf/syntheticsfobs_module.F90 index 18279c4b7..7d193dab2 100644 --- a/lis/dataassim/obs/syntheticsf/syntheticsfobs_module.F90 +++ b/lis/dataassim/obs/syntheticsf/syntheticsfobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsf/write_syntheticsfobs.F90 b/lis/dataassim/obs/syntheticsf/write_syntheticsfobs.F90 index 42d66d84a..879c23b5d 100644 --- a/lis/dataassim/obs/syntheticsf/write_syntheticsfobs.F90 +++ b/lis/dataassim/obs/syntheticsf/write_syntheticsfobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsm/read_syntheticsmobs.F90 b/lis/dataassim/obs/syntheticsm/read_syntheticsmobs.F90 index 1cb1c8594..da6443d7a 100644 --- a/lis/dataassim/obs/syntheticsm/read_syntheticsmobs.F90 +++ b/lis/dataassim/obs/syntheticsm/read_syntheticsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsm/syntheticsmobs_module.F90 b/lis/dataassim/obs/syntheticsm/syntheticsmobs_module.F90 index 7bfdeaf7c..9970f2c3d 100644 --- a/lis/dataassim/obs/syntheticsm/syntheticsmobs_module.F90 +++ b/lis/dataassim/obs/syntheticsm/syntheticsmobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsm/write_syntheticsmobs.F90 b/lis/dataassim/obs/syntheticsm/write_syntheticsmobs.F90 index 49542260e..965a0a5b9 100644 --- a/lis/dataassim/obs/syntheticsm/write_syntheticsmobs.F90 +++ b/lis/dataassim/obs/syntheticsm/write_syntheticsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsnd/read_syntheticsndobs.F90 b/lis/dataassim/obs/syntheticsnd/read_syntheticsndobs.F90 index e25c70e6f..8639ff7a3 100644 --- a/lis/dataassim/obs/syntheticsnd/read_syntheticsndobs.F90 +++ b/lis/dataassim/obs/syntheticsnd/read_syntheticsndobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsnd/syntheticsndobs_module.F90 b/lis/dataassim/obs/syntheticsnd/syntheticsndobs_module.F90 index da09d1a10..b57823179 100644 --- a/lis/dataassim/obs/syntheticsnd/syntheticsndobs_module.F90 +++ b/lis/dataassim/obs/syntheticsnd/syntheticsndobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticsnd/write_syntheticsndobs.F90 b/lis/dataassim/obs/syntheticsnd/write_syntheticsndobs.F90 index a91450dc0..72904613e 100644 --- a/lis/dataassim/obs/syntheticsnd/write_syntheticsndobs.F90 +++ b/lis/dataassim/obs/syntheticsnd/write_syntheticsndobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticswe/read_syntheticsweobs.F90 b/lis/dataassim/obs/syntheticswe/read_syntheticsweobs.F90 index 5839a5378..19fad505b 100644 --- a/lis/dataassim/obs/syntheticswe/read_syntheticsweobs.F90 +++ b/lis/dataassim/obs/syntheticswe/read_syntheticsweobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticswe/syntheticsweobs_module.F90 b/lis/dataassim/obs/syntheticswe/syntheticsweobs_module.F90 index cc81fc02a..dbab99075 100644 --- a/lis/dataassim/obs/syntheticswe/syntheticsweobs_module.F90 +++ b/lis/dataassim/obs/syntheticswe/syntheticsweobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticswe/write_syntheticsweobs.F90 b/lis/dataassim/obs/syntheticswe/write_syntheticsweobs.F90 index 09bf3b3d2..3c53b7ab1 100755 --- a/lis/dataassim/obs/syntheticswe/write_syntheticsweobs.F90 +++ b/lis/dataassim/obs/syntheticswe/write_syntheticsweobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticwl/read_syntheticwlobs.F90 b/lis/dataassim/obs/syntheticwl/read_syntheticwlobs.F90 index 996f66b2f..3182efd6f 100644 --- a/lis/dataassim/obs/syntheticwl/read_syntheticwlobs.F90 +++ b/lis/dataassim/obs/syntheticwl/read_syntheticwlobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticwl/syntheticwlobs_module.F90 b/lis/dataassim/obs/syntheticwl/syntheticwlobs_module.F90 index 1a2760dae..59227a43a 100644 --- a/lis/dataassim/obs/syntheticwl/syntheticwlobs_module.F90 +++ b/lis/dataassim/obs/syntheticwl/syntheticwlobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/obs/syntheticwl/write_syntheticwlobs.F90 b/lis/dataassim/obs/syntheticwl/write_syntheticwlobs.F90 index 655c19106..c9ad6c304 100644 --- a/lis/dataassim/obs/syntheticwl/write_syntheticwlobs.F90 +++ b/lis/dataassim/obs/syntheticwl/write_syntheticwlobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/0Intro_algorithms.txt b/lis/dataassim/perturb/0Intro_algorithms.txt index 88fd3f745..05870bef0 100644 --- a/lis/dataassim/perturb/0Intro_algorithms.txt +++ b/lis/dataassim/perturb/0Intro_algorithms.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/gmaopert/0Intro_gmao.txt b/lis/dataassim/perturb/gmaopert/0Intro_gmao.txt index a2ab44558..89c67fb63 100644 --- a/lis/dataassim/perturb/gmaopert/0Intro_gmao.txt +++ b/lis/dataassim/perturb/gmaopert/0Intro_gmao.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/gmaopert/gmaopert_Mod.F90 b/lis/dataassim/perturb/gmaopert/gmaopert_Mod.F90 index f69c9dc07..fdc579282 100644 --- a/lis/dataassim/perturb/gmaopert/gmaopert_Mod.F90 +++ b/lis/dataassim/perturb/gmaopert/gmaopert_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/gmaopert/landpert_module.F90 b/lis/dataassim/perturb/gmaopert/landpert_module.F90 index 1fbd8cfa2..925dc4a5e 100644 --- a/lis/dataassim/perturb/gmaopert/landpert_module.F90 +++ b/lis/dataassim/perturb/gmaopert/landpert_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/gmaopert/landpert_routines.F90 b/lis/dataassim/perturb/gmaopert/landpert_routines.F90 index f8847d5b9..7291913f0 100644 --- a/lis/dataassim/perturb/gmaopert/landpert_routines.F90 +++ b/lis/dataassim/perturb/gmaopert/landpert_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/gmaopert/nr_jacobi.F90 b/lis/dataassim/perturb/gmaopert/nr_jacobi.F90 index c99c5bd69..8b76f8cfd 100644 --- a/lis/dataassim/perturb/gmaopert/nr_jacobi.F90 +++ b/lis/dataassim/perturb/gmaopert/nr_jacobi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/gmaopert/random_fields.F90 b/lis/dataassim/perturb/gmaopert/random_fields.F90 index 75b25d9f2..b04dd928d 100644 --- a/lis/dataassim/perturb/gmaopert/random_fields.F90 +++ b/lis/dataassim/perturb/gmaopert/random_fields.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/dataassim/perturb/uniform/uniformPert_Mod.F90 b/lis/dataassim/perturb/uniform/uniformPert_Mod.F90 index 9cd67fac7..eafd84f43 100644 --- a/lis/dataassim/perturb/uniform/uniformPert_Mod.F90 +++ b/lis/dataassim/perturb/uniform/uniformPert_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/0Intro_domains.txt b/lis/domains/0Intro_domains.txt index 5d059cdf5..f64feb1e5 100644 --- a/lis/domains/0Intro_domains.txt +++ b/lis/domains/0Intro_domains.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/UTM/0Intro_utm.txt b/lis/domains/UTM/0Intro_utm.txt index 4aebb546c..4954352d5 100644 --- a/lis/domains/UTM/0Intro_utm.txt +++ b/lis/domains/UTM/0Intro_utm.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/UTM/readinput_UTM.F90 b/lis/domains/UTM/readinput_UTM.F90 index 4726d6ed4..ea95cf2e2 100644 --- a/lis/domains/UTM/readinput_UTM.F90 +++ b/lis/domains/UTM/readinput_UTM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/catchment/createtiles_catch.F90 b/lis/domains/catchment/createtiles_catch.F90 index dbdd6653d..a102d2796 100644 --- a/lis/domains/catchment/createtiles_catch.F90 +++ b/lis/domains/catchment/createtiles_catch.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/catchment/qs.F90 b/lis/domains/catchment/qs.F90 index 54e2a6479..efbe58247 100644 --- a/lis/domains/catchment/qs.F90 +++ b/lis/domains/catchment/qs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/catchment/readinput_catch.F90 b/lis/domains/catchment/readinput_catch.F90 index 20616089f..2aec19393 100644 --- a/lis/domains/catchment/readinput_catch.F90 +++ b/lis/domains/catchment/readinput_catch.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/catchment/tile_coord_routines.F90 b/lis/domains/catchment/tile_coord_routines.F90 index 8c9875ed0..1d8ecb0a0 100644 --- a/lis/domains/catchment/tile_coord_routines.F90 +++ b/lis/domains/catchment/tile_coord_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/catchment/tile_coord_types.F90 b/lis/domains/catchment/tile_coord_types.F90 index 7ffd43875..cf7b36890 100644 --- a/lis/domains/catchment/tile_coord_types.F90 +++ b/lis/domains/catchment/tile_coord_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/gaussian/readinput_gaussian.F90 b/lis/domains/gaussian/readinput_gaussian.F90 index 53d8da038..06c510dad 100644 --- a/lis/domains/gaussian/readinput_gaussian.F90 +++ b/lis/domains/gaussian/readinput_gaussian.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/hrap/readinput_hrap.F90 b/lis/domains/hrap/readinput_hrap.F90 index e0b30523d..62b0a1fb2 100755 --- a/lis/domains/hrap/readinput_hrap.F90 +++ b/lis/domains/hrap/readinput_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/lambert/0Intro_lambert.txt b/lis/domains/lambert/0Intro_lambert.txt index 1a9711de1..1f5008a12 100644 --- a/lis/domains/lambert/0Intro_lambert.txt +++ b/lis/domains/lambert/0Intro_lambert.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/lambert/readinput_lambert.F90 b/lis/domains/lambert/readinput_lambert.F90 index cb67f4412..0b77e73a2 100644 --- a/lis/domains/lambert/readinput_lambert.F90 +++ b/lis/domains/lambert/readinput_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/latlon/0Intro_latlon.txt b/lis/domains/latlon/0Intro_latlon.txt index b8821128a..e1b687e77 100644 --- a/lis/domains/latlon/0Intro_latlon.txt +++ b/lis/domains/latlon/0Intro_latlon.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/latlon/readinput_latlon.F90 b/lis/domains/latlon/readinput_latlon.F90 index 8763622d2..6a363c4b7 100644 --- a/lis/domains/latlon/readinput_latlon.F90 +++ b/lis/domains/latlon/readinput_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/merc/0Intro_merc.txt b/lis/domains/merc/0Intro_merc.txt index 5041ed27f..e3f49160a 100644 --- a/lis/domains/merc/0Intro_merc.txt +++ b/lis/domains/merc/0Intro_merc.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/merc/readinput_merc.F90 b/lis/domains/merc/readinput_merc.F90 index 7bafcf059..967aa8188 100644 --- a/lis/domains/merc/readinput_merc.F90 +++ b/lis/domains/merc/readinput_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/polar/0Intro_polar.txt b/lis/domains/polar/0Intro_polar.txt index 68449ea32..83ea82038 100644 --- a/lis/domains/polar/0Intro_polar.txt +++ b/lis/domains/polar/0Intro_polar.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/domains/polar/readinput_polar.F90 b/lis/domains/polar/readinput_polar.F90 index 0c506c1d6..6bdfa8f5a 100644 --- a/lis/domains/polar/readinput_polar.F90 +++ b/lis/domains/polar/readinput_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/forecast/algorithm/ESPboot/ESPboot_Mod.F90 b/lis/forecast/algorithm/ESPboot/ESPboot_Mod.F90 index 2a7cc62a8..049f74a7c 100644 --- a/lis/forecast/algorithm/ESPboot/ESPboot_Mod.F90 +++ b/lis/forecast/algorithm/ESPboot/ESPboot_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/forecast/algorithm/ESPconv/ESPconv_Mod.F90 b/lis/forecast/algorithm/ESPconv/ESPconv_Mod.F90 index d19c52f47..7e12e52b9 100644 --- a/lis/forecast/algorithm/ESPconv/ESPconv_Mod.F90 +++ b/lis/forecast/algorithm/ESPconv/ESPconv_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/0Intro_interp.txt b/lis/interp/0Intro_interp.txt index 80a710542..55db7d59a 100644 --- a/lis/interp/0Intro_interp.txt +++ b/lis/interp/0Intro_interp.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/UTM_utils.F90 b/lis/interp/UTM_utils.F90 index 10d93511a..ad73bbce1 100755 --- a/lis/interp/UTM_utils.F90 +++ b/lis/interp/UTM_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/bilinear_interp.F90 b/lis/interp/bilinear_interp.F90 index 3032866d3..80bce38c1 100644 --- a/lis/interp/bilinear_interp.F90 +++ b/lis/interp/bilinear_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/bilinear_interp_input.F90 b/lis/interp/bilinear_interp_input.F90 index 1cb5d48d9..85b388c5b 100644 --- a/lis/interp/bilinear_interp_input.F90 +++ b/lis/interp/bilinear_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/bilinear_interp_input_withgrid.F90 b/lis/interp/bilinear_interp_input_withgrid.F90 index 39f9de86f..d5ad38d7a 100644 --- a/lis/interp/bilinear_interp_input_withgrid.F90 +++ b/lis/interp/bilinear_interp_input_withgrid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/breakpt_module.F90 b/lis/interp/breakpt_module.F90 index ffff42ba5..d34f10322 100644 --- a/lis/interp/breakpt_module.F90 +++ b/lis/interp/breakpt_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord.F90 b/lis/interp/compute_earth_coord.F90 index 56d2fcff3..403777b5d 100644 --- a/lis/interp/compute_earth_coord.F90 +++ b/lis/interp/compute_earth_coord.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_UTM.F90 b/lis/interp/compute_earth_coord_UTM.F90 index c0fe404fc..14f16f52d 100644 --- a/lis/interp/compute_earth_coord_UTM.F90 +++ b/lis/interp/compute_earth_coord_UTM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_ease.F90 b/lis/interp/compute_earth_coord_ease.F90 index 25429a2e7..ed9335514 100644 --- a/lis/interp/compute_earth_coord_ease.F90 +++ b/lis/interp/compute_earth_coord_ease.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_gauss.F90 b/lis/interp/compute_earth_coord_gauss.F90 index 6d93fc250..76e3c153a 100644 --- a/lis/interp/compute_earth_coord_gauss.F90 +++ b/lis/interp/compute_earth_coord_gauss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_hrap.F90 b/lis/interp/compute_earth_coord_hrap.F90 index 9aa26fa3c..89896f981 100644 --- a/lis/interp/compute_earth_coord_hrap.F90 +++ b/lis/interp/compute_earth_coord_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_lambert.F90 b/lis/interp/compute_earth_coord_lambert.F90 index 83b0896b5..b8551e31b 100644 --- a/lis/interp/compute_earth_coord_lambert.F90 +++ b/lis/interp/compute_earth_coord_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_latlon.F90 b/lis/interp/compute_earth_coord_latlon.F90 index 019cfe338..918e7e099 100644 --- a/lis/interp/compute_earth_coord_latlon.F90 +++ b/lis/interp/compute_earth_coord_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_latlon_ll.F90 b/lis/interp/compute_earth_coord_latlon_ll.F90 index ab5977ec1..d49d02514 100644 --- a/lis/interp/compute_earth_coord_latlon_ll.F90 +++ b/lis/interp/compute_earth_coord_latlon_ll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_ll.F90 b/lis/interp/compute_earth_coord_ll.F90 index 13a4ee541..d3ef91711 100644 --- a/lis/interp/compute_earth_coord_ll.F90 +++ b/lis/interp/compute_earth_coord_ll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_merc.F90 b/lis/interp/compute_earth_coord_merc.F90 index b682811f3..cb41179a3 100644 --- a/lis/interp/compute_earth_coord_merc.F90 +++ b/lis/interp/compute_earth_coord_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_earth_coord_polar.F90 b/lis/interp/compute_earth_coord_polar.F90 index a52479036..18fe0dbdc 100644 --- a/lis/interp/compute_earth_coord_polar.F90 +++ b/lis/interp/compute_earth_coord_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord.F90 b/lis/interp/compute_grid_coord.F90 index 9fb8d88ed..5d0a1af59 100644 --- a/lis/interp/compute_grid_coord.F90 +++ b/lis/interp/compute_grid_coord.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_ease.F90 b/lis/interp/compute_grid_coord_ease.F90 index 964852e4f..3ee5c05a4 100644 --- a/lis/interp/compute_grid_coord_ease.F90 +++ b/lis/interp/compute_grid_coord_ease.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_gauss.F90 b/lis/interp/compute_grid_coord_gauss.F90 index d6e9293f3..69113d5cc 100644 --- a/lis/interp/compute_grid_coord_gauss.F90 +++ b/lis/interp/compute_grid_coord_gauss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_hrap.F90 b/lis/interp/compute_grid_coord_hrap.F90 index 5c579cb3d..fbb2ea87c 100644 --- a/lis/interp/compute_grid_coord_hrap.F90 +++ b/lis/interp/compute_grid_coord_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_lambert.F90 b/lis/interp/compute_grid_coord_lambert.F90 index e03c817d2..81b278ff8 100644 --- a/lis/interp/compute_grid_coord_lambert.F90 +++ b/lis/interp/compute_grid_coord_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_latlon.F90 b/lis/interp/compute_grid_coord_latlon.F90 index fec4e79b8..4bc53bd51 100644 --- a/lis/interp/compute_grid_coord_latlon.F90 +++ b/lis/interp/compute_grid_coord_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_merc.F90 b/lis/interp/compute_grid_coord_merc.F90 index 51a0737fe..1fb522c17 100644 --- a/lis/interp/compute_grid_coord_merc.F90 +++ b/lis/interp/compute_grid_coord_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_grid_coord_polar.F90 b/lis/interp/compute_grid_coord_polar.F90 index bc8f620af..d6063e186 100644 --- a/lis/interp/compute_grid_coord_polar.F90 +++ b/lis/interp/compute_grid_coord_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_stnwts.F90 b/lis/interp/compute_stnwts.F90 index 02a2201f4..762746da9 100644 --- a/lis/interp/compute_stnwts.F90 +++ b/lis/interp/compute_stnwts.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/compute_vinterp_weights.F90 b/lis/interp/compute_vinterp_weights.F90 index b79853dfe..a0120dfd2 100755 --- a/lis/interp/compute_vinterp_weights.F90 +++ b/lis/interp/compute_vinterp_weights.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/conserv_interp.F90 b/lis/interp/conserv_interp.F90 index 3c9572c34..43e8f0a7f 100644 --- a/lis/interp/conserv_interp.F90 +++ b/lis/interp/conserv_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/conserv_interp_input.F90 b/lis/interp/conserv_interp_input.F90 index dc47686e5..add261db0 100644 --- a/lis/interp/conserv_interp_input.F90 +++ b/lis/interp/conserv_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/conserv_interp_input_withgrid.F90 b/lis/interp/conserv_interp_input_withgrid.F90 index dc66f0574..358c0a47b 100644 --- a/lis/interp/conserv_interp_input_withgrid.F90 +++ b/lis/interp/conserv_interp_input_withgrid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/defineLocalDomain.F90 b/lis/interp/defineLocalDomain.F90 index fece7cc2f..41f991113 100644 --- a/lis/interp/defineLocalDomain.F90 +++ b/lis/interp/defineLocalDomain.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/diff_lon.F90 b/lis/interp/diff_lon.F90 index a8115c107..122c1957d 100644 --- a/lis/interp/diff_lon.F90 +++ b/lis/interp/diff_lon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/easeV2_utils.F90 b/lis/interp/easeV2_utils.F90 index 63103440a..53d6abfe8 100644 --- a/lis/interp/easeV2_utils.F90 +++ b/lis/interp/easeV2_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/ezlh_convert.F90 b/lis/interp/ezlh_convert.F90 index d86cb9a4f..e83289fd5 100755 --- a/lis/interp/ezlh_convert.F90 +++ b/lis/interp/ezlh_convert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/ezlh_inverse.F90 b/lis/interp/ezlh_inverse.F90 index dce789cfe..91843a741 100755 --- a/lis/interp/ezlh_inverse.F90 +++ b/lis/interp/ezlh_inverse.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/gaussian_mod.F90.keep b/lis/interp/gaussian_mod.F90.keep index 94ec55616..b316ad13c 100644 --- a/lis/interp/gaussian_mod.F90.keep +++ b/lis/interp/gaussian_mod.F90.keep @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/gaussian_quadrature.F90 b/lis/interp/gaussian_quadrature.F90 index 015064f65..371053a76 100644 --- a/lis/interp/gaussian_quadrature.F90 +++ b/lis/interp/gaussian_quadrature.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/gaussian_routines.F90 b/lis/interp/gaussian_routines.F90 index 283fc4458..d23a4b99f 100644 --- a/lis/interp/gaussian_routines.F90 +++ b/lis/interp/gaussian_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/gausslat.F90 b/lis/interp/gausslat.F90 index 20128406c..b91e70d45 100644 --- a/lis/interp/gausslat.F90 +++ b/lis/interp/gausslat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/get_fieldpos.F90 b/lis/interp/get_fieldpos.F90 index 3e201feea..9f3dcde14 100644 --- a/lis/interp/get_fieldpos.F90 +++ b/lis/interp/get_fieldpos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/hrapToLatLon.F90 b/lis/interp/hrapToLatLon.F90 index 3df38eb5f..018f87d1f 100644 --- a/lis/interp/hrapToLatLon.F90 +++ b/lis/interp/hrapToLatLon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/idw_module.F90 b/lis/interp/idw_module.F90 index ca7d3cdc5..bfb1eeb84 100644 --- a/lis/interp/idw_module.F90 +++ b/lis/interp/idw_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/interp_stndata.F90 b/lis/interp/interp_stndata.F90 index 3537788f8..2b7c9c44f 100644 --- a/lis/interp/interp_stndata.F90 +++ b/lis/interp/interp_stndata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/latlonTohrap.F90 b/lis/interp/latlonTohrap.F90 index 8f74cbe88..27fc4a909 100644 --- a/lis/interp/latlonTohrap.F90 +++ b/lis/interp/latlonTohrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/latlonTopolar.F90 b/lis/interp/latlonTopolar.F90 index 14dee4feb..490db8e11 100644 --- a/lis/interp/latlonTopolar.F90 +++ b/lis/interp/latlonTopolar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/lltops.F90 b/lis/interp/lltops.F90 index 4f3661ab7..7812c9917 100644 --- a/lis/interp/lltops.F90 +++ b/lis/interp/lltops.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/map_utils.F90 b/lis/interp/map_utils.F90 index 43df2ac20..fe34ea71f 100644 --- a/lis/interp/map_utils.F90 +++ b/lis/interp/map_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/mqb_module.F90 b/lis/interp/mqb_module.F90 index 9e9937644..4a411b007 100644 --- a/lis/interp/mqb_module.F90 +++ b/lis/interp/mqb_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/neighbor_interp.F90 b/lis/interp/neighbor_interp.F90 index b8430ccd1..5aaeac61d 100644 --- a/lis/interp/neighbor_interp.F90 +++ b/lis/interp/neighbor_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/neighbor_interp_input.F90 b/lis/interp/neighbor_interp_input.F90 index 94882e174..5519dd069 100644 --- a/lis/interp/neighbor_interp_input.F90 +++ b/lis/interp/neighbor_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/neighbor_interp_input_withgrid.F90 b/lis/interp/neighbor_interp_input_withgrid.F90 index b86b15013..26acd8583 100644 --- a/lis/interp/neighbor_interp_input_withgrid.F90 +++ b/lis/interp/neighbor_interp_input_withgrid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/normalize_stnwts.F90 b/lis/interp/normalize_stnwts.F90 index 0f8e5d480..d95252415 100644 --- a/lis/interp/normalize_stnwts.F90 +++ b/lis/interp/normalize_stnwts.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/polarToLatLon.F90 b/lis/interp/polarToLatLon.F90 index 4aee0e4a3..e4a200ae9 100644 --- a/lis/interp/polarToLatLon.F90 +++ b/lis/interp/polarToLatLon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/polfixs.F90 b/lis/interp/polfixs.F90 index 576f3ba8d..d99a4ccde 100644 --- a/lis/interp/polfixs.F90 +++ b/lis/interp/polfixs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/pstoll.F90 b/lis/interp/pstoll.F90 index 0a8818363..165f0cd44 100644 --- a/lis/interp/pstoll.F90 +++ b/lis/interp/pstoll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/snsoidxyTolatlon.F90 b/lis/interp/snsoidxyTolatlon.F90 index ff01f8e08..26654f9ce 100755 --- a/lis/interp/snsoidxyTolatlon.F90 +++ b/lis/interp/snsoidxyTolatlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/stninterp_module.F90 b/lis/interp/stninterp_module.F90 index 56e7944cc..d7809af9e 100644 --- a/lis/interp/stninterp_module.F90 +++ b/lis/interp/stninterp_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/upscaleByAveraging.F90 b/lis/interp/upscaleByAveraging.F90 index a67930f03..77b55dfc2 100644 --- a/lis/interp/upscaleByAveraging.F90 +++ b/lis/interp/upscaleByAveraging.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/upscaleByAveraging_input.F90 b/lis/interp/upscaleByAveraging_input.F90 index b21876ef1..fb9d2933b 100644 --- a/lis/interp/upscaleByAveraging_input.F90 +++ b/lis/interp/upscaleByAveraging_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/upscaleByWeightedAveraging.F90 b/lis/interp/upscaleByWeightedAveraging.F90 index 89a9aa66d..4599e6787 100644 --- a/lis/interp/upscaleByWeightedAveraging.F90 +++ b/lis/interp/upscaleByWeightedAveraging.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/upscaleByWeightedAveraging_input.F90 b/lis/interp/upscaleByWeightedAveraging_input.F90 index 8e747f47f..510e11a2d 100644 --- a/lis/interp/upscaleByWeightedAveraging_input.F90 +++ b/lis/interp/upscaleByWeightedAveraging_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/interp/zterp.F90 b/lis/interp/zterp.F90 index 4d5628747..96e90ad10 100644 --- a/lis/interp/zterp.F90 +++ b/lis/interp/zterp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/irrigation/drip/drip_irrigationMod.F90 b/lis/irrigation/drip/drip_irrigationMod.F90 index 08de11066..64499a345 100644 --- a/lis/irrigation/drip/drip_irrigationMod.F90 +++ b/lis/irrigation/drip/drip_irrigationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/irrigation/flood/flood_irrigationMod.F90 b/lis/irrigation/flood/flood_irrigationMod.F90 index fec2f5984..5c2655ea5 100644 --- a/lis/irrigation/flood/flood_irrigationMod.F90 +++ b/lis/irrigation/flood/flood_irrigationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/irrigation/sprinkler/sprinkler_irrigationMod.F90 b/lis/irrigation/sprinkler/sprinkler_irrigationMod.F90 index 8e412d315..8732ad27e 100755 --- a/lis/irrigation/sprinkler/sprinkler_irrigationMod.F90 +++ b/lis/irrigation/sprinkler/sprinkler_irrigationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/Makefile b/lis/lib/lis-cmem3/Makefile index 08ca37f91..71a75a7e8 100644 --- a/lis/lib/lis-cmem3/Makefile +++ b/lis/lib/lis-cmem3/Makefile @@ -1,13 +1,24 @@ # Compiler/Linker +ifeq ($(LIS_ARCH),linux_ifc) FC = ifort LD = ifort +else ifeq ($(LIS_ARCH),linux_gfortran) +FC = gfortran +LD = gfortran +else +$(error "Please specify the compiler via the LIS_ARCH env variable. Only linux_ifc and linux_gfortran are supported. See the LISF Installation Guide for more information.") +endif # compiler/linker flags # Compile with DEBUG messages #FCFLAGS = -DDEBUG -fpp -g -u -traceback -fpe0 -nomixed_str_len_arg -names lowercase -convert big_endian -assume byterecl -I/home/ytian/proj-disk/libs/CRTM_Profile_Utility_intel_11_1_038/include # Compile without DEBUG messages +ifeq ($(LIS_ARCH),linux_ifc) FCFLAGS = -fpp -g -u -traceback -fpe0 -nomixed_str_len_arg -names lowercase -convert big_endian -assume byterecl +else ifeq ($(LIS_ARCH),linux_gfortran) +FCFLAGS = -cpp -g -u -fbacktrace -ffpe-trap=invalid,zero,overflow -fconvert=big-endian +endif #-I/home/ytian/proj-disk/libs/CRTM_Profile_Utility_intel_11_1_038/include #LIBS = /home/ytian/proj-disk/libs/CRTM_Profile_Utility_intel_11_1_038/lib/libProfile_Utility.a diff --git a/lis/lib/lis-cmem3/atm.F90.turnoff b/lis/lib/lis-cmem3/atm.F90.turnoff index f678a7ab5..5cb5b938c 100755 --- a/lis/lib/lis-cmem3/atm.F90.turnoff +++ b/lis/lib/lis-cmem3/atm.F90.turnoff @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/desert.F90 b/lis/lib/lis-cmem3/desert.F90 index 0d77f975b..ba91a0bba 100755 --- a/lis/lib/lis-cmem3/desert.F90 +++ b/lis/lib/lis-cmem3/desert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/dieldesert_sub.F90 b/lis/lib/lis-cmem3/dieldesert_sub.F90 index 19186aa68..e4c1e23ae 100755 --- a/lis/lib/lis-cmem3/dieldesert_sub.F90 +++ b/lis/lib/lis-cmem3/dieldesert_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/dielice_sub.F90 b/lis/lib/lis-cmem3/dielice_sub.F90 index f3eae22d7..4bd03c553 100755 --- a/lis/lib/lis-cmem3/dielice_sub.F90 +++ b/lis/lib/lis-cmem3/dielice_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/dielsoil_sub.F90 b/lis/lib/lis-cmem3/dielsoil_sub.F90 index c4d4340c9..7367446d2 100755 --- a/lis/lib/lis-cmem3/dielsoil_sub.F90 +++ b/lis/lib/lis-cmem3/dielsoil_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/dielwat_sub.F90 b/lis/lib/lis-cmem3/dielwat_sub.F90 index 130275b7c..22ed5b9e0 100755 --- a/lis/lib/lis-cmem3/dielwat_sub.F90 +++ b/lis/lib/lis-cmem3/dielwat_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/fresnel_sub.F90 b/lis/lib/lis-cmem3/fresnel_sub.F90 index c261dc0ee..ec4af7d19 100755 --- a/lis/lib/lis-cmem3/fresnel_sub.F90 +++ b/lis/lib/lis-cmem3/fresnel_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/liebe89_sub.F90.turnoff b/lis/lib/lis-cmem3/liebe89_sub.F90.turnoff index 58aaff927..3d14fb7af 100755 --- a/lis/lib/lis-cmem3/liebe89_sub.F90.turnoff +++ b/lis/lib/lis-cmem3/liebe89_sub.F90.turnoff @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/lis_mem.F90 b/lis/lib/lis-cmem3/lis_mem.F90 index f37f728e2..5e63048ac 100755 --- a/lis/lib/lis-cmem3/lis_mem.F90 +++ b/lis/lib/lis-cmem3/lis_mem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/rghref_sub.F90 b/lis/lib/lis-cmem3/rghref_sub.F90 index 8f1712717..7c14a46a6 100755 --- a/lis/lib/lis-cmem3/rghref_sub.F90 +++ b/lis/lib/lis-cmem3/rghref_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/snow.F90 b/lis/lib/lis-cmem3/snow.F90 index 6b9f4f2a1..752e8dfac 100755 --- a/lis/lib/lis-cmem3/snow.F90 +++ b/lis/lib/lis-cmem3/snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/soil.F90 b/lis/lib/lis-cmem3/soil.F90 index 7b8dc1cfb..2cb2c48c4 100755 --- a/lis/lib/lis-cmem3/soil.F90 +++ b/lis/lib/lis-cmem3/soil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/veg.F90 b/lis/lib/lis-cmem3/veg.F90 index e14d2e2bb..e7e947e99 100755 --- a/lis/lib/lis-cmem3/veg.F90 +++ b/lis/lib/lis-cmem3/veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/veg_sub.F90 b/lis/lib/lis-cmem3/veg_sub.F90 index cb4ab3850..d9e7c0631 100755 --- a/lis/lib/lis-cmem3/veg_sub.F90 +++ b/lis/lib/lis-cmem3/veg_sub.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-cmem3/water.F90 b/lis/lib/lis-cmem3/water.F90 index 7ffcbd397..27e0178da 100755 --- a/lis/lib/lis-cmem3/water.F90 +++ b/lis/lib/lis-cmem3/water.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-crtm-profile-utility/make.macros b/lis/lib/lis-crtm-profile-utility/make.macros index 400645d5b..5060b969e 100755 --- a/lis/lib/lis-crtm-profile-utility/make.macros +++ b/lis/lib/lis-crtm-profile-utility/make.macros @@ -509,8 +509,15 @@ LINUX_FLAGS_ABSOFT_PROD = $(LINUX_FLAGS_ABSOFT) #LINUX_FLAGS = $(LINUX_FLAGS_LAHEY) #LINUX_FLAGS = $(LINUX_FLAGS_PGI) -LINUX_FLAGS = $(LINUX_FLAGS_INTEL) +#LINUX_FLAGS = $(LINUX_FLAGS_INTEL) #LINUX_FLAGS = $(LINUX_FLAGS_G95) #LINUX_FLAGS = $(LINUX_FLAGS_GFORTRAN) #LINUX_FLAGS = $(LINUX_FLAGS_ABSOFT) +ifeq ($(LIS_ARCH),linux_ifc) +LINUX_FLAGS = $(LINUX_FLAGS_INTEL) +else ifeq ($(LIS_ARCH),linux_gfortran) +LINUX_FLAGS = $(LINUX_FLAGS_GFORTRAN) +else +$(error "Please specify the compiler via the LIS_ARCH env variable. Only linux_ifc and linux_gfortran are supported. See the LISF Installation Guide for more information.") +endif diff --git a/lis/lib/lis-crtm/CRTM_MW_Land_SfcOptics.f90 b/lis/lib/lis-crtm/CRTM_MW_Land_SfcOptics.f90 index b802598f9..655166f30 100644 --- a/lis/lib/lis-crtm/CRTM_MW_Land_SfcOptics.f90 +++ b/lis/lib/lis-crtm/CRTM_MW_Land_SfcOptics.f90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-crtm/CRTM_MW_Snow_SfcOptics.f90 b/lis/lib/lis-crtm/CRTM_MW_Snow_SfcOptics.f90 index 1db3270a3..381016424 100644 --- a/lis/lib/lis-crtm/CRTM_MW_Snow_SfcOptics.f90 +++ b/lis/lib/lis-crtm/CRTM_MW_Snow_SfcOptics.f90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-crtm/CRTM_Surface_Define.f90 b/lis/lib/lis-crtm/CRTM_Surface_Define.f90 index 2ac1ae74d..ba273c09e 100644 --- a/lis/lib/lis-crtm/CRTM_Surface_Define.f90 +++ b/lis/lib/lis-crtm/CRTM_Surface_Define.f90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-crtm/NESDIS_LandEM_Module.f90 b/lis/lib/lis-crtm/NESDIS_LandEM_Module.f90 index 9759b1259..cfc312113 100644 --- a/lis/lib/lis-crtm/NESDIS_LandEM_Module.f90 +++ b/lis/lib/lis-crtm/NESDIS_LandEM_Module.f90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-crtm/README b/lis/lib/lis-crtm/README index f266ff353..0bb4e35c2 100644 --- a/lis/lib/lis-crtm/README +++ b/lis/lib/lis-crtm/README @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/lib/lis-crtm/Set_CRTM_Environment.sh b/lis/lib/lis-crtm/Set_CRTM_Environment.sh index 943c55f2d..54e9c7e61 100755 --- a/lis/lib/lis-crtm/Set_CRTM_Environment.sh +++ b/lis/lib/lis-crtm/Set_CRTM_Environment.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/make/build_version.sh b/lis/make/build_version.sh index f4c2a39df..eb162cf14 100644 --- a/lis/make/build_version.sh +++ b/lis/make/build_version.sh @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/make/default.cfg b/lis/make/default.cfg index ee4345171..8b7538b29 100644 --- a/lis/make/default.cfg +++ b/lis/make/default.cfg @@ -282,6 +282,11 @@ enabled: True macro: MF_MERRA2 path: metforcing/merra2 +[GEOS-IT] +enabled: True +macro: MF_GEOS_IT +path: metforcing/geos_it + [ERA5] enabled: True macro: MF_ERA5 @@ -472,7 +477,10 @@ enabled: True macro: MF_GALWEM_GE_FORECAST path: metforcing/galwem_ge - +[MOGREPS-G forecast] +enabled: True +macro: MF_MOGREPS_G_FORECAST +path: metforcing/mogreps_g #}}} @@ -861,6 +869,10 @@ enabled: True macro: DA_OBS_GRACE path: dataassim/obs/GRACE +[DA CDF TRANSFER NASA SMAPSM] +enabled: True +macro: DA_CDF_TRANSFER_NASA_SMAPSM +path: dataassim/obs/CDF_Transfer_NASA_SMAPsm #}}} # @@ -1707,7 +1719,7 @@ macro: SM_GEOWRSI_2 path: surfacemodels/land/geowrsi.2 [LSM RDHM.3.5.6] -enabled: True +enabled: False macro: SM_RDHM_3_5_6 path: surfacemodels/land/rdhm.3.5.6, surfacemodels/land/rdhm.3.5.6/sac, @@ -1733,6 +1745,13 @@ path: surfacemodels/land/subLSM/crocus.8.1, surfacemodels/land/subLSM/crocus.8.1/phys, surfacemodels/land/subLSM/crocus.8.1/cplLSM +[SNOWMODEL] +enabled: False +macro: SM_SNOWMODEL +path: surfacemodels/land/subLSM/snowmodel, + surfacemodels/land/subLSM/snowmodel/physics, + surfacemodels/land/subLSM/snowmodel/cplLSM + [Flake.1.0] enabled: False macro: SM_FLAKE_1_0 diff --git a/lis/make/makedep.py b/lis/make/makedep.py index a7d033e9c..77955a4c1 100755 --- a/lis/make/makedep.py +++ b/lis/make/makedep.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/make/plugins.py b/lis/make/plugins.py index a9b163790..967a6bc00 100755 --- a/lis/make/plugins.py +++ b/lis/make/plugins.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/0Intro_3B42RT.txt b/lis/metforcing/3B42RT/0Intro_3B42RT.txt index f9ee767f0..b51071dbb 100644 --- a/lis/metforcing/3B42RT/0Intro_3B42RT.txt +++ b/lis/metforcing/3B42RT/0Intro_3B42RT.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/TRMM3B42RT_forcingMod.F90 b/lis/metforcing/3B42RT/TRMM3B42RT_forcingMod.F90 index 5923ff666..2d2538e66 100644 --- a/lis/metforcing/3B42RT/TRMM3B42RT_forcingMod.F90 +++ b/lis/metforcing/3B42RT/TRMM3B42RT_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/finalize_TRMM3B42RT.F90 b/lis/metforcing/3B42RT/finalize_TRMM3B42RT.F90 index f4e5e34b2..899b0d4fd 100644 --- a/lis/metforcing/3B42RT/finalize_TRMM3B42RT.F90 +++ b/lis/metforcing/3B42RT/finalize_TRMM3B42RT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/get_TRMM3B42RT.F90 b/lis/metforcing/3B42RT/get_TRMM3B42RT.F90 index f490fe433..e45622002 100644 --- a/lis/metforcing/3B42RT/get_TRMM3B42RT.F90 +++ b/lis/metforcing/3B42RT/get_TRMM3B42RT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/interp_TRMM3B42RT.F90 b/lis/metforcing/3B42RT/interp_TRMM3B42RT.F90 index a81284d3a..63ab5a1dc 100644 --- a/lis/metforcing/3B42RT/interp_TRMM3B42RT.F90 +++ b/lis/metforcing/3B42RT/interp_TRMM3B42RT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/read_TRMM3B42RT.F90 b/lis/metforcing/3B42RT/read_TRMM3B42RT.F90 index f52ae1ce6..394cf1558 100644 --- a/lis/metforcing/3B42RT/read_TRMM3B42RT.F90 +++ b/lis/metforcing/3B42RT/read_TRMM3B42RT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/readcrd_TRMM3B42RT.F90 b/lis/metforcing/3B42RT/readcrd_TRMM3B42RT.F90 index 693fe84be..9534d4fa7 100644 --- a/lis/metforcing/3B42RT/readcrd_TRMM3B42RT.F90 +++ b/lis/metforcing/3B42RT/readcrd_TRMM3B42RT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RT/timeinterp_TRMM3B42RT.F90 b/lis/metforcing/3B42RT/timeinterp_TRMM3B42RT.F90 index 5b0ba84df..9aac05113 100644 --- a/lis/metforcing/3B42RT/timeinterp_TRMM3B42RT.F90 +++ b/lis/metforcing/3B42RT/timeinterp_TRMM3B42RT.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/0Intro_3B42RTV7.txt b/lis/metforcing/3B42RTV7/0Intro_3B42RTV7.txt index fbcf7190b..345143da4 100644 --- a/lis/metforcing/3B42RTV7/0Intro_3B42RTV7.txt +++ b/lis/metforcing/3B42RTV7/0Intro_3B42RTV7.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 b/lis/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 index d1198cdd6..36bb22e51 100644 --- a/lis/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 +++ b/lis/metforcing/3B42RTV7/TRMM3B42RTV7_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 b/lis/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 index 1f58eb638..148a9f4f6 100644 --- a/lis/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 +++ b/lis/metforcing/3B42RTV7/finalize_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 b/lis/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 index 5a2d1845f..bf5ecec0d 100644 --- a/lis/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 +++ b/lis/metforcing/3B42RTV7/get_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 b/lis/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 index 4465d6d61..bdb0f3068 100644 --- a/lis/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 +++ b/lis/metforcing/3B42RTV7/interp_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 b/lis/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 index e10f9893f..8d30f0711 100644 --- a/lis/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 +++ b/lis/metforcing/3B42RTV7/read_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 b/lis/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 index 8321af514..a73846038 100644 --- a/lis/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 +++ b/lis/metforcing/3B42RTV7/readcrd_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 b/lis/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 index 880db1b6a..144158a91 100644 --- a/lis/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 +++ b/lis/metforcing/3B42RTV7/timeinterp_TRMM3B42RTV7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/0Intro_3B42V6.txt b/lis/metforcing/3B42V6/0Intro_3B42V6.txt index a58564fdd..68bf99241 100644 --- a/lis/metforcing/3B42V6/0Intro_3B42V6.txt +++ b/lis/metforcing/3B42V6/0Intro_3B42V6.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 b/lis/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 index 681663f3e..c9bff7d25 100644 --- a/lis/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 +++ b/lis/metforcing/3B42V6/TRMM3B42V6_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/finalize_TRMM3B42V6.F90 b/lis/metforcing/3B42V6/finalize_TRMM3B42V6.F90 index baa1447f7..1dce901df 100644 --- a/lis/metforcing/3B42V6/finalize_TRMM3B42V6.F90 +++ b/lis/metforcing/3B42V6/finalize_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/get_TRMM3B42V6.F90 b/lis/metforcing/3B42V6/get_TRMM3B42V6.F90 index 3fd877fc0..1d5f14e64 100644 --- a/lis/metforcing/3B42V6/get_TRMM3B42V6.F90 +++ b/lis/metforcing/3B42V6/get_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/interp_TRMM3B42V6.F90 b/lis/metforcing/3B42V6/interp_TRMM3B42V6.F90 index 8edff81d0..a0ad841aa 100644 --- a/lis/metforcing/3B42V6/interp_TRMM3B42V6.F90 +++ b/lis/metforcing/3B42V6/interp_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/read_TRMM3B42V6.F90 b/lis/metforcing/3B42V6/read_TRMM3B42V6.F90 index 624c8cc35..1c6cbba54 100644 --- a/lis/metforcing/3B42V6/read_TRMM3B42V6.F90 +++ b/lis/metforcing/3B42V6/read_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 b/lis/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 index fc36780c4..ace53336d 100644 --- a/lis/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 +++ b/lis/metforcing/3B42V6/readcrd_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 b/lis/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 index 990054dfc..6e0bf8b03 100644 --- a/lis/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 +++ b/lis/metforcing/3B42V6/timeinterp_TRMM3B42V6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/0Intro_3B42V7.txt b/lis/metforcing/3B42V7/0Intro_3B42V7.txt index dd6f8a858..f1d982d13 100644 --- a/lis/metforcing/3B42V7/0Intro_3B42V7.txt +++ b/lis/metforcing/3B42V7/0Intro_3B42V7.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 b/lis/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 index a9f61a5c6..a76aa9fbd 100644 --- a/lis/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 +++ b/lis/metforcing/3B42V7/TRMM3B42V7_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/finalize_TRMM3B42V7.F90 b/lis/metforcing/3B42V7/finalize_TRMM3B42V7.F90 index d0aba143f..77e6bab50 100644 --- a/lis/metforcing/3B42V7/finalize_TRMM3B42V7.F90 +++ b/lis/metforcing/3B42V7/finalize_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/get_TRMM3B42V7.F90 b/lis/metforcing/3B42V7/get_TRMM3B42V7.F90 index a1010072d..274bebd83 100644 --- a/lis/metforcing/3B42V7/get_TRMM3B42V7.F90 +++ b/lis/metforcing/3B42V7/get_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/interp_TRMM3B42V7.F90 b/lis/metforcing/3B42V7/interp_TRMM3B42V7.F90 index 5ecc310be..7b6f8cc01 100644 --- a/lis/metforcing/3B42V7/interp_TRMM3B42V7.F90 +++ b/lis/metforcing/3B42V7/interp_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/read_TRMM3B42V7.F90 b/lis/metforcing/3B42V7/read_TRMM3B42V7.F90 index 33e4e8c7b..065501039 100644 --- a/lis/metforcing/3B42V7/read_TRMM3B42V7.F90 +++ b/lis/metforcing/3B42V7/read_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 b/lis/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 index 73b81efc9..12c42eb86 100644 --- a/lis/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 +++ b/lis/metforcing/3B42V7/readcrd_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 b/lis/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 index f5647ae5b..1fbb5f513 100644 --- a/lis/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 +++ b/lis/metforcing/3B42V7/timeinterp_TRMM3B42V7.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/AWAP_forcingMod.F90 b/lis/metforcing/AWAP/AWAP_forcingMod.F90 index a592d98b4..0fb51fb76 100644 --- a/lis/metforcing/AWAP/AWAP_forcingMod.F90 +++ b/lis/metforcing/AWAP/AWAP_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/AWAPfile.F90 b/lis/metforcing/AWAP/AWAPfile.F90 index e4a218bbe..2ddd41570 100644 --- a/lis/metforcing/AWAP/AWAPfile.F90 +++ b/lis/metforcing/AWAP/AWAPfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/finalize_AWAP.F90 b/lis/metforcing/AWAP/finalize_AWAP.F90 index ed2a29c81..cc4cae47e 100644 --- a/lis/metforcing/AWAP/finalize_AWAP.F90 +++ b/lis/metforcing/AWAP/finalize_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/get_AWAP.F90 b/lis/metforcing/AWAP/get_AWAP.F90 index a328a8f5c..8299f136f 100644 --- a/lis/metforcing/AWAP/get_AWAP.F90 +++ b/lis/metforcing/AWAP/get_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/interp_AWAP.F90 b/lis/metforcing/AWAP/interp_AWAP.F90 index e6bd2f865..6fd2fd934 100644 --- a/lis/metforcing/AWAP/interp_AWAP.F90 +++ b/lis/metforcing/AWAP/interp_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/read_AWAP.F90 b/lis/metforcing/AWAP/read_AWAP.F90 index e252e9817..9e238cb86 100644 --- a/lis/metforcing/AWAP/read_AWAP.F90 +++ b/lis/metforcing/AWAP/read_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/readcrd_AWAP.F90 b/lis/metforcing/AWAP/readcrd_AWAP.F90 index ed9f3f2ac..30a0d86fc 100644 --- a/lis/metforcing/AWAP/readcrd_AWAP.F90 +++ b/lis/metforcing/AWAP/readcrd_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/reset_AWAP.F90 b/lis/metforcing/AWAP/reset_AWAP.F90 index 657bca30d..edbc57786 100644 --- a/lis/metforcing/AWAP/reset_AWAP.F90 +++ b/lis/metforcing/AWAP/reset_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWAP/timeinterp_AWAP.F90 b/lis/metforcing/AWAP/timeinterp_AWAP.F90 index d7457d736..7c86936f8 100644 --- a/lis/metforcing/AWAP/timeinterp_AWAP.F90 +++ b/lis/metforcing/AWAP/timeinterp_AWAP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/AWRAL_forcingMod.F90 b/lis/metforcing/AWRAL/AWRAL_forcingMod.F90 index ac37eccb5..b73c80bc5 100644 --- a/lis/metforcing/AWRAL/AWRAL_forcingMod.F90 +++ b/lis/metforcing/AWRAL/AWRAL_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/finalize_AWRAL.F90 b/lis/metforcing/AWRAL/finalize_AWRAL.F90 index 704359403..75052144f 100644 --- a/lis/metforcing/AWRAL/finalize_AWRAL.F90 +++ b/lis/metforcing/AWRAL/finalize_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/get_AWRAL.F90 b/lis/metforcing/AWRAL/get_AWRAL.F90 index d4d46ee17..ebc184e6b 100644 --- a/lis/metforcing/AWRAL/get_AWRAL.F90 +++ b/lis/metforcing/AWRAL/get_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/interp_AWRAL.F90 b/lis/metforcing/AWRAL/interp_AWRAL.F90 index 5714179ca..5b71e5f6a 100644 --- a/lis/metforcing/AWRAL/interp_AWRAL.F90 +++ b/lis/metforcing/AWRAL/interp_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/read_AWRAL.F90 b/lis/metforcing/AWRAL/read_AWRAL.F90 index b2a3cb1d7..80bf7f732 100644 --- a/lis/metforcing/AWRAL/read_AWRAL.F90 +++ b/lis/metforcing/AWRAL/read_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/readcrd_AWRAL.F90 b/lis/metforcing/AWRAL/readcrd_AWRAL.F90 index b27ace4f8..a279a6266 100644 --- a/lis/metforcing/AWRAL/readcrd_AWRAL.F90 +++ b/lis/metforcing/AWRAL/readcrd_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/reset_AWRAL.F90 b/lis/metforcing/AWRAL/reset_AWRAL.F90 index 2bf5e8386..b6eb06f73 100644 --- a/lis/metforcing/AWRAL/reset_AWRAL.F90 +++ b/lis/metforcing/AWRAL/reset_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/AWRAL/timeinterp_AWRAL.F90 b/lis/metforcing/AWRAL/timeinterp_AWRAL.F90 index 00781f551..419ff83a2 100644 --- a/lis/metforcing/AWRAL/timeinterp_AWRAL.F90 +++ b/lis/metforcing/AWRAL/timeinterp_AWRAL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/0Intro_Bondville.txt b/lis/metforcing/Bondville/0Intro_Bondville.txt index 9a06e40a1..a6a0d7c50 100644 --- a/lis/metforcing/Bondville/0Intro_Bondville.txt +++ b/lis/metforcing/Bondville/0Intro_Bondville.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/Bondville_forcingMod.F90 b/lis/metforcing/Bondville/Bondville_forcingMod.F90 index 26ce4cc6c..3efc4f48e 100644 --- a/lis/metforcing/Bondville/Bondville_forcingMod.F90 +++ b/lis/metforcing/Bondville/Bondville_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/finalize_Bondville.F90 b/lis/metforcing/Bondville/finalize_Bondville.F90 index 777dfe9a0..b112933b1 100644 --- a/lis/metforcing/Bondville/finalize_Bondville.F90 +++ b/lis/metforcing/Bondville/finalize_Bondville.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/get_Bondville.F90 b/lis/metforcing/Bondville/get_Bondville.F90 index b3679f891..2cbbbf115 100644 --- a/lis/metforcing/Bondville/get_Bondville.F90 +++ b/lis/metforcing/Bondville/get_Bondville.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/read_Bondville.F90 b/lis/metforcing/Bondville/read_Bondville.F90 index 639013cb5..eb1973806 100644 --- a/lis/metforcing/Bondville/read_Bondville.F90 +++ b/lis/metforcing/Bondville/read_Bondville.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/readcrd_Bondville.F90 b/lis/metforcing/Bondville/readcrd_Bondville.F90 index 5369c5e27..039518726 100644 --- a/lis/metforcing/Bondville/readcrd_Bondville.F90 +++ b/lis/metforcing/Bondville/readcrd_Bondville.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Bondville/timeinterp_Bondville.F90 b/lis/metforcing/Bondville/timeinterp_Bondville.F90 index 431938c64..b59ff0d1a 100644 --- a/lis/metforcing/Bondville/timeinterp_Bondville.F90 +++ b/lis/metforcing/Bondville/timeinterp_Bondville.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/COAMPSout_forcingMod.F90 b/lis/metforcing/COAMPSout/COAMPSout_forcingMod.F90 index ccb247f8c..e10d66e69 100755 --- a/lis/metforcing/COAMPSout/COAMPSout_forcingMod.F90 +++ b/lis/metforcing/COAMPSout/COAMPSout_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/finalize_COAMPSout.F90 b/lis/metforcing/COAMPSout/finalize_COAMPSout.F90 index 3311a03e7..acaa7cbf8 100755 --- a/lis/metforcing/COAMPSout/finalize_COAMPSout.F90 +++ b/lis/metforcing/COAMPSout/finalize_COAMPSout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/get_COAMPSout.F90 b/lis/metforcing/COAMPSout/get_COAMPSout.F90 index b93b60aa4..e912995b7 100755 --- a/lis/metforcing/COAMPSout/get_COAMPSout.F90 +++ b/lis/metforcing/COAMPSout/get_COAMPSout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/read_COAMPSout.F90 b/lis/metforcing/COAMPSout/read_COAMPSout.F90 index c379f3a2c..1d3d5a373 100755 --- a/lis/metforcing/COAMPSout/read_COAMPSout.F90 +++ b/lis/metforcing/COAMPSout/read_COAMPSout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/readcrd_COAMPSout.F90 b/lis/metforcing/COAMPSout/readcrd_COAMPSout.F90 index 1a01664d6..96a7fc68c 100755 --- a/lis/metforcing/COAMPSout/readcrd_COAMPSout.F90 +++ b/lis/metforcing/COAMPSout/readcrd_COAMPSout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/reset_COAMPSout.F90 b/lis/metforcing/COAMPSout/reset_COAMPSout.F90 index 0efed5044..4338cc0ed 100755 --- a/lis/metforcing/COAMPSout/reset_COAMPSout.F90 +++ b/lis/metforcing/COAMPSout/reset_COAMPSout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/COAMPSout/timeinterp_COAMPSout.F90 b/lis/metforcing/COAMPSout/timeinterp_COAMPSout.F90 index 421f870fc..e09bad862 100755 --- a/lis/metforcing/COAMPSout/timeinterp_COAMPSout.F90 +++ b/lis/metforcing/COAMPSout/timeinterp_COAMPSout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/HiMATGMU_forcingMod.F90 b/lis/metforcing/HiMAT_GMU/HiMATGMU_forcingMod.F90 index f7232df95..a5b72f03e 100644 --- a/lis/metforcing/HiMAT_GMU/HiMATGMU_forcingMod.F90 +++ b/lis/metforcing/HiMAT_GMU/HiMATGMU_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/HiMATGMUfile.F90 b/lis/metforcing/HiMAT_GMU/HiMATGMUfile.F90 index 4169748f3..6fd5d4ac7 100644 --- a/lis/metforcing/HiMAT_GMU/HiMATGMUfile.F90 +++ b/lis/metforcing/HiMAT_GMU/HiMATGMUfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/finalize_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/finalize_HiMATGMU.F90 index 7446866cb..679fb565c 100644 --- a/lis/metforcing/HiMAT_GMU/finalize_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/finalize_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/get_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/get_HiMATGMU.F90 index 882cf5d39..e7353fa84 100644 --- a/lis/metforcing/HiMAT_GMU/get_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/get_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/interp_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/interp_HiMATGMU.F90 index 14e11c022..46914bca5 100644 --- a/lis/metforcing/HiMAT_GMU/interp_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/interp_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/read_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/read_HiMATGMU.F90 index f50c540b3..42c98ead3 100644 --- a/lis/metforcing/HiMAT_GMU/read_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/read_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/readcrd_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/readcrd_HiMATGMU.F90 index c21bedacd..62477c313 100644 --- a/lis/metforcing/HiMAT_GMU/readcrd_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/readcrd_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/reset_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/reset_HiMATGMU.F90 index 2cbf7e7ea..daeb42ea8 100644 --- a/lis/metforcing/HiMAT_GMU/reset_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/reset_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/HiMAT_GMU/timeinterp_HiMATGMU.F90 b/lis/metforcing/HiMAT_GMU/timeinterp_HiMATGMU.F90 index 299fa0a87..5ba708f53 100644 --- a/lis/metforcing/HiMAT_GMU/timeinterp_HiMATGMU.F90 +++ b/lis/metforcing/HiMAT_GMU/timeinterp_HiMATGMU.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/0Intro_Loobos.txt b/lis/metforcing/Loobos/0Intro_Loobos.txt index fe5cda43d..3d79d3ac4 100755 --- a/lis/metforcing/Loobos/0Intro_Loobos.txt +++ b/lis/metforcing/Loobos/0Intro_Loobos.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/Loobos_forcingMod.F90 b/lis/metforcing/Loobos/Loobos_forcingMod.F90 index dce85b59d..2510fcb61 100755 --- a/lis/metforcing/Loobos/Loobos_forcingMod.F90 +++ b/lis/metforcing/Loobos/Loobos_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/0Intro_Bondville.txt b/lis/metforcing/Loobos/code/0Intro_Bondville.txt index 9a06e40a1..a6a0d7c50 100755 --- a/lis/metforcing/Loobos/code/0Intro_Bondville.txt +++ b/lis/metforcing/Loobos/code/0Intro_Bondville.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/Loobos_forcingMod.F90 b/lis/metforcing/Loobos/code/Loobos_forcingMod.F90 index 5115350aa..7aa7054fb 100755 --- a/lis/metforcing/Loobos/code/Loobos_forcingMod.F90 +++ b/lis/metforcing/Loobos/code/Loobos_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/finalize_Loobos.F90 b/lis/metforcing/Loobos/code/finalize_Loobos.F90 index 777dfe9a0..b112933b1 100755 --- a/lis/metforcing/Loobos/code/finalize_Loobos.F90 +++ b/lis/metforcing/Loobos/code/finalize_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/get_Loobos.F90 b/lis/metforcing/Loobos/code/get_Loobos.F90 index b3679f891..2cbbbf115 100755 --- a/lis/metforcing/Loobos/code/get_Loobos.F90 +++ b/lis/metforcing/Loobos/code/get_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/read_Loobos.F90 b/lis/metforcing/Loobos/code/read_Loobos.F90 index 95338bc3f..c42847486 100755 --- a/lis/metforcing/Loobos/code/read_Loobos.F90 +++ b/lis/metforcing/Loobos/code/read_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/readcrd_Loobos.F90 b/lis/metforcing/Loobos/code/readcrd_Loobos.F90 index 618fba5f6..8223f30c6 100755 --- a/lis/metforcing/Loobos/code/readcrd_Loobos.F90 +++ b/lis/metforcing/Loobos/code/readcrd_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/code/timeinterp_Loobos.F90 b/lis/metforcing/Loobos/code/timeinterp_Loobos.F90 index 044e67bcf..736901dc2 100755 --- a/lis/metforcing/Loobos/code/timeinterp_Loobos.F90 +++ b/lis/metforcing/Loobos/code/timeinterp_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/finalize_Loobos.F90 b/lis/metforcing/Loobos/finalize_Loobos.F90 index 84ef69c16..28b4f7231 100755 --- a/lis/metforcing/Loobos/finalize_Loobos.F90 +++ b/lis/metforcing/Loobos/finalize_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/get_Loobos.F90 b/lis/metforcing/Loobos/get_Loobos.F90 index 3763c9f06..8762d1d93 100755 --- a/lis/metforcing/Loobos/get_Loobos.F90 +++ b/lis/metforcing/Loobos/get_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/read_Loobos.F90 b/lis/metforcing/Loobos/read_Loobos.F90 index 7da9ba284..230c2445c 100755 --- a/lis/metforcing/Loobos/read_Loobos.F90 +++ b/lis/metforcing/Loobos/read_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/readcrd_Loobos.F90 b/lis/metforcing/Loobos/readcrd_Loobos.F90 index 9c8a4a5a6..8bfb96efd 100755 --- a/lis/metforcing/Loobos/readcrd_Loobos.F90 +++ b/lis/metforcing/Loobos/readcrd_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/Loobos/timeinterp_Loobos.F90 b/lis/metforcing/Loobos/timeinterp_Loobos.F90 index 7448df5a8..4e1e1c74b 100755 --- a/lis/metforcing/Loobos/timeinterp_Loobos.F90 +++ b/lis/metforcing/Loobos/timeinterp_Loobos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/PALSmetdata/PALSmetdata_forcingMod.F90 b/lis/metforcing/PALSmetdata/PALSmetdata_forcingMod.F90 index 085c955f7..deaa3379a 100644 --- a/lis/metforcing/PALSmetdata/PALSmetdata_forcingMod.F90 +++ b/lis/metforcing/PALSmetdata/PALSmetdata_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/PALSmetdata/finalize_PALSmetdata.F90 b/lis/metforcing/PALSmetdata/finalize_PALSmetdata.F90 index 4c3f12739..904c959ca 100644 --- a/lis/metforcing/PALSmetdata/finalize_PALSmetdata.F90 +++ b/lis/metforcing/PALSmetdata/finalize_PALSmetdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/PALSmetdata/get_PALSmetdata.F90 b/lis/metforcing/PALSmetdata/get_PALSmetdata.F90 index f79ef8444..241834d3a 100644 --- a/lis/metforcing/PALSmetdata/get_PALSmetdata.F90 +++ b/lis/metforcing/PALSmetdata/get_PALSmetdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/PALSmetdata/readcrd_PALSmetdata.F90 b/lis/metforcing/PALSmetdata/readcrd_PALSmetdata.F90 index f81444c10..67fa648bf 100644 --- a/lis/metforcing/PALSmetdata/readcrd_PALSmetdata.F90 +++ b/lis/metforcing/PALSmetdata/readcrd_PALSmetdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/PALSmetdata/reset_PALSmetdata.F90 b/lis/metforcing/PALSmetdata/reset_PALSmetdata.F90 index dd8c69d6b..a7a2fba3c 100644 --- a/lis/metforcing/PALSmetdata/reset_PALSmetdata.F90 +++ b/lis/metforcing/PALSmetdata/reset_PALSmetdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/PALSmetdata/timeinterp_PALSmetdata.F90 b/lis/metforcing/PALSmetdata/timeinterp_PALSmetdata.F90 index b481eb0f4..49a907752 100644 --- a/lis/metforcing/PALSmetdata/timeinterp_PALSmetdata.F90 +++ b/lis/metforcing/PALSmetdata/timeinterp_PALSmetdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/0Intro_rfe2daily.txt b/lis/metforcing/RFE2Daily/0Intro_rfe2daily.txt index 1427f72eb..12fb7c5f2 100644 --- a/lis/metforcing/RFE2Daily/0Intro_rfe2daily.txt +++ b/lis/metforcing/RFE2Daily/0Intro_rfe2daily.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 b/lis/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 index 5afaeb30c..32df3f9bc 100644 --- a/lis/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 +++ b/lis/metforcing/RFE2Daily/RFE2Daily_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/finalize_RFE2Daily.F90 b/lis/metforcing/RFE2Daily/finalize_RFE2Daily.F90 index c0d9fe95c..0d1755d27 100644 --- a/lis/metforcing/RFE2Daily/finalize_RFE2Daily.F90 +++ b/lis/metforcing/RFE2Daily/finalize_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/get_RFE2Daily.F90 b/lis/metforcing/RFE2Daily/get_RFE2Daily.F90 index 427385923..31057c3bf 100644 --- a/lis/metforcing/RFE2Daily/get_RFE2Daily.F90 +++ b/lis/metforcing/RFE2Daily/get_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 b/lis/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 index 153ad9483..9fd004597 100644 --- a/lis/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 +++ b/lis/metforcing/RFE2Daily/readcrd_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 b/lis/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 index 142ccbde4..a8974722d 100644 --- a/lis/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 +++ b/lis/metforcing/RFE2Daily/readprecip_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/reproject_RFE2Daily.F90 b/lis/metforcing/RFE2Daily/reproject_RFE2Daily.F90 index e1ab2c518..42e698dd8 100644 --- a/lis/metforcing/RFE2Daily/reproject_RFE2Daily.F90 +++ b/lis/metforcing/RFE2Daily/reproject_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 b/lis/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 index f291b6cd5..b97720d6f 100644 --- a/lis/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 +++ b/lis/metforcing/RFE2Daily/timeinterp_RFE2Daily.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/0Intro_rfe2gdas.txt b/lis/metforcing/RFE2gdas/0Intro_rfe2gdas.txt index b4e9d5102..73f781347 100644 --- a/lis/metforcing/RFE2gdas/0Intro_rfe2gdas.txt +++ b/lis/metforcing/RFE2gdas/0Intro_rfe2gdas.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 b/lis/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 index ef113a562..893ab94a8 100644 --- a/lis/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 +++ b/lis/metforcing/RFE2gdas/RFE2gdas_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/finalize_RFE2gdas.F90 b/lis/metforcing/RFE2gdas/finalize_RFE2gdas.F90 index 7afbcc88c..32a3e7bcc 100644 --- a/lis/metforcing/RFE2gdas/finalize_RFE2gdas.F90 +++ b/lis/metforcing/RFE2gdas/finalize_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/get_RFE2gdas.F90 b/lis/metforcing/RFE2gdas/get_RFE2gdas.F90 index 2d4310d55..904973719 100644 --- a/lis/metforcing/RFE2gdas/get_RFE2gdas.F90 +++ b/lis/metforcing/RFE2gdas/get_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/readRFE2gdascrd.F90 b/lis/metforcing/RFE2gdas/readRFE2gdascrd.F90 index a6abe8b25..7367a200d 100644 --- a/lis/metforcing/RFE2gdas/readRFE2gdascrd.F90 +++ b/lis/metforcing/RFE2gdas/readRFE2gdascrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 b/lis/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 index 7d76f91b9..73247bde9 100644 --- a/lis/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 +++ b/lis/metforcing/RFE2gdas/readprecip_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/reproject_RFE2gdas.F90 b/lis/metforcing/RFE2gdas/reproject_RFE2gdas.F90 index 4f8d8dbda..12cee3830 100644 --- a/lis/metforcing/RFE2gdas/reproject_RFE2gdas.F90 +++ b/lis/metforcing/RFE2gdas/reproject_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/reset_RFE2gdas.F90 b/lis/metforcing/RFE2gdas/reset_RFE2gdas.F90 index 8a86d0bc6..f0a30cd31 100644 --- a/lis/metforcing/RFE2gdas/reset_RFE2gdas.F90 +++ b/lis/metforcing/RFE2gdas/reset_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 b/lis/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 index 58f60fbf2..f005264e1 100644 --- a/lis/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 +++ b/lis/metforcing/RFE2gdas/timeinterp_RFE2gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/0Intro_WRF_AKdomain.txt b/lis/metforcing/WRFAKdom/0Intro_WRF_AKdomain.txt index 799a31357..0ff988425 100644 --- a/lis/metforcing/WRFAKdom/0Intro_WRF_AKdomain.txt +++ b/lis/metforcing/WRFAKdom/0Intro_WRF_AKdomain.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 b/lis/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 index c592ec75b..5addf1906 100644 --- a/lis/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 +++ b/lis/metforcing/WRFAKdom/WRF_AKdom_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/finalize_WRF_AKdom.F90 b/lis/metforcing/WRFAKdom/finalize_WRF_AKdom.F90 index 8d19ccc09..0d4bace47 100644 --- a/lis/metforcing/WRFAKdom/finalize_WRF_AKdom.F90 +++ b/lis/metforcing/WRFAKdom/finalize_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/get_WRF_AKdom.F90 b/lis/metforcing/WRFAKdom/get_WRF_AKdom.F90 index 5e6cdf186..1018e643d 100644 --- a/lis/metforcing/WRFAKdom/get_WRF_AKdom.F90 +++ b/lis/metforcing/WRFAKdom/get_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/read_WRFAK_elev.F90 b/lis/metforcing/WRFAKdom/read_WRFAK_elev.F90 index cfadedb92..fe4524b3c 100644 --- a/lis/metforcing/WRFAKdom/read_WRFAK_elev.F90 +++ b/lis/metforcing/WRFAKdom/read_WRFAK_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/read_WRF_AKdom.F90 b/lis/metforcing/WRFAKdom/read_WRF_AKdom.F90 index 9411427dd..c3705053b 100644 --- a/lis/metforcing/WRFAKdom/read_WRF_AKdom.F90 +++ b/lis/metforcing/WRFAKdom/read_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 b/lis/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 index b1d5f17f0..9550b30b2 100644 --- a/lis/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 +++ b/lis/metforcing/WRFAKdom/readconfig_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/reset_WRF_AKdom.F90 b/lis/metforcing/WRFAKdom/reset_WRF_AKdom.F90 index c7ce529b4..82e52d34f 100644 --- a/lis/metforcing/WRFAKdom/reset_WRF_AKdom.F90 +++ b/lis/metforcing/WRFAKdom/reset_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFAKdom/timeinterp_WRF_AKdom.F90 b/lis/metforcing/WRFAKdom/timeinterp_WRF_AKdom.F90 index b2ad6f836..eb12d8766 100644 --- a/lis/metforcing/WRFAKdom/timeinterp_WRF_AKdom.F90 +++ b/lis/metforcing/WRFAKdom/timeinterp_WRF_AKdom.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/0Intro_wrfout.txt b/lis/metforcing/WRFout/0Intro_wrfout.txt index bd5327974..0c2872168 100644 --- a/lis/metforcing/WRFout/0Intro_wrfout.txt +++ b/lis/metforcing/WRFout/0Intro_wrfout.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/WRFout_forcingMod.F90 b/lis/metforcing/WRFout/WRFout_forcingMod.F90 index d4108f74d..1d14995f9 100644 --- a/lis/metforcing/WRFout/WRFout_forcingMod.F90 +++ b/lis/metforcing/WRFout/WRFout_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/finalize_WRFout.F90 b/lis/metforcing/WRFout/finalize_WRFout.F90 index 5459e4022..9b0a5c4d6 100644 --- a/lis/metforcing/WRFout/finalize_WRFout.F90 +++ b/lis/metforcing/WRFout/finalize_WRFout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/get_WRFout.F90 b/lis/metforcing/WRFout/get_WRFout.F90 index 19792add0..1e3156655 100644 --- a/lis/metforcing/WRFout/get_WRFout.F90 +++ b/lis/metforcing/WRFout/get_WRFout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/read_WRFout.F90 b/lis/metforcing/WRFout/read_WRFout.F90 index 936d3a9fd..aca161c57 100644 --- a/lis/metforcing/WRFout/read_WRFout.F90 +++ b/lis/metforcing/WRFout/read_WRFout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/readcrd_WRFout.F90 b/lis/metforcing/WRFout/readcrd_WRFout.F90 index c35e522f6..9987165ce 100644 --- a/lis/metforcing/WRFout/readcrd_WRFout.F90 +++ b/lis/metforcing/WRFout/readcrd_WRFout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/reset_WRFout.F90 b/lis/metforcing/WRFout/reset_WRFout.F90 index 45140d8cb..196fac027 100644 --- a/lis/metforcing/WRFout/reset_WRFout.F90 +++ b/lis/metforcing/WRFout/reset_WRFout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFout/timeinterp_WRFout.F90 b/lis/metforcing/WRFout/timeinterp_WRFout.F90 index 0ec781d36..ff93bc288 100644 --- a/lis/metforcing/WRFout/timeinterp_WRFout.F90 +++ b/lis/metforcing/WRFout/timeinterp_WRFout.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/0Intro_WRFoutv2.txt b/lis/metforcing/WRFoutv2/0Intro_WRFoutv2.txt index d4184af06..522db3728 100644 --- a/lis/metforcing/WRFoutv2/0Intro_WRFoutv2.txt +++ b/lis/metforcing/WRFoutv2/0Intro_WRFoutv2.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 b/lis/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 index 2d6d9f861..67bf95f3d 100644 --- a/lis/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 +++ b/lis/metforcing/WRFoutv2/WRFoutv2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/finalize_WRFoutv2.F90 b/lis/metforcing/WRFoutv2/finalize_WRFoutv2.F90 index 139dd0e82..215dcb891 100644 --- a/lis/metforcing/WRFoutv2/finalize_WRFoutv2.F90 +++ b/lis/metforcing/WRFoutv2/finalize_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/get_WRFoutv2.F90 b/lis/metforcing/WRFoutv2/get_WRFoutv2.F90 index b1a4101c4..c29e2aacc 100644 --- a/lis/metforcing/WRFoutv2/get_WRFoutv2.F90 +++ b/lis/metforcing/WRFoutv2/get_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/read_WRFoutv2.F90 b/lis/metforcing/WRFoutv2/read_WRFoutv2.F90 index 9a4d0b916..62ef489eb 100644 --- a/lis/metforcing/WRFoutv2/read_WRFoutv2.F90 +++ b/lis/metforcing/WRFoutv2/read_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 b/lis/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 index f88165a26..c436be473 100644 --- a/lis/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 +++ b/lis/metforcing/WRFoutv2/read_WRFoutv2_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 b/lis/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 index 8969b85f7..45089b20a 100644 --- a/lis/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 +++ b/lis/metforcing/WRFoutv2/readconfig_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/reset_WRFoutv2.F90 b/lis/metforcing/WRFoutv2/reset_WRFoutv2.F90 index 1db445435..d19e574ff 100644 --- a/lis/metforcing/WRFoutv2/reset_WRFoutv2.F90 +++ b/lis/metforcing/WRFoutv2/reset_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/WRFoutv2/timeinterp_WRFoutv2.F90 b/lis/metforcing/WRFoutv2/timeinterp_WRFoutv2.F90 index 65c6f19e8..200fec839 100644 --- a/lis/metforcing/WRFoutv2/timeinterp_WRFoutv2.F90 +++ b/lis/metforcing/WRFoutv2/timeinterp_WRFoutv2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/0Intro_agrmetradps.txt b/lis/metforcing/agrradps/0Intro_agrmetradps.txt index 756b12f9b..f8ca0356b 100644 --- a/lis/metforcing/agrradps/0Intro_agrmetradps.txt +++ b/lis/metforcing/agrradps/0Intro_agrmetradps.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/agrlwdn.F90 b/lis/metforcing/agrradps/agrlwdn.F90 index 6a859fa7f..2ddfb3a99 100644 --- a/lis/metforcing/agrradps/agrlwdn.F90 +++ b/lis/metforcing/agrradps/agrlwdn.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/agrradps_filenames.F90 b/lis/metforcing/agrradps/agrradps_filenames.F90 index a0bc16ea4..a890a5093 100644 --- a/lis/metforcing/agrradps/agrradps_filenames.F90 +++ b/lis/metforcing/agrradps/agrradps_filenames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/agrradps_forcingMod.F90 b/lis/metforcing/agrradps/agrradps_forcingMod.F90 index a1b599e43..410ac94c6 100644 --- a/lis/metforcing/agrradps/agrradps_forcingMod.F90 +++ b/lis/metforcing/agrradps/agrradps_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/finalize_agrradps.F90 b/lis/metforcing/agrradps/finalize_agrradps.F90 index 35e5102d9..795ba9104 100644 --- a/lis/metforcing/agrradps/finalize_agrradps.F90 +++ b/lis/metforcing/agrradps/finalize_agrradps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/get_agrradps.F90 b/lis/metforcing/agrradps/get_agrradps.F90 index c01695486..7eee12819 100644 --- a/lis/metforcing/agrradps/get_agrradps.F90 +++ b/lis/metforcing/agrradps/get_agrradps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/interp_agrradpsvar.F90 b/lis/metforcing/agrradps/interp_agrradpsvar.F90 index 25602012a..35631e29e 100644 --- a/lis/metforcing/agrradps/interp_agrradpsvar.F90 +++ b/lis/metforcing/agrradps/interp_agrradpsvar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/read_agrradps.F90 b/lis/metforcing/agrradps/read_agrradps.F90 index 389a49fe5..cc96d2433 100644 --- a/lis/metforcing/agrradps/read_agrradps.F90 +++ b/lis/metforcing/agrradps/read_agrradps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/readcrd_agrradps.F90 b/lis/metforcing/agrradps/readcrd_agrradps.F90 index 2475f4a69..00bae94ea 100644 --- a/lis/metforcing/agrradps/readcrd_agrradps.F90 +++ b/lis/metforcing/agrradps/readcrd_agrradps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/agrradps/timeinterp_agrradps.F90 b/lis/metforcing/agrradps/timeinterp_agrradps.F90 index 564298457..e73bc00ee 100644 --- a/lis/metforcing/agrradps/timeinterp_agrradps.F90 +++ b/lis/metforcing/agrradps/timeinterp_agrradps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/chirps2_forcingMod.F90 b/lis/metforcing/chirps2/chirps2_forcingMod.F90 index aa85ef527..53d19fe69 100644 --- a/lis/metforcing/chirps2/chirps2_forcingMod.F90 +++ b/lis/metforcing/chirps2/chirps2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/finalize_chirps2.F90 b/lis/metforcing/chirps2/finalize_chirps2.F90 index b28ec12b8..b29a3dbef 100644 --- a/lis/metforcing/chirps2/finalize_chirps2.F90 +++ b/lis/metforcing/chirps2/finalize_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/get_chirps2.F90 b/lis/metforcing/chirps2/get_chirps2.F90 index a985680e6..d28cf65d7 100644 --- a/lis/metforcing/chirps2/get_chirps2.F90 +++ b/lis/metforcing/chirps2/get_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/read_chirps2.F90 b/lis/metforcing/chirps2/read_chirps2.F90 index c10ab2847..498f6d3f5 100644 --- a/lis/metforcing/chirps2/read_chirps2.F90 +++ b/lis/metforcing/chirps2/read_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/readconfig_chirps2.F90 b/lis/metforcing/chirps2/readconfig_chirps2.F90 index c4ce8f7ac..3bdf86d8e 100644 --- a/lis/metforcing/chirps2/readconfig_chirps2.F90 +++ b/lis/metforcing/chirps2/readconfig_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/reset_chirps2.F90 b/lis/metforcing/chirps2/reset_chirps2.F90 index 5d103a480..84b405b6e 100644 --- a/lis/metforcing/chirps2/reset_chirps2.F90 +++ b/lis/metforcing/chirps2/reset_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/chirps2/timeinterp_chirps2.F90 b/lis/metforcing/chirps2/timeinterp_chirps2.F90 index 70f04c860..1e080c3e5 100644 --- a/lis/metforcing/chirps2/timeinterp_chirps2.F90 +++ b/lis/metforcing/chirps2/timeinterp_chirps2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/climatology_SpatialInterpMod.F90 b/lis/metforcing/climatology/climatology_SpatialInterpMod.F90 index 21970f4d2..d6fe13f5c 100644 --- a/lis/metforcing/climatology/climatology_SpatialInterpMod.F90 +++ b/lis/metforcing/climatology/climatology_SpatialInterpMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/climatology_VariablesMod.F90 b/lis/metforcing/climatology/climatology_VariablesMod.F90 index 4087baa02..6a51d31af 100644 --- a/lis/metforcing/climatology/climatology_VariablesMod.F90 +++ b/lis/metforcing/climatology/climatology_VariablesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/climatology_forcingMod.F90 b/lis/metforcing/climatology/climatology_forcingMod.F90 index 832799694..e53a06887 100644 --- a/lis/metforcing/climatology/climatology_forcingMod.F90 +++ b/lis/metforcing/climatology/climatology_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/finalize_climatology.F90 b/lis/metforcing/climatology/finalize_climatology.F90 index 935356806..fd0afadc9 100644 --- a/lis/metforcing/climatology/finalize_climatology.F90 +++ b/lis/metforcing/climatology/finalize_climatology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/get_climatology.F90 b/lis/metforcing/climatology/get_climatology.F90 index 126893718..fee6b5705 100644 --- a/lis/metforcing/climatology/get_climatology.F90 +++ b/lis/metforcing/climatology/get_climatology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/get_climatology_filename.F90 b/lis/metforcing/climatology/get_climatology_filename.F90 index 292ae47b8..ab85777cb 100755 --- a/lis/metforcing/climatology/get_climatology_filename.F90 +++ b/lis/metforcing/climatology/get_climatology_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/readcrd_climatology.F90 b/lis/metforcing/climatology/readcrd_climatology.F90 index a50f74767..ab9a822ac 100644 --- a/lis/metforcing/climatology/readcrd_climatology.F90 +++ b/lis/metforcing/climatology/readcrd_climatology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/reset_climatology.F90 b/lis/metforcing/climatology/reset_climatology.F90 index 602c8c617..cacf9c847 100644 --- a/lis/metforcing/climatology/reset_climatology.F90 +++ b/lis/metforcing/climatology/reset_climatology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/climatology/timeinterp_climatology.F90 b/lis/metforcing/climatology/timeinterp_climatology.F90 index d6e7c2d3d..bf65b71d5 100644 --- a/lis/metforcing/climatology/timeinterp_climatology.F90 +++ b/lis/metforcing/climatology/timeinterp_climatology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/0Intro_cmap.txt b/lis/metforcing/cmap/0Intro_cmap.txt index 27ca3ad11..826606afa 100644 --- a/lis/metforcing/cmap/0Intro_cmap.txt +++ b/lis/metforcing/cmap/0Intro_cmap.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/cmap_forcingMod.F90 b/lis/metforcing/cmap/cmap_forcingMod.F90 index 73df757b0..cda7b5a07 100644 --- a/lis/metforcing/cmap/cmap_forcingMod.F90 +++ b/lis/metforcing/cmap/cmap_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/cmap_reset_interp_input.F90 b/lis/metforcing/cmap/cmap_reset_interp_input.F90 index ea20fb5a6..eb6134004 100644 --- a/lis/metforcing/cmap/cmap_reset_interp_input.F90 +++ b/lis/metforcing/cmap/cmap_reset_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/finalize_cmap.F90 b/lis/metforcing/cmap/finalize_cmap.F90 index 9b740bde1..7f5e376d0 100644 --- a/lis/metforcing/cmap/finalize_cmap.F90 +++ b/lis/metforcing/cmap/finalize_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/get_cmap.F90 b/lis/metforcing/cmap/get_cmap.F90 index eae05cc71..23f3416b6 100644 --- a/lis/metforcing/cmap/get_cmap.F90 +++ b/lis/metforcing/cmap/get_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/interp_cmap.F90 b/lis/metforcing/cmap/interp_cmap.F90 index 00f7a641a..8e9d2e2b3 100644 --- a/lis/metforcing/cmap/interp_cmap.F90 +++ b/lis/metforcing/cmap/interp_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/read_cmap.F90 b/lis/metforcing/cmap/read_cmap.F90 index d0a1acee0..56e9c992b 100644 --- a/lis/metforcing/cmap/read_cmap.F90 +++ b/lis/metforcing/cmap/read_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/readcrd_cmap.F90 b/lis/metforcing/cmap/readcrd_cmap.F90 index fb56fd248..d69c19afa 100644 --- a/lis/metforcing/cmap/readcrd_cmap.F90 +++ b/lis/metforcing/cmap/readcrd_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmap/timeinterp_cmap.F90 b/lis/metforcing/cmap/timeinterp_cmap.F90 index ada7238c2..90e5d65bc 100644 --- a/lis/metforcing/cmap/timeinterp_cmap.F90 +++ b/lis/metforcing/cmap/timeinterp_cmap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/0Intro_cmorph.txt b/lis/metforcing/cmorph/0Intro_cmorph.txt index dadc067a1..baeea1144 100644 --- a/lis/metforcing/cmorph/0Intro_cmorph.txt +++ b/lis/metforcing/cmorph/0Intro_cmorph.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/cm_readzipf.c b/lis/metforcing/cmorph/cm_readzipf.c index 78e48f9b7..4bdf9a6c9 100644 --- a/lis/metforcing/cmorph/cm_readzipf.c +++ b/lis/metforcing/cmorph/cm_readzipf.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/cmorph_forcingMod.F90 b/lis/metforcing/cmorph/cmorph_forcingMod.F90 index fb570d50b..ceaa83c6c 100644 --- a/lis/metforcing/cmorph/cmorph_forcingMod.F90 +++ b/lis/metforcing/cmorph/cmorph_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/finalize_cmorph.F90 b/lis/metforcing/cmorph/finalize_cmorph.F90 index 4ea5f3b2e..3871e42cc 100644 --- a/lis/metforcing/cmorph/finalize_cmorph.F90 +++ b/lis/metforcing/cmorph/finalize_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/fmktime.c b/lis/metforcing/cmorph/fmktime.c index f875c7c42..ab59a0a99 100755 --- a/lis/metforcing/cmorph/fmktime.c +++ b/lis/metforcing/cmorph/fmktime.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/get_cmorph.F90 b/lis/metforcing/cmorph/get_cmorph.F90 index b8ed7fcc6..8649e0be6 100644 --- a/lis/metforcing/cmorph/get_cmorph.F90 +++ b/lis/metforcing/cmorph/get_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/interp_cmorph.F90 b/lis/metforcing/cmorph/interp_cmorph.F90 index c6c456960..d27314a97 100644 --- a/lis/metforcing/cmorph/interp_cmorph.F90 +++ b/lis/metforcing/cmorph/interp_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/read_cmorph.F90 b/lis/metforcing/cmorph/read_cmorph.F90 index 1aeb0b1df..51975f396 100644 --- a/lis/metforcing/cmorph/read_cmorph.F90 +++ b/lis/metforcing/cmorph/read_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/readcrd_cmorph.F90 b/lis/metforcing/cmorph/readcrd_cmorph.F90 index c202f522c..f983f2ec0 100644 --- a/lis/metforcing/cmorph/readcrd_cmorph.F90 +++ b/lis/metforcing/cmorph/readcrd_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/cmorph/timeinterp_cmorph.F90 b/lis/metforcing/cmorph/timeinterp_cmorph.F90 index 45e492a35..8f3d38ab2 100644 --- a/lis/metforcing/cmorph/timeinterp_cmorph.F90 +++ b/lis/metforcing/cmorph/timeinterp_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/0Intro_ecmwf.txt b/lis/metforcing/ecmwf/0Intro_ecmwf.txt index b80a8e876..846d58410 100644 --- a/lis/metforcing/ecmwf/0Intro_ecmwf.txt +++ b/lis/metforcing/ecmwf/0Intro_ecmwf.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/ecmwf_forcingMod.F90 b/lis/metforcing/ecmwf/ecmwf_forcingMod.F90 index e4eafc90b..0d70e9456 100644 --- a/lis/metforcing/ecmwf/ecmwf_forcingMod.F90 +++ b/lis/metforcing/ecmwf/ecmwf_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/finalize_ecmwf.F90 b/lis/metforcing/ecmwf/finalize_ecmwf.F90 index f05b68612..13a620c37 100644 --- a/lis/metforcing/ecmwf/finalize_ecmwf.F90 +++ b/lis/metforcing/ecmwf/finalize_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/get_ecmwf.F90 b/lis/metforcing/ecmwf/get_ecmwf.F90 index fb5ed6a7b..26051188e 100644 --- a/lis/metforcing/ecmwf/get_ecmwf.F90 +++ b/lis/metforcing/ecmwf/get_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/read_ecmwf.F90 b/lis/metforcing/ecmwf/read_ecmwf.F90 index f13e32009..0ef807606 100644 --- a/lis/metforcing/ecmwf/read_ecmwf.F90 +++ b/lis/metforcing/ecmwf/read_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/read_ecmwf_elev.F90 b/lis/metforcing/ecmwf/read_ecmwf_elev.F90 index c3e442394..7ce034031 100644 --- a/lis/metforcing/ecmwf/read_ecmwf_elev.F90 +++ b/lis/metforcing/ecmwf/read_ecmwf_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/readcrd_ecmwf.F90 b/lis/metforcing/ecmwf/readcrd_ecmwf.F90 index d23cf4136..f46e83243 100644 --- a/lis/metforcing/ecmwf/readcrd_ecmwf.F90 +++ b/lis/metforcing/ecmwf/readcrd_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/reset_ecmwf.F90 b/lis/metforcing/ecmwf/reset_ecmwf.F90 index 3bf54e0f4..75c966e5b 100644 --- a/lis/metforcing/ecmwf/reset_ecmwf.F90 +++ b/lis/metforcing/ecmwf/reset_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/ecmwf/timeinterp_ecmwf.F90 b/lis/metforcing/ecmwf/timeinterp_ecmwf.F90 index 2482dcf20..cb44f3e67 100644 --- a/lis/metforcing/ecmwf/timeinterp_ecmwf.F90 +++ b/lis/metforcing/ecmwf/timeinterp_ecmwf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/era5_forcingMod.F90 b/lis/metforcing/era5/era5_forcingMod.F90 index 18a359fb4..d6403b1d5 100644 --- a/lis/metforcing/era5/era5_forcingMod.F90 +++ b/lis/metforcing/era5/era5_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/finalize_era5.F90 b/lis/metforcing/era5/finalize_era5.F90 index 7e72e3818..22abea03a 100644 --- a/lis/metforcing/era5/finalize_era5.F90 +++ b/lis/metforcing/era5/finalize_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/get_era5.F90 b/lis/metforcing/era5/get_era5.F90 index e6588d5e5..fe19541a8 100644 --- a/lis/metforcing/era5/get_era5.F90 +++ b/lis/metforcing/era5/get_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/read_era5.F90 b/lis/metforcing/era5/read_era5.F90 index 10c0c3bb5..0a44e8f99 100644 --- a/lis/metforcing/era5/read_era5.F90 +++ b/lis/metforcing/era5/read_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/read_era5_elev.F90 b/lis/metforcing/era5/read_era5_elev.F90 index 7ad666620..b8a2c89c8 100644 --- a/lis/metforcing/era5/read_era5_elev.F90 +++ b/lis/metforcing/era5/read_era5_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/readcrd_era5.F90 b/lis/metforcing/era5/readcrd_era5.F90 index b94abcd44..480549bef 100644 --- a/lis/metforcing/era5/readcrd_era5.F90 +++ b/lis/metforcing/era5/readcrd_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/reset_era5.F90 b/lis/metforcing/era5/reset_era5.F90 index f5ad200f3..e9e19f31c 100644 --- a/lis/metforcing/era5/reset_era5.F90 +++ b/lis/metforcing/era5/reset_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/era5/timeinterp_era5.F90 b/lis/metforcing/era5/timeinterp_era5.F90 index a3a5b430d..bbcacee96 100644 --- a/lis/metforcing/era5/timeinterp_era5.F90 +++ b/lis/metforcing/era5/timeinterp_era5.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem/finalize_galwem.F90 b/lis/metforcing/galwem/finalize_galwem.F90 index 6a1871ed1..6ec94e9a0 100644 --- a/lis/metforcing/galwem/finalize_galwem.F90 +++ b/lis/metforcing/galwem/finalize_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem/galwem_forcingMod.F90 b/lis/metforcing/galwem/galwem_forcingMod.F90 index d6e0e30c0..f1d415a2c 100644 --- a/lis/metforcing/galwem/galwem_forcingMod.F90 +++ b/lis/metforcing/galwem/galwem_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -20,7 +20,8 @@ module galwem_forcingMod ! REVISION HISTORY: ! 11 Mar 2022; Yeosang Yoon; Initial Specification ! 08 Sep 2022; Yeosang Yoon, Add codes to read GALWEM 25 DEG dataset - +! 11 Jan 2024; Eric Kemp, added third entries for fcsttime and metdata +! for temporary storage. ! !USES: use LIS_constantsMod, only : LIS_CONST_PATH_LEN @@ -39,7 +40,7 @@ module galwem_forcingMod type, public :: galwem_type_dec real :: ts integer :: nc, nr, vector_len - real*8 :: fcsttime1,fcsttime2 + real*8 :: fcsttime1,fcsttime2,fcsttime3 character(len=LIS_CONST_PATH_LEN) :: odir !GALWEM forecast forcing Directory character*20 :: runmode integer :: resol !GALWEM forecast resolution (17km or 25deg) @@ -68,7 +69,7 @@ module galwem_forcingMod integer :: init_yr, init_mo, init_da, init_hr real, allocatable :: metdata1(:,:) real, allocatable :: metdata2(:,:) - + real, allocatable :: metdata3(:,:) integer :: nmodels end type galwem_type_dec @@ -154,6 +155,7 @@ subroutine init_galwem(findex) allocate(galwem_struc(n)%metdata1(LIS_rc%met_nf(findex),LIS_rc%ngrid(n))) allocate(galwem_struc(n)%metdata2(LIS_rc%met_nf(findex),LIS_rc%ngrid(n))) + allocate(galwem_struc(n)%metdata3(LIS_rc%met_nf(findex),LIS_rc%ngrid(n))) ! Initialize the forecast initial date-time and grib record: galwem_struc(n)%init_yr = LIS_rc%syr @@ -164,6 +166,7 @@ subroutine init_galwem(findex) galwem_struc(n)%fcst_hour = 0 galwem_struc(n)%metdata1 = 0 galwem_struc(n)%metdata2 = 0 + galwem_struc(n)%metdata3 = 0 gridDesci = 0 if(galwem_struc(n)%resol == 17) then !galwem-17km @@ -197,6 +200,7 @@ subroutine init_galwem(findex) galwem_struc(n)%mi = galwem_struc(n)%nc*galwem_struc(n)%nr galwem_struc(n)%fcsttime1 = 3000.0 galwem_struc(n)%fcsttime2 = 0.0 + galwem_struc(n)%fcsttime3 = 0.0 enddo do n=1,LIS_rc%nnest diff --git a/lis/metforcing/galwem/get_galwem.F90 b/lis/metforcing/galwem/get_galwem.F90 index a029b5109..0567ab58b 100644 --- a/lis/metforcing/galwem/get_galwem.F90 +++ b/lis/metforcing/galwem/get_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -21,15 +21,20 @@ ! 00Z, to correct time intervals between GALWEM-GD files, ! and to stop searching for (nonexistent) GALWEM-GD file ! when LIS reaches it's end time. +! 11 Jan 2024: Eric Kemp. Reworked code to be fault tolerant, to roll +! back to an earlier GALWEM run if necessary, and to better +! ensure LIS outputs history files before an early +! termination. ! !INTERFACE: subroutine get_galwem(n, findex) ! !USES: - use LIS_coreMod - use LIS_timeMgrMod - use LIS_logMod - use LIS_metforcingMod use galwem_forcingMod use LIS_constantsMod, only: LIS_CONST_PATH_LEN + use LIS_coreMod, only: LIS_masterproc, LIS_rc, LIS_endofrun + use LIS_logMod, only: LIS_logunit, LIS_abort, LIS_alert, LIS_endrun + use LIS_metforcingMod + use LIS_mpiMod + use LIS_timeMgrMod, only: LIS_julhr_date, LIS_tick implicit none @@ -55,15 +60,36 @@ subroutine get_galwem(n, findex) integer :: fcsthr_intv integer :: fcst_hour integer :: openfile + integer :: filecount + logical, save :: use_prior_galwem_run + integer :: first_fcsthr, next_fcsthr + integer :: ierr + logical :: lrc + character(255) :: message(20) ! GALWEM cycles every 6 hours; each cycle provide up to 168 hours (7 days) forecast for GALWEM-17km; ! each cycle provide up to 240 hours (10 days) forecast for GALWEM-25deg; ! <=42 (every 1-hour); > 42 (every 3-hour) - if(LIS_rc%ts.gt.10800) then - write(LIS_logunit,*) '[WARN] The model timestep is > forcing data timestep ...' - write(LIS_logunit,*) '[WARN] LIS does not support this mode currently.' - call LIS_endrun() + if (LIS_rc%ts .gt. 3600) then + write(LIS_logunit,*) '[ERR] The model timestep is > 1 hour ...' + write(LIS_logunit,*) '[ERR] LIS does not support this mode currently.' + message = '' + message(1) = '[ERR] Program: LIS' + message(2) = ' Routine: get_galwem.' + message(3) = ' Model timestep > 1 hour' + message(4) = ' LIS does not support this mode.' + +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) +#endif + if (LIS_masterproc) then + call LIS_alert( 'LIS.get_galwem ', 1, message) + call LIS_abort(message) + else + call sleep(10) ! Make sure LIS_masterproc finishes LIS_abort + call LIS_endrun() + end if endif ! EMK...Return if LIS has reached the end time (meaning a new GALWEM @@ -78,156 +104,126 @@ subroutine get_galwem(n, findex) '[INFO] LIS run has reached end time, will not read more GALWEM' return end if - + openfile=0 if(LIS_rc%tscount(n).eq.1 .or.LIS_rc%rstflag(n).eq.1) then !beginning of run LIS_rc%rstflag(n) = 0 endif - ! First timestep of run - if(LIS_rc%tscount(n).eq.1 .or.LIS_rc%rstflag(n).eq.1) then - ! Bookend-time record 1 - yr1 = LIS_rc%syr - mo1=LIS_rc%smo - da1=LIS_rc%sda - hr1=LIS_rc%shr - mn1=0 - ss1=0 - ts1=0 - call LIS_tick(time1,doy1,gmt1,yr1,mo1,da1,hr1,mn1,ss1,ts1) - - ! Bookend-time record 2 - yr2=LIS_rc%syr - mo2=LIS_rc%smo - da2=LIS_rc%sda - hr2=LIS_rc%shr - mn2=0 - ss2=0 - ts2=3600 ! Advance 1 hour - call LIS_tick(time2,doy2,gmt2,yr2,mo2,da2,hr2,mn2,ss2,ts2) - - !movetime = 1 - openfile=1 - - !write(LIS_logunit,*)'EMK: time1,yr1,mo1,da1,hr1,ts1 = ', & - ! time1,yr1,mo1,da1,hr1,ts1 - !write(LIS_logunit,*)'EMK: time2,yr2,mo2,da2,hr2,ts2 = ', & - ! time2,yr2,mo2,da2,hr2,ts2 - - endif - - ! Determine valid times when forecasts are available to be read in: - ! EMK...Revised based on sample forecast runs for 20230523. - if(galwem_struc(n)%fcst_hour < 42) then - fcsthr_intv = 1 - valid_hour = fcsthr_intv * (LIS_rc%hr/fcsthr_intv) - elseif(galwem_struc(n)%fcst_hour >= 42 .and. & - galwem_struc(n)%fcst_hour < 168) then - fcsthr_intv = 3 - valid_hour = fcsthr_intv * (LIS_rc%hr/fcsthr_intv) - else - fcsthr_intv = 6 - valid_hour = fcsthr_intv * (LIS_rc%hr/fcsthr_intv) - endif - - if((valid_hour==LIS_rc%hr .and. LIS_rc%mn==0) .or. & - openfile == 1) then + !EMK...Perform audit of available GALWEM-GD GRIB files for current fcst + !run. First two files will be saved in galwem_struc(n) as metdata1 + !and metdata2; also saves fcst_hour. + if (LIS_rc%tscount(n) .eq. 1 .or. LIS_rc%rstflag(n) .eq. 1) then + use_prior_galwem_run = .false. + call run_audit(n, findex, & + LIS_rc%syr, LIS_rc%smo, LIS_rc%sda, LIS_rc%shr, & + 0, filecount) + if (filecount < 2) then !Roll back to prior GALWEM run + yr1 = LIS_rc%syr + mo1 = LIS_rc%smo + da1 = LIS_rc%sda + hr1 = LIS_rc%shr + mn1 = 0 + ss1 = 0 + ts1 = -43200 + call LIS_tick(time1, doy1, gmt1, & + yr1, mo1, da1, hr1, mn1, ss1, ts1) + call run_audit(n, findex, & + yr1, mo1, da1, hr1, & + 12, filecount) + if (filecount < 2) then + write(LIS_logunit,*) & + "[ERR] No GALWEM files found, LIS will be halted!" + message = '' + message(1) = '[ERR] Program: LIS' + message(2) = ' Routine: get_galwem.' + message(3) = ' No GALWEM files found.' + message(4) = ' LIS will be halted.' + +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) +#endif + if (LIS_masterproc) then + call LIS_alert( 'LIS.get_galwem ', 1, message) + call LIS_abort(message) + else + call sleep(10) ! Make sure LIS_masterproc finishes LIS_abort + call LIS_endrun() + end if + + else + use_prior_galwem_run = .true. + galwem_struc(n)%init_yr = yr1 + galwem_struc(n)%init_mo = mo1 + galwem_struc(n)%init_da = da1 + galwem_struc(n)%init_hr = hr1 + end if + end if + end if - ! Forecast hour condition within each file: - if(galwem_struc(n)%fcst_hour < 42) then - galwem_struc(n)%fcst_hour = galwem_struc(n)%fcst_hour + fcsthr_intv - elseif(galwem_struc(n)%fcst_hour >= 42) then - galwem_struc(n)%fcst_hour = galwem_struc(n)%fcst_hour + fcsthr_intv - endif + ! Get the bookends at the start of the run + if (LIS_rc%tscount(n) .eq. 1 .or. LIS_rc%rstflag(n) .eq. 1) then + openfile = 1 ! Data already stored in galwem_struc(n) by run_audit + end if - ! Check if local forecast hour exceeds max grib file forecast hour (GALWEM-17km): - if(galwem_struc(n)%resol == 17) then - if(galwem_struc(n)%fcst_hour > 168 ) then - write(LIS_logunit,*) & - "[INFO] GALWEM Forecast hour has exceeded the grib file's final" - write(LIS_logunit,*) & - " forecast hour (record). Run will end here for now ... " - call LIS_endrun - endif - endif - ! Check if local forecast hour exceeds max grib file forecast hour (GALWEM-25deg): - if(galwem_struc(n)%resol == 25) then - if(galwem_struc(n)%fcst_hour > 240 ) then + ! If this is not the first LIS timestep, see if we need a new bookend + if (openfile == 0 .and. LIS_rc%mn==0 .and. & + LIS_rc%tscount(n) .ne. 1) then + + ! See if we need to update the bookends + yr1 = LIS_rc%yr + mo1 = LIS_rc%mo + da1 = LIS_rc%da + hr1 = LIS_rc%hr + mn1 = 0 + ss1 = 0 + ts1 = 0 + call LIS_tick(time1, doy1, gmt1, yr1, mo1, da1, hr1, mn1, ss1, ts1) + + if (time1 >= galwem_struc(n)%fcsttime2) then + + ! Update the bookends. Note: find_next_fcsthr will save + ! data from next file in galwem_struc(n)%metdata3 + call find_next_fcsthr(n, findex, & + galwem_struc(n)%init_yr, & + galwem_struc(n)%init_mo, & + galwem_struc(n)%init_da, & + galwem_struc(n)%init_hr, & + galwem_struc(n)%fcst_hour, next_fcsthr, ierr) + + if (ierr .ne. 0) then + ! We couldn't find a newer GALWEM file. Set flag to + ! terminate after this timestep, and return. write(LIS_logunit,*) & - "[INFO] GALWEM Forecast hour has exceeded the grib file's final" + '[WARN] Cannot find next GALWEM GRIB file!' write(LIS_logunit,*) & - " forecast hour (record). Run will end here for now ... " - call LIS_endrun - endif - endif - - ! Update bookend-time record 2: - if(LIS_rc%tscount(n).ne.1) then - galwem_struc(n)%fcsttime1=galwem_struc(n)%fcsttime2 - galwem_struc(n)%metdata1=galwem_struc(n)%metdata2 - - yr2=LIS_rc%syr - mo2=LIS_rc%smo - da2=LIS_rc%sda - hr2=LIS_rc%shr - mn2=0 - ss2=0 - ts2=3600 * galwem_struc(n)%fcst_hour - call LIS_tick(time2,doy2,gmt2,yr2,mo2,da2,hr2,mn2,ss2,ts2) - endif - - ! Read in file contents: - if(LIS_rc%tscount(n) == 1) then ! Read in first two book-ends - - !write(LIS_logunit,*)'EMK: galwem_struc(n)%init_yr = ', & - ! galwem_struc(n)%init_yr - !write(LIS_logunit,*)'EMK: galwem_struc(n)%init_mo = ', & - ! galwem_struc(n)%init_mo - !write(LIS_logunit,*)'EMK: galwem_struc(n)%init_da = ', & - ! galwem_struc(n)%init_da - !write(LIS_logunit,*)'EMK: galwem_struc(n)%init_hr = ', & - ! galwem_struc(n)%init_hr - !write(LIS_logunit,*)'EMK: galwem_struc(n)%fcst_hour = ', & - ! galwem_struc(n)%fcst_hour - - ferror=0 - order=1 - call getGALWEMfilename(n,galwem_struc(n)%odir,galwem_struc(n)%init_yr,& - galwem_struc(n)%init_mo,galwem_struc(n)%init_da,galwem_struc(n)%init_hr,& - 0,fname) - - write(LIS_logunit,*)'[INFO] Getting GALWEM forecast file1 ... ',trim(fname) - call read_galwem(n, findex, order, fname, ferror) - if(ferror.ge.1) galwem_struc(n)%fcsttime1=time1 - - ferror=0 - order=2 - call getGALWEMfilename(n,galwem_struc(n)%odir,galwem_struc(n)%init_yr,& - galwem_struc(n)%init_mo,galwem_struc(n)%init_da,galwem_struc(n)%init_hr,& - galwem_struc(n)%fcst_hour,fname) - - write(LIS_logunit,*)'[INFO] Getting GALWEM forecast file2 ... ',trim(fname) - call read_galwem(n, findex, order, fname, ferror) - if(ferror.ge.1) galwem_struc(n)%fcsttime2=time2 - else - ferror=0 - order=2 - call getGALWEMfilename(n,galwem_struc(n)%odir,galwem_struc(n)%init_yr,& - galwem_struc(n)%init_mo,galwem_struc(n)%init_da,galwem_struc(n)%init_hr,& - galwem_struc(n)%fcst_hour,fname) - - write(LIS_logunit,*)'[INFO] Getting GALWEM forecast file2 ... ',trim(fname) - call read_galwem(n, findex, order, fname, ferror) - if(ferror.ge.1) galwem_struc(n)%fcsttime2=time2 - endif - endif - openfile=0 - - !write(LIS_logunit,*)"EMK: galwem_struc(n)%fcsttime1 = ", & - ! galwem_struc(n)%fcsttime1 - !write(LIS_logunit,*)"EMK: galwem_struc(n)%fcsttime2 = ", & - ! galwem_struc(n)%fcsttime2 + '[WARN] LIS will terminate early.' + flush(LIS_logunit) + lrc = LIS_endofrun(.true.) ! Force LIS_endofrun to return true + message = '' + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: get_galwem.' + message(3) = ' Cannot find next GALWEM GRIB file.' + message(4) = ' LIS will terminate early.' + if (LIS_masterproc) then + call LIS_alert( 'LIS.get_galwem ', 1, message) + end if + return + else + ! We have a new second bookend. Copy the saved older bookend + ! to the first end. + galwem_struc(n)%metdata1 = galwem_struc(n)%metdata2 + galwem_struc(n)%fcsttime1 = galwem_struc(n)%fcsttime2 + + galwem_struc(n)%fcst_hour = next_fcsthr + galwem_struc(n)%fcsttime2 = galwem_struc(n)%fcsttime3 + galwem_struc(n)%metdata2 = galwem_struc(n)%metdata3 + + end if + end if + end if + openfile = 0 end subroutine get_galwem @@ -239,11 +235,12 @@ end subroutine get_galwem ! !INTERFACE: subroutine getGALWEMfilename(n,rootdir,yr,mo,da,hr,fc_hr,filename) - use LIS_logMod, only: LIS_logunit, LIS_endrun use galwem_forcingMod + use LIS_logMod, only: LIS_logunit implicit none -! !ARGUMENTS: + + ! !ARGUMENTS: integer, intent(in) :: n character(len=*), intent(in) :: rootdir integer, intent(in) :: yr,mo,da,hr @@ -259,9 +256,9 @@ subroutine getGALWEMfilename(n,rootdir,yr,mo,da,hr,fc_hr,filename) write (UNIT=chr, FMT='(i2.2)') hr write (UNIT=fchr, FMT='(i3.3)') fc_hr - - ! GALWEM-17km - if(galwem_struc(n)%resol == 17) then + + ! GALWEM-17km + if(galwem_struc(n)%resol == 17) then fname = 'PS.557WW_SC.U_DI.C_GP.GALWEM-GD_GR.C17KM_AR.GLOBAL_DD.' endif @@ -276,4 +273,171 @@ subroutine getGALWEMfilename(n,rootdir,yr,mo,da,hr,fc_hr,filename) trim(fname) // ftime // '_CY.' // chr // '_FH.' // fchr // '_DF.GR2' end subroutine getGALWEMfilename +! Run audit on GALWEM GRIB files with specified start date and time. +subroutine run_audit(n, findex, & + yr, mo, da, hr, first_fcsthr, filecount) + ! Imports + use galwem_forcingMod, only: galwem_struc + use LIS_constantsMod, only: LIS_CONST_PATH_LEN + use LIS_logMod, only: LIS_logunit + use LIS_timeMgrMod, only: LIS_tick + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: n + integer, intent(in) :: findex + integer, intent(in) :: yr + integer, intent(in) :: mo + integer, intent(in) :: da + integer, intent(in) :: hr + integer, intent(in) :: first_fcsthr + integer, intent(out) :: filecount + + ! Locals + integer, parameter :: MAX_FCSTHRS = 240 + character(len=LIS_CONST_PATH_LEN) :: fname + integer :: fcsthr, delta, ferror, order + integer :: yr1, mo1, da1, hr1, mn1, ss1, doy1 + real :: ts1, gmt1 + real*8 :: time1 + logical :: found_inq + integer :: i + + ! Loop through list of forecast hours, and see how many files exist + delta = 1 + filecount = 0 + do i = 0, MAX_FCSTHRS + fcsthr = first_fcsthr + (i * delta) + yr1 = yr + mo1 = mo + da1 = da + hr1 = hr + call getGALWEMfilename(n, galwem_struc(n)%odir, yr1, mo1, da1, hr1, & + fcsthr, fname) + + ferror = 0 + inquire(file=trim(fname), exist=found_inq) + if (found_inq) then + if (i == 0) then + order = 1 + else if (filecount < 2) then + order = 2 + else + order = 3 + end if + call read_galwem(n, findex, order, fname, ferror) + if (ferror == 0) then + mn1 = 0 + ss1 = 0 + ts1 = fcsthr * 3600 + call LIS_tick(time1, doy1, gmt1, & + yr1, mo1, da1, hr1, mn1, ss1, ts1) + if (order == 1) then + galwem_struc(n)%fcsttime1 = time1 + write(LIS_logunit,*) & + '[INFO] Read ', trim(fname) + else if (order == 2) then + galwem_struc(n)%fcsttime2 = time1 + galwem_struc(n)%fcst_hour = fcsthr + write(LIS_logunit,*) & + '[INFO] Read ', trim(fname) + else + galwem_struc(n)%fcsttime3 = time1 + end if + end if + end if + if (found_inq .and. ferror .eq. 0) then + filecount = filecount + 1 + else + if (i == 0) then + write(LIS_logunit,*) & + '[WARN] Cannot find GALWEM GRIB file for LIS start date' + write(LIS_logunit,*) & + '[WARN] Will need to use earlier GALWEM run for forcing' + filecount = 0 + exit + end if + end if + + if (filecount >= 2) exit + end do + + !if (filecount > 0) then + ! write(LIS_logunit,*)'[INFO] Found ', filecount, ' files' + !end if + +end subroutine run_audit + +! Find next GALWEM grib file given current selected time and +! forecast hour +subroutine find_next_fcsthr(n, findex, & + yr, mo, da, hr, cur_fcsthr, & + next_fcsthr, ierr) + + ! Imports + use galwem_forcingMod, only: galwem_struc + use LIS_constantsMod, only: LIS_CONST_PATH_LEN + use LIS_logMod, only: LIS_logunit + use LIS_timeMgrMod, only: LIS_tick + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: n + integer, intent(in) :: findex + integer, intent(in) :: yr + integer, intent(in) :: mo + integer, intent(in) :: da + integer, intent(in) :: hr + integer, intent(in) :: cur_fcsthr + integer, intent(out) :: next_fcsthr + integer, intent(out) :: ierr + + ! Locals + integer, parameter :: MAX_FCSTHRS = 240 + character(len=LIS_CONST_PATH_LEN) :: fname + integer :: fcsthr, delta, order, ferror + integer :: yr1, mo1, da1, hr1, mn1, ss1, doy1 + real :: gmt1, ts1 + real*8 :: time1 + logical :: found_inq + integer :: i + + ! Loop through list of forecast hours, and see how many files exist + ierr = 1 + delta = 1 + do i = 1, MAX_FCSTHRS + fcsthr = cur_fcsthr + (i * delta) + yr1 = yr + mo1 = mo + da1 = da + hr1 = hr + call getGALWEMfilename(n, galwem_struc(n)%odir, yr1, mo1, da1, hr1, & + fcsthr, fname) + inquire(file=trim(fname), exist=found_inq) + ferror = 0 + if (found_inq) then + order = 3 + call read_galwem(n, findex, order, fname, ferror) + if (ferror == 0) then + mn1 = 0 + ss1 = 0 + ts1 = fcsthr * 3600 + call LIS_tick(time1, doy1, gmt1, & + yr1, mo1, da1, hr1, mn1, ss1, ts1) + galwem_struc(n)%fcsttime3 = time1 + end if + end if + if (found_inq .and. ferror .eq. 0) then + write(LIS_logunit,*)'[INFO] Read ', trim(fname) + next_fcsthr = fcsthr + ierr = 0 + exit + end if + end do + +end subroutine find_next_fcsthr diff --git a/lis/metforcing/galwem/read_galwem.F90 b/lis/metforcing/galwem/read_galwem.F90 index 229c180c7..2e924b434 100644 --- a/lis/metforcing/galwem/read_galwem.F90 +++ b/lis/metforcing/galwem/read_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -15,6 +15,7 @@ ! ! !REVISION HISTORY: ! 15 Mar 2022: Yeosang Yoon, initial code +! 11 Jan 2024; Eric Kemp, revisions for fault tolerance. ! ! !INTERFACE: subroutine read_galwem(n, findex, order, gribfile, rc) @@ -59,8 +60,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) real :: vwind(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous meridional wind interpolated to 10 metres[m/s] real :: ps(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous Surface Pressure [Pa] real :: prectot(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Total precipitation [kg/m^2/s] - integer, intent(out) :: rc + logical :: found_inq ! Initialize return code to "no error". We will change it below if ! necessary. @@ -70,12 +71,25 @@ subroutine read_galwem(n, findex, order, gribfile, rc) ! the first file only, as all data will be of the same type. ! (GALWEM) because the search script ensures that it is. ! + + ! EMK...Before using ECCODES/GRIB_API, see if the GRIB file exists + ! using a simple inquire statement. This avoids ECCODES/GRIB_API + ! writing error messages to stdout/stderr, which may lead to runtime + ! problems. + inquire(file=trim(gribfile),exist=found_inq) + if (.not. found_inq) then + write(LIS_logunit,*)'[ERR] Cannot find file '//trim(gribfile) + rc = 1 + return + end if + #if (defined USE_GRIBAPI) call grib_open_file(ftn,trim(gribfile),'r',ierr) if ( ierr .ne. 0 ) then write(LIS_logunit,*) '[ERR] Failed to open - '//trim(gribfile) - call LIS_endrun() + rc = 1 + return end if ! Read in the first grib record, unpack the header and extract @@ -84,7 +98,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) if ( ierr .ne. 0 ) then write(LIS_logunit,*) '[ERR] failed to read - '//trim(gribfile) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'centre',center,ierr) @@ -93,7 +108,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) 'centre in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'gridType',gtype,ierr) @@ -102,14 +118,16 @@ subroutine read_galwem(n, findex, order, gribfile, rc) 'gridtype in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif if(trim(gtype).ne."regular_ll") then write(LIS_logunit,*)'[ERR] GALWEM file not on lat/lon grid!' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'Ni',iginfo(1),ierr) @@ -117,7 +135,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) write(LIS_logunit,*) '[ERR] in grid_get: Ni in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'Nj',iginfo(2),ierr) @@ -125,7 +144,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) write(LIS_logunit,*) '[ERR] in grid_get: Nj in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'jDirectionIncrementInDegrees',gridres_dlat,ierr) @@ -135,7 +155,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) 'in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif ! EMK...Added dlon @@ -146,7 +167,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) 'in read_galwem' call grib_release(igrib, ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'dataDate',dataDate,ierr) @@ -155,7 +177,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) 'dataDate in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif call grib_get(igrib,'dataTime',dataTime,ierr) @@ -164,7 +187,8 @@ subroutine read_galwem(n, findex, order, gribfile, rc) 'dataTime in read_galwem' call grib_release(igrib,ierr) call grib_close_file(ftn) - call LIS_endrun() + rc = 1 + return endif ! Here we tentatively have a file we can use. Close it for now, and @@ -177,6 +201,7 @@ subroutine read_galwem(n, findex, order, gribfile, rc) call fldbld_read_galwem(n, findex, order, gribfile, ifguess, jfguess, & tair, qair, swdown, lwdown, uwind, vwind, ps, prectot, rc) + if (rc .ne. 0) return call assign_processed_galwemforc(n,order,1,tair) call assign_processed_galwemforc(n,order,2,qair) @@ -186,7 +211,7 @@ subroutine read_galwem(n, findex, order, gribfile, rc) call assign_processed_galwemforc(n,order,6,vwind) call assign_processed_galwemforc(n,order,7,ps) call assign_processed_galwemforc(n,order,8,prectot) - + #endif end subroutine read_galwem @@ -258,7 +283,7 @@ subroutine fldbld_read_galwem(n, findex, order, gribfile, ifguess, jfguess,& ! Executable code begins here ... - rc = 1 ! Initialize as "no error" + rc = 0 ! Initialize as "no error" ! EMK...Before using ECCODES/GRIB_API, see if the GRIB file exists ! using a simple inquire statement. This avoids ECCODES/GRIB_API @@ -267,7 +292,7 @@ subroutine fldbld_read_galwem(n, findex, order, gribfile, ifguess, jfguess,& inquire(file=trim(gribfile),exist=found_inq) if (.not. found_inq) then write(LIS_logunit,*) '[WARN] Cannot find file '//trim(gribfile) - rc = 0 + rc = 1 return end if @@ -278,7 +303,7 @@ subroutine fldbld_read_galwem(n, findex, order, gribfile, ifguess, jfguess,& call grib_open_file(ftn,trim(gribfile),'r',ierr) if ( ierr .ne. 0 ) then write(LIS_logunit,*) '[WARN] Failed to open - '//trim(gribfile) - rc = 0 + rc = 1 return end if @@ -503,7 +528,7 @@ subroutine fldbld_read_galwem(n, findex, order, gribfile, ifguess, jfguess,& ! At this point, we have everything. Close the file and return. call grib_close_file(ftn) - rc = 1 + rc = 0 return ! Jump down here to clean up memory before returning after finding a @@ -520,7 +545,7 @@ subroutine fldbld_read_galwem(n, findex, order, gribfile, ifguess, jfguess,& deallocate ( fg_vwind ) deallocate ( fg_ps ) deallocate ( fg_prectot ) - rc = 0 + rc = 1 #endif end subroutine fldbld_read_galwem @@ -738,6 +763,10 @@ subroutine assign_processed_galwemforc(n,order,var_index,galwemforc) galwem_struc(n)%metdata2(var_index,& LIS_domain(n)%gindex(c,r)) = & galwemforc(c,r) + elseif(order.eq.3) then + galwem_struc(n)%metdata3(var_index,& + LIS_domain(n)%gindex(c,r)) = & + galwemforc(c,r) endif endif enddo diff --git a/lis/metforcing/galwem/readcrd_galwem.F90 b/lis/metforcing/galwem/readcrd_galwem.F90 index 8d6125ecc..7ad1cc6df 100644 --- a/lis/metforcing/galwem/readcrd_galwem.F90 +++ b/lis/metforcing/galwem/readcrd_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem/reset_galwem.F90 b/lis/metforcing/galwem/reset_galwem.F90 index 32b62bc37..1a0b2486e 100644 --- a/lis/metforcing/galwem/reset_galwem.F90 +++ b/lis/metforcing/galwem/reset_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem/timeinterp_galwem.F90 b/lis/metforcing/galwem/timeinterp_galwem.F90 index 50eef25ac..c8d160e31 100644 --- a/lis/metforcing/galwem/timeinterp_galwem.F90 +++ b/lis/metforcing/galwem/timeinterp_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/finalize_galwemge.F90 b/lis/metforcing/galwem_ge/finalize_galwemge.F90 index e0866af94..525d7f153 100644 --- a/lis/metforcing/galwem_ge/finalize_galwemge.F90 +++ b/lis/metforcing/galwem_ge/finalize_galwemge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/galwemge_forcingMod.F90 b/lis/metforcing/galwem_ge/galwemge_forcingMod.F90 index 664d7e807..bb63cb7f7 100644 --- a/lis/metforcing/galwem_ge/galwemge_forcingMod.F90 +++ b/lis/metforcing/galwem_ge/galwemge_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/get_galwemge.F90 b/lis/metforcing/galwem_ge/get_galwemge.F90 index ba353729e..5b8120dae 100644 --- a/lis/metforcing/galwem_ge/get_galwemge.F90 +++ b/lis/metforcing/galwem_ge/get_galwemge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/read_galwemge.F90 b/lis/metforcing/galwem_ge/read_galwemge.F90 index 10870c11d..ce43a1f21 100644 --- a/lis/metforcing/galwem_ge/read_galwemge.F90 +++ b/lis/metforcing/galwem_ge/read_galwemge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/readcrd_galwemge.F90 b/lis/metforcing/galwem_ge/readcrd_galwemge.F90 index 038ab9fd0..87339d5c9 100644 --- a/lis/metforcing/galwem_ge/readcrd_galwemge.F90 +++ b/lis/metforcing/galwem_ge/readcrd_galwemge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/reset_galwemge.F90 b/lis/metforcing/galwem_ge/reset_galwemge.F90 index c54c80289..7bcd64181 100644 --- a/lis/metforcing/galwem_ge/reset_galwemge.F90 +++ b/lis/metforcing/galwem_ge/reset_galwemge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/galwem_ge/timeinterp_galwemge.F90 b/lis/metforcing/galwem_ge/timeinterp_galwemge.F90 index 61f8afc0e..7c794961f 100644 --- a/lis/metforcing/galwem_ge/timeinterp_galwemge.F90 +++ b/lis/metforcing/galwem_ge/timeinterp_galwemge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/0Intro_gdas.txt b/lis/metforcing/gdas/0Intro_gdas.txt index c127d0719..dc8906d76 100644 --- a/lis/metforcing/gdas/0Intro_gdas.txt +++ b/lis/metforcing/gdas/0Intro_gdas.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/create_gdasf9_filename.F90 b/lis/metforcing/gdas/create_gdasf9_filename.F90 index dce891ee5..394cfa013 100644 --- a/lis/metforcing/gdas/create_gdasf9_filename.F90 +++ b/lis/metforcing/gdas/create_gdasf9_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/create_gdasfilename.F90 b/lis/metforcing/gdas/create_gdasfilename.F90 index 5efc7f019..f07ab5598 100644 --- a/lis/metforcing/gdas/create_gdasfilename.F90 +++ b/lis/metforcing/gdas/create_gdasfilename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/finalize_gdas.F90 b/lis/metforcing/gdas/finalize_gdas.F90 index a523155df..51e0ecbfa 100644 --- a/lis/metforcing/gdas/finalize_gdas.F90 +++ b/lis/metforcing/gdas/finalize_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/gdas_forcingMod.F90 b/lis/metforcing/gdas/gdas_forcingMod.F90 index e7134ca20..a2911b2c4 100644 --- a/lis/metforcing/gdas/gdas_forcingMod.F90 +++ b/lis/metforcing/gdas/gdas_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/gdas_reset_interp_input.F90 b/lis/metforcing/gdas/gdas_reset_interp_input.F90 index 96de7ffab..c6f75bcd8 100644 --- a/lis/metforcing/gdas/gdas_reset_interp_input.F90 +++ b/lis/metforcing/gdas/gdas_reset_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/get_gdas.F90 b/lis/metforcing/gdas/get_gdas.F90 index a242c9da9..b5aa88596 100644 --- a/lis/metforcing/gdas/get_gdas.F90 +++ b/lis/metforcing/gdas/get_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -224,10 +224,13 @@ subroutine get_gdas(n, findex) gridDesci(10) = 95 gridDesci(20) = 0 -! EMK Bug fix -! if(LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - Previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Including MicroMet downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_gdas_elev(n,findex, 1) endif @@ -260,10 +263,13 @@ subroutine get_gdas(n, findex) gridDesci(10) = 128 gridDesci(20) = 0.0 -! EMK Bug fix -! if(LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - Previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Including MicroMet downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_gdas_elev(n,findex, 2) endif @@ -296,10 +302,13 @@ subroutine get_gdas(n, findex) gridDesci(10) = 192 gridDesci(20) = 0.0 -! EMK Bug fix -! if(LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - Previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Including MicroMet downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_gdas_elev(n,findex, 3) endif @@ -332,10 +341,13 @@ subroutine get_gdas(n, findex) gridDesci(10) = 288 gridDesci(20) = 0.0 -! EMK Bug fix -! if(LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - Previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Including MicroMet downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_gdas_elev(n,findex, 4) endif @@ -368,10 +380,13 @@ subroutine get_gdas(n, findex) gridDesci(10) = 440 gridDesci(20) = 0.0 -! EMK Bug fix -! if(LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - Previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Including MicroMet downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_gdas_elev(n,findex, 5) endif @@ -403,10 +418,13 @@ subroutine get_gdas(n, findex) gridDesci(10) = 768.0 gridDesci(20) = 0.0 -! EMK Bug fix -! if(LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - Previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Including MicroMet downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_gdas_elev(n,findex, 6) endif diff --git a/lis/metforcing/gdas/read_gdas.F90 b/lis/metforcing/gdas/read_gdas.F90 index e55443fa9..81ff49115 100644 --- a/lis/metforcing/gdas/read_gdas.F90 +++ b/lis/metforcing/gdas/read_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/read_gdas_elev.F90 b/lis/metforcing/gdas/read_gdas_elev.F90 index bece0d745..175402692 100644 --- a/lis/metforcing/gdas/read_gdas_elev.F90 +++ b/lis/metforcing/gdas/read_gdas_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -53,10 +53,14 @@ subroutine read_gdas_elev(n, findex, change) integer :: c,r real :: go(LIS_rc%lnc(n),LIS_rc%lnr(n)) -! EMK TEST -! if ( LIS_rc%met_ecor(findex).eq."lapse-rate") then - if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & - LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! KRA - previous: +! if(LIS_rc%met_ecor(findex).eq."lapse-rate" .or. & +! LIS_rc%met_ecor(findex) .eq. "lapse-rate and slope-aspect") then +! Addition of Micromet topographic downscaling: + if(LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then + write(LIS_logunit,*) 'Reading the GDAS elevation' if ( change == 0 ) then ! period 1980--1991 ! Note that for this time period we have a difference file diff --git a/lis/metforcing/gdas/readcrd_gdas.F90 b/lis/metforcing/gdas/readcrd_gdas.F90 index a4646843a..7999e3805 100644 --- a/lis/metforcing/gdas/readcrd_gdas.F90 +++ b/lis/metforcing/gdas/readcrd_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/reset_gdas.F90 b/lis/metforcing/gdas/reset_gdas.F90 index f5ae4c8c9..ab53ccad0 100644 --- a/lis/metforcing/gdas/reset_gdas.F90 +++ b/lis/metforcing/gdas/reset_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdas/timeinterp_gdas.F90 b/lis/metforcing/gdas/timeinterp_gdas.F90 index 837a765a0..c4cb0ecf5 100644 --- a/lis/metforcing/gdas/timeinterp_gdas.F90 +++ b/lis/metforcing/gdas/timeinterp_gdas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/create_gdasT1534filename.F90 b/lis/metforcing/gdasT1534/create_gdasT1534filename.F90 index de8db80d5..f289e0543 100644 --- a/lis/metforcing/gdasT1534/create_gdasT1534filename.F90 +++ b/lis/metforcing/gdasT1534/create_gdasT1534filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/finalize_gdasT1534.F90 b/lis/metforcing/gdasT1534/finalize_gdasT1534.F90 index da22450e1..f36de2027 100644 --- a/lis/metforcing/gdasT1534/finalize_gdasT1534.F90 +++ b/lis/metforcing/gdasT1534/finalize_gdasT1534.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/gdasT1534_forcingMod.F90 b/lis/metforcing/gdasT1534/gdasT1534_forcingMod.F90 index 7cf4d22a2..c0dd820c3 100644 --- a/lis/metforcing/gdasT1534/gdasT1534_forcingMod.F90 +++ b/lis/metforcing/gdasT1534/gdasT1534_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/get_gdasT1534.F90 b/lis/metforcing/gdasT1534/get_gdasT1534.F90 index 68eac731f..fa8c63ea9 100644 --- a/lis/metforcing/gdasT1534/get_gdasT1534.F90 +++ b/lis/metforcing/gdasT1534/get_gdasT1534.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/read_gdasT1534.F90 b/lis/metforcing/gdasT1534/read_gdasT1534.F90 index f0c72120e..cb59de1f9 100644 --- a/lis/metforcing/gdasT1534/read_gdasT1534.F90 +++ b/lis/metforcing/gdasT1534/read_gdasT1534.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/readcrd_gdasT1534.F90 b/lis/metforcing/gdasT1534/readcrd_gdasT1534.F90 index f8899dd9a..9cbc5191c 100644 --- a/lis/metforcing/gdasT1534/readcrd_gdasT1534.F90 +++ b/lis/metforcing/gdasT1534/readcrd_gdasT1534.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/reset_gdasT1534.F90 b/lis/metforcing/gdasT1534/reset_gdasT1534.F90 index eebf40d7b..1fa7db36d 100644 --- a/lis/metforcing/gdasT1534/reset_gdasT1534.F90 +++ b/lis/metforcing/gdasT1534/reset_gdasT1534.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gdasT1534/timeinterp_gdasT1534.F90 b/lis/metforcing/gdasT1534/timeinterp_gdasT1534.F90 index 7f836f4d3..d01628203 100644 --- a/lis/metforcing/gdasT1534/timeinterp_gdasT1534.F90 +++ b/lis/metforcing/gdasT1534/timeinterp_gdasT1534.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/finalize_gddp.F90 b/lis/metforcing/gddp/finalize_gddp.F90 index 0a53441dd..ba71f399a 100644 --- a/lis/metforcing/gddp/finalize_gddp.F90 +++ b/lis/metforcing/gddp/finalize_gddp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/gddp_forcingMod.F90 b/lis/metforcing/gddp/gddp_forcingMod.F90 index 404e1e6da..5f507adc1 100644 --- a/lis/metforcing/gddp/gddp_forcingMod.F90 +++ b/lis/metforcing/gddp/gddp_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/get_gddp.F90 b/lis/metforcing/gddp/get_gddp.F90 index 00dc03c82..df5016339 100644 --- a/lis/metforcing/gddp/get_gddp.F90 +++ b/lis/metforcing/gddp/get_gddp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/read_gddp.F90 b/lis/metforcing/gddp/read_gddp.F90 index 402994d9a..069f0a888 100644 --- a/lis/metforcing/gddp/read_gddp.F90 +++ b/lis/metforcing/gddp/read_gddp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/readcrd_gddp.F90 b/lis/metforcing/gddp/readcrd_gddp.F90 index 71675f217..e4bd4caaa 100644 --- a/lis/metforcing/gddp/readcrd_gddp.F90 +++ b/lis/metforcing/gddp/readcrd_gddp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/reset_gddp.F90 b/lis/metforcing/gddp/reset_gddp.F90 index 9ed5640a0..a90e9a6a8 100644 --- a/lis/metforcing/gddp/reset_gddp.F90 +++ b/lis/metforcing/gddp/reset_gddp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gddp/timeinterp_gddp.F90 b/lis/metforcing/gddp/timeinterp_gddp.F90 index 7af3e42d5..b61ee5fa3 100644 --- a/lis/metforcing/gddp/timeinterp_gddp.F90 +++ b/lis/metforcing/gddp/timeinterp_gddp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/0Intro_gefs.txt b/lis/metforcing/gefs/0Intro_gefs.txt index 6d961601b..c02e5ce2e 100644 --- a/lis/metforcing/gefs/0Intro_gefs.txt +++ b/lis/metforcing/gefs/0Intro_gefs.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/finalize_gefs.F90 b/lis/metforcing/gefs/finalize_gefs.F90 index 83a837d94..9c182249e 100644 --- a/lis/metforcing/gefs/finalize_gefs.F90 +++ b/lis/metforcing/gefs/finalize_gefs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/gefs_forcingMod.F90 b/lis/metforcing/gefs/gefs_forcingMod.F90 index 59e9b779c..140eace4e 100644 --- a/lis/metforcing/gefs/gefs_forcingMod.F90 +++ b/lis/metforcing/gefs/gefs_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/get_gefs.F90 b/lis/metforcing/gefs/get_gefs.F90 index 7dbd5e532..e7823da20 100644 --- a/lis/metforcing/gefs/get_gefs.F90 +++ b/lis/metforcing/gefs/get_gefs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/interp_gefs.F90 b/lis/metforcing/gefs/interp_gefs.F90 index 1dd8c8c4d..8fe0e1dfd 100644 --- a/lis/metforcing/gefs/interp_gefs.F90 +++ b/lis/metforcing/gefs/interp_gefs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/read_gefs_operational.F90 b/lis/metforcing/gefs/read_gefs_operational.F90 index 92d81274b..fa1fe7d94 100644 --- a/lis/metforcing/gefs/read_gefs_operational.F90 +++ b/lis/metforcing/gefs/read_gefs_operational.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/read_gefs_reforecast.F90 b/lis/metforcing/gefs/read_gefs_reforecast.F90 index 2dc3a49f2..a846ac3db 100644 --- a/lis/metforcing/gefs/read_gefs_reforecast.F90 +++ b/lis/metforcing/gefs/read_gefs_reforecast.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/readcrd_gefs.F90 b/lis/metforcing/gefs/readcrd_gefs.F90 index 0ff56e5a9..67b8a46a1 100644 --- a/lis/metforcing/gefs/readcrd_gefs.F90 +++ b/lis/metforcing/gefs/readcrd_gefs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/reset_gefs.F90 b/lis/metforcing/gefs/reset_gefs.F90 index 983f0b4f1..0efeaa95c 100644 --- a/lis/metforcing/gefs/reset_gefs.F90 +++ b/lis/metforcing/gefs/reset_gefs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gefs/timeinterp_gefs.F90 b/lis/metforcing/gefs/timeinterp_gefs.F90 index 1c2a0e7b4..6cb3a4fe3 100644 --- a/lis/metforcing/gefs/timeinterp_gefs.F90 +++ b/lis/metforcing/gefs/timeinterp_gefs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/0Intro_genEnsFcst.txt b/lis/metforcing/genEnsFcst/0Intro_genEnsFcst.txt index 487210e68..0134efa2e 100644 --- a/lis/metforcing/genEnsFcst/0Intro_genEnsFcst.txt +++ b/lis/metforcing/genEnsFcst/0Intro_genEnsFcst.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/finalize_genEnsFcst.F90 b/lis/metforcing/genEnsFcst/finalize_genEnsFcst.F90 index 89674465e..bc209cb2f 100644 --- a/lis/metforcing/genEnsFcst/finalize_genEnsFcst.F90 +++ b/lis/metforcing/genEnsFcst/finalize_genEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/genEnsFcst_SpatialInterpMod.F90 b/lis/metforcing/genEnsFcst/genEnsFcst_SpatialInterpMod.F90 index e66516094..536fdb172 100644 --- a/lis/metforcing/genEnsFcst/genEnsFcst_SpatialInterpMod.F90 +++ b/lis/metforcing/genEnsFcst/genEnsFcst_SpatialInterpMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/genEnsFcst_VariablesMod.F90 b/lis/metforcing/genEnsFcst/genEnsFcst_VariablesMod.F90 index a30de1526..1e5d5c746 100644 --- a/lis/metforcing/genEnsFcst/genEnsFcst_VariablesMod.F90 +++ b/lis/metforcing/genEnsFcst/genEnsFcst_VariablesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/genEnsFcst_forcingMod.F90 b/lis/metforcing/genEnsFcst/genEnsFcst_forcingMod.F90 index 072940384..e5d599270 100644 --- a/lis/metforcing/genEnsFcst/genEnsFcst_forcingMod.F90 +++ b/lis/metforcing/genEnsFcst/genEnsFcst_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/get_genEnsFcst.F90 b/lis/metforcing/genEnsFcst/get_genEnsFcst.F90 index 935cad130..4770224c9 100644 --- a/lis/metforcing/genEnsFcst/get_genEnsFcst.F90 +++ b/lis/metforcing/genEnsFcst/get_genEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/get_genEnsFcst_filename.F90 b/lis/metforcing/genEnsFcst/get_genEnsFcst_filename.F90 index 3e2ad01d8..a2039a23b 100755 --- a/lis/metforcing/genEnsFcst/get_genEnsFcst_filename.F90 +++ b/lis/metforcing/genEnsFcst/get_genEnsFcst_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/readcrd_genEnsFcst.F90 b/lis/metforcing/genEnsFcst/readcrd_genEnsFcst.F90 index a2cdc6d2e..55e90017a 100644 --- a/lis/metforcing/genEnsFcst/readcrd_genEnsFcst.F90 +++ b/lis/metforcing/genEnsFcst/readcrd_genEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/reset_genEnsFcst.F90 b/lis/metforcing/genEnsFcst/reset_genEnsFcst.F90 index 668bb2ffe..3f8bb5250 100644 --- a/lis/metforcing/genEnsFcst/reset_genEnsFcst.F90 +++ b/lis/metforcing/genEnsFcst/reset_genEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genEnsFcst/timeinterp_genEnsFcst.F90 b/lis/metforcing/genEnsFcst/timeinterp_genEnsFcst.F90 index aa7abcbc1..4d6fe9197 100644 --- a/lis/metforcing/genEnsFcst/timeinterp_genEnsFcst.F90 +++ b/lis/metforcing/genEnsFcst/timeinterp_genEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/0Intro_metForceGenerated.txt b/lis/metforcing/genMetForc/0Intro_metForceGenerated.txt index 56df3b319..834dee977 100644 --- a/lis/metforcing/genMetForc/0Intro_metForceGenerated.txt +++ b/lis/metforcing/genMetForc/0Intro_metForceGenerated.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/finalize_metForcGenerated.F90 b/lis/metforcing/genMetForc/finalize_metForcGenerated.F90 index c2807fbf4..7233a3740 100644 --- a/lis/metforcing/genMetForc/finalize_metForcGenerated.F90 +++ b/lis/metforcing/genMetForc/finalize_metForcGenerated.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/get_metForcGen_filename.F90 b/lis/metforcing/genMetForc/get_metForcGen_filename.F90 index ad78a0281..722494dca 100755 --- a/lis/metforcing/genMetForc/get_metForcGen_filename.F90 +++ b/lis/metforcing/genMetForc/get_metForcGen_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/get_metForcGenerated.F90 b/lis/metforcing/genMetForc/get_metForcGenerated.F90 index d7418dace..9facf7a3b 100644 --- a/lis/metforcing/genMetForc/get_metForcGenerated.F90 +++ b/lis/metforcing/genMetForc/get_metForcGenerated.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/metForcGen_SpatialInterpMod.F90 b/lis/metforcing/genMetForc/metForcGen_SpatialInterpMod.F90 index e4850af6a..05a0e465d 100644 --- a/lis/metforcing/genMetForc/metForcGen_SpatialInterpMod.F90 +++ b/lis/metforcing/genMetForc/metForcGen_SpatialInterpMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/metForcGen_VariablesMod.F90 b/lis/metforcing/genMetForc/metForcGen_VariablesMod.F90 index e67f8d8d2..e8071319d 100644 --- a/lis/metforcing/genMetForc/metForcGen_VariablesMod.F90 +++ b/lis/metforcing/genMetForc/metForcGen_VariablesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/metForcGenerated_forcingMod.F90 b/lis/metforcing/genMetForc/metForcGenerated_forcingMod.F90 index ae7836048..a49db65ee 100644 --- a/lis/metforcing/genMetForc/metForcGenerated_forcingMod.F90 +++ b/lis/metforcing/genMetForc/metForcGenerated_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/readcrd_metForcGenerated.F90 b/lis/metforcing/genMetForc/readcrd_metForcGenerated.F90 index 6a4af7450..1110cd958 100644 --- a/lis/metforcing/genMetForc/readcrd_metForcGenerated.F90 +++ b/lis/metforcing/genMetForc/readcrd_metForcGenerated.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/reset_metForcGenerated.F90 b/lis/metforcing/genMetForc/reset_metForcGenerated.F90 index b43f8f836..97ba428df 100644 --- a/lis/metforcing/genMetForc/reset_metForcGenerated.F90 +++ b/lis/metforcing/genMetForc/reset_metForcGenerated.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/genMetForc/timeinterp_metForcGenerated.F90 b/lis/metforcing/genMetForc/timeinterp_metForcGenerated.F90 index 1bb0fb421..fb876e263 100644 --- a/lis/metforcing/genMetForc/timeinterp_metForcGenerated.F90 +++ b/lis/metforcing/genMetForc/timeinterp_metForcGenerated.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/finalize_geos5fcst.F90 b/lis/metforcing/geos5fcst/finalize_geos5fcst.F90 index 364da8803..8fc8deed6 100644 --- a/lis/metforcing/geos5fcst/finalize_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/finalize_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/geos5fcst_forcingMod.F90 b/lis/metforcing/geos5fcst/geos5fcst_forcingMod.F90 index da197b744..b359039e2 100644 --- a/lis/metforcing/geos5fcst/geos5fcst_forcingMod.F90 +++ b/lis/metforcing/geos5fcst/geos5fcst_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/get_geos5fcst.F90 b/lis/metforcing/geos5fcst/get_geos5fcst.F90 index c54fd8c42..d12623722 100644 --- a/lis/metforcing/geos5fcst/get_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/get_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/interp_geos5fcst.F90 b/lis/metforcing/geos5fcst/interp_geos5fcst.F90 index 3406781f9..873ce2ad4 100644 --- a/lis/metforcing/geos5fcst/interp_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/interp_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/read_geos5fcst.F90 b/lis/metforcing/geos5fcst/read_geos5fcst.F90 index c2ab2c0df..fc469cc30 100644 --- a/lis/metforcing/geos5fcst/read_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/read_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/readcrd_geos5fcst.F90 b/lis/metforcing/geos5fcst/readcrd_geos5fcst.F90 index 94b8f554f..94743ed17 100644 --- a/lis/metforcing/geos5fcst/readcrd_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/readcrd_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/reset_geos5fcst.F90 b/lis/metforcing/geos5fcst/reset_geos5fcst.F90 index 23bac3cc9..a40b5fc86 100644 --- a/lis/metforcing/geos5fcst/reset_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/reset_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos5fcst/timeinterp_geos5fcst.F90 b/lis/metforcing/geos5fcst/timeinterp_geos5fcst.F90 index b4472fad9..c259fcf95 100644 --- a/lis/metforcing/geos5fcst/timeinterp_geos5fcst.F90 +++ b/lis/metforcing/geos5fcst/timeinterp_geos5fcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/geos_it/0Intro_geosit.txt b/lis/metforcing/geos_it/0Intro_geosit.txt new file mode 100644 index 000000000..8d4a473a6 --- /dev/null +++ b/lis/metforcing/geos_it/0Intro_geosit.txt @@ -0,0 +1,14 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +!BOP +!\section{GEOS-IT} +!This section describes the implementation of the GEOS-IT forcing data. +!EOP diff --git a/lis/metforcing/geos_it/finalize_geosit.F90 b/lis/metforcing/geos_it/finalize_geosit.F90 new file mode 100644 index 000000000..7db1e7fce --- /dev/null +++ b/lis/metforcing/geos_it/finalize_geosit.F90 @@ -0,0 +1,72 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: finalize_geosit +! \label{finalize_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine finalize_geosit(findex) + +! !USES: + use LIS_coreMod, only : LIS_rc + use geosit_forcingMod, only : geosit_struc +! +! !DESCRIPTION: +! Routine to cleanup GEOS-IT forcing related memory allocations. +! +!EOP + implicit none + + integer :: findex + integer :: n + + do n = 1,LIS_rc%nnest + select case( LIS_rc%met_interp(findex) ) + + case( "bilinear" ) + deallocate(geosit_struc(n)%n111) + deallocate(geosit_struc(n)%n121) + deallocate(geosit_struc(n)%n211) + deallocate(geosit_struc(n)%n221) + deallocate(geosit_struc(n)%w111) + deallocate(geosit_struc(n)%w121) + deallocate(geosit_struc(n)%w211) + deallocate(geosit_struc(n)%w221) + + case( "budget-bilinear" ) + deallocate(geosit_struc(n)%n111) + deallocate(geosit_struc(n)%n121) + deallocate(geosit_struc(n)%n211) + deallocate(geosit_struc(n)%n221) + deallocate(geosit_struc(n)%w111) + deallocate(geosit_struc(n)%w121) + deallocate(geosit_struc(n)%w211) + deallocate(geosit_struc(n)%w221) + deallocate(geosit_struc(n)%n112) + deallocate(geosit_struc(n)%n122) + deallocate(geosit_struc(n)%n212) + deallocate(geosit_struc(n)%n222) + deallocate(geosit_struc(n)%w112) + deallocate(geosit_struc(n)%w122) + deallocate(geosit_struc(n)%w212) + deallocate(geosit_struc(n)%w222) + + case( "neighbor" ) + deallocate(geosit_struc(n)%n113) + end select + enddo + deallocate(geosit_struc) + + end subroutine finalize_geosit + diff --git a/lis/metforcing/geos_it/geosit_forcingMod.F90 b/lis/metforcing/geos_it/geosit_forcingMod.F90 new file mode 100644 index 000000000..d6400de1d --- /dev/null +++ b/lis/metforcing/geos_it/geosit_forcingMod.F90 @@ -0,0 +1,292 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- + module geosit_forcingMod +!BOP +! !MODULE: geosit_forcingMod +! +! !DESCRIPTION: +! This module contains variables and data structures that are used +! for the implementation of the GEOS-IT forcing data. +! The data is global 0.625-degree lon. by 0.5-degree lat, in latlon +! projection, and at 1 hourly intervals. The derived data type +! {\tt geosit\_struc} +! includes the variables that specify the runtime options, and the +! weights and neighbor information to be used for spatial interpolation. +! They are described below: +! \begin{description} +! \item[ncold] +! Number of columns (along the east west dimension) for the input data +! \item[nrold] +! Number of rows (along the north south dimension) for the input data +! \item[nmif] +! Number of forcing variables in the data +! \item[geosittime1] +! The nearest, previous 1 hour instance of the incoming +! data (as a real time). +! \item[geosittime2] +! The nearest, next 1 hour instance of the incoming +! data (as a real time). +! \item[geositdir] +! Directory containing the input data +! \item[mi] +! Number of points in the input grid +! \item[n111,n121,n211,n221] +! Arrays containing the neighbor information of the input grid +! for each grid point in LIS, for bilinear interpolation. +! \item[w111,w121,w211,w221] +! Arrays containing the weights of the input grid +! for each grid point in LIS, for bilinear interpolation. +! \item[n122,n122,n212,n222] +! Arrays containing the neighbor information of the input grid +! for each grid point in LIS, for conservative interpolation. +! \item[w112,w122,w212,w222] +! Arrays containing the weights of the input grid +! for each grid point in LIS, for conservative interpolation. +! \item[n113] +! Arrays containing the neighbor information of the input grid +! for each grid point in LIS, for n. neighbor interpolation. +! \item[findtime1, findtime2] +! boolean flags to indicate which time is to be read for +! temporal interpolation. +! \end{description} +! +! !USES: + use LIS_constantsMod, only : LIS_CONST_PATH_LEN + + implicit none + + PRIVATE +!----------------------------------------------------------------------------- +! !PUBLIC MEMBER FUNCTIONS: +!----------------------------------------------------------------------------- + public :: init_geosit ! defines the native resolution of the input data +!----------------------------------------------------------------------------- +! !PUBLIC TYPES: +!----------------------------------------------------------------------------- + public :: geosit_struc + +!EOP + type, public :: geosit_type_dec + real :: ts + integer :: ncold, nrold + character(len=LIS_CONST_PATH_LEN) :: geositdir ! GEOS-IT Forcing Directory + real*8 :: geosittime1,geosittime2 + logical :: reset_flag + + integer :: mi + integer, allocatable :: n111(:) + integer, allocatable :: n121(:) + integer, allocatable :: n211(:) + integer, allocatable :: n221(:) + real, allocatable :: w111(:),w121(:) + real, allocatable :: w211(:),w221(:) + + integer, allocatable :: n112(:,:) + integer, allocatable :: n122(:,:) + integer, allocatable :: n212(:,:) + integer, allocatable :: n222(:,:) + real, allocatable :: w112(:,:),w122(:,:) + real, allocatable :: w212(:,:),w222(:,:) + integer, allocatable :: n113(:) + integer :: findtime1,findtime2 + logical :: startFlag,dayFlag + real, allocatable :: geositforc1(:,:,:),geositforc2(:,:,:) + + integer :: nvars + integer :: uselml + real*8 :: ringtime + integer :: nIter,st_iterid,en_iterid + + real, allocatable :: metdata1(:,:,:) + real, allocatable :: metdata2(:,:,:) + + integer :: use2mwind + character(len=LIS_CONST_PATH_LEN) :: scaleffile + integer, allocatable :: rseed(:,:) + end type geosit_type_dec + + type(geosit_type_dec), allocatable :: geosit_struc(:) + + contains + +!BOP +! +! !ROUTINE: init_geosit +! \label{init_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine init_geosit(findex) + +! !USES: + use LIS_coreMod + use LIS_timeMgrMod + use LIS_logMod + use LIS_spatialDownscalingMod, only : LIS_init_pcpclimo_native + + implicit none +! !AGRUMENTS: + integer, intent(in) :: findex + +! !DESCRIPTION: +! Defines the native resolution of the input forcing for GEOS-IT +! data. The grid description arrays are based on the decoding +! schemes used by NCEP and followed in the LIS interpolation +! schemes (see Section~\ref{interp}). +! +! The routines invoked are: +! \begin{description} +! \item[readcrd\_geosit](\ref{readcrd_geosit}) \newline +! reads the runtime options specified for GEOS-IT data +! \item[bilinear\_interp\_input](\ref{bilinear_interp_input}) \newline +! computes the neighbor, weights for bilinear interpolation +! \item[conserv\_interp\_input](\ref{conserv_interp_input}) \newline +! computes the neighbor, weights for conservative interpolation +! \end{description} +!EOP + real :: gridDesci(LIS_rc%nnest,50) + integer :: updoy,yr1,mo1,da1,hr1,mn1,ss1 + real :: upgmt + integer :: n + + allocate(geosit_struc(LIS_rc%nnest)) + + do n = 1,LIS_rc%nnest + geosit_struc(n)%ncold = 576 + geosit_struc(n)%nrold = 361 + enddo + + call readcrd_geosit() + LIS_rc%met_nf(findex) = 14 + + geosit_struc%reset_flag = .false. + + do n = 1, LIS_rc%nnest + geosit_struc(n)%ts = 3600 !check + call LIS_update_timestep(LIS_rc,n,geosit_struc(n)%ts) + enddo + + gridDesci = 0 + + do n = 1,LIS_rc%nnest + gridDesci(n,1) = 0 + gridDesci(n,2) = geosit_struc(n)%ncold + gridDesci(n,3) = geosit_struc(n)%nrold + gridDesci(n,4) = -90.000 + gridDesci(n,5) = -180.000 + gridDesci(n,6) = 128 + gridDesci(n,7) = 90.000 + gridDesci(n,8) = 179.375 + gridDesci(n,9) = 0.625 + gridDesci(n,10) = 0.5 + gridDesci(n,20) = 0 + + geosit_struc(n)%mi = geosit_struc(n)%ncold*geosit_struc(n)%nrold + + ! Setting up weights for Interpolation + if (trim(LIS_rc%met_interp(findex)).eq."bilinear") then + allocate(geosit_struc(n)%n111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%n121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%n211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%n221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + call bilinear_interp_input(n,gridDesci(n,:), & + geosit_struc(n)%n111,geosit_struc(n)%n121, & + geosit_struc(n)%n211,geosit_struc(n)%n221, & + geosit_struc(n)%w111,geosit_struc(n)%w121, & + geosit_struc(n)%w211,geosit_struc(n)%w221) + + elseif (trim(LIS_rc%met_interp(findex)).eq."budget-bilinear") then + allocate(geosit_struc(n)%n111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%n121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%n211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%n221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%w221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + call bilinear_interp_input(n,gridDesci(n,:), & + geosit_struc(n)%n111,geosit_struc(n)%n121, & + geosit_struc(n)%n211,geosit_struc(n)%n221, & + geosit_struc(n)%w111,geosit_struc(n)%w121, & + geosit_struc(n)%w211,geosit_struc(n)%w221) + + allocate(geosit_struc(n)%n112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%n122(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%n212(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%n222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%w112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%w122(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%w212(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(geosit_struc(n)%w222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + call conserv_interp_input(n,gridDesci(n,:), & + geosit_struc(n)%n112,geosit_struc(n)%n122, & + geosit_struc(n)%n212,geosit_struc(n)%n222, & + geosit_struc(n)%w112,geosit_struc(n)%w122, & + geosit_struc(n)%w212,geosit_struc(n)%w222) + + elseif (trim(LIS_rc%met_interp(findex)).eq."neighbor") then + allocate(geosit_struc(n)%n113(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + call neighbor_interp_input(n,gridDesci(n,:), & + geosit_struc(n)%n113) + + else + write(LIS_logunit,*) '[ERR] Interpolation option '// & + trim(LIS_rc%met_interp(findex))// & + ' for GEOS-IT forcing is not supported' + call LIS_endrun() + endif + + call LIS_registerAlarm("GEOS-IT forcing alarm",86400.0,86400.0) + geosit_struc(n)%startFlag = .true. + geosit_struc(n)%dayFlag = .true. + + geosit_struc(n)%nvars = 14 + + allocate(geosit_struc(n)%geositforc1(1, & + geosit_struc(n)%nvars, LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(geosit_struc(n)%geositforc2(1,& + geosit_struc(n)%nvars, LIS_rc%lnc(n)*LIS_rc%lnr(n))) + geosit_struc(n)%st_iterid = 1 + geosit_struc(n)%en_iterId = 1 + geosit_struc(n)%nIter = 1 + + allocate(geosit_struc(n)%metdata1(1,LIS_rc%met_nf(findex), & + LIS_rc%ngrid(n))) + allocate(geosit_struc(n)%metdata2(1,LIS_rc%met_nf(findex), & + LIS_rc%ngrid(n))) + + geosit_struc(n)%metdata1 = 0 + geosit_struc(n)%metdata2 = 0 + + geosit_struc(n)%geositforc1 = LIS_rc%udef + geosit_struc(n)%geositforc2 = LIS_rc%udef + + if ((LIS_rc%met_ecor(findex).eq."lapse-rate").or. & + (LIS_rc%met_ecor(findex).eq."lapse-rate and slope-aspect")) then + call read_geosit_elev(n,findex) + endif + +! Set up precipitation climate downscaling: + if (LIS_rc%pcp_downscale(findex).ne.0) then + call LIS_init_pcpclimo_native(n,findex,geosit_struc(n)%ncold,& + geosit_struc(n)%nrold) + endif + enddo ! End nest loop + + end subroutine init_geosit + end module geosit_forcingMod + diff --git a/lis/metforcing/geos_it/get_geosit.F90 b/lis/metforcing/geos_it/get_geosit.F90 new file mode 100644 index 000000000..46795255d --- /dev/null +++ b/lis/metforcing/geos_it/get_geosit.F90 @@ -0,0 +1,309 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: get_geosit +! \label{get_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 08 Dec 2015: James Geiger, update timing logic +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine get_geosit(n,findex) +! !USES: + use LIS_coreMod + use LIS_timeMgrMod + use LIS_logMod + use LIS_metforcingMod + use geosit_forcingMod + use LIS_constantsMod, only : LIS_CONST_PATH_LEN + + implicit none + +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex +! +! !DESCRIPTION: +! Opens, reads, and interpolates 1-hourly GEOS-IT forcing. +! +! The GEOS-IT forcing data are organized into hourly files. +! The data are considered valid at the mid-point of the hourly interval. +! +! In general, metforcing readers read the forcing data before the +! current time, referred to as bookend1, and after the current time, +! referred to as bookend2. Then the readers temporally interpolate +! between bookend1 and bookend2. +! +! Below are some examples to illustrate the timing logic of the +! GEOS-IT reader. +! +! \begin{verbatim} +! ---*---|---*---|---*---|---*---|---*---|---*---|---*---|---*--- +! hour 21 22 23 0 1 2 3 +! hr_int <---22--X--23---X--24---X---1---X---2---X---3---> +! +! where: +! hour is the hour UTC +! hr_int is the hour-interval +! * marks the valid point for the interval <--- hr_int ---> +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[findex] +! forcing dataset index +! \end{description} +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_tick](\ref{LIS_tick}) \newline +! call to advance or retract time +! \item[geositfiles](\ref{geositfiles}) \newline +! Puts together appropriate file name for 1 hour intervals +! \item[read\_geosit](\ref{read_geosit}) \newline +! call to read the GEOS-IT data and perform spatial interpolation +! \end{description} +!EOP + integer :: order + integer :: ferror + character(len=LIS_CONST_PATH_LEN) :: slvname,flxname,lfoname,radname + integer :: c,f,r,kk + integer :: yr1,mo1,da1,hr1,mn1,ss1,doy1 + integer :: yr2,mo2,da2,hr2,mn2,ss2,doy2 + real*8 :: time1,time2,timenow + real :: gmt1,gmt2 + real :: ts1,ts2 + integer :: hr_int1,hr_int2 + integer :: movetime ! Flag to move bookend2 files to bookend1 + +! _________________________________________________________ +! + + if (LIS_rc%nts(n).gt.3600) then ! > 1-hr timestep + write(LIS_logunit,*) '[ERR] When running LIS with GEOS-IT,' + write(LIS_logunit,*) '[ERR] the clock should run with a time' + write(LIS_logunit,*) '[ERR] step less than or equal to 1 hr.' + call LIS_endrun() + endif + + geosit_struc(n)%findtime1 = 0 + geosit_struc(n)%findtime2 = 0 + movetime = 0 + +!---------------------------------------------------------- +! Determine current time +!---------------------------------------------------------- + yr1 = LIS_rc%yr + mo1 = LIS_rc%mo + da1 = LIS_rc%da + hr1 = LIS_rc%hr + mn1 = LIS_rc%mn + ss1 = 0 + ts1 = 0 + call LIS_tick(timenow,doy1,gmt1,yr1,mo1,da1,hr1,mn1,ss1,ts1) + + if (LIS_rc%ts.gt.3600.0) then + write(LIS_logunit,*) & + '[ERR] The model timestep is > forcing data timestep' + write(LIS_logunit,*) & + '[ERR] LIS does not support this mode currently' + write(LIS_logunit,*) '[ERR] Program stopping ...' + call LIS_endrun() + endif + + if (mod(nint(LIS_rc%ts),3600).eq.0) then + if (timenow.ge.geosit_struc(n)%geosittime2) then + yr1 = LIS_rc%yr + mo1 = LIS_rc%mo + da1 = LIS_rc%da + hr1 = LIS_rc%hr + mn1 = 0 + ss1 = 0 + ts1 = -60*60 + call LIS_tick(time1,doy1,gmt1,yr1,mo1,da1,hr1,mn1,ss1,ts1) + + yr2 = LIS_rc%yr !next hour + mo2 = LIS_rc%mo + da2 = LIS_rc%da + hr2 = LIS_rc%hr + mn2 = 0 + ss2 = 0 + ts2 = 0 + call LIS_tick(time2,doy2,gmt2,yr2,mo2,da2,hr2,mn2,ss2,ts2) + endif + else + if (timenow.ge.geosit_struc(n)%geosittime2) then + yr1 = LIS_rc%yr + mo1 = LIS_rc%mo + da1 = LIS_rc%da + hr1 = LIS_rc%hr + mn1 = 0 + ss1 = 0 + ts1 = 0 + call LIS_tick(time1,doy1,gmt1,yr1,mo1,da1,hr1,mn1,ss1,ts1) + geosit_struc(n)%findtime1 = 1 + + yr2 = LIS_rc%yr !next hour + mo2 = LIS_rc%mo + da2 = LIS_rc%da + hr2 = LIS_rc%hr + mn2 = 0 + ss2 = 0 + ts2 = 60*60 + call LIS_tick(time2,doy2,gmt2,yr2,mo2,da2,hr2,mn2,ss2,ts2) + geosit_struc(n)%geosittime2 = time2 + endif + endif + +! Beginning of the run + if ((LIS_rc%tscount(n).eq.1).or.(LIS_rc%rstflag(n).eq.1)) then + geosit_struc(n)%findtime1 = 1 + geosit_struc(n)%geosittime2 = time2 + LIS_rc%rstflag(n) = 0 + endif + +! Read GEOS-IT - Bookend 1 files: + if (geosit_struc(n)%findtime1.eq.1) then + order = 1 + do kk = geosit_struc(n)%st_iterid,geosit_struc(n)%en_iterid + call geositfiles(n,kk,findex,geosit_struc(n)%geositdir, & + doy1,yr1,mo1,da1,hr1, & + slvname,flxname,lfoname,radname) + call read_geosit(n,order,mo1,findex, & + slvname,flxname,lfoname,radname, & + geosit_struc(n)%geositforc1(kk,:,:),ferror) + enddo + geosit_struc(n)%geosittime1 = time1 + endif + +! Assign GEOS-IT forcing fields to two LIS time-interp placeholders: + do r = 1,LIS_rc%lnr(n) + do c = 1,LIS_rc%lnc(n) + if (LIS_domain(n)%gindex(c,r).ne.-1) then + geosit_struc(n)%metdata1(:,:,LIS_domain(n)%gindex(c,r)) = & + geosit_struc(n)%geositforc1(:,:,(c+(r-1)*LIS_rc%lnc(n))) + geosit_struc(n)%metdata2(:,:,LIS_domain(n)%gindex(c,r)) = & + geosit_struc(n)%geositforc2(:,:,(c+(r-1)*LIS_rc%lnc(n))) + endif + enddo + enddo + + end subroutine get_geosit + +!BOP +! !ROUTINE: geositfiles +! \label{geositfiles} +! +! !INTERFACE: + subroutine geositfiles(n,kk,findex,geositdir,doy,yr,mo,da,hr, & + slvname,flxname,lfoname,radname) + +! !USES: + use LIS_coreMod + use LIS_logMod + use LIS_timeMgrMod + + implicit none +! !ARGUMENTS: + integer :: n + integer :: kk + integer :: findex + character(len=*), intent(in) :: geositdir + integer, intent(in) :: doy,yr,mo,da,hr + character(len=*), intent(out) :: slvname + character(len=*), intent(out) :: flxname + character(len=*), intent(out) :: lfoname + character(len=*), intent(out) :: radname + +! !DESCRIPTION: +! This subroutine puts together GEOS-IT file names for +! hourly netCDF files. +! +! The arguments are: +! \begin{description} +! \item[geositdir] +! Name of the GEOS-IT directory +! \item[doy] +! day of year +! \item[yr] +! year +! \item[mo] +! month +! \item[da] +! day of month +! \item[hr] +! hour +! \item[slvname] +! name of the timestamped single level file +! \item[flxname] +! name of the timestamped flux file +! \item[lfoname] +! name of the timestamped land surface forcings file +! \item[radname] +! name of the timestamped radiation forcings file +! \end{description} +! +!EOP + + character*4 :: cyear + character*2 :: cyr,cmo,cdy,chr + character*16 :: prefix + character*31 :: slv_spec,flx_spec,lfo_spec,rad_spec + + write(unit=cyear,fmt='(i4.4)') yr + write(unit=cmo, fmt='(i2.2)') mo + write(unit=chr, fmt='(i2.2)') hr + write(unit=cdy, fmt='(i2.2)') da + + prefix = 'd5294_geosit_jan' + if (yr.lt.1998) then + write(LIS_logunit,*) '[ERR] GEOS-IT data starts 1 Jan 1998.' + call LIS_endrun() + else + cyr = '98' + endif + if (yr.ge.2008) then + cyr = '08' + endif + if (yr.ge.2018) then + cyr = '18' + endif + + slv_spec = '.slv_tavg_1hr_glo_L576x361_slv.' + flx_spec = '.flx_tavg_1hr_glo_L576x361_slv.' + lfo_spec = '.lfo_tavg_1hr_glo_L576x361_slv.' + rad_spec = '.rad_tavg_1hr_glo_L576x361_slv.' + +! Single level fields: + slvname = trim(geositdir)//'/'//prefix//cyr//'/diag/Y'//cyear// & + '/M'//cmo//'/'//prefix//cyr//slv_spec//cyear//'-'// & + cmo//'-'//cdy//'T'//chr//'30Z.nc4' + +! Flux fields: + flxname = trim(geositdir)//'/'//prefix//cyr//'/diag/Y'//cyear// & + '/M'//cmo//'/'//prefix//cyr//flx_spec//cyear//'-'// & + cmo//'-'//cdy//'T'//chr//'30Z.nc4' + +! Land surface forcing level: + lfoname = trim(geositdir)//'/'//prefix//cyr//'/diag/Y'//cyear// & + '/M'//cmo//'/'//prefix//cyr//lfo_spec//cyear//'-'// & + cmo//'-'//cdy//'T'//chr//'30Z.nc4' + +! Radiation fields: + radname = trim(geositdir)//'/'//prefix//cyr//'/diag/Y'//cyear// & + '/M'//cmo//'/'//prefix//cyr//rad_spec//cyear//'-'// & + cmo//'-'//cdy//'T'//chr//'30Z.nc4' + + end subroutine geositfiles + diff --git a/lis/metforcing/geos_it/read_geosit.F90 b/lis/metforcing/geos_it/read_geosit.F90 new file mode 100644 index 000000000..2901d76c1 --- /dev/null +++ b/lis/metforcing/geos_it/read_geosit.F90 @@ -0,0 +1,487 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: read_geosit +! \label{read_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine read_geosit(n,order,month,findex, & + slvname,flxname,lfoname,radname, & + geositforc,ferror) +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_domain, LIS_masterproc + use LIS_logMod + use LIS_FORC_AttributesMod + use LIS_metforcingMod, only : LIS_forc + use geosit_forcingMod, only : geosit_struc +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: order + integer, intent(in) :: month + integer, intent(in) :: findex + character(len=*), intent(in) :: slvname + character(len=*), intent(in) :: flxname + character(len=*), intent(in) :: lfoname + character(len=*), intent(in) :: radname + real, intent(inout) :: geositforc(geosit_struc(n)%nvars,& + LIS_rc%lnc(n)*LIS_rc%lnr(n)) + integer, intent(out) :: ferror + +! !DESCRIPTION: +! For the given time, reads parameters from GEOS-IT data, transforms +! into 9 LIS forcing parameters and interpolates to the LIS domain. \newline +! +! GEOS-IT FORCING VARIABLES: \newline +! 1. tair Temperature of air at 2-m, 10-m, or LML [$K$] \newline +! 2. qair Specific humidity of air at 2-m, 10-m, or LML [$kg/kg$] \newline +! 3. swgdn Downward shortwave radiation at the ground [$W/m^2$] \newline +! 4. lwgab Downward longwave radiation at the ground [$W/m^2$] \newline +! 5. uwind Zonal wind at 2-m, 10-m, or LML [$m/s$] \newline +! 6. vwind Meridional wind at 2-m, 10-m, or LML [$m/s$] \newline +! 7. ps Instantaneous Surface Pressure [$Pa$] \newline +! 8. pretot Total precipitation [$mm/s$] \newline +! 9. precon Convective precipitation [$mm/s$] \newline +! 10. presno Precipitation falling as snow [$mm/s$] \newline +! 11. swland Net shortwave radiation at the ground [$W/m^2$] \newline +! 12. pardr Surface downward PAR beam flux [$W/m^2$] \newline +! 13. pardf Surface downward PAR diffuse flux [$W/m^2$] \newline +! 14. hlml Height of center of lowest model layer (LML) [$m$] \newline +! +! The arguments are: +! \begin{description} +! \item[order] +! flag indicating which data to be read (order=1, read the previous +! 1 hourly instance, order=2, read the next 1 hourly instance) +! \item[n] +! index of the nest +! \item[name] +! name of the 1 hour GEOS-IT analysis file +! \item[tscount] +! time step count +! \item[ferror] +! return error code (0 indicates success) +! \end{description} +! +! The routines invoked are: +! \begin{description} +! \item[bilinear\_interp](\ref{bilinear_interp}) \newline +! spatially interpolate the forcing data using bilinear interpolation +! \item[conserv\_interp](\ref{conserv_interp}) \newline +! spatially interpolate the forcing data using conservative interpolation +! \end{description} +!EOP + + integer :: ftn_slv,ftn_flx,ftn_lfo,ftn_rad + integer :: tmpId,qId,uId,vId,psId + integer :: prectotId,precconId,swgdnId,lwgabId + integer :: precsnoId,hlmlID + integer :: swlandId,pardrId,pardfId + integer :: nr_index,nc_index + logical :: file_exists,file_exists1 + integer :: c,r,t,k,iret + integer :: mo + logical :: read_lnd + + real :: tair(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: qair(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: uwind(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: vwind(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: ps(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: prectot(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: precsno(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: preccon(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: swgdn(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: lwgab(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: swland(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: pardr(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: pardf(geosit_struc(n)%ncold,geosit_struc(n)%nrold) + real :: hlml(geosit_struc(n)%ncold,geosit_struc(n)%nrold) +! __________________________________________________________________________ + +#if (defined USE_NETCDF3) + write(LIS_logunit,*) "[ERR] GEOS-IT reader requires NetCDF4" + call LIS_endrun() +#endif + +#if (defined USE_NETCDF4) + ferror = 0 + nr_index = geosit_struc(n)%nrold + nc_index = geosit_struc(n)%ncold + mo = LIS_rc%lnc(n)*LIS_rc%lnr(n) + +! Read single layer file (*slv) fields: + inquire(file=slvname,exist=file_exists) + if (file_exists) then + write(LIS_logunit,*) & + '[INFO] Reading GEOS-IT file: ',trim(slvname) + call LIS_verify(nf90_open(path=trim(slvname), & + mode=NF90_NOWRITE,ncid=ftn_slv), & + 'nf90_open failed for slvfile in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_slv,'PS',psId), & + 'nf90_inq_varid failed for ps in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,psId,ps), & + 'nf90_get_var failed for ps in read_geosit') + +! If using the GEOS-IT lowest model level forcing (*flx): + if (geosit_struc(n)%uselml.eq.1) then + inquire(file=flxname,exist=file_exists1) + if (.not.file_exists1) then + write(LIS_logunit,*) & + '[ERR] ',trim(flxname)//' does not exist' + call LIS_endrun() + endif + + write(LIS_logunit,*) & + '[INFO] Reading GEOS-IT file: ',trim(flxname) + write(LIS_logunit,*) ' (for lowest model level fields)' + call LIS_verify(nf90_open(path=trim(flxname), & + mode=NF90_NOWRITE,ncid=ftn_flx), & + 'nf90_open failed for flxfile in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_flx,'TLML',tmpId), & + 'nf90_inq_varid failed for tlml in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,tmpId,tair), & + 'nf90_get_var failed for tlml in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_flx,'QLML',qId), & + 'nf90_inq_varid failed for qlml in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,qId,qair), & + 'nf90_get_var failed for qlml in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_flx,'ULML',uId), & + 'nf90_inq_varid failed for ulml in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,uId,uwind), & + 'nf90_get_var failed for ulml in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_flx,'VLML',vId), & + 'nf90_inq_varid failed for vlml in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,vId,vwind), & + 'nf90_get_var failed for vlml in read_geosit') + + call LIS_verify(nf90_close(ftn_flx), & + '[WARN] Failed to close flxfile in read_geosit.') + +! Else use the single-layer fields (e.g., 2-m ref. height): + else + call LIS_verify(nf90_inq_varid(ftn_slv,'T2M',tmpId), & + 'nf90_inq_varid failed for t2m in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,tmpId,tair), & + 'nf90_get_var failed for t2m in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_slv,'QV2M',qId), & + 'nf90_inq_varid failed for qv2m in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,qId,qair), & + 'nf90_get_var failed for qv2m in read_geosit') + +! Use either 2-m winds or 10-m winds: + if (geosit_struc(n)%use2mwind.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_slv,'U2M',uId), & + 'nf90_inq_varid failed for u2m in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,uId,uwind), & + 'nf90_get_var failed for u2m in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_slv,'V2M',vId), & + 'nf90_inq_varid failed for v2m in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,vId,vwind), & + 'nf90_get_var failed for v2m in read_geosit') + else + call LIS_verify(nf90_inq_varid(ftn_slv,'U10M',uId), & + 'nf90_inq_varid failed for u10m in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,uId,uwind), & + 'nf90_get_var failed for u10m in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_slv,'V10M',vId), & + 'nf90_inq_varid failed for v10m in read_geosit') + call LIS_verify(nf90_get_var(ftn_slv,vId,vwind), & + 'nf90_get_var failed for v10m in read_geosit') + endif + endif + + call LIS_verify(nf90_close(ftn_slv), & + '[WARN] Failed to close slvfile in read_geosit.') + + call interp_geosit_var(n,findex,month,tair, 1,.false.,geositforc) + call interp_geosit_var(n,findex,month,qair, 2,.false.,geositforc) + call interp_geosit_var(n,findex,month,uwind, 5,.false.,geositforc) + call interp_geosit_var(n,findex,month,vwind, 6,.false.,geositforc) + call interp_geosit_var(n,findex,month,ps, 7,.false.,geositforc) + else + write(LIS_logunit,*) '[ERR] ',trim(slvname)//' does not exist' + call LIS_endrun() + endif + +! Read in the flux file fields (*flx): + inquire(file=flxname,exist=file_exists) + if (file_exists) then + write(LIS_logunit,*) & + '[INFO] Reading GEOS-IT file: ',trim(flxname) + call LIS_verify(nf90_open(path=trim(flxname), & + mode=NF90_NOWRITE,ncid=ftn_flx), & + 'nf90_open failed for flxfile in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_flx,'PRECTOT',prectotId), & + 'nf90_inq_varid failed for prectot in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,prectotId,prectot), & + 'nf90_get_var failed for prectot in read_geosit') + + call interp_geosit_var(n,findex,month,prectot,8,.true.,geositforc) + +! Read in the convective precipitation, if selected in the forcing table: + if (LIS_FORC_CRainf%selectOpt.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_flx,'PRECCON',precconId),& + 'nf90_inq_varid failed for preccon in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,precconId,preccon), & + 'nf90_get_var failed for preccon in read_geosit') + + call interp_geosit_var(n,findex,month,preccon,9,.true.,geositforc) + endif + +! Read in the snowfall field, if selected in the forcing input table: + if (LIS_FORC_Snowf%selectOpt.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_flx,'PRECSNO',precsnoId),& + 'nf90_inq_varid failed for precsno in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,precsnoId,precsno), & + 'nf90_get_var failed for precsno in read_geosit') + + call interp_geosit_var(n,findex,month,precsno,10,.true.,geositforc) + endif + +! Read in Forcing Height, if selected in the forcing input table: + if (LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_flx,'HLML',hlmlId), & + 'nf90_inq_varid failed for hlml in read_geosit') + call LIS_verify(nf90_get_var(ftn_flx,hlmlId,hlml), & + 'nf90_get_var failed for hlml in read_geosit') + + call interp_geosit_var(n,findex,month,hlml,14,.false.,geositforc) + endif + + call LIS_verify(nf90_close(ftn_flx), & + '[WARN] Failed to close flxfile in read_geosit.') + + else + write(LIS_logunit,*) '[ERR] ',trim(flxname)//' does not exist' + call LIS_endrun() + endif + +! Read in the radiation file fields (*rad): + inquire(file=radname,exist=file_exists) + if (file_exists) then + write(LIS_logunit,*) & + '[INFO] Reading GEOS-IT file: ',trim(radname) + call LIS_verify(nf90_open(path=trim(radname), & + mode=NF90_NOWRITE,ncid=ftn_rad), & + 'nf90_open failed for radfile in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_rad,'SWGDN',swgdnId), & + 'nf90_inq_varid failed for swgdn in read_geosit') + call LIS_verify(nf90_get_var(ftn_rad,swgdnId,swgdn), & + 'nf90_get_var failed for swgdn in read_geosit') + + call LIS_verify(nf90_inq_varid(ftn_rad,'LWGAB',lwgabId), & + 'nf90_inq_varid failed for lwgab in read_geosit') + call LIS_verify(nf90_get_var(ftn_rad,lwgabId,lwgab), & + 'nf90_get_var failed for lwgab in read_geosit') + + call interp_geosit_var(n,findex,month,swgdn,3,.false.,geositforc) + call interp_geosit_var(n,findex,month,lwgab,4,.false.,geositforc) + + call LIS_verify(nf90_close(ftn_rad), & + '[WARN] Failed to close radfile in read_geosit.') + else + write(LIS_logunit,*) '[ERR] ',trim(radname)//' does not exist' + call LIS_endrun() + endif + +! Checks: For reading in the surface layer file fields (*lfo): + read_lnd = .false. + if ((LIS_FORC_Pardr%selectOpt.eq.1).or. & + (LIS_FORC_Pardf%selectOpt.eq.1).or. & + (LIS_FORC_SWnet%selectOpt.eq.1)) then + read_lnd = .true. + endif + +! Read in the surface layer fields (*lfo): + if (read_lnd) then + inquire(file=lfoname,exist=file_exists) + if (file_exists) then + write(LIS_logunit,*) & + '[INFO] Reading GEOS-IT file: ',trim(radname) + call LIS_verify(nf90_open(path=trim(radname), & + mode=NF90_NOWRITE,ncid=ftn_rad), & + 'nf90_open failed for radfile in read_geosit') + + if (LIS_FORC_SWnet%selectOpt.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_lfo,'SWLAND',swlandId),& + 'nf90_inq_varid failed for swland in read_geosit') + call LIS_verify(nf90_get_var(ftn_lfo,swlandId,swland), & + 'nf90_get_var failed for swland in read_geosit') + + call interp_geosit_var(n,findex,month,swland,11,.false.,geositforc) + endif + + if (LIS_FORC_Pardr%selectOpt.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_lfo,'PARDR',pardrId),& + 'nf90_inq_varid failed for pardr in read_geosit') + call LIS_verify(nf90_get_var(ftn_lfo,pardrId,pardr), & + 'nf90_get_var failed for pardr in read_geosit') + + call interp_geosit_var(n,findex,month,pardr,12,.false.,geositforc) + endif + + if (LIS_FORC_Pardf%selectOpt.eq.1) then + call LIS_verify(nf90_inq_varid(ftn_lfo,'PARDF',pardfId),& + 'nf90_inq_varid failed for pardf in read_geosit') + call LIS_verify(nf90_get_var(ftn_lfo,pardfId,pardf), & + 'nf90_get_var failed for pardf in read_geosit') + + call interp_geosit_var(n,findex,month,pardf,13,.false.,geositforc) + endif + + call LIS_verify(nf90_close(ftn_lfo), & + '[WARN] Failed to close lfofile in read_geosit.') + + else + write(LIS_logunit,*) '[ERR] ',trim(lfoname)// & + ' does not exist' + call LIS_endrun() + endif + endif +#endif + + end subroutine read_geosit + +!BOP +! +! !ROUTINE: interp_geosit_var +! \label{interp_geosit_var} +! +! !INTERFACE: + subroutine interp_geosit_var(n,findex,month,input_var,var_index, & + pcp_flag,geositforc) + +! !USES: + use LIS_coreMod + use LIS_logMod + use LIS_spatialDownscalingMod + use geosit_forcingMod, only : geosit_struc +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex + integer, intent(in) :: month + real, intent(in) :: input_var(geosit_struc(n)%ncold, & + geosit_struc(n)%nrold) + integer, intent(in) :: var_index + logical, intent(in) :: pcp_flag + real, intent(inout) :: geositforc(geosit_struc(n)%nvars, & + LIS_rc%lnc(n)*LIS_rc%lnr(n)) + +! !DESCRIPTION: +! This subroutine spatially interpolates a GEOS-IT field +! to the LIS running domain +! +!EOP + integer :: t,c,r,k,iret + integer :: doy + integer :: ftn + integer :: pcp1Id,pcp2Id,pcp3Id,pcp4Id,pcp5Id,pcp6Id + real :: f (geosit_struc(n)%ncold*geosit_struc(n)%nrold) + logical*1 :: lb(geosit_struc(n)%ncold*geosit_struc(n)%nrold) + logical*1 :: lo(LIS_rc%lnc(n)*LIS_rc%lnr(n)) + integer :: input_size + logical :: scal_read_flag +! _____________________________________________________________ + + input_size = geosit_struc(n)%ncold*geosit_struc(n)%nrold + +!----------------------------------------------------------------------- +! Apply downscaling +!----------------------------------------------------------------------- + lb = .true. + do r = 1,geosit_struc(n)%nrold + do c = 1,geosit_struc(n)%ncold + k = c+(r-1)*geosit_struc(n)%ncold + f(k) = input_var(c,r) + if (f(k).eq.1.e+15) then + f(k) = LIS_rc%udef + lb(k) = .false. + endif + enddo + enddo + + if (pcp_flag.and.(LIS_rc%pcp_downscale(findex).ne.0)) then +! input_data becomes the ratio field. + call LIS_generatePcpClimoRatioField(n,findex,"GEOS-IT", & + month,input_size,f,lb) + endif + + if (pcp_flag.and. & + (trim(LIS_rc%met_interp(findex)).eq."budget-bilinear")) then + + call conserv_interp(LIS_rc%gridDesc(n,:),lb,f,lo, & + geositforc(var_index,:), & + geosit_struc(n)%mi,LIS_rc%lnc(n)*LIS_rc%lnr(n), & + LIS_domain(n)%lat,LIS_domain(n)%lon, & + geosit_struc(n)%w112,geosit_struc(n)%w122, & + geosit_struc(n)%w212,geosit_struc(n)%w222, & + geosit_struc(n)%n112,geosit_struc(n)%n122, & + geosit_struc(n)%n212,geosit_struc(n)%n222, & + LIS_rc%udef,iret) + + elseif ((trim(LIS_rc%met_interp(findex)).eq."bilinear").or. & + (trim(LIS_rc%met_interp(findex)).eq."budget-bilinear")) then + call bilinear_interp(LIS_rc%gridDesc(n,:),lb,f,lo, & + geositforc(var_index,:), & + geosit_struc(n)%mi,LIS_rc%lnc(n)*LIS_rc%lnr(n), & + LIS_domain(n)%lat,LIS_domain(n)%lon, & + geosit_struc(n)%w111,geosit_struc(n)%w121, & + geosit_struc(n)%w211,geosit_struc(n)%w221, & + geosit_struc(n)%n111,geosit_struc(n)%n121, & + geosit_struc(n)%n211,geosit_struc(n)%n221, & + LIS_rc%udef,iret) + + elseif (trim(LIS_rc%met_interp(findex)).eq."neighbor") then + call neighbor_interp(LIS_rc%gridDesc(n,:),lb,f,lo, & + geositforc(var_index,:), & + geosit_struc(n)%mi,LIS_rc%lnc(n)*LIS_rc%lnr(n), & + LIS_domain(n)%lat,LIS_domain(n)%lon, & + geosit_struc(n)%n113,LIS_rc%udef,iret) + + else + write(LIS_logunit,*) '[ERR] Spatial interpolation option '// & + trim(LIS_rc%met_interp(findex))// & + ' not supported for GEOS-IT.' + call LIS_endrun() + endif + + if (pcp_flag.and.(LIS_rc%pcp_downscale(findex).ne.0)) then + call LIS_pcpClimoDownscaling(n,findex,month, & + LIS_rc%lnc(n)*LIS_rc%lnr(n),geositforc(var_index,:),lo) + endif + + end subroutine interp_geosit_var + diff --git a/lis/metforcing/geos_it/read_geosit_elev.F90 b/lis/metforcing/geos_it/read_geosit_elev.F90 new file mode 100644 index 000000000..032d2a680 --- /dev/null +++ b/lis/metforcing/geos_it/read_geosit_elev.F90 @@ -0,0 +1,78 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: read_geosit_elev +! \label{read_geosit_elev} +! +! !REVISION HISTORY: +! +! 22 Sep 2016: James Geiger; Initial Specification +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine read_geosit_elev(n,findex) +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_domain + use LIS_metforcingMod, only : LIS_forc + use LIS_fileIOMod, only : LIS_read_param + use LIS_logMod, only : LIS_logunit + + implicit none + +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex + +! !DESCRIPTION: +! +! Opens and reads MERRA-2 model elevation to the LIS grid. +! The MERRA-2 elevation is the same as the GEOS-IT elevation. +! The data will be used to perform any topographical adjustments +! to the forcing. +! +! The elevation file needs to be preprocessed to fit the running +! resolution and domain. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[findex] +! index of the forcing source +! \end{description} +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_readData](\ref{LIS_readData}) \newline +! Abstract method to read the elevation of the forcing +! data in the same map projection used in LIS. +! \end{description} +!EOP + + integer :: c,r + real :: go(LIS_rc%lnc(n),LIS_rc%lnr(n)) + + if (trim(LIS_rc%met_ecor(findex)).ne."none") then + write(LIS_logunit,*) & + 'Reading the GEOS-IT/MERRA-2 elevation map ...' + + call LIS_read_param(n,"ELEV_MERRA2",go) + + do r = 1,LIS_rc%lnr(n) + do c = 1,LIS_rc%lnc(n) + if (LIS_domain(n)%gindex(c,r).ne.-1) then + LIS_forc(n,findex)%modelelev(LIS_domain(n)%gindex(c,r)) = go(c,r) + endif + enddo + enddo + endif + + end subroutine read_geosit_elev + diff --git a/lis/metforcing/geos_it/readcrd_geosit.F90 b/lis/metforcing/geos_it/readcrd_geosit.F90 new file mode 100644 index 000000000..9a2cd790a --- /dev/null +++ b/lis/metforcing/geos_it/readcrd_geosit.F90 @@ -0,0 +1,77 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: readcrd_geosit +! \label{readcrd_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine readcrd_geosit() +! !USES: + use ESMF + use LIS_logMod + use LIS_coreMod, only : LIS_rc,LIS_config + use geosit_forcingMod, only : geosit_struc +! +! !DESCRIPTION: +! +! This routine reads the options specific to GEOS-IT forcing +! from the LIS configuration file. +! +!EOP + implicit none + + integer :: n,t,rc,m + + call ESMF_ConfigFindLabel(LIS_config, & + "GEOS-IT forcing directory:",rc=rc) + do n = 1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + geosit_struc(n)%geositdir,rc=rc) + call LIS_verify(rc,'GEOS-IT forcing directory: not defined') + enddo + + call ESMF_ConfigFindLabel(LIS_config, & + "GEOS-IT use lowest model level forcing:",rc=rc) + do n = 1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + geosit_struc(n)%uselml,rc=rc) + call LIS_verify(rc, & + 'GEOS-IT use lowest model level forcing: not defined') + enddo + + do m = 1, LIS_rc%nnest + if (geosit_struc(m)%uselml.eq.0) then + call ESMF_ConfigFindLabel(LIS_config, & + "GEOS-IT use 2m wind fields:",rc=rc) + do n = 1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + geosit_struc(n)%use2mwind,rc=rc) + call LIS_verify(rc, & + 'GEOS-IT use 2m wind fields: not defined') + enddo + endif + enddo + + do n = 1,LIS_rc%nnest + write(LIS_logunit,*) '[INFO] Using GEOS-IT forcing' + write(LIS_logunit,*) '[INFO] GEOS-IT forcing directory: ', & + trim(geosit_struc(n)%geositdir) + + geosit_struc(n)%geosittime1 = 3000.0 + geosit_struc(n)%geosittime2 = 0.0 + enddo + + end subroutine readcrd_geosit + diff --git a/lis/metforcing/geos_it/reset_geosit.F90 b/lis/metforcing/geos_it/reset_geosit.F90 new file mode 100644 index 000000000..0dd025d37 --- /dev/null +++ b/lis/metforcing/geos_it/reset_geosit.F90 @@ -0,0 +1,43 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !MODULE: reset_geosit +! \label{reset_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine reset_geosit +! !USES: + use LIS_coreMod, only : LIS_rc + use LIS_timeMgrMod, only : LIS_date2time + use geosit_forcingMod +! +! !DESCRIPTION: +! Routine to cleanup allocated structures for GEOS-IT forcing. +! +!EOP + implicit none + + integer :: n + + do n = 1,LIS_rc%nnest + geosit_struc(n)%startFlag = .true. + geosit_struc(n)%dayFlag = .true. + geosit_struc(n)%geosittime1 = 3000.0 + geosit_struc(n)%geosittime2 = 0.0 + geosit_struc(n)%ringtime = 0.0 + geosit_struc(n)%reset_flag = .true. + enddo + + end subroutine reset_geosit + diff --git a/lis/metforcing/geos_it/timeinterp_geosit.F90 b/lis/metforcing/geos_it/timeinterp_geosit.F90 new file mode 100644 index 000000000..ccffec411 --- /dev/null +++ b/lis/metforcing/geos_it/timeinterp_geosit.F90 @@ -0,0 +1,294 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: timeinterp_geosit +! \label{timeinterp_geosit} +! +! !REVISION HISTORY: +! 18 Mar 2015: James Geiger, initial code (based on merra-land) +! 20 Apr 2023: David Mocko, initial code (based on merra2) +! +! !INTERFACE: + subroutine timeinterp_geosit(n,findex) + +! !USES: + use ESMF + use LIS_FORC_AttributesMod + use LIS_coreMod, only : LIS_rc,LIS_domain,LIS_localPet + use LIS_metforcingMod, only : LIS_forc,LIS_FORC_Base_State + use LIS_constantsMod, only : LIS_CONST_SOLAR + use LIS_timeMgrMod, only : LIS_tick + use LIS_logMod, only : LIS_logunit,LIS_verify,LIS_endrun + use geosit_forcingMod, only : geosit_struc + use LIS_forecastMod, only : LIS_get_iteration_index + use LIS_ran2_gasdev + + implicit none + +! !ARGUMENTS: + integer, intent(in):: n + integer, intent(in):: findex +! +! !DESCRIPTION: +! Temporally interpolates the forcing data to the current model +! timestep. Because all variables are a 1-hourly time average, +! no interpolation in time is actually performed. The identical +! data is used for all timesteps within the hourly input file. +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_time2date](\ref{LIS_time2date}) \newline +! converts the time to a date format +! \item[zterp](\ref{zterp}) \newline +! zenith-angle based interpolation +! \end{description} +!EOP + integer :: t,zdoy,k,kk + integer :: index1 + integer :: bdoy,byr,bmo + integer :: bda,bhr,bmn + integer :: bss + real*8 :: btime + real :: wt1,wt2,czb,cze,czm,gmt1,gmt2 + real :: zw1,zw2,bts + integer :: status + integer :: mfactor,m + type(ESMF_Field) :: tairField,qairField,swgdnField,lwgabField + type(ESMF_Field) :: uwindField,vwindField,psField + type(ESMF_Field) :: prectotField,precconField,precsnoField + type(ESMF_Field) :: swlandField,pardrField,pardfField,hlmlField + real,pointer :: tair(:),qair(:),swgdn(:),lwgab(:) + real,pointer :: uwind(:),vwind(:),ps(:) + real,pointer :: prectot(:),preccon(:),precsno(:) + real,pointer :: swland(:),pardr(:),pardf(:),hlml(:) + + btime = geosit_struc(n)%geosittime1 + byr = LIS_rc%yr + bmo = LIS_rc%mo + bda = LIS_rc%da + bhr = LIS_rc%hr + bmn = 30 + bss = 0 + if (LIS_rc%mn.lt.30) then + bts = -(60*60) + else + bts = 0 + endif + call LIS_tick(btime,bdoy,gmt1,byr,bmo,bda,bhr,bmn,bss,bts) + + btime = geosit_struc(n)%geosittime2 + byr = LIS_rc%yr !next hour + bmo = LIS_rc%mo + bda = LIS_rc%da + bhr = LIS_rc%hr + bmn = 30 + bss = 0 + if (LIS_rc%mn.lt.30) then + bts = 0 + else + bts = 60*60 + endif + call LIS_tick(btime,bdoy,gmt2,byr,bmo,bda,bhr,bmn,bss,bts) + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Tair%varname(1),tairField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Tair in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Qair%varname(1),QairField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Qair in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_SWdown%varname(1),swgdnField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable SWdown in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_LWdown%varname(1),lwgabField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable LWdown in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Wind_E%varname(1),uwindField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Wind_E in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Wind_N%varname(1),vwindField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Wind_N in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Psurf%varname(1),psField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Psurf in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Rainf%varname(1),prectotField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Rainf in the forcing variables list') + + if (LIS_FORC_CRainf%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_CRainf%varname(1),precconField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable CRainf in the forcing variables list') + endif + + if (LIS_FORC_Snowf%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Snowf%varname(1),precsnoField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Snowf in the forcing variables list') + endif + + if (LIS_FORC_Swnet%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Swnet%varname(1),swlandField,& + rc=status) + call LIS_verify(status, & + 'Error: Enable SWnet in the forcing variables list') + endif + + if (LIS_FORC_Pardr%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Pardr%varname(1),pardrField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable PARDR in the forcing variables list') + endif + + if (LIS_FORC_Pardf%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Pardf%varname(1),pardfField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable PARDF in the forcing variables list') + endif + + if (LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Forc_Hgt%varname(1),hlmlField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Forc_Hgt in the forcing variables list') + endif + + call ESMF_FieldGet(tairField,localDE=0,farrayPtr=tair,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(qairField,localDE=0,farrayPtr=qair,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(swgdnField,localDE=0,farrayPtr=swgdn,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(lwgabField,localDE=0,farrayPtr=lwgab,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(uwindField,localDE=0,farrayPtr=uwind,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(vwindField,localDE=0,farrayPtr=vwind,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(psField,localDE=0,farrayPtr=ps,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(prectotField,localDE=0,farrayPtr=prectot,rc=status) + call LIS_verify(status) + + if (LIS_FORC_CRainf%selectOpt.eq.1) then + call ESMF_FieldGet(precconField,localDE=0,farrayPtr=preccon,rc=status) + call LIS_verify(status) + endif + + if (LIS_FORC_Snowf%selectOpt.eq.1) then + call ESMF_FieldGet(precsnoField,localDE=0,farrayPtr=precsno,rc=status) + call LIS_verify(status) + endif + + if (LIS_FORC_Swnet%selectOpt.eq.1) then + call ESMF_FieldGet(swlandField,localDE=0,farrayPtr=swland,rc=status) + call LIS_verify(status) + endif + + if (LIS_FORC_Pardr%selectOpt.eq.1) then + call ESMF_FieldGet(pardrField,localDE=0,farrayPtr=pardr,rc=status) + call LIS_verify(status) + endif + + if (LIS_FORC_Pardf%selectOpt.eq.1) then + call ESMF_FieldGet(pardfField,localDE=0,farrayPtr=pardf,rc=status) + call LIS_verify(status) + endif + + if (LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + call ESMF_FieldGet(hlmlField,localDE=0,farrayPtr=hlml,rc=status) + call LIS_verify(status) + endif + + mfactor = LIS_rc%nensem(n)/geosit_struc(n)%nIter + + do k = 1,LIS_rc%ntiles(n)/mfactor + do m = 1,mfactor + t = m + (k-1)*mfactor + index1 = LIS_domain(n)%tile(t)%index + kk = LIS_get_iteration_index(n,k,index1,mfactor) + + tair(t) = geosit_struc(n)%metdata1(kk,1,index1) + qair(t) = geosit_struc(n)%metdata1(kk,2,index1) + swgdn(t) = geosit_struc(n)%metdata1(kk,3,index1) + if (swgdn(t).gt.LIS_CONST_SOLAR) then + swgdn(t) = LIS_CONST_SOLAR + endif + lwgab(t) = geosit_struc(n)%metdata1(kk,4,index1) + uwind(t) = geosit_struc(n)%metdata1(kk,5,index1) + vwind(t) = geosit_struc(n)%metdata1(kk,6,index1) + ps(t) = geosit_struc(n)%metdata1(kk,7,index1) + prectot(t) = geosit_struc(n)%metdata1(kk,8,index1) + if (prectot(t).lt.0.0) then + prectot(t) = 0.0 + endif + if (LIS_FORC_CRainf%selectOpt.eq.1) then + preccon(t) = geosit_struc(n)%metdata1(kk,9,index1) + endif + if (LIS_FORC_Snowf%selectOpt.eq.1) then + precsno(t) = geosit_struc(n)%metdata1(kk,10,index1) + endif + if (LIS_FORC_Swnet%selectOpt.eq.1) then + swland(t) = geosit_struc(n)%metdata1(kk,11,index1) + endif + if (LIS_FORC_Pardr%selectOpt.eq.1) then + pardr(t) = geosit_struc(n)%metdata1(kk,12,index1) + endif + if (LIS_FORC_Pardf%selectOpt.eq.1) then + pardf(t) = geosit_struc(n)%metdata1(kk,13,index1) + endif + if (LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + hlml(t) = geosit_struc(n)%metdata1(kk,14,index1) + endif + enddo + enddo + + end subroutine timeinterp_geosit + diff --git a/lis/metforcing/gfs/0Intro_gfs.txt b/lis/metforcing/gfs/0Intro_gfs.txt index 77498e9b6..9da706974 100644 --- a/lis/metforcing/gfs/0Intro_gfs.txt +++ b/lis/metforcing/gfs/0Intro_gfs.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/create_gfs_f0backup_filename.F90 b/lis/metforcing/gfs/create_gfs_f0backup_filename.F90 index 37f420574..55adfea55 100644 --- a/lis/metforcing/gfs/create_gfs_f0backup_filename.F90 +++ b/lis/metforcing/gfs/create_gfs_f0backup_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/create_gfsfilename.F90 b/lis/metforcing/gfs/create_gfsfilename.F90 index 710e78263..81e4d22cc 100644 --- a/lis/metforcing/gfs/create_gfsfilename.F90 +++ b/lis/metforcing/gfs/create_gfsfilename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/finalize_gfs.F90 b/lis/metforcing/gfs/finalize_gfs.F90 index 25cc1de77..3a84b34ea 100644 --- a/lis/metforcing/gfs/finalize_gfs.F90 +++ b/lis/metforcing/gfs/finalize_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/get_gfs.F90 b/lis/metforcing/gfs/get_gfs.F90 index 024e5cd08..7dd0c9aba 100644 --- a/lis/metforcing/gfs/get_gfs.F90 +++ b/lis/metforcing/gfs/get_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/gfs_forcingMod.F90 b/lis/metforcing/gfs/gfs_forcingMod.F90 index e864098fc..00cb4736e 100644 --- a/lis/metforcing/gfs/gfs_forcingMod.F90 +++ b/lis/metforcing/gfs/gfs_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/read_gfs.F90 b/lis/metforcing/gfs/read_gfs.F90 index 4adf4cdfa..4de9d1889 100644 --- a/lis/metforcing/gfs/read_gfs.F90 +++ b/lis/metforcing/gfs/read_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/read_gfs_elev.F90 b/lis/metforcing/gfs/read_gfs_elev.F90 index 06cdfa4fa..8a827a815 100644 --- a/lis/metforcing/gfs/read_gfs_elev.F90 +++ b/lis/metforcing/gfs/read_gfs_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/readcrd_gfs.F90 b/lis/metforcing/gfs/readcrd_gfs.F90 index ea640077a..55c41d883 100644 --- a/lis/metforcing/gfs/readcrd_gfs.F90 +++ b/lis/metforcing/gfs/readcrd_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gfs/timeinterp_gfs.F90 b/lis/metforcing/gfs/timeinterp_gfs.F90 index 0bab2ed5a..195454c5f 100644 --- a/lis/metforcing/gfs/timeinterp_gfs.F90 +++ b/lis/metforcing/gfs/timeinterp_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/0Intro_gldas.txt b/lis/metforcing/gldas/0Intro_gldas.txt index 4b3324829..f4cf6ab64 100644 --- a/lis/metforcing/gldas/0Intro_gldas.txt +++ b/lis/metforcing/gldas/0Intro_gldas.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/fillgaps_gldas.F90 b/lis/metforcing/gldas/fillgaps_gldas.F90 index ded212945..a79867198 100644 --- a/lis/metforcing/gldas/fillgaps_gldas.F90 +++ b/lis/metforcing/gldas/fillgaps_gldas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/finalize_gldas.F90 b/lis/metforcing/gldas/finalize_gldas.F90 index 2e5c4d5e3..162ce12e4 100644 --- a/lis/metforcing/gldas/finalize_gldas.F90 +++ b/lis/metforcing/gldas/finalize_gldas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/get_gldas.F90 b/lis/metforcing/gldas/get_gldas.F90 index f1e90d693..e2fc4e6ce 100644 --- a/lis/metforcing/gldas/get_gldas.F90 +++ b/lis/metforcing/gldas/get_gldas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/gldas_forcingMod.F90 b/lis/metforcing/gldas/gldas_forcingMod.F90 index 81fa8feae..6abec86f2 100644 --- a/lis/metforcing/gldas/gldas_forcingMod.F90 +++ b/lis/metforcing/gldas/gldas_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/read_gldas.F90 b/lis/metforcing/gldas/read_gldas.F90 index c1774ce8d..fc810e489 100644 --- a/lis/metforcing/gldas/read_gldas.F90 +++ b/lis/metforcing/gldas/read_gldas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/readcrd_gldas.F90 b/lis/metforcing/gldas/readcrd_gldas.F90 index 1f1c1b03f..fba42e185 100644 --- a/lis/metforcing/gldas/readcrd_gldas.F90 +++ b/lis/metforcing/gldas/readcrd_gldas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gldas/timeinterp_gldas.F90 b/lis/metforcing/gldas/timeinterp_gldas.F90 index 735309442..2c63222e7 100644 --- a/lis/metforcing/gldas/timeinterp_gldas.F90 +++ b/lis/metforcing/gldas/timeinterp_gldas.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/0Intro_gswp1.txt b/lis/metforcing/gswp1/0Intro_gswp1.txt index cc829d1f3..9a2f9c7dd 100644 --- a/lis/metforcing/gswp1/0Intro_gswp1.txt +++ b/lis/metforcing/gswp1/0Intro_gswp1.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/finalize_gswp1.F90 b/lis/metforcing/gswp1/finalize_gswp1.F90 index 1913b02db..dbe6229c9 100644 --- a/lis/metforcing/gswp1/finalize_gswp1.F90 +++ b/lis/metforcing/gswp1/finalize_gswp1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/get_gswp1.F90 b/lis/metforcing/gswp1/get_gswp1.F90 index 3be9355d9..fd837188b 100644 --- a/lis/metforcing/gswp1/get_gswp1.F90 +++ b/lis/metforcing/gswp1/get_gswp1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/gswp1_forcingMod.F90 b/lis/metforcing/gswp1/gswp1_forcingMod.F90 index 5a4eea886..f90667e8a 100644 --- a/lis/metforcing/gswp1/gswp1_forcingMod.F90 +++ b/lis/metforcing/gswp1/gswp1_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/read_gswp1.F90 b/lis/metforcing/gswp1/read_gswp1.F90 index 47cd0c71e..90aa06022 100644 --- a/lis/metforcing/gswp1/read_gswp1.F90 +++ b/lis/metforcing/gswp1/read_gswp1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/readcrd_gswp1.F90 b/lis/metforcing/gswp1/readcrd_gswp1.F90 index 5722d0232..a4c44a093 100644 --- a/lis/metforcing/gswp1/readcrd_gswp1.F90 +++ b/lis/metforcing/gswp1/readcrd_gswp1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp1/timeinterp_gswp1.F90 b/lis/metforcing/gswp1/timeinterp_gswp1.F90 index 4ffef79f5..72840276b 100644 --- a/lis/metforcing/gswp1/timeinterp_gswp1.F90 +++ b/lis/metforcing/gswp1/timeinterp_gswp1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/0Intro_gswp.txt b/lis/metforcing/gswp2/0Intro_gswp.txt index 82a9c606a..4d58c6d18 100644 --- a/lis/metforcing/gswp2/0Intro_gswp.txt +++ b/lis/metforcing/gswp2/0Intro_gswp.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/fillgaps_gswp2.F90 b/lis/metforcing/gswp2/fillgaps_gswp2.F90 index acc18a90a..dc7594c98 100644 --- a/lis/metforcing/gswp2/fillgaps_gswp2.F90 +++ b/lis/metforcing/gswp2/fillgaps_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/finalize_gswp2.F90 b/lis/metforcing/gswp2/finalize_gswp2.F90 index bd255280a..82e2d162f 100644 --- a/lis/metforcing/gswp2/finalize_gswp2.F90 +++ b/lis/metforcing/gswp2/finalize_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/finterp_gswp2.F90 b/lis/metforcing/gswp2/finterp_gswp2.F90 index 4bec50579..f921420dc 100644 --- a/lis/metforcing/gswp2/finterp_gswp2.F90 +++ b/lis/metforcing/gswp2/finterp_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/get_gswp2.F90 b/lis/metforcing/gswp2/get_gswp2.F90 index 3bc586f2b..554c2e3ac 100644 --- a/lis/metforcing/gswp2/get_gswp2.F90 +++ b/lis/metforcing/gswp2/get_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/gswp2_forcingMod.F90 b/lis/metforcing/gswp2/gswp2_forcingMod.F90 index d4c5e9ed4..ff98d5e10 100644 --- a/lis/metforcing/gswp2/gswp2_forcingMod.F90 +++ b/lis/metforcing/gswp2/gswp2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/read_gswp2.F90 b/lis/metforcing/gswp2/read_gswp2.F90 index 00cc274ce..2d407e9f9 100644 --- a/lis/metforcing/gswp2/read_gswp2.F90 +++ b/lis/metforcing/gswp2/read_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/readcrd_gswp2.F90 b/lis/metforcing/gswp2/readcrd_gswp2.F90 index 55d5ced77..28109a399 100644 --- a/lis/metforcing/gswp2/readcrd_gswp2.F90 +++ b/lis/metforcing/gswp2/readcrd_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/gswp2/timeinterp_gswp2.F90 b/lis/metforcing/gswp2/timeinterp_gswp2.F90 index b64eb7f0a..b48582c05 100644 --- a/lis/metforcing/gswp2/timeinterp_gswp2.F90 +++ b/lis/metforcing/gswp2/timeinterp_gswp2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/finalize_imerg.F90 b/lis/metforcing/imerg/finalize_imerg.F90 index bfe6672e9..783054265 100644 --- a/lis/metforcing/imerg/finalize_imerg.F90 +++ b/lis/metforcing/imerg/finalize_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/get_imerg.F90 b/lis/metforcing/imerg/get_imerg.F90 index 941d3930d..3c5d22d45 100644 --- a/lis/metforcing/imerg/get_imerg.F90 +++ b/lis/metforcing/imerg/get_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/imerg_forcingMod.F90 b/lis/metforcing/imerg/imerg_forcingMod.F90 index 3c2f3ad03..cc162db11 100644 --- a/lis/metforcing/imerg/imerg_forcingMod.F90 +++ b/lis/metforcing/imerg/imerg_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/interp_imerg.F90 b/lis/metforcing/imerg/interp_imerg.F90 index e2b09e368..1363516c9 100644 --- a/lis/metforcing/imerg/interp_imerg.F90 +++ b/lis/metforcing/imerg/interp_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/read_imerg.F90 b/lis/metforcing/imerg/read_imerg.F90 index e9290fb07..61e1dd0d4 100644 --- a/lis/metforcing/imerg/read_imerg.F90 +++ b/lis/metforcing/imerg/read_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -15,11 +15,14 @@ ! !REVISION HISTORY: ! 17 Jul 2001: Jon Gottschalck; Initial code ! 09 Mar 2015: Jon Case; Added IMERG precipitation reader +! 07 Aug 2023: Jessica Erlingas; Added support for IMERG V07 +! 16 Aug 2023: Eric Kemp; Improved graceful HDF5 library cleanup if +! error is detected. ! ! !INTERFACE: subroutine read_imerg (n, kk, name_imerg, findex, order, ferror_imerg ) ! !USES: - use LIS_coreMod,only : LIS_rc, LIS_domain, LIS_masterproc + use LIS_coreMod,only : LIS_rc, LIS_domain use LIS_logMod, only : LIS_logunit, LIS_getNextUnitNumber, & LIS_releaseUnitNumber use LIS_metforcingMod,only : LIS_forc @@ -90,16 +93,16 @@ subroutine read_imerg (n, kk, name_imerg, findex, order, ferror_imerg ) ferror_imerg = 1 inquire(file=fname, EXIST=file_exists) if (file_exists) then - if(LIS_masterproc) write(LIS_logunit,*) & + write(LIS_logunit,*) & "[INFO] Reading HDF5 IMERG precipitation data from ", trim(fname) - call read_imerghdf(fname, xd, yd, realprecip, ireaderr) + call read_imerghdf(n, fname, xd, yd, realprecip, ireaderr) if (ireaderr .ne. 0) then - if(LIS_masterproc) write(LIS_logunit,*) & + write(LIS_logunit,*) & "[WARN] Error reading IMERG file ",trim(fname) ferror_imerg = 0 endif else - if(LIS_masterproc) write(LIS_logunit,*) & + write(LIS_logunit,*) & "[WARN] Missing IMERG precipitation data:: ",trim(fname) ferror_imerg = 0 endif @@ -123,8 +126,7 @@ subroutine read_imerg (n, kk, name_imerg, findex, order, ferror_imerg ) endif enddo enddo - if (LIS_masterproc) & - write(LIS_logunit,*) "Obtained IMERG precipitation data from ", trim(fname) + write(LIS_logunit,*) "Obtained IMERG precipitation data from ", trim(fname) endif deallocate (precip_regrid) @@ -133,86 +135,111 @@ end subroutine read_imerg ! J.Case (3/9/2015) -- below will be the HDF5 reader subroutine. -subroutine read_imerghdf(filename, xsize, ysize, precipout, istatus) +subroutine read_imerghdf(n, filename, xsize, ysize, precipout, istatus) ! !USES: #if (defined USE_HDF5) use hdf5 #endif - use LIS_coreMod, only : LIS_rc, LIS_domain, LIS_masterproc + use LIS_coreMod, only : LIS_rc, LIS_domain use LIS_logMod, only : LIS_logunit, LIS_getNextUnitNumber + use imerg_forcingMod, only : imerg_struc implicit none ! ARGUMENTS character(len=*) :: filename integer, intent(in) :: xsize, ysize - - character(len=40) :: dsetname='/Grid/precipitationCal' + character(len=40) :: dsetname real :: precipin(ysize,xsize) real :: precipout(xsize,ysize) - logical :: bIsError integer :: istatus,i + character(len=4) :: vlname + integer :: vnum, n #if (defined USE_HDF5) integer(HSIZE_T), dimension(2) :: dims - integer(HID_T) :: fileid,dsetid + integer(HID_T) :: fileid, dsetid + integer :: ierr dims(1) = xsize dims(2) = ysize - bIsError=.false. -!open fortran interface - call h5open_f(istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error opening HDF5 fortran interface' - return - endif -!open hdf5 file - call h5fopen_f(filename,H5F_ACC_RDONLY_F,fileid,istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error opening IMERG file',trim(filename) - return - endif -!open dataset - call h5dopen_f(fileid,dsetname,dsetid,istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error opening IMERG dataset',trim(dsetname) - return - endif -!read dataset - call h5dread_f(dsetid,H5T_NATIVE_REAL,precipin,dims,istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error reading IMERG dataset',trim(dsetname) - return + ! Variable names changed in IMERG V07 + vlname = trim(imerg_struc(n)%imergver) + read( vlname(2:3), '(I2)') vnum + if (vnum .ge. 7) then + dsetname='/Grid/precipitation' + else + dsetname='/Grid/precipitationCal' endif -!Put the real(1:,1:) on the precipout(0:,0:) -!precipin is (ysize,xsize) starting at (lon=-179.9,lat=-89.9) + + istatus = 0 ! istatus is returned from this subroutine + ierr = 0 ! ierr is strictly a local variable + + ! Open Fortran interface + call h5open_f(istatus) + if (istatus .ne. 0) then + ! No need to proceed, something is wrong with HDF5. + write (LIS_logunit,*) '[WARN] Error opening HDF5 Fortran interface' + return + end if + + ! Open HDF5 file. + call h5fopen_f(filename, H5F_ACC_RDONLY_F, fileid, istatus) + if (istatus .ne. 0) then + ! We couldn't open the file. Close the Fortran interface and return. + ! Don't overwrite the istatus value. + write (LIS_logunit,*) '[WARN] Error opening IMERG file', & + trim(filename) + call h5close_f(ierr) + return + end if + + ! Open dataset + call h5dopen_f(fileid, dsetname, dsetid, istatus) + if (istatus .ne. 0) then + ! We can't open the dataset. Close the file and Fortran interface. + ! Don't overwrite the istatus value. + write (LIS_logunit,*) '[WARN] Error opening IMERG dataset', & + trim(dsetname) + call h5fclose_f(fileid, ierr) + call h5close_f(ierr) + return + end if + + ! Read dataset + call h5dread_f(dsetid, H5T_NATIVE_REAL, precipin, dims, istatus) + if (istatus .ne. 0) then + ! We can't read the dataset. Close the dataset, the file, and + ! the Fortran interface. Don't overwrite the istatus value. + write (LIS_logunit,*) '[WARN] Error reading IMERG dataset', & + trim(dsetname) + call h5dclose_f(dsetid, ierr) + call h5fclose_f(fileid, ierr) + call h5close_f(ierr) + return + end if + + ! Put the real(1:,1:) on the precipout(0:,0:) + ! precipin is (ysize,xsize) starting at (lon=-179.9,lat=-89.9) precipout(1:xsize,1:ysize)=transpose(precipin) -!close dataset - call h5dclose_f(dsetid,istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error closing IMERG dataset',trim(dsetname) - return - endif -!close file - call h5fclose_f(fileid,istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error closing IMERG file',trim(filename) - return - endif -!close fortran interface - call h5close_f(istatus) - if(istatus.ne.0) then - bIsError=.true. - if (LIS_masterproc) write (LIS_logunit,*) 'Error closing HDF5 fortran interface' - return - endif + ! Close the dataset, file, and Fortran interface. We already have + ! the IMERG data in the array, so we don't need to overwrite the + ! istatus value. But we'll still log problems. + call h5dclose_f(dsetid, ierr) + if (ierr .ne. 0) then + write (LIS_logunit,*) '[WARN] Error closing IMERG dataset', & + trim(dsetname) + end if + call h5fclose_f(fileid, ierr) + if (ierr .ne. 0) then + write (LIS_logunit,*) '[WARN] Error closing IMERG file', & + trim(filename) + end if + call h5close_f(ierr) + if (ierr .ne. 0) then + write (LIS_logunit,*) '[WARN] Error closing HDF5 Fortran interface' + end if #endif diff --git a/lis/metforcing/imerg/readcrd_imerg.F90 b/lis/metforcing/imerg/readcrd_imerg.F90 index 4ff8d7097..2c3334cc7 100644 --- a/lis/metforcing/imerg/readcrd_imerg.F90 +++ b/lis/metforcing/imerg/readcrd_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/reset_imerg.F90 b/lis/metforcing/imerg/reset_imerg.F90 index caeab52c0..1a424d827 100644 --- a/lis/metforcing/imerg/reset_imerg.F90 +++ b/lis/metforcing/imerg/reset_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/imerg/timeinterp_imerg.F90 b/lis/metforcing/imerg/timeinterp_imerg.F90 index 2567d607d..4cbc87fa9 100644 --- a/lis/metforcing/imerg/timeinterp_imerg.F90 +++ b/lis/metforcing/imerg/timeinterp_imerg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/0Intro_merra2.txt b/lis/metforcing/merra2/0Intro_merra2.txt index f60e94ccb..228b10984 100644 --- a/lis/metforcing/merra2/0Intro_merra2.txt +++ b/lis/metforcing/merra2/0Intro_merra2.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/finalize_merra2.F90 b/lis/metforcing/merra2/finalize_merra2.F90 index 7d56a1d0c..69c07c937 100644 --- a/lis/metforcing/merra2/finalize_merra2.F90 +++ b/lis/metforcing/merra2/finalize_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/get_merra2.F90 b/lis/metforcing/merra2/get_merra2.F90 index 6b3f25c4a..8742a3e0d 100644 --- a/lis/metforcing/merra2/get_merra2.F90 +++ b/lis/metforcing/merra2/get_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/merra2_forcingMod.F90 b/lis/metforcing/merra2/merra2_forcingMod.F90 index 8de40f393..b84efd5f3 100644 --- a/lis/metforcing/merra2/merra2_forcingMod.F90 +++ b/lis/metforcing/merra2/merra2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -330,7 +330,8 @@ subroutine init_merra2(findex) merra2_struc(n)%merraforc2 = LIS_rc%udef if ( LIS_rc%met_ecor(findex) == "lapse-rate" .or. & - LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" ) then + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then call read_merra2_elev(n,findex) endif diff --git a/lis/metforcing/merra2/read_merra2.F90 b/lis/metforcing/merra2/read_merra2.F90 index 3a7174d51..01c774170 100644 --- a/lis/metforcing/merra2/read_merra2.F90 +++ b/lis/metforcing/merra2/read_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/read_merra2_elev.F90 b/lis/metforcing/merra2/read_merra2_elev.F90 index c8e6071a4..35f8cdbac 100644 --- a/lis/metforcing/merra2/read_merra2_elev.F90 +++ b/lis/metforcing/merra2/read_merra2_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -57,9 +57,12 @@ subroutine read_merra2_elev(n,findex) integer :: c,r real :: go(LIS_rc%lnc(n),LIS_rc%lnr(n)) - if ( trim(LIS_rc%met_ecor(findex)) .ne. "none") then +! if ( trim(LIS_rc%met_ecor(findex)) .ne. "none") then + if ( LIS_rc%met_ecor(findex) == "lapse-rate" .or. & + LIS_rc%met_ecor(findex) == "lapse-rate and slope-aspect" .or. & + LIS_rc%met_ecor(findex) == "micromet" ) then - write(LIS_logunit,*) 'Reading the MERRA2 elevation map ...' + write(LIS_logunit,*) '[INFO] Reading the MERRA2 elevation map ' call LIS_read_param(n,"ELEV_MERRA2",go) diff --git a/lis/metforcing/merra2/readcrd_merra2.F90 b/lis/metforcing/merra2/readcrd_merra2.F90 index 5db862543..c493b6064 100644 --- a/lis/metforcing/merra2/readcrd_merra2.F90 +++ b/lis/metforcing/merra2/readcrd_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/reset_merra2.F90 b/lis/metforcing/merra2/reset_merra2.F90 index 9807796cb..a342343dd 100644 --- a/lis/metforcing/merra2/reset_merra2.F90 +++ b/lis/metforcing/merra2/reset_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/merra2/timeinterp_merra2.F90 b/lis/metforcing/merra2/timeinterp_merra2.F90 index e7550a45a..a341c8fb2 100644 --- a/lis/metforcing/merra2/timeinterp_merra2.F90 +++ b/lis/metforcing/merra2/timeinterp_merra2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mogreps_g/finalize_mogrepsg.F90 b/lis/metforcing/mogreps_g/finalize_mogrepsg.F90 new file mode 100644 index 000000000..85c51ea0a --- /dev/null +++ b/lis/metforcing/mogreps_g/finalize_mogrepsg.F90 @@ -0,0 +1,30 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !MODULE: finalize_mogrepsg +! \label{finalize_mogrepsg} +! +! !REVISION HISTORY: +! 26 Jan 2023; Yeosang Yoon, Initial Code +! +! !INTERFACE: +subroutine finalize_mogrepsg +! !USES: + use mogrepsg_forcingMod, only : mogrepsg_struc +! +! !DESCRIPTION: +! Routine to cleanup allocated structures for MOGREPS-G forcing. +! +!EOP + implicit none + + deallocate(mogrepsg_struc) + +end subroutine finalize_mogrepsg diff --git a/lis/metforcing/mogreps_g/get_cdf_params.F90 b/lis/metforcing/mogreps_g/get_cdf_params.F90 new file mode 100644 index 000000000..5d9c0fc07 --- /dev/null +++ b/lis/metforcing/mogreps_g/get_cdf_params.F90 @@ -0,0 +1,212 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: get_cdf_params +! \label{get_cdf_params} +! +! !REVISION HISTORY: +! 01 May 2023: Yeosang Yoon, initial code +! +! !INTERFACE: +subroutine get_cdf_params (n, fname, month, param_a, param_b, mean, std) + + !USES: + use LIS_coreMod + use LIS_logMod +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + implicit none + + !ARGUMENTS: + integer, intent(in) :: n + character(len=*), intent(in) :: fname + integer, intent(in) :: month ! month of year (1-12) + + !EOP + logical :: file_exists + integer :: ftn + integer :: param_a_id, param_b_id, mean_id, & + std_id, ngrid_id, nlead_id + integer :: ngrid, nlead + integer :: r, c, nc, c1, r1, gid, l + real, allocatable :: param_hires(:,:) + real, allocatable :: param_hires_2d(:,:) + real :: param_a(LIS_rc%ngrid(n),8) !8:lead time + real :: param_b(LIS_rc%ngrid(n),8) + real :: mean(LIS_rc%ngrid(n),8) + real :: std(LIS_rc%ngrid(n),8) + + ! check file + inquire(file=fname, exist=file_exists) + if (.not. file_exists) then + write(LIS_logunit,*) '[ERR] ', trim(fname) // ' does not exist' + call LIS_endrun() + endif + + write(LIS_logunit,*) & + '[INFO] Getting MOGREPS-G bias correction parameters ', trim(fname) + call LIS_verify(nf90_open(path=trim(fname), mode=NF90_NOWRITE, & + ncid=ftn), 'nf90_open failed in get_cdf_params') + + call LIS_verify(nf90_inq_dimid(ftn, "ngrid", ngrid_id), & + 'nf90_inq_dimid failed for ngrid in get_cdf_params') + call LIS_verify(nf90_inquire_dimension(ftn, ngrid_id, len=ngrid),& + 'nf90_inquire_dimension failed for ngrid in get_cdf_params') + + if (LIS_rc%gnc(n)*LIS_rc%gnr(n) .ne. ngrid) then + write(LIS_logunit,*) '[ERR] The input dimensions of the '//trim(fname) + write(LIS_logunit,*) '(',ngrid,')' + write(LIS_logunit,*) & + 'does not match the dimensions in the LIS parameter file' + write(LIS_logunit,*) '(',LIS_rc%gnc(n)*LIS_rc%gnr(n),')' + call LIS_endrun() + endif + + call LIS_verify(nf90_inq_dimid(ftn, "lead_time", nlead_id), & + 'nf90_inq_dimid failed for nlead in get_cdf_params') + call LIS_verify(nf90_inquire_dimension(ftn, nlead_id, len=nlead),& + 'nf90_inquire_dimension failed for nlead in get_cdf_params') + + allocate(param_hires(LIS_rc%gnc(n)*LIS_rc%gnr(n),nlead)) + allocate(param_hires_2d(LIS_rc%gnc(n),LIS_rc%gnr(n))) + + param_hires = -9999.0 + param_hires_2d = -9999.0 + + ! read param_a + call LIS_verify(nf90_inq_varid(ftn, 'cdf_param_a', param_a_id), & + 'nf90_inq_varid failed for cdf_param_a in get_cdf_params') + call LIS_verify(nf90_get_var(ftn, param_a_id, param_hires, & + start=(/1,1,month/), count=(/ngrid,nlead,1/)), & + 'nf90_get_var failed for cdf_param_a in get_cdf_params') + + do l = 1, nlead + ! 1D -> 2D + do r = 1, LIS_rc%gnr(n) + do c = 1, LIS_rc%gnc(n) + param_hires_2d(c,r) = param_hires(c+(r-1)*LIS_rc%gnc(n),l) + enddo + enddo + + !subsets the data for each processor's domain + nc = (LIS_ewe_halo_ind(n,LIS_localPet+1)-LIS_ews_halo_ind(n,LIS_localPet+1))+1 + do r = LIS_nss_halo_ind(n,LIS_localPet+1),LIS_nse_halo_ind(n,LIS_localPet+1) + do c = LIS_ews_halo_ind(n,LIS_localPet+1),LIS_ewe_halo_ind(n,LIS_localPet+1) + c1 = c - LIS_ews_halo_ind(n,LIS_localPet+1)+1 + r1 = r - LIS_nss_halo_ind(n,LIS_localPet+1)+1 + gid = LIS_domain(n)%gindex(c1,r1) + if (gid .ne. -1) then + param_a(gid,l) = param_hires_2d(c,r) + endif + enddo + enddo + enddo + + ! read param_b + call LIS_verify(nf90_inq_varid(ftn, 'cdf_param_b', param_b_id), & + 'nf90_inq_varid failed for cdf_param_b in get_cdf_params') + call LIS_verify(nf90_get_var(ftn, param_b_id, param_hires, & + start=(/1,1,month/), count=(/ngrid,nlead,1/)),& + 'nf90_get_var failed for cdf_param_b in get_cdf_params') + + do l = 1, nlead + ! 1D -> 2D + do r = 1, LIS_rc%gnr(n) + do c = 1,LIS_rc%gnc(n) + param_hires_2d(c,r) = param_hires(c+(r-1)*LIS_rc%gnc(n),l) + enddo + enddo + + !subsets the data for each processor's domain + nc = (LIS_ewe_halo_ind(n,LIS_localPet+1)-LIS_ews_halo_ind(n,LIS_localPet+1))+1 + do r = LIS_nss_halo_ind(n,LIS_localPet+1), LIS_nse_halo_ind(n,LIS_localPet+1) + do c = LIS_ews_halo_ind(n,LIS_localPet+1), LIS_ewe_halo_ind(n,LIS_localPet+1) + c1 = c - LIS_ews_halo_ind(n,LIS_localPet+1) + 1 + r1 = r - LIS_nss_halo_ind(n,LIS_localPet+1) + 1 + gid = LIS_domain(n)%gindex(c1,r1) + if (gid.ne.-1) then + param_b(gid,l) = param_hires_2d(c,r) + endif + enddo + enddo + enddo + + ! read mean + call LIS_verify(nf90_inq_varid(ftn, 'mean', mean_id), & + 'nf90_inq_varid failed for mean in get_cdf_params') + call LIS_verify(nf90_get_var(ftn, mean_id, param_hires, & + start=(/1,1,month/), count=(/ngrid,nlead,1/)),& + 'nf90_get_var failed for mean in get_cdf_params') + + do l = 1, nlead + ! 1D -> 2D + do r = 1, LIS_rc%gnr(n) + do c = 1, LIS_rc%gnc(n) + param_hires_2d(c,r) = param_hires(c+(r-1)*LIS_rc%gnc(n),l) + enddo + enddo + + !subsets the data for each processor's domain + nc = (LIS_ewe_halo_ind(n,LIS_localPet+1)-LIS_ews_halo_ind(n,LIS_localPet+1))+1 + do r = LIS_nss_halo_ind(n,LIS_localPet+1), LIS_nse_halo_ind(n,LIS_localPet+1) + do c = LIS_ews_halo_ind(n,LIS_localPet+1), LIS_ewe_halo_ind(n,LIS_localPet+1) + c1 = c - LIS_ews_halo_ind(n,LIS_localPet+1)+1 + r1 = r - LIS_nss_halo_ind(n,LIS_localPet+1)+1 + gid = LIS_domain(n)%gindex(c1,r1) + if (gid.ne.-1) then + mean(gid,l) = param_hires_2d(c,r) + endif + enddo + enddo + enddo + + ! read std + call LIS_verify(nf90_inq_varid(ftn, 'std', std_id), & + 'nf90_inq_varid failed for std in get_cdf_params') + call LIS_verify(nf90_get_var(ftn, std_id, param_hires, & + start=(/1,1,month/), count=(/ngrid,nlead,1/)),& + 'nf90_get_var failed for std in get_cdf_params') + + do l = 1, nlead + ! 1D -> 2D + do r = 1, LIS_rc%gnr(n) + do c = 1, LIS_rc%gnc(n) + param_hires_2d(c,r) =param_hires(c+(r-1)*LIS_rc%gnc(n),l) + enddo + enddo + + !subsets the data for each processor's domain + nc = (LIS_ewe_halo_ind(n,LIS_localPet+1)-LIS_ews_halo_ind(n,LIS_localPet+1))+1 + do r = LIS_nss_halo_ind(n,LIS_localPet+1), LIS_nse_halo_ind(n,LIS_localPet+1) + do c = LIS_ews_halo_ind(n,LIS_localPet+1), LIS_ewe_halo_ind(n,LIS_localPet+1) + c1 = c - LIS_ews_halo_ind(n,LIS_localPet+1) + 1 + r1 = r - LIS_nss_halo_ind(n,LIS_localPet+1) + 1 + gid = LIS_domain(n)%gindex(c1,r1) + if (gid.ne.-1) then + std(gid,l) = param_hires_2d(c,r) + endif + enddo + enddo + enddo + + deallocate(param_hires) + deallocate(param_hires_2d) + + call LIS_verify(nf90_close(ftn),'failed to close in get_cdf_params') + + write(LIS_logunit,*) & + '[INFO] Done reading MOGREPS-G bias correction parameters data ' + +end subroutine get_cdf_params + diff --git a/lis/metforcing/mogreps_g/get_mogrepsg.F90 b/lis/metforcing/mogreps_g/get_mogrepsg.F90 new file mode 100644 index 000000000..610802273 --- /dev/null +++ b/lis/metforcing/mogreps_g/get_mogrepsg.F90 @@ -0,0 +1,300 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: get_mogrepsg +! \label{get_mogrepsg} +! +! +! !REVISION HISTORY: +! 26 Jan 2023: Yeosang Yoon, initial code +! 13 Mar 2023: Yeosang Yoon, update codes to fit new format +! 01 Jan 2024; Yeosang Yoon; update codes for precpi. bias-correction +! +! !INTERFACE: +subroutine get_mogrepsg(n, findex) +! !USES: + use LIS_coreMod + use LIS_timeMgrMod + use LIS_logMod + use LIS_metforcingMod + use mogrepsg_forcingMod + use LIS_constantsMod, only: LIS_CONST_PATH_LEN + + implicit none + +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex +! +! +! !DESCRIPTION: +! Opens, reads, and interpolates MOGREPS-G forecast forcing. +! +! At the beginning of a simulation, the code reads the most recent +! past data (nearest 3-hour interval), and the nearest future data. +! These two datasets are used to temporally interpolate the data to +! the current model timestep. + +!EOP + integer :: order, ferror, m, t + character(len=LIS_CONST_PATH_LEN) :: fname + integer :: yr1, mo1, da1, hr1, mn1, ss1, doy1 + integer :: yr2, mo2, da2, hr2, mn2, ss2, doy2 + real*8 :: time1, time2 + real :: gmt1, gmt2 + real :: ts1, ts2 + + integer :: valid_hour + integer :: fcsthr_intv + integer :: openfile + + ! precipitation bias correction + real :: pcp1, pcp2 + integer :: lead_time + + external :: get_mogrepsg_filename + external :: read_mogrepsg + + ! MOGREPS-G cycles every 6 hours; ecch cycle provide up to 192 hours (8 days; 3-hour interval) forecast + if (LIS_rc%ts .gt. 10800) then + write(LIS_logunit,*) '[ERR] The model timestep is > forcing data timestep ...' + write(LIS_logunit,*) '[ERR] LIS does not support this mode currently.' + call LIS_endrun() + endif + + openfile = 0 + + if (LIS_rc%tscount(n) .eq. 1 .or. LIS_rc%rstflag(n) .eq. 1) then !beginning of run + LIS_rc%rstflag(n) = 0 + endif + + ! First timestep of run + if (LIS_rc%tscount(n) .eq. 1 .or. LIS_rc%rstflag(n) .eq. 1) then + ! Bookend-time record 1 + yr1 = LIS_rc%yr + mo1 = LIS_rc%mo + da1 = LIS_rc%da + hr1 = LIS_rc%hr + mn1 = 0 + ss1 = 0 + ts1 = 0 + call LIS_tick(time1, doy1, gmt1, yr1, mo1, da1, hr1, mn1, ss1, ts1) + + ! Bookend-time record 2 + yr2 = LIS_rc%yr !next hour + mo2 = LIS_rc%mo + da2 = LIS_rc%da + hr2 = 3 + mn2 = 0 + ss2 = 0 + ts2 = 0 + call LIS_tick(time2, doy2, gmt2, yr2, mo2, da2, hr2, mn2, ss2, ts2) + openfile=1 + endif + + ! 3 hourly interval + fcsthr_intv = 3 + valid_hour = fcsthr_intv * (LIS_rc%hr/fcsthr_intv) + + if ((valid_hour == LIS_rc%hr .and. LIS_rc%mn == 0) .or. & + openfile == 1) then + + ! Forecast hour condition within each file: + mogrepsg_struc(n)%fcst_hour = & + mogrepsg_struc(n)%fcst_hour + fcsthr_intv + + ! Check if local forecast hour exceeds max grib file forecast hour: + if (mogrepsg_struc(n)%fcst_hour > 195 ) then + write(LIS_logunit,*) & + "[ERR] MOGREPS-G Forecast hour has exceeded the grib file's final" + write(LIS_logunit,*) & + ' forecast hour (record). Run will end here for now ... ' + call LIS_endrun + endif + + ! Update bookend-time record 2: + if (LIS_rc%tscount(n) .ne. 1) then + mogrepsg_struc(n)%fcsttime1 = mogrepsg_struc(n)%fcsttime2 + mogrepsg_struc(n)%metdata1(:,:,:) = & + mogrepsg_struc(n)%metdata2(:,:,:) + + yr2 = LIS_rc%yr + mo2 = LIS_rc%mo + da2 = LIS_rc%da + hr2 = valid_hour + mn2 = fcsthr_intv * 60 ! Backward looking + ss2 = 0 + ts2 = 0 + call LIS_tick(time2, doy2, gmt2, yr2, mo2, da2, hr2, mn2, ss2, & + ts2) + endif + + do m = 1, mogrepsg_struc(n)%max_ens_members + + ! Read in file contents: + if (LIS_rc%tscount(n) == 1) then ! Read in first two book-ends + ferror = 0 + order = 1 + call get_mogrepsg_filename(mogrepsg_struc(n)%odir, & + mogrepsg_struc(n)%init_yr, & + mogrepsg_struc(n)%init_mo, & + mogrepsg_struc(n)%init_da, & + mogrepsg_struc(n)%init_hr, & + 0, m, fname) + + write(LIS_logunit,*)& + '[INFO] Getting MOGREPS-G forecast file1 ... ', & + trim(fname) + call read_mogrepsg(n, m, findex, order, fname, ferror) + if (ferror .ge. 1) mogrepsg_struc(n)%fcsttime1 = time1 + + ferror = 0 + order = 2 + call get_mogrepsg_filename(mogrepsg_struc(n)%odir, & + mogrepsg_struc(n)%init_yr, & + mogrepsg_struc(n)%init_mo, & + mogrepsg_struc(n)%init_da, & + mogrepsg_struc(n)%init_hr, & + mogrepsg_struc(n)%fcst_hour, m, fname) + + write(LIS_logunit,*) & + '[INFO] Getting MOGREPS-G forecast file2 ... ', & + trim(fname) + call read_mogrepsg(n, m, findex, order, fname, ferror) + if (ferror .ge. 1) mogrepsg_struc(n)%fcsttime2 = time2 + + !only for T+0 due to mssing LW variable + mogrepsg_struc(n)%metdata1(4,m,:) = & + mogrepsg_struc(n)%metdata2(4,m,:) + else + ferror = 0 + order = 2 + ! met forcings except for pcp + call get_mogrepsg_filename(mogrepsg_struc(n)%odir, & + mogrepsg_struc(n)%init_yr, & + mogrepsg_struc(n)%init_mo, & + mogrepsg_struc(n)%init_da, & + mogrepsg_struc(n)%init_hr, & + mogrepsg_struc(n)%fcst_hour, m, fname) + + write(LIS_logunit,*) & + '[INFO] Getting MOGREPS-G forecast file2 ... ', & + trim(fname) + call read_mogrepsg(n, m, findex, order, fname, ferror) + if (ferror .ge. 1) mogrepsg_struc(n)%fcsttime2 = time2 + + !only for T+141 due to mssing LW varaible + if (mogrepsg_struc(n)%fcst_hour == 141) then + mogrepsg_struc(n)%metdata2(4,m,:) = & + mogrepsg_struc(n)%metdata1(4,m,:) + endif + endif + + ! apply precipitation bias correction (cdf from difference bewteen NAPFA and MOGREPS-G) + if (mogrepsg_struc(n)%bc == 1) then + lead_time=floor((float(mogrepsg_struc(n)%fcst_hour))/24) + 1 + + if (lead_time > 8) then + lead_time = 8 + endif + + do t = 1, LIS_rc%ngrid(n) + if (mogrepsg_struc(n)%metdata2(8,m,t) .ne. LIS_rc%udef) then + ! only for land pixels + if (mogrepsg_struc(n)%bc_param_a(t,lead_time) .ne. LIS_rc%udef) then + ! perform centering and scaling + pcp1= & + mogrepsg_struc(n)%metdata2(8,m,t) - & + mogrepsg_struc(n)%metdata1(8,m,t) + if (mogrepsg_struc(n)%bc_std(t,lead_time) .ne. 0) then + pcp2=(pcp1-mogrepsg_struc(n)%bc_mean(t,lead_time))/& + mogrepsg_struc(n)%bc_std(t,lead_time) + else + pcp2=pcp1 + endif + + ! apply cdf params + pcp2 = pcp2 * & + mogrepsg_struc(n)%bc_param_a(t,lead_time)+mogrepsg_struc(n)%bc_param_b(t,lead_time) + ! check for negative precipitation; if the corrected value has negative, keep the original value. + if (pcp2 >= 0) then + mogrepsg_struc(n)%pcp_bc(m,t) = pcp2 + else + mogrepsg_struc(n)%pcp_bc(m,t) = pcp1 + endif + ! additionally, avoid bias correction for values that are too samll to reduce abnormal noise. + if(pcp1 < 0.01) then + mogrepsg_struc(n)%pcp_bc(m,t) = pcp1 + endif + else ! for water pixels + mogrepsg_struc(n)%pcp_bc(m,t) = & + mogrepsg_struc(n)%metdata2(8,m,t) - & + mogrepsg_struc(n)%metdata1(8,m,t) + endif + endif + enddo + endif + enddo + endif + openfile = 0 + +end subroutine get_mogrepsg + +!BOP +! +! !ROUTINE: get_mogrepsg_filename +! \label{get_mogrepsg_filename} +! +! !INTERFACE: +subroutine get_mogrepsg_filename(rootdir, yr, mo, da, hr, fc_hr, & + ens_id, filename) + + use LIS_logMod, only: LIS_endrun + implicit none +! !ARGUMENTS: + character(len=*), intent(in) :: rootdir + integer, intent(in) :: yr,mo,da,hr + integer, intent(in) :: fc_hr + integer, intent(in) :: ens_id + character(len=*), intent(out) :: filename +! +! !DESCRIPTION: +! This subroutine puts together MOGREPS-G file name for +! operational products +!EOP + character(8) :: ftime + character(2) :: chr + character(3) :: fchr + character(2) :: ens + character(len=36) :: fname + + write (UNIT=chr, FMT='(i2.2)') hr ! cycle 00/06/12/18 + write (UNIT=fchr, FMT='(i3.3)') fc_hr ! forecast time + write (UNIT=ftime, FMT='(i4, i2.2, i2.2)') yr, mo, da + + fname = 'prods_op_mogreps-g_' + + !00/12z cycle memebers 00,01-17 + !06/18z cycle memebers 00,18-34 + if ((hr == 0) .or. (hr == 12)) then + write (UNIT=ens, FMT='(i2.2)') ens_id-1 ! start 00, 01 - 17 + else + if (ens_id == 1) then + write (UNIT=ens, FMT='(i2.2)') ens_id-1 ! start 00 + else + write (UNIT=ens, FMT='(i2.2)') ens_id+16 ! start 18-34 + endif + endif + + filename = trim(rootdir)//'/'//ftime//chr//'/'//trim(fname) & + //ftime//'_'//chr//'_'//ens//'_'//fchr//'.grib2' +end subroutine get_mogrepsg_filename + diff --git a/lis/metforcing/mogreps_g/mogrepsg_forcingMod.F90 b/lis/metforcing/mogreps_g/mogrepsg_forcingMod.F90 new file mode 100644 index 000000000..dd27a7bab --- /dev/null +++ b/lis/metforcing/mogreps_g/mogrepsg_forcingMod.F90 @@ -0,0 +1,381 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +module mogrepsg_forcingMod +!BOP +! !MODULE: mogrepsg_forcingMod + +! !DESCRIPTION: +! This module contains variables and data structures that are used +! for the implementation of MOGREPS-G 8-day forecast data used as forcing +! within LIS. + +! REVISION HISTORY: +! 26 Jan 2023; Yeosang Yoon; Initial Specification +! 01 Jan 2024; Yeosang Yoon; update codes for precpi. bias-correction + +! !USES: + use LIS_constantsMod, only : LIS_CONST_PATH_LEN + + implicit none + + PRIVATE +!----------------------------------------------------------------------------- +! !PUBLIC MEMBER FUNCTIONS: +!----------------------------------------------------------------------------- + public :: init_mogrepsg !defines the native resolution of the input data +!----------------------------------------------------------------------------- +! !PUBLIC TYPES: +!----------------------------------------------------------------------------- + public :: mogrepsg_struc + + type, public :: mogrepsg_type_dec + real :: ts + integer :: nc, nr, vector_len + real*8 :: fcsttime1,fcsttime2 + character(len=LIS_CONST_PATH_LEN) :: odir !MOGREPS-G forecast forcing Directory + character*20 :: runmode + integer :: max_ens_members + + integer, allocatable :: gindex(:,:) + + integer :: mi + + integer, allocatable :: n111(:) + integer, allocatable :: n121(:) + integer, allocatable :: n211(:) + integer, allocatable :: n221(:) + real, allocatable :: w111(:),w121(:) + real, allocatable :: w211(:),w221(:) + + integer, allocatable :: n112(:,:) + integer, allocatable :: n122(:,:) + integer, allocatable :: n212(:,:) + integer, allocatable :: n222(:,:) + real, allocatable :: w112(:,:),w122(:,:) + real, allocatable :: w212(:,:),w222(:,:) + + integer, allocatable :: n113(:) + + integer :: findtime1, findtime2 + integer :: fcst_hour + integer :: init_yr, init_mo, init_da, init_hr + real, allocatable :: metdata1(:,:,:) + real, allocatable :: metdata2(:,:,:) + + integer :: nmodels + + ! only for v-wind due to difference resolution + integer :: nrv + integer, allocatable :: nv111(:) + integer, allocatable :: nv121(:) + integer, allocatable :: nv211(:) + integer, allocatable :: nv221(:) + real, allocatable :: wv111(:), wv121(:) + real, allocatable :: wv211(:), wv221(:) + + integer, allocatable :: nv112(:,:) + integer, allocatable :: nv122(:,:) + integer, allocatable :: nv212(:,:) + integer, allocatable :: nv222(:,:) + real, allocatable :: wv112(:,:), wv122(:,:) + real, allocatable :: wv212(:,:), wv222(:,:) + + integer, allocatable :: nv113(:) + + ! precipitation bias correction + integer :: bc !option for bias correction + character(len=LIS_CONST_PATH_LEN) :: cdf_fname !MOGREPS-G model CDF file name + real, allocatable :: pcp_bc(:,:) + real, allocatable :: bc_param_a(:,:) + real, allocatable :: bc_param_b(:,:) + real, allocatable :: bc_mean(:,:) + real, allocatable :: bc_std(:,:) + + end type mogrepsg_type_dec + + type(mogrepsg_type_dec), allocatable :: mogrepsg_struc(:) +!EOP +contains + +!BOP +! +! !ROUTINE: init_mogrepsg +! \label{init_mogrepsg} +! +! !INTERFACE: + subroutine init_mogrepsg(findex) +! !USES: + use LIS_coreMod, only : LIS_rc + use LIS_timeMgrMod, only : LIS_update_timestep + use LIS_logMod, only : LIS_logunit, LIS_endrun + + implicit none +! !USES: + integer, intent(in) :: findex +! +! !DESCRIPTION: +! Defines the native resolution of the input forcing for MOGREPS-G +! data. The grid description arrays are based on the decoding +! schemes used by NCEP and followed in the LIS interpolation +! schemes (see Section~\ref{interp}). +! +!EOP + + integer :: n + real :: gridDesci(LIS_rc%nnest,50) + real :: gridDesci_v(LIS_rc%nnest,50) ! v-wind + + external :: readcrd_mogrepsg + external :: bilinear_interp_input + external :: conserv_interp_input + external :: neighbor_interp_input + external :: get_cdf_params + + write(LIS_logunit,*) & + "[INFO] Initializing the MOGREPS-G forecast inputs " + + ! Forecast mode -- NOT Available at this time for this forcing reader: + if( LIS_rc%forecastMode.eq.1 ) then + write(LIS_logunit,*) & + '[ERR] Currently the MOGREPS-G forecast forcing reader' + write(LIS_logunit,*) & + '[ERR] is not set up to run in forecast mode.' + write(LIS_logunit,*) '[ERR] LIS forecast run-time ending.' + call LIS_endrun() + endif + + allocate(mogrepsg_struc(LIS_rc%nnest)) + call readcrd_mogrepsg() + + do n=1, LIS_rc%nnest + mogrepsg_struc(n)%ts = 3600*3 !check + call LIS_update_timestep(LIS_rc, n, mogrepsg_struc(n)%ts) + enddo + + do n=1, LIS_rc%nnest + mogrepsg_struc(:)%nc = 1280 ! mogreps-g + mogrepsg_struc(:)%nr = 960 + mogrepsg_struc(:)%nrv = 961 ! v-wind + enddo + + ! 8 - key met field + LIS_rc%met_nf(findex) = 8 + + do n = 1, LIS_rc%nnest + + ! Check if starting hour of LIS run matches 00/06/12/18 UTC: + if((LIS_rc%shr .ne. 0) .and. (LIS_rc%shr .ne. 6) .and. & + (LIS_rc%shr .ne. 12) .and. (LIS_rc%shr .ne. 18)) then + write(LIS_logunit,*) "[ERR] MOGREPS-G forecast type begins" + write(LIS_logunit,*) "[ERR] at 00/12Z for a forecast window, so the " + write(LIS_logunit,*) "[ERR] 'Starting hour:' should be set to 0/12 in" + write(LIS_logunit,*) "[ERR] your lis.config file.." + call LIS_endrun() + endif + + ! Allocate and initialize MOGREPS-G metforcing data structures: + LIS_rc%met_nensem(findex) = mogrepsg_struc(n)%max_ens_members + + allocate(mogrepsg_struc(n)%metdata1(LIS_rc%met_nf(findex),& + mogrepsg_struc(n)%max_ens_members,LIS_rc%ngrid(n))) + allocate(mogrepsg_struc(n)%metdata2(LIS_rc%met_nf(findex),& + mogrepsg_struc(n)%max_ens_members,LIS_rc%ngrid(n))) + + ! Initialize the forecast initial date-time and grib record: + mogrepsg_struc(n)%init_yr = LIS_rc%syr + mogrepsg_struc(n)%init_mo = LIS_rc%smo + mogrepsg_struc(n)%init_da = LIS_rc%sda + mogrepsg_struc(n)%init_hr = LIS_rc%shr + + mogrepsg_struc(n)%fcst_hour = 0 + mogrepsg_struc(n)%metdata1 = 0 + mogrepsg_struc(n)%metdata2 = 0 + gridDesci = 0 + + gridDesci(n,1) = 0 + gridDesci(n,2) = real(mogrepsg_struc(n)%nc) !gnc + gridDesci(n,3) = real(mogrepsg_struc(n)%nr) !gnr + gridDesci(n,4) = -89.906250 !lat(1,1) + !NOTE: gfortran complains about non-significant digits in below + !assignment. For now we ignore the warning message from the + !compiler. + gridDesci(n,5) = -179.859375 !lon(1,1) + gridDesci(n,6) = 128 + gridDesci(n,7) = 89.906250 !lat(gnc,gnr) + !NOTE: gfortran complains about non-significant digits in below + !assignment. For now we ignore the warning message from the + !compiler. + gridDesci(n,8) = 179.859375 !lon(gnc,gnr) + gridDesci(n,9) = 0.28125 !dx + gridDesci(n,10) = 0.18750 !dy + gridDesci(n,20) = 0 !for 0 to 360? + + mogrepsg_struc(n)%mi = mogrepsg_struc(n)%nc*mogrepsg_struc(n)%nr + mogrepsg_struc(n)%fcsttime1 = dble(3000.0) + mogrepsg_struc(n)%fcsttime2 = dble(0.0) + + ! v-wind + gridDesci_v(n,1) = 0 + gridDesci_v(n,2) = real(mogrepsg_struc(n)%nc) !gnc + gridDesci_v(n,3) = real(mogrepsg_struc(n)%nrv) !gnr + gridDesci_v(n,4) = -90.000000 !lat(1,1) + !NOTE: gfortran complains about non-significant digits in below + !assignment. For now we ignore the warning message from the + !compiler. + gridDesci_v(n,5) = -179.859375 !lon(1,1) + gridDesci_v(n,6) = 128 + gridDesci_v(n,7) = 90.000000 !lat(gnc,gnr) + !NOTE: gfortran complains about non-significant digits in below + !assignment. For now we ignore the warning message from the + !compiler. + gridDesci_v(n,8) = 179.859375 !lon(gnc,gnr) + gridDesci_v(n,9) = 0.28125 !dx + gridDesci_v(n,10) = 0.18750 !dy + gridDesci(n,20) = 0 !for 0 to 360? + enddo + + do n=1,LIS_rc%nnest + !Setting up weights for Interpolation + if(trim(LIS_rc%met_interp(findex)).eq."bilinear") then + allocate(mogrepsg_struc(n)%n111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%n121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%n211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%n221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + call bilinear_interp_input(n,gridDesci(n,:),& + mogrepsg_struc(n)%n111,mogrepsg_struc(n)%n121,& + mogrepsg_struc(n)%n211,mogrepsg_struc(n)%n221,& + mogrepsg_struc(n)%w111,mogrepsg_struc(n)%w121,& + mogrepsg_struc(n)%w211,mogrepsg_struc(n)%w221) + + elseif(trim(LIS_rc%met_interp(findex)).eq."budget-bilinear") then + allocate(mogrepsg_struc(n)%n111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%n121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%n211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%n221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%w221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + call bilinear_interp_input(n,gridDesci(n,:),& + mogrepsg_struc(n)%n111,mogrepsg_struc(n)%n121,& + mogrepsg_struc(n)%n211,mogrepsg_struc(n)%n221,& + mogrepsg_struc(n)%w111,mogrepsg_struc(n)%w121,& + mogrepsg_struc(n)%w211,mogrepsg_struc(n)%w221) + + allocate(mogrepsg_struc(n)%n112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%n122(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%n212(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%n222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%w112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%w122(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%w212(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%w222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + + call conserv_interp_input(n,gridDesci(n,:),& + mogrepsg_struc(n)%n112,mogrepsg_struc(n)%n122,& + mogrepsg_struc(n)%n212,mogrepsg_struc(n)%n222,& + mogrepsg_struc(n)%w112,mogrepsg_struc(n)%w122,& + mogrepsg_struc(n)%w212,mogrepsg_struc(n)%w222) + elseif(trim(LIS_rc%met_interp(findex)).eq."neighbor") then + allocate(mogrepsg_struc(n)%n113(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + call neighbor_interp_input(n,gridDesci(n,:),& + mogrepsg_struc(n)%n113) + endif + + ! v-wind + !Setting up weights for Interpolation + if(trim(LIS_rc%met_interp(findex)).eq."bilinear") then + allocate(mogrepsg_struc(n)%nv111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%nv121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%nv211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%nv221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + call bilinear_interp_input(n,gridDesci_v(n,:),& + mogrepsg_struc(n)%nv111,mogrepsg_struc(n)%nv121,& + mogrepsg_struc(n)%nv211,mogrepsg_struc(n)%nv221,& + mogrepsg_struc(n)%wv111,mogrepsg_struc(n)%wv121,& + mogrepsg_struc(n)%wv211,mogrepsg_struc(n)%wv221) + + elseif(trim(LIS_rc%met_interp(findex)).eq."budget-bilinear") then + allocate(mogrepsg_struc(n)%nv111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%nv121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%nv211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%nv221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv111(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv121(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv211(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + allocate(mogrepsg_struc(n)%wv221(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + call bilinear_interp_input(n,gridDesci_v(n,:),& + mogrepsg_struc(n)%nv111,mogrepsg_struc(n)%nv121,& + mogrepsg_struc(n)%nv211,mogrepsg_struc(n)%nv221,& + mogrepsg_struc(n)%wv111,mogrepsg_struc(n)%wv121,& + mogrepsg_struc(n)%wv211,mogrepsg_struc(n)%wv221) + + allocate(mogrepsg_struc(n)%nv112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%nv122(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%nv212(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%nv222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%wv112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%wv122(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%wv212(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + allocate(mogrepsg_struc(n)%wv222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25)) + + call conserv_interp_input(n,gridDesci_v(n,:),& + mogrepsg_struc(n)%nv112,mogrepsg_struc(n)%nv122,& + mogrepsg_struc(n)%nv212,mogrepsg_struc(n)%nv222,& + mogrepsg_struc(n)%wv112,mogrepsg_struc(n)%wv122,& + mogrepsg_struc(n)%wv212,mogrepsg_struc(n)%wv222) + + elseif(trim(LIS_rc%met_interp(findex)).eq."neighbor") then + allocate(mogrepsg_struc(n)%nv113(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + call neighbor_interp_input(n,gridDesci_v(n,:),& + mogrepsg_struc(n)%nv113) + endif + enddo + + ! precipitation bias correction + do n = 1, LIS_rc%nnest + if (mogrepsg_struc(n)%bc == 1) then + allocate(mogrepsg_struc(n)%pcp_bc(mogrepsg_struc(n)%max_ens_members,LIS_rc%ngrid(n))) + allocate(mogrepsg_struc(n)%bc_param_a(LIS_rc%ngrid(n),8)) !8: lead time + allocate(mogrepsg_struc(n)%bc_param_b(LIS_rc%ngrid(n),8)) + allocate(mogrepsg_struc(n)%bc_mean(LIS_rc%ngrid(n),8)) + allocate(mogrepsg_struc(n)%bc_std(LIS_rc%ngrid(n),8)) + + mogrepsg_struc(n)%pcp_bc = 0 + mogrepsg_struc(n)%bc_param_a = 0 + mogrepsg_struc(n)%bc_param_b = 0 + mogrepsg_struc(n)%bc_mean = 0 + mogrepsg_struc(n)%bc_std = 0 + + ! read cdf parameters + call get_cdf_params(n,mogrepsg_struc(n)%cdf_fname,LIS_rc%mo, & + mogrepsg_struc(n)%bc_param_a, & + mogrepsg_struc(n)%bc_param_b, & + mogrepsg_struc(n)%bc_mean, mogrepsg_struc(n)%bc_std) + endif + enddo + + end subroutine init_mogrepsg +end module mogrepsg_forcingMod diff --git a/lis/metforcing/mogreps_g/read_mogrepsg.F90 b/lis/metforcing/mogreps_g/read_mogrepsg.F90 new file mode 100644 index 000000000..d32709d3b --- /dev/null +++ b/lis/metforcing/mogreps_g/read_mogrepsg.F90 @@ -0,0 +1,854 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: read_mogrepsg +! \label{read_mogrepsg} +! +! !REVISION HISTORY: +! 26 Jan 2023: Yeosang Yoon, initial code +! 13 Mar 2023: Yeosang Yoon, update code to fit new format (precpitation) +! +! !INTERFACE: +subroutine read_mogrepsg(n, m, findex, order, gribfile, rc) + +! !USES: + use LIS_coreMod + use LIS_logMod + +#if (defined USE_GRIBAPI) + use grib_api +#endif + + implicit none + +!ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: m ! number of ensembles + integer, intent(in) :: findex ! forcing index + integer, intent(in) :: order + character(len=*), intent(in) :: gribfile + integer, intent(out) :: rc + +!DESCRIPTION: +! For the given time, reads the forcing data from the +! MOGREPS-G file, transforms into LIS forcing +! parameters and interpolates to the LIS domain. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[findex] +! index of the forcing +! \item[order] +! flag indicating which data to be read (order=1, read the previous +! hourly instance, order=2, read the next hourly instance) +! \item[gribfile] +! name of the file to be read +! \item[rc] +! return error flag (0-fail, 1-success) +! \end{description} +! +! The routines invoked are: +! \begin{description} +! \item[interp\_mogrepsg](\ref{interp_mogrepsg}) \newline +! Performs spatial interpolation of GALEM-GE forecast data to the LIS grid +! \end{description} + +!EOP + integer :: ftn, igrib, ierr + integer :: center + character*100 :: gtype + integer :: iginfo ( 40 ) + real :: gridres_dlat, gridres_dlon + integer :: ifguess, jfguess + integer :: dataDate, dataTime + + real :: tair(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Temperature interpolated to 2 metres [K] + real :: qair(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Relative humidity interpolated to 2 metres[kg/kg] + real :: swdown(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Downward shortwave flux at the ground [W/m^2] + real :: lwdown(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Downward longwave radiation at the ground [W/m^2] + real :: uwind(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous zonal wind interpolated to 10 metres [m/s] + real :: vwind(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous meridional wind interpolated to 10 metres[m/s] + real :: ps(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous Surface Pressure [Pa] + real :: prectot(LIS_rc%lnc(n),LIS_rc%lnr(n)) ! Total precipitation [kg/m^2] + + external :: fldbld_read_mogrepsg + external :: assign_processed_mogrepsgforc + + ! Initialize return code to "no error". We will change it below if + ! necessary. + rc = 0 + +#if (defined USE_GRIBAPI) + + call grib_open_file(ftn,trim(gribfile),'r',ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] Failed to open - '//trim(gribfile) + call LIS_endrun() + end if + + ! Read in the first grib record, unpack the header and extract + ! section 1 and section 2 information. + call grib_new_from_file(ftn,igrib,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] failed to read - '//trim(gribfile) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'centre',center,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grib_get: ' // & + 'centre in read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'gridType',gtype,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: ' // & + 'gridtype in read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + if(trim(gtype).ne."regular_ll") then + write(LIS_logunit,*)'[ERR] MOGREPS-G file not on lat/lon grid!' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'Ni',iginfo(1),ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: Ni read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'Nj',iginfo(2),ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: Nj in read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'jDirectionIncrementInDegrees',gridres_dlat,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: ' // & + 'jDirectionIncrementInDegrees ' // & + 'in read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + ! EMK...Added dlon + call grib_get(igrib, 'iDirectionIncrementInDegrees', gridres_dlon, ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: ' // & + 'iDirectionIncrementInDegrees ' // & + 'in read_mogrepsg' + call grib_release(igrib, ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'dataDate',dataDate,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: ' // & + 'dataDate in read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + call grib_get(igrib,'dataTime',dataTime,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[ERR] in grid_get: ' // & + 'dataTime in read_mogrepsg' + call grib_release(igrib,ierr) + call grib_close_file(ftn) + call LIS_endrun() + endif + + ! Here we tentatively have a file we can use. Close it for now, and + ! prepare to pull the appropriate variables. + call grib_release(igrib,ierr) + call grib_close_file(ftn) + + ifguess = iginfo(1) + jfguess = iginfo(2) + + call fldbld_read_mogrepsg(n, findex, gribfile, ifguess, jfguess, & + tair, qair, swdown, lwdown, uwind, vwind, ps, prectot, rc) + + call assign_processed_mogrepsgforc(n, m, order, 1, tair) + call assign_processed_mogrepsgforc(n, m, order, 2, qair) + call assign_processed_mogrepsgforc(n, m, order, 3, swdown) + call assign_processed_mogrepsgforc(n, m, order, 4, lwdown) + call assign_processed_mogrepsgforc(n, m, order, 5, uwind) + call assign_processed_mogrepsgforc(n, m, order, 6, vwind) + call assign_processed_mogrepsgforc(n, m, order, 7, ps) + call assign_processed_mogrepsgforc(n, m, order, 8, prectot) + +#endif + +end subroutine read_mogrepsg + +subroutine fldbld_read_mogrepsg(n, findex, gribfile, ifguess, jfguess, & + tair, qair, swdown, lwdown, uwind, vwind, ps, prectot, rc) + +! !USES: + use LIS_coreMod, only : LIS_rc + use LIS_logMod, only : LIS_logunit, LIS_abort, LIS_alert, LIS_verify + +#if (defined USE_GRIBAPI) + use grib_api +#endif + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex ! Forcing index + character(len=*), intent(in) :: gribfile + integer, intent(in) :: ifguess + integer, intent(in) :: jfguess + real, intent(out) :: tair(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Temperature interpolated to 2 metres [K] + real, intent(out) :: qair(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Relative humidity interpolated to 2 metres[kg/kg] + real, intent(out) :: swdown(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Downward shortwave flux at the ground [W/m^2] + real, intent(out) :: lwdown(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Downward longwave radiation at the ground [W/m^2] + real, intent(out) :: uwind(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous zonal wind interpolated to 10 metres [m/s] + real, intent(out) :: vwind(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous meridional wind interpolated to 10 metres[m/s] + real, intent(out) :: ps(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Instantaneous Surface Pressure [Pa] + real, intent(out) :: prectot(LIS_rc%lnc(n),LIS_rc%lnr(n)) !Total precipitation [kg/m^2] + + integer, intent(out) :: rc +! +! !DESCRIPTION: +! +! To read MOGREPS-G data in GRIB-2 format. +! +!EOP + character*9 :: cstat + character*255 :: message ( 20 ) + character(len=7) :: grib_msg + character(len=7) :: check_mogrepsg_message + integer :: count_tair, count_qair + integer :: count_swdown, count_lwdown + integer :: count_uwind, count_vwind + integer :: count_ps, count_prectot + integer :: ierr + integer :: istat1 + integer :: igrib + integer :: ftn + integer :: kk, nvars + integer :: param_disc_val, param_cat_val, & + param_num_val, surface_val, level_val + real, allocatable :: dum1d ( : ) + real, allocatable :: dumv1d ( : ) ! v-wind + + real, allocatable :: fg_tair ( : , : ) + real, allocatable :: fg_qair ( : , : ) + real, allocatable :: fg_swdown ( : , : ) + real, allocatable :: fg_lwdown ( : , : ) + real, allocatable :: fg_uwind ( : , : ) + real, allocatable :: fg_vwind ( : , : ) + real, allocatable :: fg_ps ( : , : ) + real, allocatable :: fg_prectot ( : , : ) + + logical :: found_inq + + external :: interp_mogrepsg + external :: interp_mogrepsg_vwind + + rc = 1 ! Initialize as "no error" + + ! EMK...Before using ECCODES/GRIB_API, see if the GRIB file exists + ! using a simple inquire statement. This avoids ECCODES/GRIB_API + ! writing error messages to stdout/stderr, which may lead to runtime + ! problems. + inquire(file=trim(gribfile),exist=found_inq) + if (.not. found_inq) then + write(LIS_logunit,*) '[WARN] Cannot find file '//trim(gribfile) + rc = 0 + return + end if + +#if (defined USE_GRIBAPI) + + ! If a problem occurs here, we can just return immediately since no + ! memory has been allocated yet. + call grib_open_file(ftn,trim(gribfile),'r',ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[WARN] Failed to open - '//trim(gribfile) + rc = 0 + return + end if + + allocate ( fg_tair (ifguess, jfguess) ) + allocate ( fg_qair (ifguess, jfguess) ) + allocate ( fg_swdown (ifguess, jfguess) ) + allocate ( fg_lwdown (ifguess, jfguess) ) + allocate ( fg_uwind (ifguess, jfguess) ) ! nr=960 + allocate ( fg_vwind (ifguess, jfguess+1) ) ! v-wind, nr=961 + allocate ( fg_ps (ifguess, jfguess) ) + allocate ( fg_prectot (ifguess, jfguess) ) + + allocate ( dum1d (ifguess*jfguess) ) + allocate ( dumv1d (ifguess*(jfguess+1)) ) ! v-wind + + ! Initalization + fg_tair = LIS_rc%udef + fg_qair = LIS_rc%udef + fg_swdown = LIS_rc%udef + fg_lwdown = LIS_rc%udef + fg_uwind = LIS_rc%udef + fg_vwind = LIS_rc%udef + fg_ps = LIS_rc%udef + fg_prectot = LIS_rc%udef + dum1d = LIS_rc%udef + + tair = LIS_rc%udef + qair = LIS_rc%udef + swdown = LIS_rc%udef + lwdown = LIS_rc%udef + uwind = LIS_rc%udef + vwind = LIS_rc%udef + ps = LIS_rc%udef + prectot = LIS_rc%udef + + ! From this point, we must deallocate memory before returning. + ! Unfortunately this means using a GOTO statement if a problem is + ! encountered, but such is life. + count_tair = 0 + count_qair = 0 + count_swdown = 0 + count_lwdown = 0 + count_uwind = 0 + count_vwind = 0 + count_ps = 0 + count_prectot = 0 + + call grib_count_in_file(ftn,nvars,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[WARN] in grib_count_in_file in ' // & + 'fldbld_read_mogrepsg' + goto 100 + end if + + ! Tentatively loop through every field in GRIB file looking for the variables + ! we want. The code below will exit the loop early if a problem is found *or* + ! once all the required variables are found and read in. + do kk=1,nvars + + call grib_new_from_file(ftn,igrib,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[WARN] failed to read - '//trim(gribfile) + goto 100 + end if + + call grib_get(igrib,'discipline',param_disc_val,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) '[WARN] in grib_get: parameterNumber in ' // & + 'fldbld_read_mogrepsg' + call grib_release(igrib,ierr) + goto 100 + end if + + call grib_get(igrib,'parameterCategory',param_cat_val,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) & + '[WARN] in grib_get: parameterCategory in ' // & + 'fldbld_read_mogrepsg' + call grib_release(igrib,ierr) + goto 100 + end if + + call grib_get(igrib,'parameterNumber',param_num_val,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) & + '[WARN] in grib_get: parameterNumber in ' // & + 'fldbld_read_mogrepsg' + call grib_release(igrib,ierr) + goto 100 + end if + + call grib_get(igrib,'typeOfFirstFixedSurface',surface_val,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) & + '[WARN] in grib_get: level in ' // & + 'fldbld_read_mogrepsg' + call grib_release(igrib,ierr) + goto 100 + end if + + call grib_get(igrib,'level',level_val,ierr) + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) & + '[WARN] in grib_get: level in ' // & + 'fldbld_read_mogrepsg' + call grib_release(igrib,ierr) + goto 100 + end if + + ! We have enough information to determine what GRIB parameter this is. + grib_msg = check_mogrepsg_message(param_disc_val, & + param_cat_val, param_num_val, surface_val, level_val) + + ! Skip this field if GRIB parameter is not required. + if (grib_msg == 'none') then + call grib_release(igrib,ierr) + if (ierr .ne. 0) then + write(LIS_logunit,*)'[WARN], in grib_release: in ' //& + 'fldbld_read_mogrepsg' + goto 100 + end if + cycle ! Not a message we are interested in. + end if + + if (grib_msg == 'v10') then + call grib_get(igrib,'values',dumv1d,ierr) + else + call grib_get(igrib,'values',dum1d,ierr) + endif + + if ( ierr .ne. 0 ) then + write(LIS_logunit,*) & + '[WARN] in grib_get: values for '//grib_msg// ' in ' // & + 'fldbld_read_mogrepsg' + call grib_release(igrib,ierr) + goto 100 + end if + + select case (grib_msg) + case('t2') ! 2-m temperature + fg_tair(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_tair = count_tair + 1 + case ('q2') ! 2-m relative humidity + fg_qair(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_qair = count_qair + 1 + case ('swdown') ! downward shortwave + fg_swdown(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_swdown = count_swdown + 1 + case ('lwdown') ! downward longwave radiation + fg_lwdown(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_lwdown = count_lwdown + 1 + case ('u10') ! 10m u-wind + fg_uwind(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_uwind = count_uwind + 1 + case('v10') ! 10m v-wind + fg_vwind(:,:) = reshape(dumv1d, (/ifguess,jfguess+1/)) + count_vwind = count_vwind + 1 + case('ps') ! surface pressure + fg_ps(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_ps = count_ps + 1 + case('prectot') ! accumulated total precipitation + fg_prectot(:,:) = reshape(dum1d, (/ifguess,jfguess/)) + count_prectot = count_prectot + 1 + + case default ! Internal error, we shouldn't be here + write(LIS_logunit,*)'[ERR] Unknown grib_message ',grib_msg + write(LIS_logunit,*)'Aborting...' + flush(LIS_logunit) + write(cstat,'(i9)',iostat=istat1) ierr + message(1) = 'Program: LIS' + message(2) = ' Subroutine: fldbld_read_mogrepsg.' + message(3) = ' Error reading first guess file:' + message(4) = ' ' // trim(gribfile) + if( istat1 .eq. 0 )then + message(5) = ' Status = ' // trim(cstat) + endif + call LIS_abort( message) + end select + + ! Finished with this field + call grib_release(igrib,ierr) + if (ierr .ne. 0) then + write(LIS_logunit,*)'[WARN], in grib_release: in ' //& + 'fldbld_read_mogrepsg' + goto 100 + end if + + ! Jump out of loop early if we have everything + if ( (count_tair .eq. 1) .and. (count_qair .eq. 1) .and. & + (count_swdown .eq. 1 ) .and. (count_lwdown .eq. 1) .and. & + (count_uwind .eq. 1) .and. (count_vwind .eq. 1) .and. & + (count_ps .eq. 1) .and. (count_prectot .eq. 1)) then + exit + end if + enddo ! Loop through all GRIB file fields + + ! Interpolate the fields to the LIS grid + ! tair + call interp_mogrepsg(n, findex, ifguess, jfguess, .false., fg_tair, tair) + ! qair + call interp_mogrepsg(n, findex, ifguess, jfguess, .false., fg_qair, qair) + ! swdown + call interp_mogrepsg(n, findex, ifguess, jfguess, .false., fg_swdown, swdown) + ! lwdown + call interp_mogrepsg(n, findex, ifguess, jfguess, .false., fg_lwdown, lwdown) + ! uwind + call interp_mogrepsg(n, findex, ifguess, jfguess, .false., fg_uwind, uwind) + ! vwind + call interp_mogrepsg_vwind(n, findex, ifguess, jfguess+1, .false., fg_vwind, vwind) + ! ps + call interp_mogrepsg(n, findex, ifguess, jfguess, .false., fg_ps, ps) + ! prectot + call interp_mogrepsg(n, findex, ifguess, jfguess, .true., fg_prectot, prectot) + + ! At this point, we have everything. Close the file and return. + call grib_close_file(ftn) + rc = 1 + return + + ! Jump down here to clean up memory before returning after finding a + ! problem. + 100 continue + call grib_close_file(ftn) + + deallocate ( dum1d ) + deallocate ( dumv1d ) + deallocate ( fg_tair ) + deallocate ( fg_qair ) + deallocate ( fg_swdown ) + deallocate ( fg_lwdown ) + deallocate ( fg_uwind ) + deallocate ( fg_vwind ) + deallocate ( fg_ps ) + deallocate ( fg_prectot ) + + rc = 0 +#endif + +end subroutine fldbld_read_mogrepsg + +function check_mogrepsg_message(param_disc_val, & + param_cat_val, param_num_val, surface_val, level_val) +! !USES: +! none + + implicit none +! !ARGUMENTS: + integer, intent(in) :: param_disc_val, param_cat_val, & + param_num_val, surface_val, level_val + character(len=7) :: check_mogrepsg_message +!EOP + + if ( param_disc_val == 0 .and. & + param_cat_val == 0 .and. & + param_num_val == 0 .and. & + surface_val == 103 )then + check_mogrepsg_message = 't2' ! Temperature interpolated to 2 metres [K] + elseif ( param_disc_val == 0 .and. & + param_cat_val == 1 .and. & + param_num_val == 0 .and. & + surface_val == 103 ) then + check_mogrepsg_message = 'q2' ! Specific humidity interpolated to 2 metres [kg/kg] + elseif ( param_disc_val == 255 .and. & + param_cat_val == 255 .and. & + param_num_val == 255 .and. & + surface_val == 1 ) then + check_mogrepsg_message = 'swdown' ! Downward shortwave flux at the ground [W/m^2] + elseif ( param_disc_val == 0 .and. & + param_cat_val == 5 .and. & + param_num_val == 3 .and. & + surface_val == 1 ) then + check_mogrepsg_message = 'lwdown' ! Downward longwave radiation at the ground [W/m^2] + elseif ( param_disc_val == 0 .and. & + param_cat_val == 2 .and. & + param_num_val == 2 .and. & + surface_val == 103 .and. & + level_val == 10) then + check_mogrepsg_message = 'u10' ! Instantaneous zonal wind interpolated to 10 metres [m/s] + elseif ( param_disc_val == 0 .and. & + param_cat_val == 2 .and. & + param_num_val == 3 .and. & + surface_val == 103 .and. & + level_val == 10) then + check_mogrepsg_message = 'v10' ! Instantaneous meridional wind interpolated to 10 metres[m/s] + elseif ( param_disc_val == 0 .and. & + param_cat_val == 3 .and. & + param_num_val == 1 ) then + check_mogrepsg_message = 'ps' ! Instantaneous Surface Pressure [Pa] + elseif ( param_disc_val == 0 .and. & + param_cat_val == 1 .and. & + param_num_val == 49 .and. & + surface_val == 1 ) then + check_mogrepsg_message = 'prectot' ! Total precipitation [kg/m2] + else + check_mogrepsg_message = 'none' + endif +end function check_mogrepsg_message + +subroutine interp_mogrepsg(n, findex, ifguess, jfguess, pcp_flag, input, output) + +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_domain + use LIS_logMod, only : LIS_logunit, LIS_endrun + use mogrepsg_forcingMod, only : mogrepsg_struc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex + integer, intent(in) :: ifguess + integer, intent(in) :: jfguess + logical, intent(in) :: pcp_flag + real, intent(in) :: input ( ifguess,jfguess ) + real, intent(out) :: output ( LIS_rc%lnc(n),LIS_rc%lnr(n) ) +! +! !DESCRIPTION: +! +! This routine interpolates the MOGREPS-G data to the LIS grid. + +!EOP + + integer :: mi, mo + integer :: i,j + integer :: iret + integer :: midway + real, allocatable, dimension(:,:) :: var + logical*1, allocatable, dimension(:) :: lb + logical*1, allocatable, dimension(:) :: lo + + external :: bilinear_interp + external :: conserv_interp + external :: neighbor_interp + + allocate(var(ifguess,jfguess)) + allocate(lb(ifguess*jfguess)) + allocate(lo(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + mi = ifguess * jfguess + mo = LIS_rc%lnc(n)*LIS_rc%lnr(n) + lb = .true. + lo = .true. + output = LIS_rc%udef + + ! translate from (0,360) to (-180,180). + midway = ifguess/2 + do j = 1, jfguess + do i = 1, ifguess + if ( (i+midway) < ifguess ) then + var(i,j) = input((i+midway),j) + else + var(i,j) = input((i-midway+1),j) + endif + enddo + enddo + + ! Interpolate to LIS grid + select case( LIS_rc%met_interp(findex) ) + + case( "bilinear" ) + call bilinear_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat,LIS_domain(n)%lon, & + mogrepsg_struc(n)%w111,mogrepsg_struc(n)%w121, & + mogrepsg_struc(n)%w211,mogrepsg_struc(n)%w221, & + mogrepsg_struc(n)%n111,mogrepsg_struc(n)%n121, & + mogrepsg_struc(n)%n211,mogrepsg_struc(n)%n221,LIS_rc%udef,iret) + + case( "budget-bilinear" ) + if (pcp_flag) then + call conserv_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat, LIS_domain(n)%lon, & + mogrepsg_struc(n)%w112,mogrepsg_struc(n)%w122, & + mogrepsg_struc(n)%w212,mogrepsg_struc(n)%w222, & + mogrepsg_struc(n)%n112,mogrepsg_struc(n)%n122, & + mogrepsg_struc(n)%n212,mogrepsg_struc(n)%n222,LIS_rc%udef,iret) + else + call bilinear_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat, LIS_domain(n)%lon, & + mogrepsg_struc(n)%w111,mogrepsg_struc(n)%w121, & + mogrepsg_struc(n)%w211,mogrepsg_struc(n)%w221, & + mogrepsg_struc(n)%n111,mogrepsg_struc(n)%n121, & + mogrepsg_struc(n)%n211,mogrepsg_struc(n)%n221,LIS_rc%udef,iret) + endif + + case( "neighbor" ) + call neighbor_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat, LIS_domain(n)%lon, & + mogrepsg_struc(n)%n113,LIS_rc%udef,iret) + + case DEFAULT + write(LIS_logunit,*) 'ERR: Unexpected interpolation method' + write(LIS_logunit,*) ' in interp_mogrepsg_first_guess' + write(LIS_logunit,*) ' ', trim(LIS_rc%met_interp(findex)) + call LIS_endrun() + end select + + deallocate(var) + deallocate(lb) + deallocate(lo) + +end subroutine interp_mogrepsg + +subroutine interp_mogrepsg_vwind(n, findex, ifguess, jfguess, pcp_flag, input, output) + +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_domain + use LIS_logMod, only : LIS_logunit, LIS_endrun + use mogrepsg_forcingMod, only : mogrepsg_struc + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex + integer, intent(in) :: ifguess + integer, intent(in) :: jfguess + logical, intent(in) :: pcp_flag + real, intent(in) :: input ( ifguess,jfguess ) + real, intent(out) :: output ( LIS_rc%lnc(n),LIS_rc%lnr(n) ) +! +! !DESCRIPTION: +! +! This routine interpolates the MOGREPS-G data to the LIS grid. + +!EOP + + integer :: mi, mo + integer :: i,j + integer :: iret + integer :: midway + real, allocatable, dimension(:,:) :: var + logical*1, allocatable, dimension(:) :: lb + logical*1, allocatable, dimension(:) :: lo + + external :: bilinear_interp + external :: conserv_interp + external :: neighbor_interp + + allocate(var(ifguess,jfguess)) + allocate(lb(ifguess*jfguess)) + allocate(lo(LIS_rc%lnc(n)*LIS_rc%lnr(n))) + + mi = ifguess * jfguess + mo = LIS_rc%lnc(n)*LIS_rc%lnr(n) + lb = .true. + lo = .true. + output = LIS_rc%udef + + ! translate from (0,360) to (-180,180). + midway = ifguess/2 + do j = 1, jfguess + do i = 1, ifguess + if ( (i+midway) < ifguess ) then + var(i,j) = input((i+midway),j) + else + var(i,j) = input((i-midway+1),j) + endif + enddo + enddo + + ! Interpolate to LIS grid + select case( LIS_rc%met_interp(findex) ) + + case( "bilinear" ) + call bilinear_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat,LIS_domain(n)%lon, & + mogrepsg_struc(n)%wv111,mogrepsg_struc(n)%wv121, & + mogrepsg_struc(n)%wv211,mogrepsg_struc(n)%wv221, & + mogrepsg_struc(n)%nv111,mogrepsg_struc(n)%nv121, & + mogrepsg_struc(n)%nv211,mogrepsg_struc(n)%nv221,LIS_rc%udef,iret) + + case( "budget-bilinear" ) + if (pcp_flag) then + call conserv_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat, LIS_domain(n)%lon, & + mogrepsg_struc(n)%wv112,mogrepsg_struc(n)%wv122, & + mogrepsg_struc(n)%wv212,mogrepsg_struc(n)%wv222, & + mogrepsg_struc(n)%nv112,mogrepsg_struc(n)%nv122, & + mogrepsg_struc(n)%nv212,mogrepsg_struc(n)%nv222,LIS_rc%udef,iret) + else + call bilinear_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat, LIS_domain(n)%lon, & + mogrepsg_struc(n)%wv111,mogrepsg_struc(n)%wv121, & + mogrepsg_struc(n)%wv211,mogrepsg_struc(n)%wv221, & + mogrepsg_struc(n)%nv111,mogrepsg_struc(n)%nv121, & + mogrepsg_struc(n)%nv211,mogrepsg_struc(n)%nv221,LIS_rc%udef,iret) + endif + + case( "neighbor" ) + call neighbor_interp(LIS_rc%gridDesc(n,:),lb, & + var,lo,output,mi,mo, & + LIS_domain(n)%lat, LIS_domain(n)%lon, & + mogrepsg_struc(n)%nv113,LIS_rc%udef,iret) + + case DEFAULT + write(LIS_logunit,*) 'ERR: Unexpected interpolation method' + write(LIS_logunit,*) ' in interp_mogrepsg_first_guess' + write(LIS_logunit,*) ' ', trim(LIS_rc%met_interp(findex)) + call LIS_endrun() + end select + + deallocate(var) + deallocate(lb) + deallocate(lo) + +end subroutine interp_mogrepsg_vwind + +!BOP +! +! !ROUTINE: assign_processed_mogrepsgforc +! \label{assign_processed_mogrepsgforc} +! +! !INTERFACE: +subroutine assign_processed_mogrepsgforc(n,m,order,var_index,mogrepsgforc) +! !USES: + use LIS_coreMod + use mogrepsg_forcingMod, only : mogrepsg_struc +! +! !DESCRIPTION: +! This routine assigns the interpolated MOGREPS-G forcing data +! to the module data structures to be used later for +! time interpolation +! +!EOP + implicit none + + integer, intent(in) :: n + integer, intent(in) :: m + integer, intent(in) :: order + integer, intent(in) :: var_index + real, intent(in) :: mogrepsgforc(LIS_rc%lnc(n),LIS_rc%lnr(n)) + + integer :: c,r + + do r=1,LIS_rc%lnr(n) + do c=1,LIS_rc%lnc(n) + if(LIS_domain(n)%gindex(c,r).ne.-1) then + if(order.eq.1) then + mogrepsg_struc(n)%metdata1(var_index,m,& + LIS_domain(n)%gindex(c,r)) = & + mogrepsgforc(c,r) + elseif(order.eq.2) then + mogrepsg_struc(n)%metdata2(var_index,m,& + LIS_domain(n)%gindex(c,r)) = & + mogrepsgforc(c,r) + endif + endif + enddo + enddo +end subroutine assign_processed_mogrepsgforc diff --git a/lis/metforcing/mogreps_g/readcrd_mogrepsg.F90 b/lis/metforcing/mogreps_g/readcrd_mogrepsg.F90 new file mode 100644 index 000000000..38cd984b4 --- /dev/null +++ b/lis/metforcing/mogreps_g/readcrd_mogrepsg.F90 @@ -0,0 +1,97 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: readcrd_mogrepsg +! \label{readcrd_mogrepsg} +! +! !REVISION HISTORY: +! 26 Jan 2023; Yeosang Yoon, Initial Code +! 01 Jan 2024; Yeosang Yoon; update codes for precpi. bias-correction +! +! !INTERFACE: +subroutine readcrd_mogrepsg() +! !USES: + use LIS_logMod + use LIS_coreMod + use mogrepsg_forcingMod, only : mogrepsg_struc + use ESMF +! +! !DESCRIPTION: +! +! This routine reads the options specific to MOGREPS-G forecast forcing from +! the LIS configuration file. +! +!EOP + + implicit none + + integer :: n, rc + + call ESMF_ConfigFindLabel(LIS_config, & + "MOGREPS-G forecast forcing directory:", rc=rc) + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, mogrepsg_struc(n)%odir, & + rc=rc) + call LIS_verify(rc, & + 'MOGREPS-G forecast forcing directory: not defined') + enddo + + call ESMF_ConfigFindLabel(LIS_config, "MOGREPS-G forecast run mode:", & + rc=rc) + call LIS_verify(rc, 'MOGREPS-G forecast run mode: not defined ') + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + mogrepsg_struc(n)%runmode, rc=rc) + enddo + + call ESMF_ConfigFindLabel(LIS_config, & + "MOGREPS-G forecast number of ensemble members:", rc=rc) + call LIS_verify(rc, & + 'MOGREPS-G forecast number of ensemble members: not defined') + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + mogrepsg_struc(n)%max_ens_members, rc=rc) + enddo + + call ESMF_ConfigFindLabel(LIS_config, & + "Apply MOGREPS-G precipitation bias correction:", rc=rc) + call LIS_verify(rc, & + 'Apply MOGREPS-G precipitation bias correction: not defined') + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, mogrepsg_struc(n)%bc, rc=rc) + enddo + + call ESMF_ConfigFindLabel(LIS_config, "MOGREPS-G model CDF file:", rc=rc) + call LIS_verify(rc, 'MOGREPS-G model CDF file: not defined') + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + mogrepsg_struc(n)%cdf_fname, rc=rc) + enddo + + do n = 1, LIS_rc%nnest + write(LIS_logunit,*) '[INFO] Using MOGREPS-G forecast forcing' + write(LIS_logunit,*) & + '[INFO] MOGREPS-G forecast forcing directory: ', & + trim(mogrepsg_struc(n)%odir) + write(LIS_logunit,*) '[INFO] MOGREPS-G forecast run mode: ', & + mogrepsg_struc(n)%runmode + write(LIS_logunit,*) & + '[INFO] MOGREPS-G forecast number of ensemble members:', & + mogrepsg_struc(n)%max_ens_members + write(LIS_logunit,*) & + '[INFO] Using MOGREPS-G precipitation bias correction:',& + mogrepsg_struc(n)%bc + if (mogrepsg_struc(n)%bc == 1) then + write(LIS_logunit,*) '[INFO] MOGREPS-G model CDF file: ', & + trim(mogrepsg_struc(n)%cdf_fname) + endif + enddo +end subroutine readcrd_mogrepsg diff --git a/lis/metforcing/mogreps_g/reset_mogrepsg.F90 b/lis/metforcing/mogreps_g/reset_mogrepsg.F90 new file mode 100644 index 000000000..24ff0cd4e --- /dev/null +++ b/lis/metforcing/mogreps_g/reset_mogrepsg.F90 @@ -0,0 +1,37 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! !MODULE: reset_mogrepsg +! \label{reset_mogrepsg} +! +! !REVISION HISTORY: +! 26 Jan 2023; Yeosang Yoon, Initial Code +! +! !INTERFACE: +subroutine reset_mogrepsg() +! !USES: + use LIS_coreMod, only : LIS_rc + use mogrepsg_forcingMod, only : mogrepsg_struc +! +! !DESCRIPTION: +! Routine to reset GALWEM-GE forcing related memory allocations. +! +!EOP + implicit none + + integer :: n + + do n=1,LIS_rc%nnest + mogrepsg_struc(n)%fcsttime1 = dble(3000.0) + mogrepsg_struc(n)%fcsttime2 = dble(0.0) + enddo + +end subroutine reset_mogrepsg diff --git a/lis/metforcing/mogreps_g/timeinterp_mogrepsg.F90 b/lis/metforcing/mogreps_g/timeinterp_mogrepsg.F90 new file mode 100644 index 000000000..c647d1c1a --- /dev/null +++ b/lis/metforcing/mogreps_g/timeinterp_mogrepsg.F90 @@ -0,0 +1,355 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.3 +! +! Copyright (c) 2020 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! !ROUTINE: timeinterp_mogrepsg +! \label{timeinterp_mogrepsg} +! +! !REVISION HISTORY: +! +! 26 Jan 2023: Yeosang Yoon, Initial specification +! 01 Jan 2024; Yeosang Yoon; update codes for precpi. bias-correction +! +! !INTERFACE: +subroutine timeinterp_mogrepsg(n,findex) +! !USES: + use ESMF + use LIS_coreMod + use LIS_constantsMod + use LIS_metforcingMod + use LIS_FORC_AttributesMod + use LIS_timeMgrMod + use LIS_logMod + use mogrepsg_forcingMod + use LIS_forecastMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + integer, intent(in) :: findex +! +! !DESCRIPTION: +! Temporally interpolates the forcing data to the current model +! timestep. Downward shortwave radiation is interpolated using a +! zenith-angled based approach. Precipitation and longwave radiation +! are not temporally interpolated, and the previous 3 hourly value +! is used. All other variables are linearly interpolated between +! the 3 hourly blocks. +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_time2date](\ref{LIS_time2date}) \newline +! converts the time to a date format +! \item[LIS\_tick](\ref{LIS_tick}) \newline +! advances or retracts time by the specified amount +! \item[zterp](\ref{zterp}) \newline +! zenith-angle based interpolation +! \end{description} +!EOP + integer :: zdoy + real :: zw1, zw2 + real :: czm, cze, czb + real :: wt1, wt2, swt1, swt2 + real :: gmt1, gmt2 + integer :: t,index1 + integer :: bdoy, byr, bmo, bda, bhr, bmn + real*8 :: btime, newtime1, newtime2 + real :: tempgmt1, tempgmt2, tempbts + integer :: tempbdoy, tempbyr, tempbmo, tempbda, tempbhr, tempbmn, tempbss + integer :: status + type(ESMF_Field) :: tmpField, q2Field, uField, vField, swdField, & + lwdField + type(ESMF_Field) :: psurfField, pcpField + real, pointer :: tmp(:), q2(:), uwind(:), vwind(:) + real, pointer :: swd(:), lwd(:), psurf(:), pcp(:) + integer :: mfactor, m, k, tid + + external :: zterp + ! ________________________________________ + + btime=mogrepsg_struc(n)%fcsttime1 + call LIS_time2date(btime, bdoy, gmt1, byr, bmo, bda, bhr, bmn) + + tempbdoy = bdoy + tempgmt1 = gmt1 + tempbyr = byr + tempbmo = bmo + tempbda = bda + tempbhr = bhr + if (tempbhr.eq.24) tempbhr = 0 + tempbmn = bmn + tempbss = 0 + tempbts = 0 + call LIS_tick(newtime1, tempbdoy, tempgmt1, & + tempbyr, tempbmo, tempbda, tempbhr, tempbmn, & + tempbss, tempbts) + + btime = mogrepsg_struc(n)%fcsttime2 + call LIS_time2date(btime, bdoy, gmt2, byr, bmo, bda, bhr, bmn) + + tempbdoy = bdoy + tempgmt2 = gmt2 + tempbyr = byr + tempbmo = bmo + tempbda = bda + tempbhr = bhr + if (tempbhr.eq.24) tempbhr = 0 + tempbmn = bmn + tempbss = 0 + tempbts = 0 + call LIS_tick(newtime2, tempbdoy, tempgmt2,& + tempbyr, tempbmo, tempbda, tempbhr, tempbmn,& + tempbss, tempbts) + + !Interpolate Data in Time + wt1 =real((mogrepsg_struc(n)%fcsttime2-LIS_rc%time)/ & + (mogrepsg_struc(n)%fcsttime2-mogrepsg_struc(n)%fcsttime1)) + wt2 = 1.0 - wt1 + swt1 = real((newtime2-LIS_rc%time)/(newtime2-newtime1)) + swt2 = 1.0 - swt1 + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Tair%varname(1), tmpField,& + rc=status) + call LIS_verify(status, & + 'Error: Enable Tair in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Qair%varname(1), q2Field, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Qair in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_SWdown%varname(1), swdField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable SWdown in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_LWdown%varname(1), lwdField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable LWdown in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Wind_E%varname(1), uField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Wind_E in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Wind_N%varname(1), vField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Wind_N in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Psurf%varname(1), psurfField,& + rc=status) + call LIS_verify(status, & + 'Error: Enable Psurf in the forcing variables list') + + call ESMF_StateGet(LIS_FORC_Base_State(n,findex), & + LIS_FORC_Rainf%varname(1), pcpField, & + rc=status) + call LIS_verify(status, & + 'Error: Enable Rainf in the forcing variables list') + + call ESMF_FieldGet(tmpField, localDE=0, farrayPtr=tmp, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(q2Field, localDE=0, farrayPtr=q2, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(swdField, localDE=0, farrayPtr=swd, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(lwdField, localDE=0, farrayPtr=lwd, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(uField, localDE=0, farrayPtr=uwind, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(vField, localDE=0, farrayPtr=vwind, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(psurfField, localDE=0, farrayPtr=psurf, rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(pcpField, localDE=0, farrayPtr=pcp, rc=status) + call LIS_verify(status) + + ! Metforcing ensemble member count factor + mfactor = LIS_rc%nensem(n) / mogrepsg_struc(n)%max_ens_members + + ! Downward shortwave radiation (average): + do t = 1, LIS_rc%ntiles(n) / LIS_rc%nensem(n) + do m = 1, mogrepsg_struc(n)%max_ens_members + do k = 1, mfactor + tid = (t - 1) * LIS_rc%nensem(n)+(m-1)*mfactor + k + index1 = LIS_domain(n)%tile(tid)%index + zdoy = LIS_rc%doy + + ! Compute and apply zenith angle weights + call zterp(1, LIS_domain(n)%grid(index1)%lat, & + LIS_domain(n)%grid(index1)%lon, & + gmt1, gmt2, LIS_rc%gmt, zdoy, zw1, zw2, czb, cze, czm, & + LIS_rc) + + if (mogrepsg_struc(n)%metdata1(3,m,index1) .ne. LIS_rc%udef & + .and. & + mogrepsg_struc(n)%metdata2(3,m,index1).ne. LIS_rc%udef) & + then + swd(tid) = mogrepsg_struc(n)%metdata1(3,m,index1) * zw1 + & + mogrepsg_struc(n)%metdata2(3,m,index1) * zw2 + !swd(tid) = zw1 * mogrepsg_struc(n)%metdata2(3,m,index1) + + ! In cases of small cos(zenith) angles, use linear weighting to avoid overly large weights + if ((swd(tid) .gt. mogrepsg_struc(n)%metdata1(3,m,index1) & + .and. & + swd(tid) .gt. mogrepsg_struc(n)%metdata2(3,m,index1)) & + .and. & + (czb .lt. 0.1 .or. cze .lt. 0.1)) then + swd(tid) = mogrepsg_struc(n)%metdata1(3,m,index1)*swt1+ & + mogrepsg_struc(n)%metdata2(3,m,index1)*swt2 + endif + + if (swd(t).gt.LIS_CONST_SOLAR) then + write(unit=LIS_logunit,fmt=*) & + '[WARN] sw radiation too high!!' + write(unit=LIS_logunit,fmt=*)'[WARN] it is',swd(t) + write(unit=LIS_logunit,fmt=*)'[WARN] mogrepsgdata1=',& + mogrepsg_struc(n)%metdata1(3,m,index1) + write(unit=LIS_logunit,fmt=*)'[WARN] mogrepsgdata2=',& + mogrepsg_struc(n)%metdata2(3,m,index1) + write(unit=LIS_logunit,fmt=*)'[WARN] zw1=',zw1,'zw2=',zw2 + swd(t) = LIS_CONST_SOLAR + write(unit=LIS_logunit,fmt=*) & + '[WARN] forcing set to ',swd(t) + endif + endif + + if ((swd(t) .ne. LIS_rc%udef) .and. (swd(t) .lt. 0)) then + if (swd(t) .gt. -0.00001) then + swd(t) = 0.0 + else + write(LIS_logunit,*) & + '[ERR] timeinterp_mogrepsg -- Stopping because ', & + 'forcing not udef but lt 0,' + write(LIS_logunit,*)'[ERR] timeinterp_mogrepsg -- ', & + t,swd(t),mogrepsg_struc(n)%metdata2(3,m,index1), & + ' (',LIS_localPet,')' + call LIS_endrun + endif + endif + enddo + enddo + enddo + +!----------------------------------------------------------------------- +! precip variable Block Interpolation +!----------------------------------------------------------------------- + ! Total precipitation field (accumulated): + do t = 1, LIS_rc%ntiles(n) / LIS_rc%nensem(n) + do m = 1, mogrepsg_struc(n)%max_ens_members + do k = 1, mfactor + tid = (t - 1) * LIS_rc%nensem(n) + (m - 1) * mfactor + k + index1 = LIS_domain(n)%tile(tid)%index + + ! apply precipitation bias correction + if (mogrepsg_struc(n)%bc == 1) then !1 - use; or 0 + if (mogrepsg_struc(n)%pcp_bc(m,index1) .ne. & + LIS_rc%udef) then + ! account for the accum fields + pcp(tid) = mogrepsg_struc(n)%pcp_bc(m,index1) / & + real(3600*3) + if (pcp(tid) .lt. 0) then + pcp(tid) = 0.0 + endif + endif + else !don't apply bias correction + if (mogrepsg_struc(n)%metdata2(8,m,index1) .ne. & + LIS_rc%udef) then + ! account for the accum fields + pcp(tid) = (mogrepsg_struc(n)%metdata2(8,m,index1) - & + mogrepsg_struc(n)%metdata1(8,m,index1)) / & + real(3600*3) + if (pcp(tid) .lt. 0) then + pcp(tid) = 0.0 + endif + endif + endif + enddo + enddo + enddo + +!----------------------------------------------------------------------- +! Linearly interpolate everything else +!----------------------------------------------------------------------- + do t = 1, LIS_rc%ntiles(n) / LIS_rc%nensem(n) + do m = 1, mogrepsg_struc(n)%max_ens_members + do k = 1, mfactor + tid = (t - 1)*LIS_rc%nensem(n) + (m - 1) * mfactor + k + index1 = LIS_domain(n)%tile(tid)%index + + ! 2-meter air temp + if ((mogrepsg_struc(n)%metdata1(1,m,index1) .ne. LIS_rc%udef) & + .and. & + (mogrepsg_struc(n)%metdata2(1,m,index1) .ne. & + LIS_rc%udef)) then + tmp(tid) = mogrepsg_struc(n)%metdata1(1,m,index1) * wt1 + & + mogrepsg_struc(n)%metdata2(1,m,index1) * wt2 + endif + ! Specific humidity + if ((mogrepsg_struc(n)%metdata1(2,m,index1) .ne. LIS_rc%udef) & + .and. & + (mogrepsg_struc(n)%metdata2(2,m,index1) .ne. & + LIS_rc%udef)) then + q2(tid) = mogrepsg_struc(n)%metdata1(2,m,index1) * wt1 + & + mogrepsg_struc(n)%metdata2(2,m,index1) * wt2 + endif + ! Downward longwave field + if ((mogrepsg_struc(n)%metdata1(4,m,index1) .ne. & + LIS_rc%udef) .and. & + (mogrepsg_struc(n)%metdata2(4,m,index1) .ne. & + LIS_rc%udef)) then + lwd(tid) = mogrepsg_struc(n)%metdata1(4,m,index1) * wt1 + & + mogrepsg_struc(n)%metdata2(4,m,index1) * wt2 + endif + ! U-wind component + if ((mogrepsg_struc(n)%metdata1(5,m,index1) .ne. LIS_rc%udef) & + .and. & + (mogrepsg_struc(n)%metdata2(5,m,index1) .ne. & + LIS_rc%udef)) then + uwind(tid) = mogrepsg_struc(n)%metdata1(5,m,index1) * wt1 & + + mogrepsg_struc(n)%metdata2(5,m,index1) * wt2 + endif + ! V-wind component + if ((mogrepsg_struc(n)%metdata1(6,m,index1) .ne. LIS_rc%udef) & + .and. & + (mogrepsg_struc(n)%metdata2(6,m,index1) .ne. & + LIS_rc%udef)) then + vwind(tid) = mogrepsg_struc(n)%metdata1(6,m,index1) * wt1 & + + mogrepsg_struc(n)%metdata2(6,m,index1) * wt2 + endif + ! Surface pressure field + if ((mogrepsg_struc(n)%metdata1(7,m,index1) .ne. LIS_rc%udef) & + .and. & + (mogrepsg_struc(n)%metdata2(7,m,index1) .ne. & + LIS_rc%udef)) then + psurf(tid) = mogrepsg_struc(n)%metdata1(7,m,index1) * wt1 & + + mogrepsg_struc(n)%metdata2(7,m,index1) * wt2 + endif + enddo + enddo + enddo + +end subroutine timeinterp_mogrepsg diff --git a/lis/metforcing/mrms/finalize_mrms_grib.F90 b/lis/metforcing/mrms/finalize_mrms_grib.F90 index a00dfdd64..d2585c082 100755 --- a/lis/metforcing/mrms/finalize_mrms_grib.F90 +++ b/lis/metforcing/mrms/finalize_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/get_mrms_grib.F90 b/lis/metforcing/mrms/get_mrms_grib.F90 index 04d209e89..a58e3a9d4 100755 --- a/lis/metforcing/mrms/get_mrms_grib.F90 +++ b/lis/metforcing/mrms/get_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/interp_mrms_grib.F90 b/lis/metforcing/mrms/interp_mrms_grib.F90 index 1f7a0696e..66fb2207d 100755 --- a/lis/metforcing/mrms/interp_mrms_grib.F90 +++ b/lis/metforcing/mrms/interp_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/mrms_grib_forcingMod.F90 b/lis/metforcing/mrms/mrms_grib_forcingMod.F90 index 0906ee66e..4ed00012f 100755 --- a/lis/metforcing/mrms/mrms_grib_forcingMod.F90 +++ b/lis/metforcing/mrms/mrms_grib_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/mrms_gribfile.F90 b/lis/metforcing/mrms/mrms_gribfile.F90 index f6b475a54..250453d2e 100755 --- a/lis/metforcing/mrms/mrms_gribfile.F90 +++ b/lis/metforcing/mrms/mrms_gribfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/read_mrms_grib.F90 b/lis/metforcing/mrms/read_mrms_grib.F90 index e9403d836..030f2a7b8 100755 --- a/lis/metforcing/mrms/read_mrms_grib.F90 +++ b/lis/metforcing/mrms/read_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/readcrd_mrms_grib.F90 b/lis/metforcing/mrms/readcrd_mrms_grib.F90 index b850c4c8b..bbd53ec6a 100755 --- a/lis/metforcing/mrms/readcrd_mrms_grib.F90 +++ b/lis/metforcing/mrms/readcrd_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/reset_mrms_grib.F90 b/lis/metforcing/mrms/reset_mrms_grib.F90 index a1989f2ab..1cf8f2026 100755 --- a/lis/metforcing/mrms/reset_mrms_grib.F90 +++ b/lis/metforcing/mrms/reset_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/mrms/timeinterp_mrms_grib.F90 b/lis/metforcing/mrms/timeinterp_mrms_grib.F90 index ea7c3f756..ae67eceef 100644 --- a/lis/metforcing/mrms/timeinterp_mrms_grib.F90 +++ b/lis/metforcing/mrms/timeinterp_mrms_grib.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/0Intro_nam242.txt b/lis/metforcing/nam242/0Intro_nam242.txt index 8ac6c1bc5..9607294c2 100644 --- a/lis/metforcing/nam242/0Intro_nam242.txt +++ b/lis/metforcing/nam242/0Intro_nam242.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/create_nam242f9_filename.F90 b/lis/metforcing/nam242/create_nam242f9_filename.F90 index f389cf102..21d89979c 100644 --- a/lis/metforcing/nam242/create_nam242f9_filename.F90 +++ b/lis/metforcing/nam242/create_nam242f9_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/create_nam242filename.F90 b/lis/metforcing/nam242/create_nam242filename.F90 index 8b90f3cf1..9582cfe9c 100644 --- a/lis/metforcing/nam242/create_nam242filename.F90 +++ b/lis/metforcing/nam242/create_nam242filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/finalize_nam242.F90 b/lis/metforcing/nam242/finalize_nam242.F90 index b96cde90b..97756b3ec 100644 --- a/lis/metforcing/nam242/finalize_nam242.F90 +++ b/lis/metforcing/nam242/finalize_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/get_nam242.F90 b/lis/metforcing/nam242/get_nam242.F90 index 116a788a2..51bcfac25 100644 --- a/lis/metforcing/nam242/get_nam242.F90 +++ b/lis/metforcing/nam242/get_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/nam242_forcingMod.F90 b/lis/metforcing/nam242/nam242_forcingMod.F90 index f28ade1fe..b86b8fe90 100644 --- a/lis/metforcing/nam242/nam242_forcingMod.F90 +++ b/lis/metforcing/nam242/nam242_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/read_nam242.F90 b/lis/metforcing/nam242/read_nam242.F90 index 2940958ed..68629adf5 100644 --- a/lis/metforcing/nam242/read_nam242.F90 +++ b/lis/metforcing/nam242/read_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/read_nam242_elev.F90 b/lis/metforcing/nam242/read_nam242_elev.F90 index 3ea481dc1..550a5d7b0 100644 --- a/lis/metforcing/nam242/read_nam242_elev.F90 +++ b/lis/metforcing/nam242/read_nam242_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/readcrd_nam242.F90 b/lis/metforcing/nam242/readcrd_nam242.F90 index dc4bdee56..1cb8b822b 100644 --- a/lis/metforcing/nam242/readcrd_nam242.F90 +++ b/lis/metforcing/nam242/readcrd_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/reset_nam242.F90 b/lis/metforcing/nam242/reset_nam242.F90 index 2eec6ccc7..333dc130f 100644 --- a/lis/metforcing/nam242/reset_nam242.F90 +++ b/lis/metforcing/nam242/reset_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nam242/timeinterp_nam242.F90 b/lis/metforcing/nam242/timeinterp_nam242.F90 index 9c60f3fb8..6cabfe65c 100644 --- a/lis/metforcing/nam242/timeinterp_nam242.F90 +++ b/lis/metforcing/nam242/timeinterp_nam242.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/0Intro_narr.txt b/lis/metforcing/narr/0Intro_narr.txt index 1f1e57dba..696fd75fb 100644 --- a/lis/metforcing/narr/0Intro_narr.txt +++ b/lis/metforcing/narr/0Intro_narr.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/finalize_narr.F90 b/lis/metforcing/narr/finalize_narr.F90 index d81cb330b..c4d785bcb 100644 --- a/lis/metforcing/narr/finalize_narr.F90 +++ b/lis/metforcing/narr/finalize_narr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/get_narr.F90 b/lis/metforcing/narr/get_narr.F90 index 8798e4692..5dacf825b 100644 --- a/lis/metforcing/narr/get_narr.F90 +++ b/lis/metforcing/narr/get_narr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/interp_narrfield.F90 b/lis/metforcing/narr/interp_narrfield.F90 index f4a1a7d34..8df784a97 100644 --- a/lis/metforcing/narr/interp_narrfield.F90 +++ b/lis/metforcing/narr/interp_narrfield.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/narr_forcingMod.F90 b/lis/metforcing/narr/narr_forcingMod.F90 index 3bbb00a95..e0fef5024 100644 --- a/lis/metforcing/narr/narr_forcingMod.F90 +++ b/lis/metforcing/narr/narr_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/read_narr.F90 b/lis/metforcing/narr/read_narr.F90 index 2fbb5a549..281c46593 100644 --- a/lis/metforcing/narr/read_narr.F90 +++ b/lis/metforcing/narr/read_narr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/readcrd_narr.F90 b/lis/metforcing/narr/readcrd_narr.F90 index a8cc6a947..f1decbc0d 100644 --- a/lis/metforcing/narr/readcrd_narr.F90 +++ b/lis/metforcing/narr/readcrd_narr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/narr/timeinterp_narr.F90 b/lis/metforcing/narr/timeinterp_narr.F90 index ccb8e824e..a8e219398 100644 --- a/lis/metforcing/narr/timeinterp_narr.F90 +++ b/lis/metforcing/narr/timeinterp_narr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/0Intro_nldas2.txt b/lis/metforcing/nldas2/0Intro_nldas2.txt index 66ad696c3..40eee0772 100644 --- a/lis/metforcing/nldas2/0Intro_nldas2.txt +++ b/lis/metforcing/nldas2/0Intro_nldas2.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/finalize_nldas2.F90 b/lis/metforcing/nldas2/finalize_nldas2.F90 index 0e8e953e5..85e8af6a2 100644 --- a/lis/metforcing/nldas2/finalize_nldas2.F90 +++ b/lis/metforcing/nldas2/finalize_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/get_gesdisc_filenames.F90 b/lis/metforcing/nldas2/get_gesdisc_filenames.F90 index a7541f2a6..db3ae8dc2 100755 --- a/lis/metforcing/nldas2/get_gesdisc_filenames.F90 +++ b/lis/metforcing/nldas2/get_gesdisc_filenames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/get_ncep_filenames.F90 b/lis/metforcing/nldas2/get_ncep_filenames.F90 index dcf80afe5..8aa0db898 100755 --- a/lis/metforcing/nldas2/get_ncep_filenames.F90 +++ b/lis/metforcing/nldas2/get_ncep_filenames.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/get_nldas2.F90 b/lis/metforcing/nldas2/get_nldas2.F90 index 18ff87bee..e6b0516d8 100644 --- a/lis/metforcing/nldas2/get_nldas2.F90 +++ b/lis/metforcing/nldas2/get_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/nldas2_ec_removal.F90 b/lis/metforcing/nldas2/nldas2_ec_removal.F90 index 7c2883091..e4de89681 100644 --- a/lis/metforcing/nldas2/nldas2_ec_removal.F90 +++ b/lis/metforcing/nldas2/nldas2_ec_removal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/nldas2_forcingMod.F90 b/lis/metforcing/nldas2/nldas2_forcingMod.F90 index 8019e598d..e3c65b227 100644 --- a/lis/metforcing/nldas2/nldas2_forcingMod.F90 +++ b/lis/metforcing/nldas2/nldas2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/read_nldas2_elev.F90 b/lis/metforcing/nldas2/read_nldas2_elev.F90 index 88a827cd9..dafe7647c 100644 --- a/lis/metforcing/nldas2/read_nldas2_elev.F90 +++ b/lis/metforcing/nldas2/read_nldas2_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/read_nldas2a.F90 b/lis/metforcing/nldas2/read_nldas2a.F90 index c8e759b8a..5f20a59ae 100644 --- a/lis/metforcing/nldas2/read_nldas2a.F90 +++ b/lis/metforcing/nldas2/read_nldas2a.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/read_nldas2b.F90 b/lis/metforcing/nldas2/read_nldas2b.F90 index fe4718c55..206f4512c 100644 --- a/lis/metforcing/nldas2/read_nldas2b.F90 +++ b/lis/metforcing/nldas2/read_nldas2b.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/read_orig_nldas2_elevdiff.F90 b/lis/metforcing/nldas2/read_orig_nldas2_elevdiff.F90 index e1b4ba82a..c433f426d 100644 --- a/lis/metforcing/nldas2/read_orig_nldas2_elevdiff.F90 +++ b/lis/metforcing/nldas2/read_orig_nldas2_elevdiff.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/readcrd_nldas2.F90 b/lis/metforcing/nldas2/readcrd_nldas2.F90 index 906d77161..32a0ac18a 100644 --- a/lis/metforcing/nldas2/readcrd_nldas2.F90 +++ b/lis/metforcing/nldas2/readcrd_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/reset_nldas2.F90 b/lis/metforcing/nldas2/reset_nldas2.F90 index 03707f70c..353ae2bf6 100644 --- a/lis/metforcing/nldas2/reset_nldas2.F90 +++ b/lis/metforcing/nldas2/reset_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/nldas2/timeinterp_nldas2.F90 b/lis/metforcing/nldas2/timeinterp_nldas2.F90 index a43bfa5a1..3ae8d97bb 100644 --- a/lis/metforcing/nldas2/timeinterp_nldas2.F90 +++ b/lis/metforcing/nldas2/timeinterp_nldas2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/0Intro_petusgs.txt b/lis/metforcing/pet_usgs/0Intro_petusgs.txt index 62edb398d..fed150ed2 100644 --- a/lis/metforcing/pet_usgs/0Intro_petusgs.txt +++ b/lis/metforcing/pet_usgs/0Intro_petusgs.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/finalize_petusgs.F90 b/lis/metforcing/pet_usgs/finalize_petusgs.F90 index 9e7c66c62..82ed94346 100644 --- a/lis/metforcing/pet_usgs/finalize_petusgs.F90 +++ b/lis/metforcing/pet_usgs/finalize_petusgs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/get_petusgs.F90 b/lis/metforcing/pet_usgs/get_petusgs.F90 index 0164c83ce..65484d77c 100644 --- a/lis/metforcing/pet_usgs/get_petusgs.F90 +++ b/lis/metforcing/pet_usgs/get_petusgs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/interp_petusgs.F90 b/lis/metforcing/pet_usgs/interp_petusgs.F90 index 8cdeae2f8..a5800413a 100644 --- a/lis/metforcing/pet_usgs/interp_petusgs.F90 +++ b/lis/metforcing/pet_usgs/interp_petusgs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/petusgs_forcingMod.F90 b/lis/metforcing/pet_usgs/petusgs_forcingMod.F90 index e85bcc8a7..c5ceb6495 100644 --- a/lis/metforcing/pet_usgs/petusgs_forcingMod.F90 +++ b/lis/metforcing/pet_usgs/petusgs_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/read_petusgs.F90 b/lis/metforcing/pet_usgs/read_petusgs.F90 index e87ba0212..72c4fa217 100644 --- a/lis/metforcing/pet_usgs/read_petusgs.F90 +++ b/lis/metforcing/pet_usgs/read_petusgs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/readpetusgscrd.F90 b/lis/metforcing/pet_usgs/readpetusgscrd.F90 index e0a04c4a1..d064f2511 100644 --- a/lis/metforcing/pet_usgs/readpetusgscrd.F90 +++ b/lis/metforcing/pet_usgs/readpetusgscrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pet_usgs/timeinterp_petusgs.F90 b/lis/metforcing/pet_usgs/timeinterp_petusgs.F90 index d43d34bec..0679f61f7 100644 --- a/lis/metforcing/pet_usgs/timeinterp_petusgs.F90 +++ b/lis/metforcing/pet_usgs/timeinterp_petusgs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/finalize_plumber2.F90 b/lis/metforcing/plumber2/finalize_plumber2.F90 index d904812d5..07b0df54d 100644 --- a/lis/metforcing/plumber2/finalize_plumber2.F90 +++ b/lis/metforcing/plumber2/finalize_plumber2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/get_plumber2.F90 b/lis/metforcing/plumber2/get_plumber2.F90 index 3c0ce22e9..c099054d8 100644 --- a/lis/metforcing/plumber2/get_plumber2.F90 +++ b/lis/metforcing/plumber2/get_plumber2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/plumber2_forcingMod.F90 b/lis/metforcing/plumber2/plumber2_forcingMod.F90 index 711149c7b..9df3c7189 100644 --- a/lis/metforcing/plumber2/plumber2_forcingMod.F90 +++ b/lis/metforcing/plumber2/plumber2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/read_plumber2.F90 b/lis/metforcing/plumber2/read_plumber2.F90 index 5d0e8d3c0..28e471111 100755 --- a/lis/metforcing/plumber2/read_plumber2.F90 +++ b/lis/metforcing/plumber2/read_plumber2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/readcrd_plumber2.F90 b/lis/metforcing/plumber2/readcrd_plumber2.F90 index ca183d62d..5081c9365 100644 --- a/lis/metforcing/plumber2/readcrd_plumber2.F90 +++ b/lis/metforcing/plumber2/readcrd_plumber2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/reset_plumber2.F90 b/lis/metforcing/plumber2/reset_plumber2.F90 index 015f40915..4bee639a0 100755 --- a/lis/metforcing/plumber2/reset_plumber2.F90 +++ b/lis/metforcing/plumber2/reset_plumber2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/plumber2/timeinterp_plumber2.F90 b/lis/metforcing/plumber2/timeinterp_plumber2.F90 index 6203283e4..1e35b9733 100644 --- a/lis/metforcing/plumber2/timeinterp_plumber2.F90 +++ b/lis/metforcing/plumber2/timeinterp_plumber2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/0Intro_genEnsFcst.txt b/lis/metforcing/pptEnsFcst/0Intro_genEnsFcst.txt index 487210e68..0134efa2e 100644 --- a/lis/metforcing/pptEnsFcst/0Intro_genEnsFcst.txt +++ b/lis/metforcing/pptEnsFcst/0Intro_genEnsFcst.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/finalize_pptEnsFcst.F90 b/lis/metforcing/pptEnsFcst/finalize_pptEnsFcst.F90 index 279f6528f..47bdf16dc 100644 --- a/lis/metforcing/pptEnsFcst/finalize_pptEnsFcst.F90 +++ b/lis/metforcing/pptEnsFcst/finalize_pptEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/get_pptEnsFcst.F90 b/lis/metforcing/pptEnsFcst/get_pptEnsFcst.F90 index 0eaee2eb5..34af840da 100644 --- a/lis/metforcing/pptEnsFcst/get_pptEnsFcst.F90 +++ b/lis/metforcing/pptEnsFcst/get_pptEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/get_pptEnsFcst_filename.F90 b/lis/metforcing/pptEnsFcst/get_pptEnsFcst_filename.F90 index df62c11bd..9abe2ae86 100755 --- a/lis/metforcing/pptEnsFcst/get_pptEnsFcst_filename.F90 +++ b/lis/metforcing/pptEnsFcst/get_pptEnsFcst_filename.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/pptEnsFcst_SpatialInterpMod.F90 b/lis/metforcing/pptEnsFcst/pptEnsFcst_SpatialInterpMod.F90 index 12ebdd566..d0a79ec7c 100644 --- a/lis/metforcing/pptEnsFcst/pptEnsFcst_SpatialInterpMod.F90 +++ b/lis/metforcing/pptEnsFcst/pptEnsFcst_SpatialInterpMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/pptEnsFcst_VariablesMod.F90 b/lis/metforcing/pptEnsFcst/pptEnsFcst_VariablesMod.F90 index bb2415970..146a3c3ef 100644 --- a/lis/metforcing/pptEnsFcst/pptEnsFcst_VariablesMod.F90 +++ b/lis/metforcing/pptEnsFcst/pptEnsFcst_VariablesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/pptEnsFcst_forcingMod.F90 b/lis/metforcing/pptEnsFcst/pptEnsFcst_forcingMod.F90 index 8261b9204..b0e7cb51a 100644 --- a/lis/metforcing/pptEnsFcst/pptEnsFcst_forcingMod.F90 +++ b/lis/metforcing/pptEnsFcst/pptEnsFcst_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/readcrd_pptEnsFcst.F90 b/lis/metforcing/pptEnsFcst/readcrd_pptEnsFcst.F90 index 899f604e4..5cc6d95bf 100644 --- a/lis/metforcing/pptEnsFcst/readcrd_pptEnsFcst.F90 +++ b/lis/metforcing/pptEnsFcst/readcrd_pptEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/reset_pptEnsFcst.F90 b/lis/metforcing/pptEnsFcst/reset_pptEnsFcst.F90 index 3018902cc..0b49827bc 100644 --- a/lis/metforcing/pptEnsFcst/reset_pptEnsFcst.F90 +++ b/lis/metforcing/pptEnsFcst/reset_pptEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/pptEnsFcst/timeinterp_pptEnsFcst.F90 b/lis/metforcing/pptEnsFcst/timeinterp_pptEnsFcst.F90 index 2518cbb1b..867619dc5 100644 --- a/lis/metforcing/pptEnsFcst/timeinterp_pptEnsFcst.F90 +++ b/lis/metforcing/pptEnsFcst/timeinterp_pptEnsFcst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/0Intro_princeton.txt b/lis/metforcing/princeton/0Intro_princeton.txt index 7afe9c2a3..ce237c903 100644 --- a/lis/metforcing/princeton/0Intro_princeton.txt +++ b/lis/metforcing/princeton/0Intro_princeton.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/finalize_princeton.F90 b/lis/metforcing/princeton/finalize_princeton.F90 index 061e0b3ed..5f71c82f3 100644 --- a/lis/metforcing/princeton/finalize_princeton.F90 +++ b/lis/metforcing/princeton/finalize_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/get_princeton.F90 b/lis/metforcing/princeton/get_princeton.F90 index 059d9d22e..ad804496c 100644 --- a/lis/metforcing/princeton/get_princeton.F90 +++ b/lis/metforcing/princeton/get_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/princeton_forcingMod.F90 b/lis/metforcing/princeton/princeton_forcingMod.F90 index 168542eab..817b61d48 100644 --- a/lis/metforcing/princeton/princeton_forcingMod.F90 +++ b/lis/metforcing/princeton/princeton_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/read_princeton.F90 b/lis/metforcing/princeton/read_princeton.F90 index 13b443c15..14703fa1a 100644 --- a/lis/metforcing/princeton/read_princeton.F90 +++ b/lis/metforcing/princeton/read_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/read_princeton_elev.F90 b/lis/metforcing/princeton/read_princeton_elev.F90 index e86c9ff4d..991aa83c2 100644 --- a/lis/metforcing/princeton/read_princeton_elev.F90 +++ b/lis/metforcing/princeton/read_princeton_elev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/readcrd_princeton.F90 b/lis/metforcing/princeton/readcrd_princeton.F90 index a47772d7b..7ac1c59cc 100644 --- a/lis/metforcing/princeton/readcrd_princeton.F90 +++ b/lis/metforcing/princeton/readcrd_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/reset_princeton.F90 b/lis/metforcing/princeton/reset_princeton.F90 index a21130db0..f34e7f6f9 100644 --- a/lis/metforcing/princeton/reset_princeton.F90 +++ b/lis/metforcing/princeton/reset_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/princeton/timeinterp_princeton.F90 b/lis/metforcing/princeton/timeinterp_princeton.F90 index 13dc7dc4f..9030efdb4 100644 --- a/lis/metforcing/princeton/timeinterp_princeton.F90 +++ b/lis/metforcing/princeton/timeinterp_princeton.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/0Intro_scan.txt b/lis/metforcing/scan/0Intro_scan.txt index e88c47085..2027553d8 100644 --- a/lis/metforcing/scan/0Intro_scan.txt +++ b/lis/metforcing/scan/0Intro_scan.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/finalize_scan.F90 b/lis/metforcing/scan/finalize_scan.F90 index db4417746..9c536d08a 100644 --- a/lis/metforcing/scan/finalize_scan.F90 +++ b/lis/metforcing/scan/finalize_scan.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/get_scan.F90 b/lis/metforcing/scan/get_scan.F90 index ecc525b1c..b23fc1522 100644 --- a/lis/metforcing/scan/get_scan.F90 +++ b/lis/metforcing/scan/get_scan.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/read_scan.F90 b/lis/metforcing/scan/read_scan.F90 index 300a2cec4..2925bf8a7 100644 --- a/lis/metforcing/scan/read_scan.F90 +++ b/lis/metforcing/scan/read_scan.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/readcrd_scan.F90 b/lis/metforcing/scan/readcrd_scan.F90 index 424ec9c82..6a6db544b 100644 --- a/lis/metforcing/scan/readcrd_scan.F90 +++ b/lis/metforcing/scan/readcrd_scan.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/scan_forcingMod.F90 b/lis/metforcing/scan/scan_forcingMod.F90 index bea5a23f7..f2cd04fc4 100644 --- a/lis/metforcing/scan/scan_forcingMod.F90 +++ b/lis/metforcing/scan/scan_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/scan/timeinterp_scan.F90 b/lis/metforcing/scan/timeinterp_scan.F90 index d4236500e..281b44010 100644 --- a/lis/metforcing/scan/timeinterp_scan.F90 +++ b/lis/metforcing/scan/timeinterp_scan.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/snotel/finalize_snotel.F90 b/lis/metforcing/snotel/finalize_snotel.F90 index cb5006547..903e9165d 100644 --- a/lis/metforcing/snotel/finalize_snotel.F90 +++ b/lis/metforcing/snotel/finalize_snotel.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/snotel/get_snotel.F90 b/lis/metforcing/snotel/get_snotel.F90 index fe61e90ca..43cd8e90e 100644 --- a/lis/metforcing/snotel/get_snotel.F90 +++ b/lis/metforcing/snotel/get_snotel.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/snotel/read_snotel.F90 b/lis/metforcing/snotel/read_snotel.F90 index 7f2772365..15b804aaa 100644 --- a/lis/metforcing/snotel/read_snotel.F90 +++ b/lis/metforcing/snotel/read_snotel.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/snotel/readcrd_snotel.F90 b/lis/metforcing/snotel/readcrd_snotel.F90 index a23c4428d..38c99a379 100644 --- a/lis/metforcing/snotel/readcrd_snotel.F90 +++ b/lis/metforcing/snotel/readcrd_snotel.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/snotel/snotel_forcingMod.F90 b/lis/metforcing/snotel/snotel_forcingMod.F90 index 6fff4e8b3..63c6881fa 100644 --- a/lis/metforcing/snotel/snotel_forcingMod.F90 +++ b/lis/metforcing/snotel/snotel_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/snotel/timeinterp_snotel.F90 b/lis/metforcing/snotel/timeinterp_snotel.F90 index 17575a6f3..3916d5d80 100644 --- a/lis/metforcing/snotel/timeinterp_snotel.F90 +++ b/lis/metforcing/snotel/timeinterp_snotel.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/0Intro_stage2.txt b/lis/metforcing/stg2/0Intro_stage2.txt index abfd10c4b..f86aab7a3 100644 --- a/lis/metforcing/stg2/0Intro_stage2.txt +++ b/lis/metforcing/stg2/0Intro_stage2.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/finalize_stg2.F90 b/lis/metforcing/stg2/finalize_stg2.F90 index 812a440e0..e8396365a 100644 --- a/lis/metforcing/stg2/finalize_stg2.F90 +++ b/lis/metforcing/stg2/finalize_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/get_stg2.F90 b/lis/metforcing/stg2/get_stg2.F90 index 8f1a4b8a9..08787a44a 100644 --- a/lis/metforcing/stg2/get_stg2.F90 +++ b/lis/metforcing/stg2/get_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/interp_stg2.F90 b/lis/metforcing/stg2/interp_stg2.F90 index c6b393278..71cde5d42 100644 --- a/lis/metforcing/stg2/interp_stg2.F90 +++ b/lis/metforcing/stg2/interp_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/read_stg2.F90 b/lis/metforcing/stg2/read_stg2.F90 index 7e09d0361..33b44a266 100644 --- a/lis/metforcing/stg2/read_stg2.F90 +++ b/lis/metforcing/stg2/read_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/readcrd_stg2.F90 b/lis/metforcing/stg2/readcrd_stg2.F90 index 9b283e79e..3f6369927 100644 --- a/lis/metforcing/stg2/readcrd_stg2.F90 +++ b/lis/metforcing/stg2/readcrd_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/stg2_forcingMod.F90 b/lis/metforcing/stg2/stg2_forcingMod.F90 index 7624ec55f..e278277cf 100644 --- a/lis/metforcing/stg2/stg2_forcingMod.F90 +++ b/lis/metforcing/stg2/stg2_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/stg2file.F90 b/lis/metforcing/stg2/stg2file.F90 index 5ca362282..8435efd17 100644 --- a/lis/metforcing/stg2/stg2file.F90 +++ b/lis/metforcing/stg2/stg2file.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg2/timeinterp_stg2.F90 b/lis/metforcing/stg2/timeinterp_stg2.F90 index dcf6c3dc6..a23bfc066 100644 --- a/lis/metforcing/stg2/timeinterp_stg2.F90 +++ b/lis/metforcing/stg2/timeinterp_stg2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/0Intro_stage4.txt b/lis/metforcing/stg4/0Intro_stage4.txt index cef7edb0b..5a15e1ffc 100644 --- a/lis/metforcing/stg4/0Intro_stage4.txt +++ b/lis/metforcing/stg4/0Intro_stage4.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/finalize_stg4.F90 b/lis/metforcing/stg4/finalize_stg4.F90 index af27c7c3d..fb5e22cd7 100644 --- a/lis/metforcing/stg4/finalize_stg4.F90 +++ b/lis/metforcing/stg4/finalize_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/get_stg4.F90 b/lis/metforcing/stg4/get_stg4.F90 index 6d8a0f7ca..a0babf676 100644 --- a/lis/metforcing/stg4/get_stg4.F90 +++ b/lis/metforcing/stg4/get_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/interp_stg4.F90 b/lis/metforcing/stg4/interp_stg4.F90 index 8e6c71ebf..fab3f11f9 100644 --- a/lis/metforcing/stg4/interp_stg4.F90 +++ b/lis/metforcing/stg4/interp_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/read_stg4.F90 b/lis/metforcing/stg4/read_stg4.F90 index c46200ec5..61c971b9c 100644 --- a/lis/metforcing/stg4/read_stg4.F90 +++ b/lis/metforcing/stg4/read_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/readcrd_stg4.F90 b/lis/metforcing/stg4/readcrd_stg4.F90 index c27aea4bc..b724982ff 100644 --- a/lis/metforcing/stg4/readcrd_stg4.F90 +++ b/lis/metforcing/stg4/readcrd_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/reset_stg4.F90 b/lis/metforcing/stg4/reset_stg4.F90 index d9f414d49..179abd471 100644 --- a/lis/metforcing/stg4/reset_stg4.F90 +++ b/lis/metforcing/stg4/reset_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/stg4_forcingMod.F90 b/lis/metforcing/stg4/stg4_forcingMod.F90 index 7389d9926..a16b73de7 100644 --- a/lis/metforcing/stg4/stg4_forcingMod.F90 +++ b/lis/metforcing/stg4/stg4_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/stg4file.F90 b/lis/metforcing/stg4/stg4file.F90 index d6e3a944a..710716fa4 100644 --- a/lis/metforcing/stg4/stg4file.F90 +++ b/lis/metforcing/stg4/stg4file.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/stg4/timeinterp_stg4.F90 b/lis/metforcing/stg4/timeinterp_stg4.F90 index 69864ccd8..a970ea0ab 100644 --- a/lis/metforcing/stg4/timeinterp_stg4.F90 +++ b/lis/metforcing/stg4/timeinterp_stg4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/templateMetForc/0Intro_template.txt b/lis/metforcing/templateMetForc/0Intro_template.txt index 6d649c93d..efabc8cea 100644 --- a/lis/metforcing/templateMetForc/0Intro_template.txt +++ b/lis/metforcing/templateMetForc/0Intro_template.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/templateMetForc/finalize_metForcTemplate.F90 b/lis/metforcing/templateMetForc/finalize_metForcTemplate.F90 index 1ac9f53c9..3b51c21df 100644 --- a/lis/metforcing/templateMetForc/finalize_metForcTemplate.F90 +++ b/lis/metforcing/templateMetForc/finalize_metForcTemplate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/templateMetForc/get_metForcTemplate.F90 b/lis/metforcing/templateMetForc/get_metForcTemplate.F90 index e2010439e..870fad05e 100644 --- a/lis/metforcing/templateMetForc/get_metForcTemplate.F90 +++ b/lis/metforcing/templateMetForc/get_metForcTemplate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/templateMetForc/metForcTemplate_forcingMod.F90 b/lis/metforcing/templateMetForc/metForcTemplate_forcingMod.F90 index 0b80f78ac..fcaea46a3 100644 --- a/lis/metforcing/templateMetForc/metForcTemplate_forcingMod.F90 +++ b/lis/metforcing/templateMetForc/metForcTemplate_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/templateMetForc/reset_metForcTemplate.F90 b/lis/metforcing/templateMetForc/reset_metForcTemplate.F90 index 36d9ef262..fde525325 100644 --- a/lis/metforcing/templateMetForc/reset_metForcTemplate.F90 +++ b/lis/metforcing/templateMetForc/reset_metForcTemplate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/templateMetForc/timeinterp_metForctemplate.F90 b/lis/metforcing/templateMetForc/timeinterp_metForctemplate.F90 index 250fd918a..46ae4733b 100644 --- a/lis/metforcing/templateMetForc/timeinterp_metForctemplate.F90 +++ b/lis/metforcing/templateMetForc/timeinterp_metForctemplate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_bakfac.F90 b/lis/metforcing/usaf/AGRMET_bakfac.F90 index 1fce3a8b1..be4ff0d53 100644 --- a/lis/metforcing/usaf/AGRMET_bakfac.F90 +++ b/lis/metforcing/usaf/AGRMET_bakfac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_bndslc.F90 b/lis/metforcing/usaf/AGRMET_bndslc.F90 index 5670a8e92..68688168c 100644 --- a/lis/metforcing/usaf/AGRMET_bndslc.F90 +++ b/lis/metforcing/usaf/AGRMET_bndslc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_calc_albedo.F90 b/lis/metforcing/usaf/AGRMET_calc_albedo.F90 index c3e5be678..728a153f6 100644 --- a/lis/metforcing/usaf/AGRMET_calc_albedo.F90 +++ b/lis/metforcing/usaf/AGRMET_calc_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_calcrh.F90 b/lis/metforcing/usaf/AGRMET_calcrh.F90 index 43812c479..dd83a3289 100644 --- a/lis/metforcing/usaf/AGRMET_calcrh.F90 +++ b/lis/metforcing/usaf/AGRMET_calcrh.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_calcrh_dpt.F90 b/lis/metforcing/usaf/AGRMET_calcrh_dpt.F90 index de3138bb6..bac183591 100644 --- a/lis/metforcing/usaf/AGRMET_calcrh_dpt.F90 +++ b/lis/metforcing/usaf/AGRMET_calcrh_dpt.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_calest.F90 b/lis/metforcing/usaf/AGRMET_calest.F90 index 7a48fa3d9..0b6ac3ce3 100644 --- a/lis/metforcing/usaf/AGRMET_calest.F90 +++ b/lis/metforcing/usaf/AGRMET_calest.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_cdfs2_est.F90 b/lis/metforcing/usaf/AGRMET_cdfs2_est.F90 index 0833ee06c..d8f82d477 100644 --- a/lis/metforcing/usaf/AGRMET_cdfs2_est.F90 +++ b/lis/metforcing/usaf/AGRMET_cdfs2_est.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -259,7 +259,7 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& agrmet_struc(n)%clouddir,agrmet_struc(n)%use_timestamp,hemi,& yr,mo,da,hr) - write(LIS_logunit,*)'- OPENING ', trim(ifil) + write(LIS_logunit,*)'[INFO] OPENING ', trim(ifil) open(9, file=trim(ifil), access='direct', & recl=icdfs2*jcdfs2*1, iostat=istat, status="old") @@ -268,7 +268,7 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& ! ------------------------------------------------------------------ if (istat /= 0) then - write(LIS_logunit,*)'- ERROR OPENING ',trim(ifil),istat + write(LIS_logunit,*)'[ERR] ERROR OPENING ',trim(ifil),istat error_flag = .true. cycle READ_DATA end if @@ -277,12 +277,12 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& ! bad read, cycle loop and try to use previous hour's data. ! ------------------------------------------------------------------ - write(LIS_logunit,*)'- READING ',trim(ifil) + write(LIS_logunit,*)'[INFO] READING ',trim(ifil) read(9, rec=1, iostat=istat) totalc(hemi,:,:) close(9) if (istat /= 0) then - write(LIS_logunit,*)'- ERROR READING ',trim(ifil) + write(LIS_logunit,*)'[ERR] ERROR READING ',trim(ifil) error_flag = .true. cycle READ_DATA end if @@ -294,7 +294,7 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& call agrmet_cdfs_pixltime_filename(ifil,agrmet_struc(n)%agrmetdir,& agrmet_struc(n)%clouddir,agrmet_struc(n)%use_timestamp,hemi,& yr,mo,da,hr) - write(LIS_logunit,*)'- OPENING ', trim(ifil) + write(LIS_logunit,*)'[INFO] OPENING ', trim(ifil) open(9, file=trim(ifil), access='direct', & recl=icdfs2*jcdfs2*4, iostat=istat, status="old") @@ -304,12 +304,12 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& ! ------------------------------------------------------------------ if (istat /= 0) then - write(LIS_logunit,*)'- ERROR OPENING ',trim(ifil) + write(LIS_logunit,*)'[ERR] Cannot open ',trim(ifil) error_flag = .true. cycle READ_DATA end if - write(LIS_logunit,*)'- READING ', trim(ifil) + write(LIS_logunit,*)'[INFO] READING ', trim(ifil) read(9, rec=1, iostat=istat) times(hemi, :,:) close(9) @@ -320,7 +320,7 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& ! ------------------------------------------------------------------ if (istat /= 0) then - write(LIS_logunit,*)'- ERROR READING ',trim(ifil) + write(LIS_logunit,*)'[ERR] ERROR READING ',trim(ifil) error_flag = .true. cycle READ_DATA else @@ -339,9 +339,9 @@ subroutine AGRMET_cdfs2_est( n,k, cliprc, clippd,& if (istat /= 0) then write(LIS_logunit,*) - write(LIS_logunit,*) '* IN ROUTINE AGRMET_CDFS2_EST: ERRORS WITH CDFS2 DATA.' - write(LIS_logunit,*) '* DATA IS CORRUPT OR DOES NOT EXIST.' - write(LIS_logunit,*) '* CDFS2 PRECIP ESTIMATE WILL NOT BE PERFORMED.' + write(LIS_logunit,*) '[WARN] IN ROUTINE AGRMET_CDFS2_EST: ERRORS WITH CDFS2 DATA.' + write(LIS_logunit,*) '[WARN] DATA IS CORRUPT OR DOES NOT EXIST.' + write(LIS_logunit,*) '[WARN] CDFS2 PRECIP ESTIMATE WILL NOT BE PERFORMED.' write(LIS_logunit,*) call AGRMET_julhr_date10 ( j3hr, date10 ) diff --git a/lis/metforcing/usaf/AGRMET_cliest.F90 b/lis/metforcing/usaf/AGRMET_cliest.F90 index e81e0d643..34da6c57d 100644 --- a/lis/metforcing/usaf/AGRMET_cliest.F90 +++ b/lis/metforcing/usaf/AGRMET_cliest.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_cmorph.F90 b/lis/metforcing/usaf/AGRMET_cmorph.F90 index 6e0039b3a..1c0b5c9eb 100644 --- a/lis/metforcing/usaf/AGRMET_cmorph.F90 +++ b/lis/metforcing/usaf/AGRMET_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_coszen.F90 b/lis/metforcing/usaf/AGRMET_coszen.F90 index 37ef2921f..35510d91b 100644 --- a/lis/metforcing/usaf/AGRMET_coszen.F90 +++ b/lis/metforcing/usaf/AGRMET_coszen.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_fgfill.F90 b/lis/metforcing/usaf/AGRMET_fgfill.F90 index 4abc7f553..ef41bc506 100644 --- a/lis/metforcing/usaf/AGRMET_fgfill.F90 +++ b/lis/metforcing/usaf/AGRMET_fgfill.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_fillgaps.F90 b/lis/metforcing/usaf/AGRMET_fillgaps.F90 index 4c5f47f32..445149612 100644 --- a/lis/metforcing/usaf/AGRMET_fillgaps.F90 +++ b/lis/metforcing/usaf/AGRMET_fillgaps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_fldbld.F90 b/lis/metforcing/usaf/AGRMET_fldbld.F90 index 618ea99ac..9829e97cb 100644 --- a/lis/metforcing/usaf/AGRMET_fldbld.F90 +++ b/lis/metforcing/usaf/AGRMET_fldbld.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_fldbld_galwem.F90 b/lis/metforcing/usaf/AGRMET_fldbld_galwem.F90 index 43e717a43..a25bb6b41 100644 --- a/lis/metforcing/usaf/AGRMET_fldbld_galwem.F90 +++ b/lis/metforcing/usaf/AGRMET_fldbld_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -1127,7 +1127,7 @@ subroutine galwem_reset_interp_input(n, findex, gridDesci) agrmet_struc(n)%fg_galwem_interp = LIS_rc%met_interp(findex) - write(LIS_logunit,*) 'MSG: The GALWEM forcing resolution is coarser ' // & + write(LIS_logunit,*) '[INFO] The GALWEM forcing resolution is coarser ' // & 'than the running domain.' write(LIS_logunit,*) ' Interpolating with the ' // & trim(agrmet_struc(n)%fg_galwem_interp) // ' method.' @@ -1184,7 +1184,7 @@ subroutine galwem_reset_interp_input(n, findex, gridDesci) elseif ( howtoTransform == 'neighbor') then agrmet_struc(n)%fg_galwem_interp = 'neighbor' - write(LIS_logunit,*) 'MSG: The GALWEM forcing resolution is comparable ' // & + write(LIS_logunit,*) '[INFO] The GALWEM forcing resolution is comparable ' // & 'to the running domain.' write(LIS_logunit,*) ' Interpolating with the ' // & trim(agrmet_struc(n)%fg_galwem_interp) // ' method.' @@ -1195,7 +1195,7 @@ subroutine galwem_reset_interp_input(n, findex, gridDesci) elseif ( howtoTransform == 'upscale' ) then agrmet_struc(n)%fg_galwem_interp = LIS_rc%met_upscale(findex) - write(LIS_logunit,*) 'MSG: The GALWEM forcing resolution is finer ' // & + write(LIS_logunit,*) '[INFO] The GALWEM forcing resolution is finer ' // & 'than the running domain.' write(LIS_logunit,*) ' Upscaling with the ' // & trim(agrmet_struc(n)%fg_galwem_interp) // ' method.' diff --git a/lis/metforcing/usaf/AGRMET_fldbld_gfs.F90 b/lis/metforcing/usaf/AGRMET_fldbld_gfs.F90 index 2667559f8..87d5c665b 100644 --- a/lis/metforcing/usaf/AGRMET_fldbld_gfs.F90 +++ b/lis/metforcing/usaf/AGRMET_fldbld_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -1587,7 +1587,7 @@ subroutine gfs_reset_interp_input(n, findex, gridDesci) agrmet_struc(n)%fg_gfs_interp = LIS_rc%met_interp(findex) - write(LIS_logunit,*) 'MSG: The GFS forcing resolution is coarser ' // & + write(LIS_logunit,*) '[INFO] The GFS forcing resolution is coarser ' // & 'than the running domain.' write(LIS_logunit,*) ' Interpolating with the ' // & trim(agrmet_struc(n)%fg_gfs_interp) // ' method.' @@ -1644,7 +1644,7 @@ subroutine gfs_reset_interp_input(n, findex, gridDesci) elseif ( howtoTransform == 'neighbor') then agrmet_struc(n)%fg_gfs_interp = 'neighbor' - write(LIS_logunit,*) 'MSG: The GFS forcing resolution is comparable ' // & + write(LIS_logunit,*) '[INFO] The GFS forcing resolution is comparable ' // & 'to the running domain.' write(LIS_logunit,*) ' Interpolating with the ' // & trim(agrmet_struc(n)%fg_gfs_interp) // ' method.' @@ -1655,7 +1655,7 @@ subroutine gfs_reset_interp_input(n, findex, gridDesci) elseif ( howtoTransform == 'upscale' ) then agrmet_struc(n)%fg_gfs_interp = LIS_rc%met_upscale(findex) - write(LIS_logunit,*) 'MSG: The GFS forcing resolution is finer ' // & + write(LIS_logunit,*) '[INFO] The GFS forcing resolution is finer ' // & 'than the running domain.' write(LIS_logunit,*) ' Upscaling with the ' // & trim(agrmet_struc(n)%fg_gfs_interp) // ' method.' diff --git a/lis/metforcing/usaf/AGRMET_fldbld_precip_galwem.F90 b/lis/metforcing/usaf/AGRMET_fldbld_precip_galwem.F90 index 6882775eb..308a343d8 100644 --- a/lis/metforcing/usaf/AGRMET_fldbld_precip_galwem.F90 +++ b/lis/metforcing/usaf/AGRMET_fldbld_precip_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -550,7 +550,7 @@ subroutine AGRMET_fldbld_read_precip_galwem(fg_filename, ifguess, jfguess,& count_prec = 0 write(LIS_logunit,*)' ' - write(LIS_logunit,*)'[MSG] Reading first guess precip ', trim(fg_filename) + write(LIS_logunit,*)'[INFO] Reading first guess precip ', trim(fg_filename) call grib_count_in_file(ftn,nvars,ierr) call LIS_verify(ierr, 'error in grib_count_in_file in ' // & diff --git a/lis/metforcing/usaf/AGRMET_fldbld_precip_gfs.F90 b/lis/metforcing/usaf/AGRMET_fldbld_precip_gfs.F90 index 474212953..4653d43b6 100644 --- a/lis/metforcing/usaf/AGRMET_fldbld_precip_gfs.F90 +++ b/lis/metforcing/usaf/AGRMET_fldbld_precip_gfs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -635,7 +635,7 @@ subroutine AGRMET_fldbld_read_precip_gfs( fg_filename, ifguess, jfguess,& allocate ( dum1d (ifguess*jfguess) ) count_prec = 0 - write(LIS_logunit,*)'[MSG] Reading first guess precip ', trim(fg_filename) + write(LIS_logunit,*)'[INFO] Reading first guess precip ', trim(fg_filename) call grib_count_in_file(ftn,nvars,ierr) call LIS_verify(ierr, 'error in grib_count_in_file in AGRMET_fldbld_read') diff --git a/lis/metforcing/usaf/AGRMET_forcingMod.F90 b/lis/metforcing/usaf/AGRMET_forcingMod.F90 index 4a707ac24..2c7f074f8 100644 --- a/lis/metforcing/usaf/AGRMET_forcingMod.F90 +++ b/lis/metforcing/usaf/AGRMET_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -302,7 +302,9 @@ module AGRMET_forcingMod ! contains the previous and next forcing values, respectively ! \end{description} ! -! !USES: +! !USES: + use LIS_constantsMod, only : LIS_CONST_PATH_LEN + implicit none PRIVATE @@ -352,6 +354,8 @@ module AGRMET_forcingMod real*8 :: agrmetpcptime1, agrmetpcptime2 real*8 :: cmortime integer :: pcpobswch + integer :: pcpobsfmt ! EMK...File format for precip obs + integer :: sfcobsfmt ! EMK...File format for sfcobs integer :: pwswch integer :: raswch integer :: cdfs2swch @@ -719,6 +723,12 @@ module AGRMET_forcingMod ! EMK Add GFS-to-GALWEM bias correction integer :: back_bias_corr real, allocatable :: pcp_back_bias_ratio(:,:) + ! EMK Add NRT bias correction toward IMERG-Final Run + ! (back_bias_corr == 2) + character(LIS_CONST_PATH_LEN) :: gfs_nrt_bias_ratio_file + character(LIS_CONST_PATH_LEN) :: galwem_nrt_bias_ratio_file + real, allocatable :: gfs_nrt_bias_ratio(:,:) + real, allocatable :: galwem_nrt_bias_ratio(:,:) integer :: pcp_back_bias_ratio_month end type agrmet_type_dec @@ -747,7 +757,7 @@ module AGRMET_forcingMod subroutine init_AGRMET(findex) ! !USES: - use LIS_coreMod, only : LIS_rc, LIS_domain + use LIS_coreMod, only : LIS_rc use LIS_timeMgrMod, only : LIS_update_timestep use LIS_logMod, only : LIS_logunit, LIS_endrun use LIS_snowMod, only : LIS_snow_setup @@ -827,6 +837,21 @@ subroutine init_AGRMET(findex) integer :: istat1 integer :: ftn + external :: readcrd_agrmet + external :: AGRMET_readmask + external :: AGRMET_readterrain + external :: AGRMET_readpcpcntm + external :: AGRMET_read_sfcalccntm + external :: polarToLatLon + external :: bilinear_interp_input_withgrid + external :: neighbor_interp_input_withgrid + external :: AGRMET_read_pcpclimodata + external :: gfs_reset_interp_input + external :: galwem_reset_interp_input + external :: conserv_interp_input + external :: bilinear_interp_input + external :: upscaleByAveraging_input + allocate(agrmet_struc(LIS_rc%nnest)) call readcrd_agrmet() @@ -2052,26 +2077,41 @@ subroutine init_AGRMET(findex) agrmet_struc(n)%pcpclimoAlarmTime = 0.0 allocate(agrmet_struc(n)%cliprc1(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%cliprc1 = 0 allocate(agrmet_struc(n)%clippd1(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%clippd1 = 0 allocate(agrmet_struc(n)%clirtn1(LIS_rc%lnc(n), LIS_rc%lnr(n))) - + agrmet_struc(n)%clirtn1 = 0 allocate(agrmet_struc(n)%cliprc2(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%cliprc2 = 0 allocate(agrmet_struc(n)%clippd2(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%clippd2 = 0 allocate(agrmet_struc(n)%clirtn2(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%clirtn2 = 0 allocate(agrmet_struc(n)%cliprc(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%cliprc = 0 allocate(agrmet_struc(n)%clippd(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%clippd = 0 allocate(agrmet_struc(n)%clirtn(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%clirtn = 0 allocate(agrmet_struc(n)%sfcprs(6,LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%sfcprs = 0 allocate(agrmet_struc(n)%sfcrlh(6,LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%sfcrlh = 0 allocate(agrmet_struc(n)%sfcspd(6,LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%sfcspd = 0 allocate(agrmet_struc(n)%sfctmp(6,LIS_rc%lnc(n), LIS_rc%lnr(n))) - + agrmet_struc(n)%sfctmp = 0 allocate(agrmet_struc(n)%lasprs(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%lasprs = 0 allocate(agrmet_struc(n)%lasrlh(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%lasrlh = 0 allocate(agrmet_struc(n)%lasspd(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%lasspd = 0 allocate(agrmet_struc(n)%lastmp(LIS_rc%lnc(n), LIS_rc%lnr(n))) + agrmet_struc(n)%lastmp = 0 ! EMK BEGIN ! diff --git a/lis/metforcing/usaf/AGRMET_geoest.F90 b/lis/metforcing/usaf/AGRMET_geoest.F90 index 1ffff203a..0f30988f1 100644 --- a/lis/metforcing/usaf/AGRMET_geoest.F90 +++ b/lis/metforcing/usaf/AGRMET_geoest.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -189,9 +189,9 @@ subroutine AGRMET_geoest( n, j3hr, land ,gest, grnk, quad9r, & inquire( file = trim(ifil), exist = exists) if ( .not. exists ) then - write(LIS_logunit,*) 'AGRMET_geoest/precip: error opening file ',trim(ifil) - write(LIS_logunit,*) ' file does not exist' - write(LIS_logunit,*) ' geo precip estimate will not be performed' + write(LIS_logunit,*) '[WARN] AGRMET_geoest/precip: error opening file ',trim(ifil) + write(LIS_logunit,*) '[WARN] file does not exist' + write(LIS_logunit,*) '[WARN] geo precip estimate will not be performed' message = ' ' message(1) = 'program: LIS' message(2) = ' routine: AGRMET_geoest' @@ -205,7 +205,7 @@ subroutine AGRMET_geoest( n, j3hr, land ,gest, grnk, quad9r, & endif return endif - write(LIS_logunit,*) '- READING ', trim(ifil) + write(LIS_logunit,*) '[INFO] READING ', trim(ifil) call LIS_putget( geoprc, 'r', ifil, routine_name, & imax, jmax ) @@ -235,14 +235,14 @@ subroutine AGRMET_geoest( n, j3hr, land ,gest, grnk, quad9r, & if ( exists ) then gdgeornk = .true. - write(LIS_logunit,*) '- READING RANK FILE', trim(ifil) + write(LIS_logunit,*) '[INFO] READING RANK FILE', trim(ifil) call LIS_putget( geornk, 'r', ifil, routine_name, & imax, jmax ) else - write(LIS_logunit,*)'AGRMET_GEOEST/PRECIP: ERROR OPENING FILE ',trim(ifil) - write(LIS_logunit,*)' FILE DOES NOT EXIST' - write(LIS_logunit,*)' DEFAULT VALUES OF 4 WILL BE USED FOR GEO RANKS' + write(LIS_logunit,*)'[WARN] AGRMET_GEOEST/PRECIP: ERROR OPENING FILE ',trim(ifil) + write(LIS_logunit,*)'[WARN] FILE DOES NOT EXIST' + write(LIS_logunit,*)'[WARN] DEFAULT VALUES OF 4 WILL BE USED FOR GEO RANKS' message = ' ' message(1)='program: LIS' message(2)=' routine: AGRMET_geoest' @@ -273,8 +273,8 @@ subroutine AGRMET_geoest( n, j3hr, land ,gest, grnk, quad9r, & ! of these cases. if ( is_geo_corrupted(geoprc, imax, jmax, mo, hemi) ) then - write(LIS_logunit,*) 'AGRMET_geoest/precip: data corrupted - ',trim(ifil) - write(LIS_logunit,*) ' geo precip estimate will not be performed' + write(LIS_logunit,*) '[WARN] AGRMET_geoest/precip: data corrupted - ',trim(ifil) + write(LIS_logunit,*) '[WARN] geo precip estimate will not be performed' message = ' ' message(1) = 'program: LIS' message(2) = ' routine: AGRMET_geoest' @@ -330,10 +330,10 @@ subroutine AGRMET_geoest( n, j3hr, land ,gest, grnk, quad9r, & grnk_tmp(hemi,i,j) = 4 write(LIS_logunit,*)' ' write(LIS_logunit,*)'--------------------------------------------' - write(LIS_logunit,*)'Bad geo precip rank value' - write(LIS_logunit,*)'This value will be set to a default of 4' - write(LIS_logunit,*)'geornk(',i,',',j,') = ',geornk(i,j) - write(LIS_logunit,*)'from file :' + write(LIS_logunit,*)'[WARN] Bad geo precip rank value' + write(LIS_logunit,*)'[WARN] This value will be set to a default of 4' + write(LIS_logunit,*)'[WARN] geornk(',i,',',j,') = ',geornk(i,j) + write(LIS_logunit,*)'[WARN] from file :' write(LIS_logunit,*) trim(ifil) write(LIS_logunit,*)'--------------------------------------------' write(LIS_logunit,*)' ' diff --git a/lis/metforcing/usaf/AGRMET_getcli.F90 b/lis/metforcing/usaf/AGRMET_getcli.F90 index 2e4c8e6d5..69db2e4d0 100644 --- a/lis/metforcing/usaf/AGRMET_getcli.F90 +++ b/lis/metforcing/usaf/AGRMET_getcli.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -74,7 +74,7 @@ subroutine AGRMET_getcli(n, filename,rtn,clidat) inquire( file = trim(filename), exist = exists) if ( exists ) then - write(LIS_logunit,*) '- READING ', trim(filename) + write(LIS_logunit,*) '[INFO] READING ', trim(filename) ! ------------------------------------------------------------------ ! the rtneph climo files are real valued files, while the precip diff --git a/lis/metforcing/usaf/AGRMET_getcmorph.F90 b/lis/metforcing/usaf/AGRMET_getcmorph.F90 index b8948518c..6d113e9f3 100644 --- a/lis/metforcing/usaf/AGRMET_getcmorph.F90 +++ b/lis/metforcing/usaf/AGRMET_getcmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_getpcpobs.F90 b/lis/metforcing/usaf/AGRMET_getpcpobs.F90 index 5ff482c9f..e629d87fa 100644 --- a/lis/metforcing/usaf/AGRMET_getpcpobs.F90 +++ b/lis/metforcing/usaf/AGRMET_getpcpobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -297,9 +297,9 @@ subroutine AGRMET_getpcpobs(n, j6hr, month, prcpwe, & message(6) = ' Observations beyond array size will be ignored' message(7) = ' Increase number of AGRMET maximum precip obs in lis.config file!' if (LIS_masterproc) then + alert_number = alert_number + 1 call LIS_alert('LIS.AGRMET_getpcpobs', & alert_number, message) - alert_number = alert_number + 1 end if nsize = agrmet_struc(n)%max_pcpobs @@ -397,9 +397,9 @@ subroutine AGRMET_getpcpobs(n, j6hr, month, prcpwe, & message(2) = ' Routine: AGRMET_getpcpobs' message(3) = ' Problem reading '// trim(filename) if (LIS_masterproc) then + alert_number = alert_number + 1 call LIS_alert('LIS.AGRMET_getpcpobs', & alert_number, message) - alert_number = alert_number + 1 end if end if else @@ -416,9 +416,9 @@ subroutine AGRMET_getpcpobs(n, j6hr, month, prcpwe, & message(2) = ' Routine: AGRMET_getpcpobs' message(3) = ' Missing rain gage file '// trim(filename) if (LIS_masterproc) then + alert_number = alert_number + 1 call LIS_alert('LIS.AGRMET_getpcpobs', & alert_number, message) - alert_number = alert_number + 1 end if endif diff --git a/lis/metforcing/usaf/AGRMET_getpwe.F90 b/lis/metforcing/usaf/AGRMET_getpwe.F90 index f3c44caf3..f07af4eb9 100644 --- a/lis/metforcing/usaf/AGRMET_getpwe.F90 +++ b/lis/metforcing/usaf/AGRMET_getpwe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_getsfc.F90 b/lis/metforcing/usaf/AGRMET_getsfc.F90 index 641c25506..e0ed4bccf 100644 --- a/lis/metforcing/usaf/AGRMET_getsfc.F90 +++ b/lis/metforcing/usaf/AGRMET_getsfc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -40,20 +40,23 @@ ! 25 Jun 20 Modified to check valid times of surface obs. ! ..............................Eric Kemp/NASA/SSAI ! 16 Dec 21 Replaced julhr with YYYYMMDDHH in log...Eric Kemp/NASA/SSAI +! 07 Nov 23 Added new sfcobs format.......Eric Kemp/NASA/SSAI ! ! !INTERFACE: subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ri, rj, obstmp, obsrlh, obsspd, obscnt, & isize, minwnd, alert_number, imax, jmax, rootdir,cdmsdir,& - use_timestamp) + use_timestamp, use_wigos_sfcobs) ! !USES: + use ESMF ! EMK Patch for DTG check use AGRMET_forcingMod, only : agrmet_struc use LIS_coreMod, only : LIS_domain, LIS_masterproc use LIS_timeMgrMod, only : LIS_julhr_date - use LIS_logMod, only : LIS_logunit, LIS_alert + use LIS_logMod, only : LIS_logunit, LIS_alert, & + LIS_getNextUnitNumber, LIS_releaseUnitNumber use map_utils, only : latlon_to_ij use USAF_bratsethMod, only: USAF_ObsData, USAF_assignObsData - use ESMF ! EMK Patch for DTG check + implicit none ! !ARGUMENTS: @@ -76,6 +79,7 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & character(len=*) :: rootdir character(len=*) :: cdmsdir integer, intent(in) :: use_timestamp + logical, intent(in) :: use_wigos_sfcobs ! ! !DESCRIPTION: ! @@ -220,11 +224,14 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & character*10 :: date10 ! EMK replace cjulhr in log character*14, allocatable :: dtg ( : ) character*100 :: message ( 20 ) - character*8, allocatable :: netyp ( : ) + !character*8, allocatable :: netyp ( : ) + character*9, allocatable :: netyp ( : ) character*8 :: norsou ( 2 ) ! character*8, allocatable :: platform ( : ) - character*9, allocatable :: platform ( : ) ! EMK BUG FIX - character*8, allocatable :: rptyp ( : ) + !character*9, allocatable :: platform ( : ) ! EMK BUG FIX + character*32, allocatable :: platform ( : ) ! EMK WIGOS + !character*8, allocatable :: rptyp ( : ) + character*9, allocatable :: rptyp ( : ) ! WIGOS logical, allocatable :: skip (:) ! EMK real :: rlat real :: rlon @@ -244,9 +251,19 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & integer :: rc real, external :: AGRMET_calcrh_dpt - character(len=10) :: net10, platform10 + !character(len=10) :: net10, platform10 + character(len=8) :: netyp8 + character(len=9) :: platform9 + character(len=32) :: net32, platform32 + character(len=8) :: rptyp8 + character*32, parameter :: blank32 = " " + integer :: iunit + logical :: found_file + data norsou / 'NORTHERN', 'SOUTHERN' / + message = '' + ! ------------------------------------------------------------------ ! Executable code begins here. Intialize observation counter to 0. ! ------------------------------------------------------------------ @@ -292,20 +309,78 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & skip(:) = .false. ! EMK call getsfcobsfilename(sfcobsfile, rootdir, cdmsdir, & - use_timestamp,hemi, yr, mo, da, hr) - - write(LIS_logunit,*)'Reading OBS: ',trim(sfcobsfile) - open(22,file=trim(sfcobsfile),status='old', iostat=ierr1) - if(ierr1.eq.0) then - read(22,*, iostat=ierr2) nsize - + use_timestamp,hemi, yr, mo, da, hr, use_wigos_sfcobs) + + inquire(file=trim(sfcobsfile), exist=found_file) + if (.not. found_file) then + write(LIS_logunit,*) '[WARN] Cannot find ', trim(sfcobsfile) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: AGRMET_getsfc' + message(3) = ' Cannot find file ' // trim(sfcobsfile) + if (LIS_masterproc) then + call LIS_alert('LIS.AGRMET_getsfc', & + alert_number, message) + alert_number = alert_number + 1 + end if + message = '' + if (use_wigos_sfcobs) exit ! These files are global + cycle + end if + + write(LIS_logunit,*)'[INFO] Opening: ',trim(sfcobsfile) + iunit = LIS_getNextUnitNumber() + open(iunit,file=trim(sfcobsfile),status='old', iostat=ierr1) + + if (ierr1 .ne. 0) then + write(date10,'(i4, i2.2, i2.2, i2.2)', iostat=istat1) & + yr, mo, da, hr + write(LIS_logunit,*)' ' + write(LIS_logunit,*) & + '[WARN] ROUTINE AGRMET_GETSFC: ERROR OPENING ', & + trim(sfcobsfile) + write(LIS_logunit,*)'[WARN] ISTAT IS ', ierr1 + message(1) = 'program: LIS' + message(2) = ' routine: AGRMET_getsfc' + message(3) = ' error opening file ' // trim(sfcobsfile) + alert_number = alert_number + 1 + if(LIS_masterproc) then + call lis_alert( 'LIS.AGRMET_getsfc', alert_number, message ) + endif + message = '' + if (use_wigos_sfcobs) exit ! New WIGOS version is global + cycle + endif + + if(ierr1.eq.0) then + read(iunit,*, iostat=ierr2) nsize + + if (ierr2 .ne. 0) then + write(LIS_logunit,*) & + '[WARN] Problem reading total report count from ', & + trim(sfcobsfile) + message(1) = 'program: LIS' + message(2) = ' routine: AGRMET_getsfc' + message(3) = ' Cannot read total report count from ' // & + trim(sfcobsfile) + alert_number = alert_number + 1 + if(LIS_masterproc) then + call lis_alert( 'LIS.AGRMET_getsfc', alert_number, & + message ) + endif + message = '' + close(iunit) + call LIS_releaseUnitNumber(iunit) + if (use_wigos_sfcobs) exit + cycle + end if + ! ------------------------------------------------------------------ ! If the number of obs in the file is greater than the array size ! write an alert to the log and set back the number to read to ! prevent a segfault. ! ------------------------------------------------------------------ - if ( nsize .GT. isize ) then + if ( nsize .GT. isize ) then write(LIS_logunit,*)' ' write(LIS_logunit,*)"******************************************************" @@ -321,15 +396,32 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & end if do i=1,nsize - read(22,*, iostat=ierr3) platform(i), dtg(i), & - itmp(i), idpt(i), irelh(i), ilat(i), ilon(i), & - ispd(i), rptyp(i), netyp(i) + if (.not. use_wigos_sfcobs) then + !read(iunit, *, iostat=ierr3) platform(i), dtg(i), & + ! itmp(i), idpt(i), irelh(i), ilat(i), ilon(i), & + ! ispd(i), rptyp(i), netyp(i) + read(iunit, *, iostat=ierr3) platform9, dtg(i), & + itmp(i), idpt(i), irelh(i), ilat(i), ilon(i), & + ispd(i), rptyp8, netyp8 + if (ierr3 == 0) then + platform(i) = platform9 + rptyp(i) = rptyp8 + netyp(i) = netyp8 + end if + else + read(iunit, 1000, iostat=ierr3) platform(i), dtg(i), & + itmp(i), idpt(i), irelh(i), ilat(i), ilon(i), & + ispd(i), rptyp(i), netyp(i) +1000 format(a32, 1x, a14, 1x, i9, 1x, i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, i9, 1x, a9, 1x, a9) + end if !if (ierr3 .ne. 0) skip(i) = .true. ! EMK ! EMK Patch Skip report if problem occurred reading it if (ierr3 .ne. 0) then write(LIS_logunit,*) & - '[WARN] Problem reading report ', i, ' from file' + '[WARN] Problem reading report ', i, & + ' from sfcobs file, skipping line' skip(i) = .true. cycle end if @@ -366,7 +458,8 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & end if enddo - close(22) + close(iunit) + call LIS_releaseUnitNumber(iunit) !if(ierr2.eq.0.and.ierr3.eq.0) then ! EMK Patch...Allow observation storage even if problem occurred @@ -399,20 +492,21 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ! ------------------------------------------------------------------ ! Only process the observations for the current hemisphere. ! ------------------------------------------------------------------ - + + ! EMK...Use all obs if we are using a WIGOS global file if( ((hemi .eq. 1) .and. (rlat .ge. 0.0)) .or. & - ((hemi .eq. 2) .and. (rlat .lt. 0.0)) ) then + ((hemi .eq. 2) .and. (rlat .lt. 0.0)) .or. & + use_wigos_sfcobs) then ! ------------------------------------------------------------------ ! Convert point's lat/lon to i/j coordinates. ! check for values of rigrid and rjgrid outside of ! the AGRMET model grid, or in the other hemisphere. ! ------------------------------------------------------------------ - call latlon_to_ij(LIS_domain(n)%lisproj, rlat, rlon, & - rigrid, rjgrid) - -! if(rigrid.ge.1.and.rigrid.le.imax.and. & + rigrid, rjgrid) + + !if(rigrid.ge.1.and.rigrid.le.imax.and. & ! rjgrid.ge.1.and.rjgrid.le.jmax) then ! EMK TEST if (.true.) then @@ -423,16 +517,16 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ! observations had to be discared for this reason. ! ------------------------------------------------------------------ - if ( ( (itmp(irecord) .gt. -99999998) .and. & - (ispd(irecord) .gt. -99999998) ) .and. & - ( (irelh(irecord) .gt. -99999998) .or. & - (idpt(irecord) .gt. -99999998) ) ) then - - ! EMK...Make sure dew point .le. temperature - if ( (itmp(irecord) .gt. -99999998) .and. & - (idpt(irecord) .gt. -99999998) ) then - if (idpt(irecord) .gt. itmp(irecord)) cycle - end if + if ( ( (itmp(irecord) .gt. -99999998) .and. & + (ispd(irecord) .gt. -99999998) ) .and. & + ( (irelh(irecord) .gt. -99999998) .or. & + (idpt(irecord) .gt. -99999998) ) ) then + + ! EMK...Make sure dew point .le. temperature + if ( (itmp(irecord) .gt. -99999998) .and. & + (idpt(irecord) .gt. -99999998) ) then + if (idpt(irecord) .gt. itmp(irecord)) cycle + end if ! ------------------------------------------------------------------ ! Gross error check and set temperature. @@ -442,14 +536,14 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ! so the Barnes scheme will ignore it. ! ------------------------------------------------------------------ - if (itmp(irecord) .gt. -99999998) then - rtmp = float (itmp(irecord)) / 100.0 - if ( (rtmp .lt. 200.0) .or. (rtmp .gt. 350.0) ) then + if (itmp(irecord) .gt. -99999998) then + rtmp = float (itmp(irecord)) / 100.0 + if ( (rtmp .lt. 200.0) .or. (rtmp .gt. 350.0) ) then + rtmp = -1.0 + end if + else rtmp = -1.0 end if - else - rtmp = -1.0 - end if ! ------------------------------------------------------------------ ! Gross error check and set relative humidity values. @@ -458,21 +552,21 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ! value of -1, so the Barnes scheme will ignore it. ! ------------------------------------------------------------------ - if (irelh(irecord) .gt. -99999998) then - rrelh = float(irelh(irecord)) / 10000.0 - if ( (rrelh .gt. 1.0) .or. (rrelh .lt. 0.0) ) then - rrelh = -1.0 - end if - else if ( (idpt(irecord) .gt. -99999998) .and. & - (rtmp .ne. -1.0) ) then - rdpt = float(idpt(irecord)) / 100.0 - rrelh = AGRMET_calcrh_dpt(rtmp, rdpt) - if ( (rrelh .gt. 1.0) .or. (rrelh .lt. 0.0) ) then + if (irelh(irecord) .gt. -99999998) then + rrelh = float(irelh(irecord)) / 10000.0 + if ( (rrelh .gt. 1.0) .or. (rrelh .lt. 0.0) ) then + rrelh = -1.0 + end if + else if ( (idpt(irecord) .gt. -99999998) .and. & + (rtmp .ne. -1.0) ) then + rdpt = float(idpt(irecord)) / 100.0 + rrelh = AGRMET_calcrh_dpt(rtmp, rdpt) + if ( (rrelh .gt. 1.0) .or. (rrelh .lt. 0.0) ) then + rrelh = -1.0 + end if + else rrelh = -1.0 end if - else - rrelh = -1.0 - end if ! ------------------------------------------------------------------ ! Constrain surface wind speed to a value between @@ -481,149 +575,116 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ! of -1, so the Barnes scheme will ignore it. ! ------------------------------------------------------------------ - if (ispd(irecord) .gt. -99999998) then - rspd = float(ispd(irecord)) / 10.0 - rspd = max( min( rspd, 75.0 ), minwnd ) - else - rspd = -1.0 - end if - + if (ispd(irecord) .gt. -99999998) then + rspd = float(ispd(irecord)) / 10.0 + rspd = max( min( rspd, 75.0 ), minwnd ) + else + rspd = -1.0 + end if + ! ------------------------------------------------------------------ ! If all the data is out of range and/or missing, don't store ! this observation. ! ------------------------------------------------------------------ - if ( (nint(rtmp) .gt. 0) .and. & - (nint(rrelh) .gt. 0) .and.& - (nint(rspd) .gt. 0) ) then - + if ( (nint(rtmp) .gt. 0) .and. & + (nint(rrelh) .gt. 0) .and.& + (nint(rspd) .gt. 0) ) then + ! ------------------------------------------------------------------ ! If we make it here, the observation probably has some good ! data, so increment the observation counter, store the ! data into the observation arrays. ! ------------------------------------------------------------------ - ! EMK...Add to data structures. Handle reformated - ! CDMS data that is missing platform and network - if (rtmp .gt. 0) then - net10 = trim(netyp(irecord)) - platform10 = trim(platform(irecord)) - if (trim(net10) .eq. 'NULL') then - net10 = 'CDMS' - end if - if (trim(platform10) .eq. '-99999999') then - platform10 = '00000000' - end if - call USAF_assignObsData(t2mObs,net10, & - platform10,rtmp,rlat,rlon, & - agrmet_struc(n)%bratseth_t2m_stn_sigma_o_sqr,& - 0.) + ! EMK...Add to data structures. Handle reformated + ! CDMS data that is missing platform and network + if (rtmp .gt. 0) then + net32 = blank32 + net32 = netyp(irecord) + platform32 = blank32 + platform32 = platform(irecord) + if (trim(net32) .eq. 'NULL') then + net32 = 'CDMS' + end if + if (trim(platform32) .eq. '-99999999') then + platform32 = '00000000' + end if + call USAF_assignObsData(t2mObs,net32, & + platform32,rtmp,rlat,rlon, & + agrmet_struc(n)%bratseth_t2m_stn_sigma_o_sqr,& + 0.) - end if - if (rrelh .gt. 0) then - net10 = trim(netyp(irecord)) - platform10 = trim(platform(irecord)) - if (trim(net10) .eq. 'NULL') then - net10 = 'CDMS' end if - if (trim(platform10) .eq. '-99999999') then - platform10 = '00000000' + if (rrelh .gt. 0) then + net32 = blank32 + net32 = netyp(irecord) + platform32 = blank32 + platform32 = platform(irecord) + if (trim(net32) .eq. 'NULL') then + net32 = 'CDMS' + end if + if (trim(platform32) .eq. '-99999999') then + platform32 = '00000000' + end if + call USAF_assignObsData(rh2mObs,net32, & + platform32,rrelh,rlat,rlon, & + agrmet_struc(n)%bratseth_t2m_stn_sigma_o_sqr, & + 0.) end if - call USAF_assignObsData(rh2mObs,net10, & - platform10,rrelh,rlat,rlon, & - agrmet_struc(n)%bratseth_t2m_stn_sigma_o_sqr, & - 0.) - end if - if (rspd .gt. 0) then - net10 = trim(netyp(irecord)) - platform10 = trim(platform(irecord)) - if (trim(net10) .eq. 'NULL') then - net10 = 'CDMS' + if (rspd .gt. 0) then + net32 = blank32 + net32 = netyp(irecord) + platform32 = blank32 + platform32 = platform(irecord) + if (trim(net32) .eq. 'NULL') then + net32 = 'CDMS' + end if + if (trim(platform32) .eq. '-99999999') then + platform32 = '00000000' + end if + call USAF_assignObsData(spd10mObs,net32, & + platform32,rspd,rlat,rlon, & + agrmet_struc(n)%bratseth_spd10m_stn_sigma_o_sqr, & + 0.) end if - if (trim(platform10) .eq. '-99999999') then - platform10 = '00000000' - end if - call USAF_assignObsData(spd10mObs,net10, & - platform10,rspd,rlat,rlon, & - agrmet_struc(n)%bratseth_spd10m_stn_sigma_o_sqr, & - 0.) - end if + obscnt = obscnt + 1 - obscnt = obscnt + 1 - - ri(obscnt) = rigrid - rj(obscnt) = rjgrid - obstmp(obscnt) = rtmp - obsrlh(obscnt) = rrelh - obsspd(obscnt) = rspd - if(rspd.lt.0) then - print*, 'probl ',rlat,rlon, rspd + ri(obscnt) = rigrid + rj(obscnt) = rjgrid + obstmp(obscnt) = rtmp + obsrlh(obscnt) = rrelh + obsspd(obscnt) = rspd endif - endif ! ------------------------------------------------------------------ ! If we have reached the number of obs that our hard-wired ! arrays can hold, then exit the loop. ! ------------------------------------------------------------------ - if ( obscnt .eq. isize ) exit + if ( obscnt .eq. isize ) then + write(LIS_logunit,*) & + '[WARN] ROUTINE GETSFC: REACHED MAXIMUM NUMBER OF SFC OBS TO SAVE IN MEMORY' + message(1) = 'program: LIS' + message(2) = ' routine: AGRMET_getsfc' + message(3) = ' reached maximum number of sfc obs to save memory in memory' + alert_number = alert_number + 1 + if(LIS_masterproc) then + call lis_alert( 'LIS.AGRMET_getsfc', & + alert_number, & + message ) + endif + message = '' + exit ! Jump out of hemi do loop + end if + endif endif endif - endif - enddo - else -! ------------------------------------------------------------------ -! There was an error retrieving obs for this Julhr and hemi. -! Send an alert message, but don't abort. -! ------------------------------------------------------------------ - - ! EMK...Replace julhr with YYYYMMDD - !write(cjulhr,'(i6)',iostat=istat1) julhr - write(date10,'(i4, i2.2, i2.2, i2.2)', iostat=istat1) yr, mo, da, hr - write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- ROUTINE GETSFC: ERROR RETRIEVING SFC OBS FOR' - write(LIS_logunit,*)'- THE '//norsou(hemi)//' HEMISPHERE.' - write(LIS_logunit,*)'- ISTAT IS ', ierr1 - message(1) = 'program: LIS' - message(2) = ' routine: AGRMET_getsfc' - message(3) = ' error retrieving sfc obs from database for' - message(4) = ' the '//norsou(hemi)//' hemisphere.' - if( istat1 .eq. 0 ) then - ! EMK...Replace julhr with YYYYMMDD - !write(LIS_logunit,*)'- JULHR IS ' // cjulhr - !message(5) = ' julhr is ' // trim(cjulhr) // '.' - write(LIS_logunit,*)' - YYYYMMDDHH is ' // date10 - message(5) = ' yyyymmddhh is ' // trim(date10) // '.' - endif - alert_number = alert_number + 1 - if(LIS_masterproc) then - call lis_alert( 'sfcalc ', alert_number, message ) - endif - endif - else - ! EMK...Replace julhr with YYYYMMDD - !write(cjulhr,'(i6)',iostat=istat1) julhr - write(date10,'(i4, i2.2, i2.2, i2.2)', iostat=istat1) yr, mo, da, hr - write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- ROUTINE AGRMET_GETSFC: ERROR RETRIEVING SFC OBS FOR' - write(LIS_logunit,*)'- THE '//norsou(hemi)//' HEMISPHERE.' - write(LIS_logunit,*)'- ISTAT IS ', ierr1 - message(1) = 'program: LIS' - message(2) = ' routine: AGRMET_getsfc' - message(3) = ' error retrieving sfc obs from database for' - message(4) = ' the '//norsou(hemi)//' hemisphere.' - if( istat1 .eq. 0 ) then - ! EMK...Replace julhr with YYYYMMDDHH - !write(LIS_logunit,*)'- JULHR IS ' // cjulhr - !message(5) = ' julhr is ' // trim(cjulhr) // '.' - write(LIS_logunit,*)' - YYYYMMDDHH is ' // date10 - message(5) = ' yyyymmddhh is ' // trim(date10) // '.' - endif - alert_number = alert_number + 1 - if(LIS_masterproc) then - call lis_alert( 'sfcalc ', alert_number, message ) + enddo endif endif + + if (use_wigos_sfcobs) exit ! New sfcobs file is global enddo deallocate ( idpt ) @@ -638,6 +699,8 @@ subroutine AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & deallocate ( rptyp ) deallocate(skip) ! EMK + + write(LIS_logunit,*)'[INFO] Stored ', obscnt, ' sfc obs' end subroutine AGRMET_getsfc !BOP @@ -647,15 +710,18 @@ end subroutine AGRMET_getsfc ! ! !INTERFACE: subroutine getsfcobsfilename(filename, rootdir, dir, & - use_timestamp, hemi, yr,mo,da,hr) + use_timestamp, hemi, yr, mo, da, hr, use_wigos_sfcobs) implicit none + ! !ARGUMENTS: - character(len=*) :: filename - character(len=*) :: rootdir - character(len=*) :: dir - integer, intent(in) :: yr,mo,da,hr, hemi + character(len=*), intent(inout) :: filename + character(len=*), intent(in) :: rootdir + character(len=*), intent(in) :: dir integer, intent(in) :: use_timestamp + integer, intent(in) :: hemi + integer, intent(in) :: yr, mo, da, hr + logical, intent(in) :: use_wigos_sfcobs ! ! !DESCRIPTION: ! This routines generates the name of the surface obs file @@ -699,14 +765,30 @@ subroutine getsfcobsfilename(filename, rootdir, dir, & write(unit=fhemi,fmt='(a2)') 'sh' endif - if(use_timestamp.eq.1) then - filename = trim(rootdir)//'/'//trim(fyr)//trim(fmo)//trim(fda)//& - '/'//trim(dir)//'/sfcobs_'& - //trim(fhemi)//'.01hr.'//trim(fyr)//trim(fmo)//trim(fda)//trim(fhr) + if(use_timestamp.eq.1) then + if (use_wigos_sfcobs) then + filename = trim(rootdir) // '/' // & + trim(fyr) // trim(fmo) // trim(fda) // & + '/' // trim(dir) // '/sfcobs_01hr_' // & + trim(fyr) // trim(fmo) // trim(fda) // trim(fhr) // ".txt" + else + filename = trim(rootdir) // '/' // & + trim(fyr) // trim(fmo) // trim(fda) // & + '/' // trim(dir) // '/sfcobs_' // & + trim(fhemi) // '.01hr.' // & + trim(fyr) // trim(fmo) // trim(fda) // trim(fhr) + end if else - filename = trim(rootdir)//& - '/'//trim(dir)//'/sfcobs_'& - //trim(fhemi)//'.01hr.'//trim(fyr)//trim(fmo)//trim(fda)//trim(fhr) + if (use_wigos_sfcobs) then + filename = trim(rootdir) // & + '/' // trim(dir) // '/sfcobs_01hr_' // & + trim(fyr) // trim(fmo) // trim(fda) // trim(fhr) // ".txt" + else + filename = trim(rootdir) // & + '/' // trim(dir) // '/sfcobs_' // & + trim(fhemi) // '.01hr.' // & + trim(fyr) // trim(fmo) // trim(fda) // trim(fhr) + end if endif end subroutine getsfcobsfilename diff --git a/lis/metforcing/usaf/AGRMET_interp_cmorph.F90 b/lis/metforcing/usaf/AGRMET_interp_cmorph.F90 index 467bf555c..8bc88cdbb 100644 --- a/lis/metforcing/usaf/AGRMET_interp_cmorph.F90 +++ b/lis/metforcing/usaf/AGRMET_interp_cmorph.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_julhr_date10.F90 b/lis/metforcing/usaf/AGRMET_julhr_date10.F90 index f4df45553..036e8729e 100644 --- a/lis/metforcing/usaf/AGRMET_julhr_date10.F90 +++ b/lis/metforcing/usaf/AGRMET_julhr_date10.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_loadcloud.F90 b/lis/metforcing/usaf/AGRMET_loadcloud.F90 index a72511ffc..7ddb7d727 100644 --- a/lis/metforcing/usaf/AGRMET_loadcloud.F90 +++ b/lis/metforcing/usaf/AGRMET_loadcloud.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_longwv.F90 b/lis/metforcing/usaf/AGRMET_longwv.F90 index 167ac43b1..6bc4c5a54 100644 --- a/lis/metforcing/usaf/AGRMET_longwv.F90 +++ b/lis/metforcing/usaf/AGRMET_longwv.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_make03.F90 b/lis/metforcing/usaf/AGRMET_make03.F90 index 021ea8cf9..2edcae54c 100644 --- a/lis/metforcing/usaf/AGRMET_make03.F90 +++ b/lis/metforcing/usaf/AGRMET_make03.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_makest.F90 b/lis/metforcing/usaf/AGRMET_makest.F90 index 5225dccd3..e1608c827 100644 --- a/lis/metforcing/usaf/AGRMET_makest.F90 +++ b/lis/metforcing/usaf/AGRMET_makest.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_makpwe.F90 b/lis/metforcing/usaf/AGRMET_makpwe.F90 index ea2a1392a..033f0dec3 100644 --- a/lis/metforcing/usaf/AGRMET_makpwe.F90 +++ b/lis/metforcing/usaf/AGRMET_makpwe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_parse12.F90 b/lis/metforcing/usaf/AGRMET_parse12.F90 index 00c872c0e..8a2f2d284 100644 --- a/lis/metforcing/usaf/AGRMET_parse12.F90 +++ b/lis/metforcing/usaf/AGRMET_parse12.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_parse6.F90 b/lis/metforcing/usaf/AGRMET_parse6.F90 index 552e239ce..d820422b8 100644 --- a/lis/metforcing/usaf/AGRMET_parse6.F90 +++ b/lis/metforcing/usaf/AGRMET_parse6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_pcp_barnes.F90 b/lis/metforcing/usaf/AGRMET_pcp_barnes.F90 index fecba7b3e..26226dca8 100644 --- a/lis/metforcing/usaf/AGRMET_pcp_barnes.F90 +++ b/lis/metforcing/usaf/AGRMET_pcp_barnes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_pcpobs_search.F90 b/lis/metforcing/usaf/AGRMET_pcpobs_search.F90 index eda75a10e..96b79678f 100644 --- a/lis/metforcing/usaf/AGRMET_pcpobs_search.F90 +++ b/lis/metforcing/usaf/AGRMET_pcpobs_search.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_phsrel12.F90 b/lis/metforcing/usaf/AGRMET_phsrel12.F90 index 5b8f3af49..c7eff096f 100644 --- a/lis/metforcing/usaf/AGRMET_phsrel12.F90 +++ b/lis/metforcing/usaf/AGRMET_phsrel12.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_phsrel6.F90 b/lis/metforcing/usaf/AGRMET_phsrel6.F90 index 16ea2eb8b..9901d7d24 100644 --- a/lis/metforcing/usaf/AGRMET_phsrel6.F90 +++ b/lis/metforcing/usaf/AGRMET_phsrel6.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_processobs.F90 b/lis/metforcing/usaf/AGRMET_processobs.F90 index 714a65d51..72103944a 100644 --- a/lis/metforcing/usaf/AGRMET_processobs.F90 +++ b/lis/metforcing/usaf/AGRMET_processobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -289,7 +289,9 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & type(rain_obs), allocatable :: obs_cur(:) type(rain_obs), allocatable :: obs_6(:) type(rain_obs), allocatable :: obs_12(:) - + + character*32 :: net32, platform32 + data chemi / '_nh.', '_sh.' / sumsqr(a,b,c,d) = ((a-b)**2) + ((c-d)**2) @@ -486,7 +488,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & if (sixyes) then - write(LIS_logunit,*)'- READING ', trim(filename_min6) + write(LIS_logunit,*)'[INFO] READING ', trim(filename_min6) iofunc = "OPEN " open(8, file=trim(filename_min6), iostat=istat, err=100) @@ -533,9 +535,9 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & write(LIS_logunit,*)' ' write(LIS_logunit,*)"******************************************************" - write(LIS_logunit,*)"* PRECIP SAVE FILE FROM 6 HOURS AGO DOES NOT EXIST." - write(LIS_logunit,*)"* FILE NAME IS ", trim(filename_min6) - write(LIS_logunit,*)"* OBSERVATION COUNT WILL BE REDUCED." + write(LIS_logunit,*)"[WARN] PRECIP SAVE FILE FROM 6 HOURS AGO DOES NOT EXIST." + write(LIS_logunit,*)"[WARN] FILE NAME IS ", trim(filename_min6) + write(LIS_logunit,*)"[WARN] OBSERVATION COUNT WILL BE REDUCED." write(LIS_logunit,*)"******************************************************" write(LIS_logunit,*)' ' @@ -554,9 +556,9 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & write(LIS_logunit,*)' ' write(LIS_logunit,*)"*******************************************************" - write(LIS_logunit,*)"* BAD ", trim(iofunc), " ON FILE ",trim(filename_min6) - write(LIS_logunit,*)"* ISTAT = ", istat - write(LIS_logunit,*)"* OBSERVATION COUNT WILL BE REDUCED." + write(LIS_logunit,*)"[WARN] BAD ", trim(iofunc), " ON FILE ",trim(filename_min6) + write(LIS_logunit,*)"[WARN] ISTAT = ", istat + write(LIS_logunit,*)"[WARN] OBSERVATION COUNT WILL BE REDUCED." write(LIS_logunit,*)"*******************************************************" write(LIS_logunit,*)' ' @@ -598,7 +600,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & iofunc = "OPEN " open(9, file=trim(filename_min12), iostat=istat, err=200) - write(LIS_logunit,*)'- READING ', trim(filename_min12) + write(LIS_logunit,*)'[INFO] READING ', trim(filename_min12) iofunc = "READ " read(9, *, iostat=istat, err=200, end=200) count12 @@ -643,9 +645,9 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & write(LIS_logunit,*)' ' write(LIS_logunit,*)"*******************************************************" - write(LIS_logunit,*)"* PRECIP SAVE FILE FROM 12 HOURS AGO DOES NOT EXIST." - write(LIS_logunit,*)"* FILE NAME IS ", trim(filename_min12) - write(LIS_logunit,*)"* OBSERVATION COUNT WILL BE REDUCED." + write(LIS_logunit,*)"[WARN] PRECIP SAVE FILE FROM 12 HOURS AGO DOES NOT EXIST." + write(LIS_logunit,*)"[WARN] FILE NAME IS ", trim(filename_min12) + write(LIS_logunit,*)"[WARN] OBSERVATION COUNT WILL BE REDUCED." write(LIS_logunit,*)"*******************************************************" write(LIS_logunit,*)' ' @@ -664,9 +666,9 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & write(LIS_logunit,*)' ' write(LIS_logunit,*)"*******************************************************" - write(LIS_logunit,*)"* BAD ", trim(iofunc), " ON FILE ",trim(filename_min12) - write(LIS_logunit,*)"* ISTAT = ", istat - write(LIS_logunit,*)"* OBSERVATION COUNT WILL BE REDUCED." + write(LIS_logunit,*)"[WARN] BAD ", trim(iofunc), " ON FILE ",trim(filename_min12) + write(LIS_logunit,*)"[WARN] ISTAT = ", istat + write(LIS_logunit,*)"[WARN] OBSERVATION COUNT WILL BE REDUCED." write(LIS_logunit,*)"*******************************************************" write(LIS_logunit,*)' ' @@ -698,7 +700,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & if (sixyes) then write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- MAKING 12 HRLY AMTS FROM PREVIOUS 6 HRLY AMTS' + write(LIS_logunit,*)'[INFO] MAKING 12 HRLY AMTS FROM PREVIOUS 6 HRLY AMTS' MAKE12_FROM_6 : do i = 1, fltrcnt @@ -757,7 +759,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & if (twelveyes) then - write(LIS_logunit,*)'- MAKING 12 HRLY AMTS FROM CURRENT 24 AND OLD 12 HRLY AM TS' + write(LIS_logunit,*)'[INFO] MAKING 12 HRLY AMTS FROM CURRENT 24 AND OLD 12 HRLY AM TS' MAKE12_FROM_24 : do i = 1, fltrcnt @@ -1046,7 +1048,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & open (11, file=trim(filename), iostat=istat, err=300) write(LIS_logunit,*)' ' - write(LIS_logunit,*)"- WRITING ",trim(filename) + write(LIS_logunit,*)"[INFO] WRITING ",trim(filename) iofunc = "WRITE" write(11,*, iostat=istat, err=300) fltrcnt @@ -1068,7 +1070,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & close (11) write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- NUMBER OF 12 AND 6 HOURLY OBS IS ',count12obs, count6obs + write(LIS_logunit,*)'[INFO] NUMBER OF 12 AND 6 HOURLY OBS IS ',count12obs, count6obs write(LIS_logunit,*)' ' 300 continue @@ -1080,8 +1082,8 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & write(LIS_logunit,*)' ' write(LIS_logunit,*)"*******************************************************" - write(LIS_logunit,*)"* BAD ", trim(iofunc), " ON FILE ",trim(filename) - write(LIS_logunit,*)"* ISTAT = ", istat + write(LIS_logunit,*)"[WARN] BAD ", trim(iofunc), " ON FILE ",trim(filename) + write(LIS_logunit,*)"[WARN] ISTAT = ", istat write(LIS_logunit,*)"*******************************************************" write(LIS_logunit,*)' ' @@ -1116,7 +1118,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & USE_6 : if ( .not. use_twelve ) then - write(LIS_logunit,*)"- PUTTING 6 HOURLY RAIN GAUGE OBSERVATIONS ON GRID." + write(LIS_logunit,*)"[INFO] PUTTING 6 HOURLY RAIN GAUGE OBSERVATIONS ON GRID." oldd = 999.0 @@ -1142,8 +1144,10 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & obs_cur(i)%lat, obs_cur(i)%lon,ri,rj) ! EMK...Add observation + net32 = obs_cur(i)%net + platform32 = obs_cur(i)%platform call USAF_assignObsData(precip6, & - obs_cur(i)%net, obs_cur(i)%platform, & + net32, platform32, & float(obs_cur(i)%amt6) * 0.1, & obs_cur(i)%lat, obs_cur(i)%lon,& agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & @@ -1192,7 +1196,7 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & USE_12 : if (use_twelve) then - write(LIS_logunit,*)"- PUTTING 12 HOURLY RAIN GAUGE OBSERVATIONS ON GRID." + write(LIS_logunit,*)"[INFO] PUTTING 12 HOURLY RAIN GAUGE OBSERVATIONS ON GRID." oldd = 999.0 @@ -1209,8 +1213,10 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & obs_cur(i)%lon,ri,rj) ! EMK...Add observation + net32 = obs_cur(i)%net + platform32 = obs_cur(i)%platform call USAF_assignObsData(precip12, & - obs_cur(i)%net, obs_cur(i)%platform, & + net32, platform32, & float(obs_cur(i)%amt12) * 0.1, & obs_cur(i)%lat, obs_cur(i)%lon, & agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & @@ -1275,8 +1281,10 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & obs_cur(i)%lon,ri,rj) ! EMK...Add observation + net32 = obs_cur(i)%net + platform32 = obs_cur(i)%platform call USAF_assignObsData(precip12, & - obs_cur(i)%net, obs_cur(i)%platform, & + net32, platform32, & 0.0, & obs_cur(i)%lat, obs_cur(i)%lon, & agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & @@ -1326,8 +1334,10 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & ri,rj) ! EMK...Add observation + net32 = obs_cur(i)%net + platform32 = obs_cur(i)%platform call USAF_assignObsData(precip12, & - obs_cur(i)%net, obs_cur(i)%platform, & + net32, platform32, & float(obs_cur(i)%amtmsc) * 0.1, & obs_cur(i)%lat, obs_cur(i)%lon, & agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & @@ -1382,8 +1392,10 @@ subroutine AGRMET_processobs(n, obs, isize, stncnt, hemi, julhr, & ri,rj) ! EMK...Add observation + net32 = obs_6(i)%net + platform32 = obs_6(i)%platform call USAF_assignObsData(precip12, & - obs_6(i)%net, obs_6(i)%platform, & + net32, platform32, & float(obs_6(i)%amtmsc) * 0.1, & obs_6(i)%lat, obs_6(i)%lon, & agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & diff --git a/lis/metforcing/usaf/AGRMET_read_pcpclimodata.F90 b/lis/metforcing/usaf/AGRMET_read_pcpclimodata.F90 index dc857a881..c9cb1107d 100644 --- a/lis/metforcing/usaf/AGRMET_read_pcpclimodata.F90 +++ b/lis/metforcing/usaf/AGRMET_read_pcpclimodata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_read_sfcalccntm.F90 b/lis/metforcing/usaf/AGRMET_read_sfcalccntm.F90 index 0e6b488d8..b82c004e2 100644 --- a/lis/metforcing/usaf/AGRMET_read_sfcalccntm.F90 +++ b/lis/metforcing/usaf/AGRMET_read_sfcalccntm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -56,8 +56,8 @@ subroutine AGRMET_read_sfcalccntm(n) inquire( file = trim(agrmet_struc(n)%sfcntmfile), exist = exists) if ( exists ) then - write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- READING ', trim(agrmet_struc(n)%sfcntmfile) + !write(LIS_logunit,*)' ' + write(LIS_logunit,*)'[INFO] READING ', trim(agrmet_struc(n)%sfcntmfile) ftn= LIS_getNextUnitNumber() open(ftn, file=trim(agrmet_struc(n)%sfcntmfile), access='direct',& status='old', form="unformatted", recl=LIS_rc%gnr(n)*LIS_rc%gnc(n)*4) @@ -73,10 +73,10 @@ subroutine AGRMET_read_sfcalccntm(n) else write(LIS_logunit,*) write(LIS_logunit,*) "*****************************************************" - write(LIS_logunit,*) "* LIS: ERROR OPENING FILE:" - write(LIS_logunit,*) "* ", trim(agrmet_struc(n)%sfcntmfile) - write(LIS_logunit,*) "* FILE DOES NOT EXIST." - write(LIS_logunit,*) "* LIS WILL ABORT." + write(LIS_logunit,*) "[ERR] LIS: ERROR OPENING FILE:" + write(LIS_logunit,*) "[ERR] ", trim(agrmet_struc(n)%sfcntmfile) + write(LIS_logunit,*) "[ERR] FILE DOES NOT EXIST." + write(LIS_logunit,*) "[ERR] LIS WILL ABORT." write(LIS_logunit,*) "*****************************************************" message = ' ' message(1) = 'program: LIS' diff --git a/lis/metforcing/usaf/AGRMET_readmask.F90 b/lis/metforcing/usaf/AGRMET_readmask.F90 index 380d2e7d4..86e528550 100644 --- a/lis/metforcing/usaf/AGRMET_readmask.F90 +++ b/lis/metforcing/usaf/AGRMET_readmask.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -75,8 +75,8 @@ subroutine AGRMET_readmask(n) endif inquire( file = trim(name), exist = exists) if ( exists ) then - write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- READING ', trim(name) + !write(LIS_logunit,*)' ' + write(LIS_logunit,*)'[INFO] READING ', trim(name) if(agrmet_struc(n)%global_or_hemi .eq. 0) then call LIS_putget( agrmet_struc(n)%land(:,:,hemi), 'r', name, routine_name, & agrmet_struc(n)%imax, agrmet_struc(n)%jmax ) @@ -87,10 +87,10 @@ subroutine AGRMET_readmask(n) else write(LIS_logunit,*) write(LIS_logunit,*) "*****************************************************" - write(LIS_logunit,*) "* LIS: ERROR OPENING FILE:" - write(LIS_logunit,*) "* ", trim(name) - write(LIS_logunit,*) "* FILE DOES NOT EXIST." - write(LIS_logunit,*) "* LIS WILL ABORT." + write(LIS_logunit,*) "[ERR] LIS: ERROR OPENING FILE:" + write(LIS_logunit,*) "[ERR] ", trim(name) + write(LIS_logunit,*) "[ERR] FILE DOES NOT EXIST." + write(LIS_logunit,*) "[ERR] LIS WILL ABORT." write(LIS_logunit,*) "*****************************************************" message = ' ' message(1) = 'program: LIS' diff --git a/lis/metforcing/usaf/AGRMET_readpcpcntm.F90 b/lis/metforcing/usaf/AGRMET_readpcpcntm.F90 index e450f2e4d..4806bc956 100644 --- a/lis/metforcing/usaf/AGRMET_readpcpcntm.F90 +++ b/lis/metforcing/usaf/AGRMET_readpcpcntm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -60,8 +60,8 @@ subroutine AGRMET_readpcpcntm(n) name = trim(agrmet_struc(n)%climodir)//'/pcp_spread_radii.1gd4r' inquire( file = trim(name) , exist = exists) if ( exists ) then - write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- READING ', trim(name) + !write(LIS_logunit,*)' ' + write(LIS_logunit,*)'[INFO] READING ', trim(name) ftn= LIS_getNextUnitNumber() open(ftn, file=trim(name), access='direct',& status='old', form="unformatted", recl=LIS_rc%gnr(n)*LIS_rc%gnc(n)*4) @@ -76,10 +76,10 @@ subroutine AGRMET_readpcpcntm(n) call LIS_releaseUnitNumber(ftn) else - write(LIS_logunit,*) 'LIS: error opening file ',trim(name) - write(LIS_logunit,*) ' file does not exist' - write(LIS_logunit,*) ' this could indicate serious data discrepancies' - write(LIS_logunit,*) ' LIS will be aborted' + write(LIS_logunit,*) '[ERR] LIS: error opening file ',trim(name) + write(LIS_logunit,*) '[ERR] file does not exist' + write(LIS_logunit,*) '[ERR] this could indicate serious data discrepancies' + write(LIS_logunit,*) '[ERR] LIS will be aborted' message(1) = 'program: LIS' message(2) = ' routine: AGRMET_readpcpcntm' message(3) = ' error opening file '//trim(name) diff --git a/lis/metforcing/usaf/AGRMET_readterrain.F90 b/lis/metforcing/usaf/AGRMET_readterrain.F90 index 859676106..3c682caad 100644 --- a/lis/metforcing/usaf/AGRMET_readterrain.F90 +++ b/lis/metforcing/usaf/AGRMET_readterrain.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -61,17 +61,17 @@ subroutine AGRMET_readterrain(n) call get_agrmetterrain_filename(name,agrmet_struc(n)%terrainfile,hemi) inquire( file = trim(name), exist = exists) if ( exists ) then - write(LIS_logunit,*)' ' - write(LIS_logunit,*)'- READING ', trim(name) + !write(LIS_logunit,*)' ' + write(LIS_logunit,*)'[INFO] READING ', trim(name) call LIS_putget( agrmet_struc(n)%alt(:,:,hemi), 'r', name, routine_name, & agrmet_struc(n)%imax, agrmet_struc(n)%jmax ) else write(LIS_logunit,*) write(LIS_logunit,*) "*****************************************************" - write(LIS_logunit,*) "* LIS: ERROR OPENING FILE:" - write(LIS_logunit,*) "* ", trim(name) - write(LIS_logunit,*) "* FILE DOES NOT EXIST." - write(LIS_logunit,*) "* LIS WILL ABORT." + write(LIS_logunit,*) "[ERR] LIS: ERROR OPENING FILE:" + write(LIS_logunit,*) "[ERR] ", trim(name) + write(LIS_logunit,*) "[ERR] FILE DOES NOT EXIST." + write(LIS_logunit,*) "[ERR] LIS WILL ABORT." write(LIS_logunit,*) "*****************************************************" message = ' ' message(1) = 'program: LIS' diff --git a/lis/metforcing/usaf/AGRMET_sfcalc.F90 b/lis/metforcing/usaf/AGRMET_sfcalc.F90 index cd45f7a3e..d68826d26 100644 --- a/lis/metforcing/usaf/AGRMET_sfcalc.F90 +++ b/lis/metforcing/usaf/AGRMET_sfcalc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -174,12 +174,13 @@ subroutine AGRMET_sfcalc(n) character(len=10) :: yyyymmddhh integer :: ierr integer :: r,c, L - character(len=10) :: type + character(len=32) :: type integer :: gdeltas, gid, ntiles integer :: count1 logical :: found_inq integer :: rc integer, external :: LIS_create_subdirs + logical :: use_wigos_sfcobs data lokspd / 15, 25, 30, 40, 50 / data lokrlh / 10, 15, 25, 35, 40 / @@ -367,7 +368,7 @@ subroutine AGRMET_sfcalc(n) write(LIS_logunit,*)' ' write(LIS_logunit,*)'---------------------------- ' !write(LIS_logunit,*)'- PROCESSING-SFC JULHR ', julhr - write(LIS_logunit,*)'- PROCESSING-SFC YYYYMMDDHH ', yyyymmddhh + write(LIS_logunit,*)'[INFO] PROCESSING-SFC YYYYMMDDHH ', yyyymmddhh write(LIS_logunit,*)'---------------------------- ' ! ------------------------------------------------------------------ @@ -486,12 +487,17 @@ subroutine AGRMET_sfcalc(n) call USAF_createObsData(spd10mObs, n, & maxobs=agrmet_struc(n)%max_sfcobs) + if (agrmet_struc(n)%sfcobsfmt == 1) then + use_wigos_sfcobs = .false. + else + use_wigos_sfcobs = .true. + end if call AGRMET_getsfc( n, julhr, t2mObs, rh2mObs, spd10mObs, & ri, rj, obstmp, obsrlh, obsspd, & obscnt, agrmet_struc(n)%max_sfcobs, agrmet_struc(n)%minwnd, & alert_number, LIS_rc%lnc(n), LIS_rc%lnr(n),& agrmet_struc(n)%agrmetdir,agrmet_struc(n)%cdmsdir,& - agrmet_struc(n)%use_timestamp) + agrmet_struc(n)%use_timestamp, use_wigos_sfcobs) ! call MPI_Barrier(LIS_mpi_comm, ierr) ! stop diff --git a/lis/metforcing/usaf/AGRMET_sfcalc_barnes.F90 b/lis/metforcing/usaf/AGRMET_sfcalc_barnes.F90 index d7442c21d..541512c83 100644 --- a/lis/metforcing/usaf/AGRMET_sfcalc_barnes.F90 +++ b/lis/metforcing/usaf/AGRMET_sfcalc_barnes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_sfcval.F90 b/lis/metforcing/usaf/AGRMET_sfcval.F90 index 49222b922..49218ce99 100644 --- a/lis/metforcing/usaf/AGRMET_sfcval.F90 +++ b/lis/metforcing/usaf/AGRMET_sfcval.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_smiest.F90 b/lis/metforcing/usaf/AGRMET_smiest.F90 index 6fc4088d6..819ee15e0 100644 --- a/lis/metforcing/usaf/AGRMET_smiest.F90 +++ b/lis/metforcing/usaf/AGRMET_smiest.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -136,9 +136,9 @@ subroutine AGRMET_smiest( n,j3hr, quad9r, ra, razero,alert_number,imax,jmax) inquire(file = trim(ifil), exist = exists) if (.not. exists) then write(LIS_logunit,*) ' ' - write(LIS_logunit,*)'precip/smiedr: error opening file' - write(LIS_logunit,*)' SSMI data file ', trim(ifil),' does not exist.' - write(LIS_logunit,*)' SSMI estimates will not be used in ',& + write(LIS_logunit,*)'[WARN] precip/smiedr: error opening file' + write(LIS_logunit,*)'[WARN] SSMI data file ', trim(ifil),' does not exist.' + write(LIS_logunit,*)'[WARN] SSMI estimates will not be used in ',& 'precip analysis.' write(LIS_logunit,*) ' ' message =' ' @@ -153,7 +153,7 @@ subroutine AGRMET_smiest( n,j3hr, quad9r, ra, razero,alert_number,imax,jmax) ra_tmp(hemi,:,:) = udef else - write(LIS_logunit,*) '- READING ',trim(ifil) + write(LIS_logunit,*) '[INFO] READING ',trim(ifil) call LIS_putget( ra_tmp(hemi,:,:), 'r', ifil, routine_name, & imax, jmax) endif @@ -161,7 +161,7 @@ subroutine AGRMET_smiest( n,j3hr, quad9r, ra, razero,alert_number,imax,jmax) enddo if ( .not. use_zeros ) then - write(LIS_logunit,*)'- SSMI ZEROS NOT USED' + write(LIS_logunit,*)'[INFO] SSMI ZEROS NOT USED' where ( ra_tmp .eq. 0.0 ) ra_tmp = udef endif diff --git a/lis/metforcing/usaf/AGRMET_solar.F90 b/lis/metforcing/usaf/AGRMET_solar.F90 index 8ee0cd5cd..1312fbb47 100644 --- a/lis/metforcing/usaf/AGRMET_solar.F90 +++ b/lis/metforcing/usaf/AGRMET_solar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_storeobs.F90 b/lis/metforcing/usaf/AGRMET_storeobs.F90 index b10e751c5..16c708a44 100644 --- a/lis/metforcing/usaf/AGRMET_storeobs.F90 +++ b/lis/metforcing/usaf/AGRMET_storeobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_storeobs_offhour.F90 b/lis/metforcing/usaf/AGRMET_storeobs_offhour.F90 index ad95cd589..4d1733cac 100644 --- a/lis/metforcing/usaf/AGRMET_storeobs_offhour.F90 +++ b/lis/metforcing/usaf/AGRMET_storeobs_offhour.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_svp.F90 b/lis/metforcing/usaf/AGRMET_svp.F90 index 3d95f36ea..c93a0c2cf 100644 --- a/lis/metforcing/usaf/AGRMET_svp.F90 +++ b/lis/metforcing/usaf/AGRMET_svp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_tr_coeffs.F90 b/lis/metforcing/usaf/AGRMET_tr_coeffs.F90 index 0a06d0b60..179ff89cd 100644 --- a/lis/metforcing/usaf/AGRMET_tr_coeffs.F90 +++ b/lis/metforcing/usaf/AGRMET_tr_coeffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_trcalc.F90 b/lis/metforcing/usaf/AGRMET_trcalc.F90 index faf43a1f7..ff1988809 100644 --- a/lis/metforcing/usaf/AGRMET_trcalc.F90 +++ b/lis/metforcing/usaf/AGRMET_trcalc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_trnref.F90 b/lis/metforcing/usaf/AGRMET_trnref.F90 index c3f35db28..2c4c2bda3 100644 --- a/lis/metforcing/usaf/AGRMET_trnref.F90 +++ b/lis/metforcing/usaf/AGRMET_trnref.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_trpoly.F90 b/lis/metforcing/usaf/AGRMET_trpoly.F90 index 6c2d2aa61..4bf83d935 100644 --- a/lis/metforcing/usaf/AGRMET_trpoly.F90 +++ b/lis/metforcing/usaf/AGRMET_trpoly.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_typcnv.F90 b/lis/metforcing/usaf/AGRMET_typcnv.F90 index 6ff90c1f0..6f164912a 100644 --- a/lis/metforcing/usaf/AGRMET_typcnv.F90 +++ b/lis/metforcing/usaf/AGRMET_typcnv.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_valid.F90 b/lis/metforcing/usaf/AGRMET_valid.F90 index 4314d49de..aa562ae1b 100644 --- a/lis/metforcing/usaf/AGRMET_valid.F90 +++ b/lis/metforcing/usaf/AGRMET_valid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/AGRMET_w.F90 b/lis/metforcing/usaf/AGRMET_w.F90 index a016baa5b..880e7c1f3 100644 --- a/lis/metforcing/usaf/AGRMET_w.F90 +++ b/lis/metforcing/usaf/AGRMET_w.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/EMK_precipMod.F90.qc_attempt b/lis/metforcing/usaf/EMK_precipMod.F90.qc_attempt index debcd5a13..00d77e314 100644 --- a/lis/metforcing/usaf/EMK_precipMod.F90.qc_attempt +++ b/lis/metforcing/usaf/EMK_precipMod.F90.qc_attempt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/USAF_GagesMod.F90 b/lis/metforcing/usaf/USAF_GagesMod.F90 new file mode 100644 index 000000000..51c8c47b1 --- /dev/null +++ b/lis/metforcing/usaf/USAF_GagesMod.F90 @@ -0,0 +1,2645 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +! MODULE: USAF_GagesMod +! +! DESCRIPTION: Contains structure and related routines for storing and +! updating new database of rain gauge reports from USAF. Includes +! routines to reconcile reports by intercomparison. +! +! AUTHOR: Eric Kemp, SSAI/NASA GSFC +! +! REFERENCES: +! Durre, I, M J Menne, B E Gleason, T G Houston, and R S Vose, 2010: +! Comprehensive automated quality assurance of daily surface observations. +! J Appl Meteor Climatol, 49, 1615-1633, +! https://doi.org/10.1175/2010JAMC2375.1 +! Qi, Y, S Martinaitis, J Zhang, and S Cocks, 2016: A real-time automated +! quality control of hourly rain gauge data based on multiple sensors in +! MRMS system. J Hydrometeor, 17, 1675-1691, +! https://doi.org/10.1175/JHM-D-15-0188.1 +! WMO, 2019: Manual on Codes, International Codes, Volume I.1, Part A -- +! Alphanumeric Codes. WMO No. 306, +! https://library.wmo.int/doc_num.php?explnum_id=10235 +! WMO, 2021: Manual on Codes, International Codes, Volume I.2, Part B -- +! Binary Codes. WMO No. 306, +! https://library.wmo.int/doc_num.php?explnum_id=10722 +! WMO, 2018: Manual on Codes, Regional Codes and National Coding Practices, +! Volume II. WMO No. 306, +! https://library.wmo.int/doc_num.php?explnum_id=5730 +! WMO, 2012: Weather Reporting, Volume A -- Observing Stations. WMO No. 9, +! https://library.wmo.int/doc_num.php?explnum_id=9896 +! +! REVISION HISTORY: +! 30 Aug 2021...First developmental version committed to git. +! 03 Aug 2023...Added 1-hr and 2-hr accumulations, date/times of each +! observation, and ob-specific past weather durations. +! 23 Aug 2023...Added both WMO and FIPS country codes. +! 07 Sep 2023...Fixed WMO block check (values in preobs files are typically +! <= 100, so these are multipied by 1000 or 10000 to check for country +! ranges). +!------------------------------------------------------------------------------ + +module USAF_GagesMod + + ! Defaults + implicit none + private + + type, public :: USAF_Gages_t + private + logical :: cdms_flag + character(10) :: date10 + integer :: nobs + character(14), allocatable :: YYYYMMDDhhmmss(:) + character(32), allocatable :: networks(:) + character(32), allocatable :: platforms(:) + character(2), allocatable :: wmocode_id(:) + character(2), allocatable :: fipscode_id(:) + integer, allocatable :: wmonumbers(:) + integer, allocatable :: bsn(:) + ! NOTE: Latitudes and longitudes are in hundreths of degrees + ! (100 = 1.00 deg) + integer, allocatable :: lats(:) + integer, allocatable :: lons(:) + ! NOTE: Accumulations are in tenths of mm (10 = 1 mm) + integer, allocatable :: amts24(:) + integer, allocatable :: amts21(:) ! Non-standard + integer, allocatable :: amts18(:) + integer, allocatable :: amts15(:) + integer, allocatable :: amts12(:) + ! "Original", non-filled or reconciled 12hr amount, needed for + ! some 12Z South America sanity checks. These are not written + ! to the presav2 file. + integer, allocatable :: amts12_orig(:) + integer, allocatable :: amts09(:) + integer, allocatable :: amts06(:) + ! "Original", non-filled or reconciled 06hr amount, needed for + ! some 12Z South America sanity checks. These are not written + ! to the presav2 file. + integer, allocatable :: amts06_orig(:) + integer, allocatable :: amts03(:) + integer, allocatable :: amts02(:) + integer, allocatable :: amts01(:) + integer, allocatable :: amts00(:) ! Non-standard accumulations + integer, allocatable :: durations(:) ! Durations of non-std accums + integer, allocatable :: preswx(:) + integer, allocatable :: pastwx(:) + integer, allocatable :: pastwx_durations(:) + character(32), allocatable :: unique_networks(:) + integer, allocatable :: firsts(:) ! Starting indices for each network + integer, allocatable :: lasts(:) ! Ending indices for each network + integer :: num_unique_networks + contains + procedure :: new => USAF_gages_new + procedure :: read_data => USAF_gages_read_data + procedure :: delete => USAF_gages_delete + procedure :: check_gross_errors => & + USAF_gages_check_gross_errors + procedure :: use_misc_precip => USAF_gages_use_misc_precip + procedure :: reconcile_self => USAF_gages_reconcile_self + procedure :: reconcile_gages01 => USAF_gages_reconcile_gages01 + procedure :: reconcile_gages02 => USAF_gages_reconcile_gages02 + procedure :: reconcile_gages03 => USAF_gages_reconcile_gages03 + procedure :: reconcile_gages06 => USAF_gages_reconcile_gages06 + procedure :: reconcile_gages09 => USAF_gages_reconcile_gages09 + procedure :: reconcile_gages12 => USAF_gages_reconcile_gages12 + procedure :: reconcile_gages15 => USAF_gages_reconcile_gages15 + procedure :: reconcile_gages18 => USAF_gages_reconcile_gages18 + procedure :: reconcile_gages21 => USAF_gages_reconcile_gages21 + procedure :: correct_region3_12Z => USAF_gages_correct_region3_12Z + procedure :: use_preswx_pastwx => USAF_gages_use_preswx_pastwx + procedure :: fill_gaps => USAF_gages_fill_gaps + procedure :: write_data => USAF_gages_write_data + procedure :: set_pastwx_durations => USAF_gages_set_pastwx_durations + procedure :: copy_to_usaf_obsdata => USAF_copy_to_usaf_obsdata + end type USAF_Gages_t + + ! Local parameters + integer, parameter :: MAX_UNIQUE_NETWORKS = 25 + integer, parameter :: MISSING = -99999999 + character(4), parameter :: MISSING_NAME = "NULL" + + ! Old CDMS replacements for WMO numbers + ! The following two are guesses + integer, parameter :: CDMS_SWEDEN_LOWLIMIT = 020010 + integer, parameter :: CDMS_SWEDEN_HIGHLIMIT = 026999 + ! The following two are guesses + integer, parameter :: CDMS_DENMARK_LOWLIMIT = 060010 + integer, parameter :: CDMS_DENMARK_HIGHLIMIT = 061999 + integer, parameter :: CDMS_RUSSIA_LOWLIMIT = 200000 + integer, parameter :: CDMS_RUSSIA_HIGHLIMIT = 390009 + integer, parameter :: CDMS_INDIA_LOWLIMIT = 420010 + integer, parameter :: CDMS_INDIA_HIGHLIMIT = 433999 + integer, parameter :: CDMS_SRILANKA_LOWLIMIT = 434000 + integer, parameter :: CDMS_SRILANKA_HIGHLIMIT = 434979 + integer, parameter :: CDMS_S_AMER_LOWLIMIT = 800000 + integer, parameter :: CDMS_S_AMER_HIGHLIMIT = 889999 + + ! JMOBS WMO Numbers. + integer, parameter, public :: JMOBS_SWEDEN_LOWLIMIT = 02001 + integer, parameter, public :: JMOBS_SWEDEN_HIGHLIMIT = 02699 + integer, parameter, public :: JMOBS_DENMARK_LOWLIMIT = 06001 + integer, parameter, public :: JMOBS_DENMARK_HIGHLIMIT = 06199 + integer, parameter, public :: JMOBS_RUSSIA_LOWLIMIT = 20000 + integer, parameter, public :: JMOBS_RUSSIA_HIGHLIMIT = 39000 + integer, parameter, public :: JMOBS_INDIA_LOWLIMIT = 42000 + integer, parameter, public :: JMOBS_INDIA_HIGHLIMIT = 43399 + integer, parameter, public :: JMOBS_SRILANKA_LOWLIMIT = 43400 + integer, parameter, public :: JMOBS_SRILANKA_HIGHLIMIT = 43497 + integer, parameter, public :: JMOBS_S_AMER_LOWLIMIT = 80000 + integer, parameter, public :: JMOBS_S_AMER_HIGHLIMIT = 88999 + + ! Maximum allowed accumulations + ! Values below are in tenths of mm (10 = 1 mm) + ! Qi et al. (2016) use 50.8 mm (2 in) for 1 hour accum, based on + ! subjective evaluation in CONUS regions with poor radar coverage; + ! they judged approximately 97% of observations above this amount were + ! erroneous. + integer, parameter :: MAX_PCP_1HR = 508 ! 2 inches + integer, parameter :: MAX_PCP_2HR = 1016 ! 4 inches + integer, parameter :: MAX_PCP_3HR = 1524 ! 6 inches + integer, parameter :: MAX_PCP_6HR = 3048 ! 12 inches + integer, parameter :: MAX_PCP_9HR = 4572 ! 18 inches + integer, parameter :: MAX_PCP_12HR = 6096 ! 24 inches + integer, parameter :: MAX_PCP_15HR = 7620 ! 30 inches + integer, parameter :: MAX_PCP_18HR = 9144 ! 36 inches + integer, parameter :: MAX_PCP_21HR = 10668 ! 42 inches + integer, parameter :: MAX_PCP_24HR = 12192 ! 48 inches + + ! Durre et al (2010) use 1828.8 mm (72 in) for 24-hr limit, based on WMO + ! world record for 24-hr accumulation. + ! integer, parameter :: MAX_PCP_3HR = 2286 ! 9 inches + ! integer, parameter :: MAX_PCP_6HR = 4572 ! 18 inches + ! integer, parameter :: MAX_PCP_9HR = 6858 ! 27 inches + ! integer, parameter :: MAX_PCP_12HR = 9144 ! 36 inches + ! integer, parameter :: MAX_PCP_15HR = 11430 ! 45 inches + ! integer, parameter :: MAX_PCP_18HR = 13716 ! 54 inches + ! integer, parameter :: MAX_PCP_21HR = 16002 ! 63 inches + ! integer, parameter :: MAX_PCP_24HR = 18288 ! 72 inches + + ! Note: WMO world records. See https://wmo.asu.edu + ! 1-hr rainfall: 305 mm (12 inch), Holt MO, USA, June 1947 + ! 12-hr rainfall: 1144 mm (45 inch), Foc-Foc, La Reunion, Jan 1966 + ! 24-hr rainfall: 1825 mm (71.8 inch), Foc-Foc, La Reunion, Jan 1966 + +contains + + ! Constructor for USAF_gages_t type + subroutine USAF_gages_new(this, date10, & + nobs, YYYYMMDDhhmmss, networks, platforms, & + wmocode_id, fipscode_id, & + wmonumbers, bsn, lats, lons, & + amts24, amts21, amts18, amts15, amts12, amts09, amts06, amts03, & + amts02, amts01, & + amts00, durations, preswx, pastwx) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(out) :: this + character(10), intent(in) :: date10 + integer, intent(in) :: nobs + character(14), intent(in) :: YYYYMMDDhhmmss(nobs) + character(32), intent(in) :: networks(nobs) + character(32), intent(in) :: platforms(nobs) + character(2), intent(in) :: wmocode_id(nobs) + character(2), intent(in) :: fipscode_id(nobs) + integer, intent(in) :: wmonumbers(nobs) + integer, intent(in) :: bsn(nobs) + integer, intent(in) :: lats(nobs) + integer, intent(in) :: lons(nobs) + integer, intent(in) :: amts24(nobs) + integer, intent(in) :: amts21(nobs) + integer, intent(in) :: amts18(nobs) + integer, intent(in) :: amts15(nobs) + integer, intent(in) :: amts12(nobs) + integer, intent(in) :: amts09(nobs) + integer, intent(in) :: amts06(nobs) + integer, intent(in) :: amts03(nobs) + integer, intent(in) :: amts02(nobs) + integer, intent(in) :: amts01(nobs) + integer, intent(in) :: amts00(nobs) + integer, intent(in) :: durations(nobs) + integer, intent(in) :: preswx(nobs) + integer, intent(in) :: pastwx(nobs) + + this%date10 = date10 + + this%nobs = nobs + + allocate(this%YYYYMMDDhhmmss(nobs)) + this%YYYYMMDDhhmmss = YYYYMMDDhhmmss + + allocate(this%networks(nobs)) + this%networks = networks + + allocate(this%platforms(nobs)) + this%platforms = platforms + + allocate(this%wmocode_id(nobs)) + this%wmocode_id = wmocode_id + + allocate(this%fipscode_id(nobs)) + this%fipscode_id = fipscode_id + + allocate(this%wmonumbers(nobs)) + this%wmonumbers = wmonumbers + + allocate(this%bsn(nobs)) + this%bsn = bsn + + allocate(this%lats(nobs)) + this%lats = lats + + allocate(this%lons(nobs)) + this%lons = lons + + allocate(this%amts24(nobs)) + this%amts24 = amts24 + + allocate(this%amts21(nobs)) + this%amts21 = amts21 + + allocate(this%amts18(nobs)) + this%amts18 = amts18 + + allocate(this%amts15(nobs)) + this%amts15 = amts15 + + allocate(this%amts12(nobs)) + this%amts12 = amts12 + + allocate(this%amts12_orig(nobs)) + this%amts12_orig = amts12 + + allocate(this%amts09(nobs)) + this%amts09 = amts09 + + allocate(this%amts06(nobs)) + this%amts06 = amts06 + + allocate(this%amts06_orig(nobs)) + this%amts06_orig = amts06 + + allocate(this%amts03(nobs)) + this%amts03 = amts03 + + allocate(this%amts02(nobs)) + this%amts02 = amts02 + + allocate(this%amts01(nobs)) + this%amts01 = amts01 + + allocate(this%amts00(nobs)) + this%amts00 = amts00 + + allocate(this%durations(nobs)) + this%durations = durations + + allocate(this%preswx(nobs)) + this%preswx = preswx + + allocate(this%pastwx(nobs)) + this%pastwx = pastwx + + !this%pastwx_duration = set_pastwx_duration(date10) + allocate(this%pastwx_durations(nobs)) + call this%set_pastwx_durations() + + ! Make sure lats/lons are valid. + call check_latlons(this) + + ! Handle arrays for unique networks in private method. Also set & + ! cdms_flag. + call set_unique_networks(this) + + end subroutine USAF_gages_new + + ! Destructor + subroutine USAF_gages_delete(this) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + this%date10 = "NULL" + + this%nobs = 0 + if (allocated(this%YYYYMMDDhhmmss)) deallocate(this%YYYYMMDDhhmmss) + if (allocated(this%networks)) deallocate(this%networks) + if (allocated(this%platforms)) deallocate(this%platforms) + if (allocated(this%wmocode_id)) deallocate(this%wmocode_id) + if (allocated(this%fipscode_id)) deallocate(this%fipscode_id) + if (allocated(this%wmonumbers)) deallocate(this%wmonumbers) + if (allocated(this%bsn)) deallocate(this%bsn) + if (allocated(this%lats)) deallocate(this%lats) + if (allocated(this%lons)) deallocate(this%lons) + if (allocated(this%amts24)) deallocate(this%amts24) + if (allocated(this%amts21)) deallocate(this%amts21) + if (allocated(this%amts18)) deallocate(this%amts18) + if (allocated(this%amts15)) deallocate(this%amts15) + if (allocated(this%amts12)) deallocate(this%amts12) + if (allocated(this%amts12_orig)) deallocate(this%amts12_orig) + if (allocated(this%amts09)) deallocate(this%amts09) + if (allocated(this%amts06)) deallocate(this%amts06) + if (allocated(this%amts06_orig)) deallocate(this%amts06_orig) + if (allocated(this%amts03)) deallocate(this%amts03) + if (allocated(this%amts02)) deallocate(this%amts02) + if (allocated(this%amts01)) deallocate(this%amts01) + if (allocated(this%amts00)) deallocate(this%amts00) + if (allocated(this%durations)) deallocate(this%durations) + if (allocated(this%preswx)) deallocate(this%preswx) + if (allocated(this%pastwx)) deallocate(this%pastwx) + if (allocated(this%unique_networks)) deallocate(this%unique_networks) + if (allocated(this%firsts)) deallocate(this%firsts) + if (allocated(this%lasts)) deallocate(this%lasts) + if (allocated(this%pastwx_durations)) & + deallocate(this%pastwx_durations) + this%num_unique_networks = 0 + end subroutine USAF_gages_delete + + ! Use the miscellaneous precip amount. + subroutine USAF_gages_use_misc_precip(this) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + integer :: russia_lowlimit + integer :: russia_highlimit + integer :: india_lowlimit + integer :: india_highlimit + integer :: srilanka_lowlimit + integer :: srilanka_highlimit + integer :: wmo_block + character(10) :: date10 + integer :: nobs + integer :: i + + if (this%cdms_flag) then + india_lowlimit = CDMS_INDIA_LOWLIMIT + india_highlimit = CDMS_INDIA_HIGHLIMIT + russia_lowlimit = CDMS_RUSSIA_LOWLIMIT + russia_highlimit = CDMS_RUSSIA_HIGHLIMIT + srilanka_lowlimit = CDMS_SRILANKA_LOWLIMIT + srilanka_highlimit = CDMS_SRILANKA_HIGHLIMIT + else + india_lowlimit = JMOBS_INDIA_LOWLIMIT + india_highlimit = JMOBS_INDIA_HIGHLIMIT + russia_lowlimit = JMOBS_RUSSIA_LOWLIMIT + russia_highlimit = JMOBS_RUSSIA_HIGHLIMIT + srilanka_lowlimit = JMOBS_SRILANKA_LOWLIMIT + srilanka_highlimit = JMOBS_SRILANKA_HIGHLIMIT + end if + + date10 = this%date10 + + nobs = this%nobs + do i = 1, nobs + + ! WMO block number in preobs files usually range from 1 to 100. + ! Multiply so they are directly comparable to the + ! appropriate WMO block ID ranges. + wmo_block = this%wmonumbers(i) + if (wmo_block < 1000) then + if (this%cdms_flag) then + wmo_block = wmo_block*10000 + else + wmo_block = wmo_block*1000 + end if + end if + + ! India rule...Obs are usually relative to 03Z with an invalid + ! duration flag. So we may need to copy values from miscellaneous + ! (amts00) to a more standard duration. + if (this%durations(i) .eq. 0 .or. & + this%durations(i) .eq. MISSING) then + + if ((wmo_block .ge. india_lowlimit .and. & + wmo_block .le. india_highlimit) .or. & + (this%bsn(i) .ge. india_lowlimit .and. & + this%bsn(i) .le. india_highlimit)) then + + if (this%amts00(i) .ne. MISSING) then + + if (date10(9:10) == "03" .and. & + this%amts24(i) .eq. MISSING) then + this%amts24(i) = this%amts00(i) + else if (date10(9:10) == "06" .and. & + this%amts03(i) .eq. MISSING) then + this%amts03(i) = this%amts00(i) + else if (date10(9:10) == "09" .and. & + this%amts06(i) .eq. MISSING) then + this%amts06(i) = this%amts00(i) + else if (date10(9:10) == "12" .and. & + this%amts09(i) .eq. MISSING) then + this%amts09(i) = this%amts00(i) + else if (date10(9:10) == "15" .and. & + this%amts12(i) .eq. MISSING) then + this%amts12(i) = this%amts00(i) + else if (date10(9:10) == "18" .and. & + this%amts15(i) .eq. MISSING) then + this%amts15(i) = this%amts00(i) + else if (date10(9:10) == "21" .and. & + this%amts18(i) .eq. MISSING) then + this%amts18(i) = this%amts00(i) + else if (date10(9:10) == "00" .and. & + this%amts21(i) .eq. MISSING) then + this%amts21(i) = this%amts00(i) + end if + end if + end if + end if + + ! Sri Lanka rule. + if ((wmo_block .ge. srilanka_lowlimit .and. & + wmo_block .le. srilanka_highlimit) .or. & + (this%bsn(i) .ge. srilanka_lowlimit .and. & + this%bsn(i) .le. srilanka_highlimit) ) then + + ! At present, it doesn't appear a special Sri Lanka rule is + ! required. We can process 3, 9, and 15 hour reports. + continue + end if + + ! Russia rule (actually, post-Soviet rule). In the past, USAF + ! personnel noted many "Russian" obs were only reported at 00Z and + ! 12Z, and did not use a valid duration flag. These are decoded in + ! the miscellaneous accumulation (amts00), and the duration is set + ! to 0. In AGRMET they were treated as 12-hr accumulations. More + ! recently, a spot check in July 2021 showed similar invalid + ! durations in Kazakhstan, Kyrgyzstan, Georgia, Tajiskistan, and + ! Turkenistan at 06Z and 18Z. Since WMO Region VI (Europe) expects + ! 12-hr accumulations at 06Z and 18Z, we assume these rogue + ! reports are 12-hr accumulations. + if (this%durations(i) .eq. 0 .or. & + this%durations(i) .eq. MISSING) then + + if ((wmo_block .ge. russia_lowlimit .and. & + wmo_block .le. russia_highlimit) .or. & + (this%bsn(i) .ge. russia_lowlimit .and. & + this%bsn(i) .le. russia_highlimit) ) then + + if (date10(9:10) .eq. "00" .or. date10(9:10) .eq. "06" .or. & + date10(9:10) .eq. "12" .or. date10(9:10) .eq. "18") then + + if (this%amts00(i) .ne. MISSING) then + if (this%amts12(i) .eq. MISSING) then + this%amts12(i) = this%amts00(i) + end if + end if + end if + end if + end if ! Russia rule + + ! Copy from miscellaneous (amts00) to a more standard duration, + ! according to the reported duration. + if (this%amts00(i) .ne. MISSING) then + if (this%amts24(i) .eq. MISSING .and. & + this%durations(i) .eq. 24) then + this%amts24(i) = this%amts00(i) + else if (this%amts21(i) .eq. MISSING .and. & + this%durations(i) .eq. 21) then + this%amts21(i) = this%amts00(i) + else if (this%amts18(i) .eq. MISSING .and. & + this%durations(i) .eq. 18) then + this%amts18(i) = this%amts00(i) + else if (this%amts15(i) .eq. MISSING .and. & + this%durations(i) .eq. 15) then + this%amts15(i) = this%amts00(i) + else if (this%amts12(i) .eq. MISSING .and. & + this%durations(i) .eq. 12) then + this%amts12(i) = this%amts00(i) + else if (this%amts09(i) .eq. MISSING .and. & + this%durations(i) .eq. 9) then + this%amts09(i) = this%amts00(i) + else if (this%amts06(i) .eq. MISSING .and. & + this%durations(i) .eq. 6) then + this%amts06(i) = this%amts00(i) + else if (this%amts03(i) .eq. MISSING .and. & + this%durations(i) .eq. 3) then + this%amts03(i) = this%amts00(i) + ! EMK...Disabled saving 2-hr and 1-hr amounts from misc. + ! Old preobs files have a mix of different hours, so we + ! can't expect this to work. We will revisit with the + ! new preobs files, likely requiring a new argument to + ! this subroutine to activate. + ! else if (this%amts02(i) .eq. MISSING .and. & + ! this%durations(i) .eq. 2) then + ! this%amts02(i) = this%amts00(i) + ! else if (this%amts01(i) .eq. MISSING .and. & + ! this%durations(i) .eq. 1) then + ! this%amts01(i) = this%amts00(i) + end if + end if + + end do ! i + + ! Make sure shorter durations don't exceed larger durations. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_use_misc_precip + + ! Reconciles different accumulations from the same report. + subroutine USAF_gages_reconcile_self(this) + + use LIS_logMod, only: LIS_logunit + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + integer :: nobs + integer :: i + integer :: amts_tmp(10) ! 1, 2, 3, 6, 9, 12, 15, 18, 21, 24 + integer :: j, jj + + nobs = this%nobs + do i = 1, nobs + + ! Zero out smaller-duration accumulation if larger one is zero. + if (this%amts24(i) .eq. 0) then + this%amts21(i) = 0 + end if + if (this%amts21(i) .eq. 0) then + this%amts18(i) = 0 + end if + if (this%amts18(i) .eq. 0) then + this%amts15(i) = 0 + end if + if (this%amts15(i) .eq. 0) then + this%amts12(i) = 0 + end if + if (this%amts12(i) .eq. 0) then + this%amts09(i) = 0 + end if + if (this%amts09(i) .eq. 0) then + this%amts06(i) = 0 + end if + if (this%amts06(i) .eq. 0) then + this%amts03(i) = 0 + end if + if (this%amts03(i) .eq. 0) then + this%amts02(i) = 0 + end if + if (this%amts02(i) .eq. 0) then + this%amts01(i) = 0 + end if + + ! Sometimes smaller-duration accumulations exceed larger-durations, + ! due to precision differences in WMO reporting standard. We + ! correct that here. + amts_tmp(1) = this%amts01(i) + amts_tmp(2) = this%amts02(i) + amts_tmp(3) = this%amts03(i) + amts_tmp(4) = this%amts06(i) + amts_tmp(5) = this%amts09(i) + amts_tmp(6) = this%amts12(i) + amts_tmp(7) = this%amts15(i) + amts_tmp(8) = this%amts18(i) + amts_tmp(9) = this%amts21(i) + amts_tmp(10) = this%amts24(i) + + do j = 10, 2, -1 ! Longer duration limit, 24-hr to 02-hr + if (amts_tmp(j) .ne. MISSING) then + do jj = j-1, 1, -1 ! Shorter duration limit, 21-hr to 01-hr + if (amts_tmp(jj) .ne. MISSING) then + amts_tmp(jj) = min(amts_tmp(jj), amts_tmp(j)) + end if + end do ! jj + end if + end do ! j + + this%amts01(i) = amts_tmp(1) + this%amts02(i) = amts_tmp(2) + this%amts03(i) = amts_tmp(3) + this%amts06(i) = amts_tmp(4) + this%amts09(i) = amts_tmp(5) + this%amts12(i) = amts_tmp(6) + this%amts15(i) = amts_tmp(7) + this%amts18(i) = amts_tmp(8) + this%amts21(i) = amts_tmp(9) + this%amts24(i) = amts_tmp(10) + + end do ! i + + end subroutine USAF_gages_reconcile_self + + ! Fill gaps in precip record if bookend accumulations are identical. + subroutine USAF_gages_fill_gaps(this) + + use LIS_logmod, only: LIS_logunit + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + integer :: nobs + integer :: i + integer :: amts_tmp(10) ! 1, 2, 3, 6, 9, 12, 15, 18, 21, 24 + integer :: j, jj, jjj + logical :: is_data_gap + + nobs = this%nobs + do i = 1, nobs + + amts_tmp(1) = this%amts01(i) + amts_tmp(2) = this%amts02(i) + amts_tmp(3) = this%amts03(i) + amts_tmp(4) = this%amts06(i) + amts_tmp(5) = this%amts09(i) + amts_tmp(6) = this%amts12(i) + amts_tmp(7) = this%amts15(i) + amts_tmp(8) = this%amts18(i) + amts_tmp(9) = this%amts21(i) + amts_tmp(10) = this%amts24(i) + + ! Fill in gaps if shorter and longer accumulations are identical. + do j = 1, 8 ! Shorter duration limit, from 01-hr to 18-hr + do jj = j+2, 10 ! Longer duration limit, from 03-hr to 24-hr + if (amts_tmp(j) .ne. MISSING .and. & + amts_tmp(jj) .ne. MISSING .and. & + amts_tmp(j) == amts_tmp(jj)) then + ! We have two bookends with identical values. See + ! if all the durations in-between are missing. + is_data_gap = .true. + do jjj = j+1, jj-1 + if (amts_tmp(jjj) .ne. MISSING) then + is_data_gap = .false. + exit + end if + end do ! jjj + ! If all the durations in between are missing, just + ! copy the value (we can assume no additional precip + ! occurred during these periods, at least from this + ! particular report). + if (is_data_gap) then + do jjj = j+1, jj-1 + amts_tmp(jjj) = amts_tmp(j) + end do ! jjj + end if + end if + end do ! jj + end do ! j + + this%amts01(i) = amts_tmp(1) + this%amts02(i) = amts_tmp(2) + this%amts03(i) = amts_tmp(3) + this%amts06(i) = amts_tmp(4) + this%amts09(i) = amts_tmp(5) + this%amts12(i) = amts_tmp(6) + this%amts15(i) = amts_tmp(7) + this%amts18(i) = amts_tmp(8) + this%amts21(i) = amts_tmp(9) + this%amts24(i) = amts_tmp(10) + + end do ! i + + end subroutine USAF_gages_fill_gaps + + ! Reconcile current obs with obs from 1 hour ago + subroutine USAF_gages_reconcile_gages01(this, gages01) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages01 + + ! Locals + integer :: nobs + integer tmp + integer :: i, i1 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i1 = search_pcpobs(gages01, this%networks(i), this%platforms(i), & + this%wmocode_id(i), this%fipscode_id(i)) + + if (i1 .eq. MISSING) cycle + + ! Use current 1-hr accumulation, if available. + if (this%amts01(i) .ne. MISSING) then + + ! Update 3-hr accumulation if missing + if (this%amts03(i) .eq. MISSING .and. & + gages01%amts02(i1) .ne. MISSING ) then + tmp = this%amts01(i) + gages01%amts02(i1) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) this%amts03(i) = tmp + end if + + ! Update 2-hr accumulation if missing + if (this%amts02(i) .eq. MISSING .and. & + gages01%amts01(i1) .ne. MISSING ) then + tmp = this%amts01(i) + gages01%amts01(i1) + if (tmp >= 0 .and. tmp <= MAX_PCP_2HR) this%amts02(i) = tmp + end if + + end if + + ! Update the 01-hr accumulation + if (this%amts01(i) .eq. MISSING) then + if (this%amts02(i) .ne. MISSING .and. & + gages01%amts01(i1) .ne. MISSING) then + tmp = this%amts02(i) - gages01%amts01(i1) + if (tmp >= 0 .and. tmp <= MAX_PCP_1HR) then + this%amts01(i) = tmp + cycle + end if + end if + if (this%amts03(i) .ne. MISSING .and. & + gages01%amts02(i1) .ne. MISSING) then + tmp = this%amts03(i) - gages01%amts02(i1) + if (tmp >= 0 .and. tmp <= MAX_PCP_1HR) then + this%amts01(i) = tmp + cycle + end if + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration accumulations + ! don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages01 + + ! Reconcile current obs with obs from 2 hours ago + subroutine USAF_gages_reconcile_gages02(this, gages02) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages02 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i2 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i2 = search_pcpobs(gages02, this%networks(i), this%platforms(i), & + this%wmocode_id(i), this%fipscode_id(i)) + + if (i2 .eq. MISSING) cycle + + ! Use current 2-hr accumulation, if available. + if (this%amts02(i) .ne. MISSING) then + + ! Update 3-hr accumulation if missing + if (this%amts03(i) .eq. MISSING .and. & + gages02%amts01(i2) .ne. MISSING ) then + tmp = this%amts02(i) + gages02%amts01(i2) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) this%amts03(i) = tmp + end if + end if + + ! Update the 2-hr accumulation + if (this%amts02(i) .eq. MISSING) then + if (this%amts03(i) .ne. MISSING .and. & + gages02%amts01(i2) .ne. MISSING) then + tmp = this%amts03(i) - gages02%amts01(i2) + if (tmp >= 0 .and. tmp <= MAX_PCP_2HR) this%amts02(i) = tmp + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration accumulations + ! don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages02 + + ! Reconcile current obs with obs from 3 hours ago + subroutine USAF_gages_reconcile_gages03(this, gages03) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages03 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i3 + + nobs = this%nobs + do i = 1, nobs + + ! Find current station in prior report list + i3 = search_pcpobs(gages03, this%networks(i), this%platforms(i), & + this%wmocode_id(i), this%fipscode_id(i)) + + if (i3 .eq. MISSING) cycle + + ! Use current 3-hr accumulation, if available. + if (this%amts03(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages03%amts21(i3) .ne. MISSING ) then + tmp = this%amts03(i) + gages03%amts21(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + ! Update 21-hr accumulation if missing + if (this%amts21(i) .eq. MISSING .and. & + gages03%amts18(i3) .ne. MISSING) then + tmp = this%amts03(i) + gages03%amts18(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + + ! Update 18-hr accumulation if missing + if (this%amts18(i) .eq. MISSING .and. & + gages03%amts15(i3) .ne. MISSING) then + tmp = this%amts03(i) + gages03%amts15(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) this%amts18(i) = tmp + end if + + ! Update 15-hr accumulation if missing + if (this%amts15(i) .eq. MISSING .and. & + gages03%amts12(i3) .ne. MISSING) then + tmp = this%amts03(i) + gages03%amts12(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) this%amts15(i) = tmp + end if + + ! Update 12-hr accumulation if missing + if (this%amts12(i) .eq. MISSING .and. & + gages03%amts09(i3) .ne. MISSING) then + tmp = this%amts03(i) + gages03%amts09(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) this%amts12(i) = tmp + end if + + ! Update 09-hr accumulation if missing + if (this%amts09(i) .eq. MISSING .and. & + gages03%amts06(i3) .ne. MISSING) then + tmp = this%amts03(i) + gages03%amts06(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) this%amts09(i) = tmp + end if + + ! Update 06-hr accumulation if missing + if (this%amts06(i) .eq. MISSING .and. & + gages03%amts03(i3) .ne. MISSING) then + tmp = this%amts03(i) + gages03%amts03(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_6HR) this%amts06(i) = tmp + end if + end if + + ! Multiple attempts to update 03-hr accumulation. + if (this%amts03(i) .eq. MISSING) then + if (this%amts06(i) .ne. MISSING .and. & + gages03%amts03(i3) .ne. MISSING) then + tmp = this%amts06(i) - gages03%amts03(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + + if (this%amts09(i) .ne. MISSING .and. & + gages03%amts06(i3) .ne. MISSING) then + tmp = this%amts09(i) - gages03%amts06(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + + if (this%amts12(i) .ne. MISSING .and. & + gages03%amts09(i3) .ne. MISSING) then + tmp = this%amts12(i) - gages03%amts09(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + + if (this%amts15(i) .ne. MISSING .and. & + gages03%amts12(i3) .ne. MISSING) then + tmp = this%amts15(i) - gages03%amts12(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + + if (this%amts18(i) .ne. MISSING .and. & + gages03%amts15(i3) .ne. MISSING) then + tmp = this%amts18(i) - gages03%amts15(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + + if (this%amts21(i) .ne. MISSING .and. & + gages03%amts18(i3) .ne. MISSING) then + tmp = this%amts21(i) - gages03%amts18(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + + if (this%amts24(i) .ne. MISSING .and. & + gages03%amts21(i3) .ne. MISSING ) then + tmp = this%amts24(i) - gages03%amts21(i3) + if (tmp >= 0 .and. tmp <= MAX_PCP_3HR) then + this%amts03(i) = tmp + cycle + end if + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration accumulations + ! don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages03 + + ! Reconcile current obs with obs from 6 hours ago. + subroutine USAF_gages_reconcile_gages06(this, gages06) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages06 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i6 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i6 = search_pcpobs(gages06, this%networks(i), this%platforms(i), & + this%wmocode_id(i), this%fipscode_id(i)) + + if (i6 .eq. MISSING) cycle + + ! Use current 6-hr accumulation, if available. + if (this%amts06(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages06%amts18(i6) .ne. MISSING) then + tmp = this%amts06(i) + gages06%amts18(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + ! Update 21-hr accumulation if missing + if (this%amts21(i) .eq. MISSING .and. & + gages06%amts15(i6) .ne. MISSING) then + tmp = this%amts06(i) + gages06%amts15(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + + ! Update 18-hr accumulation if missing + if (this%amts18(i) .eq. MISSING .and. & + gages06%amts12(i6) .ne. MISSING) then + tmp = this%amts06(i) + gages06%amts12(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) this%amts18(i) = tmp + end if + + ! Update 15-hr accumulation if missing + if (this%amts15(i) .eq. MISSING .and. & + gages06%amts09(i6) .ne. MISSING) then + tmp = this%amts06(i) + gages06%amts09(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) this%amts15(i) = tmp + end if + + ! Update 12-hr accumulation if missing + if (this%amts12(i) .eq. MISSING .and. & + gages06%amts06(i6) .ne. MISSING) then + tmp = this%amts06(i) + gages06%amts06(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) this%amts12(i) = tmp + end if + + ! Update 09-hr accumulation if missing + if (this%amts09(i) .eq. MISSING .and. & + gages06%amts03(i6) .ne. MISSING) then + tmp = this%amts06(i) + gages06%amts03(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) this%amts09(i) = tmp + end if + + end if + + ! Multiple attempts to update 06-hr accumulation. + if (this%amts06(i) .eq. MISSING) then + if ( (this%amts12(i) .ne. MISSING) .and. & + (gages06%amts06(i6) .ne. MISSING) ) then + tmp = this%amts12(i) - gages06%amts06(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_6HR) then + this%amts06(i) = tmp + cycle + end if + end if + + if ( (this%amts15(i) .ne. MISSING) .and. & + (gages06%amts09(i6) .ne. MISSING) ) then + tmp = this%amts15(i) - gages06%amts09(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_6HR) then + this%amts06(i) = tmp + cycle + end if + end if + + if ( (this%amts18(i) .ne. MISSING) .and. & + (gages06%amts12(i6) .ne. MISSING) ) then + tmp = this%amts18(i) - gages06%amts12(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_6HR) then + this%amts06(i) = tmp + cycle + end if + end if + + if ( (this%amts21(i) .ne. MISSING) .and. & + (gages06%amts15(i6) .ne. MISSING) ) then + tmp = this%amts21(i) - gages06%amts15(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_6HR) then + this%amts06(i) = tmp + cycle + end if + end if + + if ( (this%amts24(i) .ne. MISSING) .and. & + (gages06%amts18(i6) .ne. MISSING) ) then + tmp = this%amts24(i) - gages06%amts18(i6) + if (tmp >= 0 .and. tmp <= MAX_PCP_6HR) then + this%amts06(i) = tmp + cycle + end if + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages06 + + ! Reconcile current obs with obs from 9 hours ago. + subroutine USAF_gages_reconcile_gages09(this, gages09) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages09 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i9 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i9 = search_pcpobs(gages09, this%networks(i), this%platforms(i), & + this%wmocode_id(i), this%fipscode_id(i)) + + if (i9 .eq. MISSING) cycle + + ! Use current 9-hr accumulation, if available. + if (this%amts09(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages09%amts15(i9) .ne. MISSING ) then + tmp = this%amts09(i) + gages09%amts15(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + ! Update 21-hr accumulation if missing + if (this%amts21(i) .eq. MISSING .and. & + gages09%amts12(i9) .ne. MISSING ) then + tmp = this%amts09(i) + gages09%amts12(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + + ! Update 18-hr accumulation if missing + if (this%amts18(i) .eq. MISSING .and. & + gages09%amts09(i9) .ne. MISSING) then + tmp = this%amts09(i) + gages09%amts09(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) this%amts18(i) = tmp + end if + + ! Update 15-hr accumulation if missing + if (this%amts15(i) .eq. MISSING .and. & + gages09%amts06(i9) .ne. MISSING) then + tmp = this%amts09(i) + gages09%amts06(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) this%amts15(i) = tmp + end if + + ! Update 12-hr accumulation if missing + if (this%amts12(i) .eq. MISSING .and. & + gages09%amts03(i9) .ne. MISSING) then + tmp = this%amts09(i) + gages09%amts03(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) this%amts12(i) = tmp + end if + + end if + + ! Multiple attempts to update 09-hr accumulation. + if (this%amts09(i) .eq. MISSING) then + if ( (this%amts12(i) .ne. MISSING) .and. & + (gages09%amts03(i9) .ne. MISSING) ) then + tmp = this%amts12(i) - gages09%amts03(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) then + this%amts09(i) = tmp + cycle + end if + end if + + if ( (this%amts15(i) .ne. MISSING) .and. & + (gages09%amts06(i9) .ne. MISSING) ) then + this%amts09(i) = this%amts15(i) - gages09%amts06(i9) + this%amts09(i) = max(this%amts09(i), 0) + tmp = this%amts15(i) - gages09%amts06(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) then + this%amts09(i) = tmp + cycle + end if + end if + + if ( (this%amts18(i) .ne. MISSING) .and. & + (gages09%amts09(i9) .ne. MISSING) ) then + tmp = this%amts18(i) - gages09%amts09(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) then + this%amts09(i) = tmp + cycle + end if + end if + + if ( (this%amts21(i) .ne. MISSING) .and. & + (gages09%amts12(i9) .ne. MISSING) ) then + tmp = this%amts21(i) - gages09%amts12(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) then + this%amts09(i) = tmp + cycle + end if + end if + + if ( (this%amts24(i) .ne. MISSING) .and. & + (gages09%amts15(i9) .ne. MISSING) ) then + tmp = this%amts24(i) - gages09%amts15(i9) + if (tmp >= 0 .and. tmp <= MAX_PCP_9HR) then + this%amts09(i) = tmp + cycle + end if + end if + end if + end do + + ! Reconcile current obs again to ensure smaller-duration + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages09 + + ! Reconcile current obs with obs from 12 hours ago. + subroutine USAF_gages_reconcile_gages12(this, gages12) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages12 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i12 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i12 = search_pcpobs(gages12, this%networks(i), & + this%platforms(i), this%wmocode_id(i), this%fipscode_id(i)) + + if (i12 .eq. MISSING) cycle + + ! Use current 12-hr accumulation, if available + if (this%amts12(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages12%amts12(i12) .ne. MISSING) then + tmp = this%amts12(i) + gages12%amts12(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + ! Update 21-hr accumulation if missing + if (this%amts21(i) .eq. MISSING .and. & + gages12%amts09(i12) .ne. MISSING) then + tmp = this%amts12(i) + gages12%amts09(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + + ! Update 18-hr accumulation if missing + if (this%amts18(i) .eq. MISSING .and. & + gages12%amts06(i12) .ne. MISSING) then + tmp = this%amts12(i) + gages12%amts06(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) this%amts18(i) = tmp + end if + + ! Update 15-hr accumulation if missing + if (this%amts15(i) .eq. MISSING .and. & + gages12%amts03(i12) .ne. MISSING) then + tmp = this%amts12(i) + gages12%amts03(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) this%amts15(i) = tmp + end if + end if + + ! Multiple attempts to update 12-hr accumulation. + if (this%amts12(i) .eq. MISSING) then + if ( (this%amts15(i) .ne. MISSING) .and. & + (gages12%amts03(i12) .ne. MISSING) ) then + tmp = this%amts15(i) - gages12%amts03(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) then + this%amts12(i) = tmp + cycle + end if + end if + + if( (this%amts18(i) .ne. MISSING) .and. & + (gages12%amts06(i12) .ne. MISSING) ) then + tmp = this%amts18(i) - gages12%amts06(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) then + this%amts12(i) = tmp + cycle + end if + end if + + if( (this%amts21(i) .ne. MISSING) .and. & + (gages12%amts09(i12) .ne. MISSING) ) then + tmp = this%amts21(i) - gages12%amts09(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) then + this%amts12(i) = tmp + cycle + end if + end if + + if ( (this%amts24(i) .ne. MISSING) .and. & + (gages12%amts12(i12) .ne. MISSING) ) then + tmp = this%amts24(i) - gages12%amts12(i12) + if (tmp >= 0 .and. tmp <= MAX_PCP_12HR) then + this%amts12(i) = tmp + cycle + end if + end if + + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages12 + + ! Reconcile current obs with obs from 15 hours ago. + subroutine USAF_gages_reconcile_gages15(this, gages15) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages15 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i15 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i15 = search_pcpobs(gages15, this%networks(i), & + this%platforms(i), this%wmocode_id(i), this%fipscode_id(i)) + + if (i15 .eq. MISSING) cycle + + ! Use current 15-hr accumulation, if available + if (this%amts15(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages15%amts09(i15) .ne. MISSING) then + tmp = this%amts15(i) + gages15%amts09(i15) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + ! Update 21-hr accumulation if missing + if (this%amts21(i) .eq. MISSING .and. & + gages15%amts06(i15) .ne. MISSING) then + tmp = this%amts15(i) + gages15%amts06(i15) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + + ! Update 18-hr accumulation if missing + if (this%amts18(i) .eq. MISSING .and. & + gages15%amts03(i15) .ne. MISSING) then + tmp = this%amts15(i) + gages15%amts03(i15) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) this%amts18(i) = tmp + end if + + end if + + ! Multiple attempts to update 15-hr accumulation. + if (this%amts15(i) .eq. MISSING) then + if ( (this%amts18(i) .ne. MISSING) .and. & + (gages15%amts03(i15) .ne. MISSING) ) then + tmp = this%amts18(i) - gages15%amts03(i15) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) then + this%amts15(i) = tmp + cycle + end if + end if + + if ( (this%amts21(i) .ne. MISSING) .and. & + (gages15%amts06(i15) .ne. MISSING) ) then + tmp = this%amts21(i) - gages15%amts06(i15) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) then + this%amts15(i) = tmp + cycle + end if + end if + + if ( (this%amts24(i) .ne. MISSING) .and. & + (gages15%amts09(i15) .ne. MISSING) ) then + tmp = this%amts24(i) - gages15%amts09(i15) + if (tmp >= 0 .and. tmp <= MAX_PCP_15HR) then + this%amts15(i) = tmp + cycle + end if + end if + + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration & + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages15 + + ! Reconcile current obs with obs from 18 hours ago. + subroutine USAF_gages_reconcile_gages18(this, gages18) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages18 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i18 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i18 = search_pcpobs(gages18, this%networks(i), & + this%platforms(i), this%wmocode_id(i), this%fipscode_id(i)) + + if (i18 .eq. MISSING) cycle + + ! Use current 18-hr accumulation, if available + if (this%amts18(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages18%amts06(i18) .ne. MISSING) then + tmp = this%amts18(i) + gages18%amts06(i18) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + ! Update 21-hr accumulation if missing + if (this%amts21(i) .eq. MISSING .and. & + gages18%amts03(i18) .ne. MISSING) then + tmp = this%amts18(i) + gages18%amts03(i18) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + + end if + + ! Multiple attempts to update 18-hr accumulation. + if (this%amts18(i) .eq. MISSING) then + if (this%amts21(i) .ne. MISSING .and. & + gages18%amts03(i18) .ne. MISSING) then + tmp = this%amts21(i) - gages18%amts03(i18) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) then + this%amts18(i) = tmp + cycle + end if + end if + + if (this%amts24(i) .ne. MISSING .and. & + gages18%amts06(i18) .ne. MISSING) then + tmp = this%amts24(i) - gages18%amts06(i18) + if (tmp >= 0 .and. tmp <= MAX_PCP_18HR) then + this%amts18(i) = tmp + cycle + end if + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages18 + + ! Reconcile current obs with obs from 21 hours ago. + subroutine USAF_gages_reconcile_gages21(this, gages21) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + class(USAF_gages_t), intent(in) :: gages21 + + ! Locals + integer :: nobs + integer :: tmp + integer :: i, i21 + + nobs = this%nobs + + do i = 1, nobs + + ! Find current station in prior report list + i21 = search_pcpobs(gages21, this%networks(i), & + this%platforms(i), this%wmocode_id(i), this%fipscode_id(i)) + + if (i21 .eq. MISSING) cycle + + ! Use current 21-hr accumulation, if available + if (this%amts21(i) .ne. MISSING) then + + ! Update 24-hr accumulation if missing + if (this%amts24(i) .eq. MISSING .and. & + gages21%amts03(i21) .ne. MISSING) then + tmp = this%amts21(i) + gages21%amts03(i21) + if (tmp >= 0 .and. tmp <= MAX_PCP_24HR) this%amts24(i) = tmp + end if + + end if + + ! Update 21-hr accumulation + if (this%amts21(i) .eq. MISSING) then + if (this%amts24(i) .ne. MISSING .and. & + gages21%amts03(i21) .ne. MISSING) then + tmp = this%amts24(i) - gages21%amts03(i21) + if (tmp >= 0 .and. tmp <= MAX_PCP_21HR) this%amts21(i) = tmp + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_reconcile_gages21 + + ! Correct for missing "zero-precip" 12-hr reports at 12Z for Region III + ! (South America). Based on logic in AGRMET_processobs. + subroutine USAF_gages_correct_region3_12Z(this) + + use LIS_logmod, only: LIS_logunit + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + integer :: s_amer_lowlimit + integer :: s_amer_highlimit + integer :: wmo_block + character(10) :: date10 + integer :: nobs + integer :: i + + ! Only work with 12Z observations. + date10 = this%date10 + if (date10(9:10) .ne. "12") return + + if (this%cdms_flag) then + s_amer_lowlimit = CDMS_S_AMER_LOWLIMIT + s_amer_highlimit = CDMS_S_AMER_HIGHLIMIT + else + s_amer_lowlimit = JMOBS_S_AMER_LOWLIMIT + s_amer_highlimit = JMOBS_S_AMER_HIGHLIMIT + end if + + nobs = this%nobs + + do i = 1, nobs + + ! WMO block number in preobs files usually range from 1 to 100. + ! Multiply so they are directly comparable to the + ! appropriate WMO block ID ranges. + wmo_block = this%wmonumbers(i) + if (wmo_block < 1000) then + if (this%cdms_flag) then + wmo_block = wmo_block*10000 + else + wmo_block = wmo_block*1000 + end if + end if + + ! In the past, USAF personnel noticed a lack of "zero-precip" + ! 12-hr accumulations at 12Z over South America, which they + ! attributed to two causes: + ! (1) Many stations fail to report at 06Z; and + ! (2) Many 12Z reports indicate zero precip without indicating + ! duration. (Speculation: SYNOP reports excluded a 6RRRt_r + ! precip group in the ob, and instead mark the "I_R" + ! indicator in Section 0 as "3" (meaning precipitation amount + ! is zero) without indicating the duration.) + ! Apparently this is decoded by default as "no precip over last + ! six hours". + ! To reconcile, South American obs at 12Z with missing 12-hr + ! accumulations but with "zero" 6-hr accumulations will also + ! be treated as "zero" 12-hr accumulations. + ! EXCEPTION: If a rare 9-hour non-zero report exists, don't + ! change the 12-hr. + if (this%amts12(i) .ne. MISSING) cycle + if (this%amts12_orig(i) .ne. MISSING) cycle + if (this%amts09(i) .gt. 0) cycle + + if ((wmo_block .ge. s_amer_lowlimit .and. & + wmo_block .le. s_amer_highlimit) .or. & + (this%bsn(i) .ge. s_amer_lowlimit .and. & + this%bsn(i) .le. s_amer_highlimit)) then + + ! We want to make sure the 6-hr report is "original", and + ! not just filled in or derived from comparing other gage + ! reports or present/past weather. That is, the station + ! really made a "zero precip" ob at 12Z, and nothing is + ! available from 06Z. + if (this%amts06(i) .eq. 0 .and. & + this%amts06_orig(i) .eq. 0) then + this%amts12(i) = 0 + this%amts09(i) = 0 + this%amts06(i) = 0 + this%amts03(i) = 0 + this%amts02(i) = 0 + this%amts01(i) = 0 + end if + end if + + end do + + ! Reconcile current obs again to ensure smaller-duration + ! accumulations don't exceed longer-duration. + call this%reconcile_self() + call this%fill_gaps() + + end subroutine USAF_gages_correct_region3_12Z + + ! Write gage data to output file. + subroutine USAF_gages_write_data(this, filename) + + ! Imports + use LIS_logMod, only: LIS_getNextUnitNumber, LIS_releaseUnitNumber, LIS_logunit + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(in) :: this + character(*), intent(in) :: filename + + ! Locals + integer :: istat + integer :: nobs, nobs_good + integer :: i + integer :: iunit + + nobs = this%nobs + + ! First, count number of good obs in the structure, after quality + ! control. + nobs_good = 0 + do i = 1, nobs + if (this%amts24(i) .eq. MISSING .and. & + this%amts21(i) .eq. MISSING .and. & + this%amts18(i) .eq. MISSING .and. & + this%amts15(i) .eq. MISSING .and. & + this%amts12(i) .eq. MISSING .and. & + this%amts09(i) .eq. MISSING .and. & + this%amts06(i) .eq. MISSING .and. & + this%amts03(i) .eq. MISSING .and. & + this%amts02(i) .eq. MISSING .and. & + this%amts01(i) .eq. MISSING) cycle + nobs_good = nobs_good + 1 + end do + + iunit = LIS_getNextUnitNumber() + open(iunit, file=trim(filename), iostat=istat, err=300) + write(iunit, *, iostat=istat, err=300) nobs_good + do i = 1, nobs + + if (this%amts24(i) .eq. MISSING .and. & + this%amts21(i) .eq. MISSING .and. & + this%amts18(i) .eq. MISSING .and. & + this%amts15(i) .eq. MISSING .and. & + this%amts12(i) .eq. MISSING .and. & + this%amts09(i) .eq. MISSING .and. & + this%amts06(i) .eq. MISSING .and. & + this%amts03(i) .eq. MISSING .and. & + this%amts02(i) .eq. MISSING .and. & + this%amts01(i) .eq. MISSING) cycle + write(iunit, 6000, iostat=istat, err=300) & + this%YYYYMMDDhhmmss(i), & + this%networks(i), this%platforms(i), & + this%wmocode_id(i), this%fipscode_id(i), & + this%wmonumbers(i), this%bsn(i), & + this%lats(i), this%lons(i), & + this%amts24(i), this%amts21(i), this%amts18(i), & + this%amts15(i), this%amts12(i), this%amts09(i), & + this%amts06(i), this%amts03(i), & + this%amts02(i), this%amts01(i), & + this%amts00(i), this%durations(i), & + this%preswx(i), this%pastwx(i) +6000 format (a14, 1x, & + a32, 1x, a32, 1x, & + a2, 1x, a2, 1x, & + i6, 1x, i6, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9, 1x & + i9, 1x, i9) + + end do + + 300 continue + call LIS_releaseUnitNumber(iunit) ! Closes file + + end subroutine USAF_gages_write_data + + ! Read gage data from file. Acts as an alternative constructor. + subroutine USAF_gages_read_data(this, filename, date10, alert_number) + + ! Imports + use LIS_coreMod, only: LIS_masterproc + use LIS_logMod, only: LIS_getNextUnitNumber, LIS_releaseUnitNumber, & + LIS_alert, LIS_logunit + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(out) :: this + character(*), intent(in) :: filename + character(10), intent(in) :: date10 + integer, intent(inout) :: alert_number + + ! Locals + integer :: nobs + character(14), allocatable :: YYYYMMDDhhmmss(:) + character(32), allocatable :: networks(:) + character(32), allocatable :: platforms(:) + character(2), allocatable :: wmocode_id(:) + character(2), allocatable :: fipscode_id(:) + integer, allocatable :: wmonumbers(:) + integer, allocatable :: bsn(:) + integer, allocatable :: lats(:) + integer, allocatable :: lons(:) + integer, allocatable :: amts24(:) + integer, allocatable :: amts21(:) + integer, allocatable :: amts18(:) + integer, allocatable :: amts15(:) + integer, allocatable :: amts12(:) + integer, allocatable :: amts09(:) + integer, allocatable :: amts06(:) + integer, allocatable :: amts03(:) + integer, allocatable :: amts02(:) + integer, allocatable :: amts01(:) + integer, allocatable :: amts00(:) + integer, allocatable :: durations(:) + integer, allocatable :: preswx(:) + integer, allocatable :: pastwx(:) + integer :: istat + logical :: found + integer :: i + integer :: iunit + character(255) :: message(20) + + message = '' + call this%delete() ! Make sure structure is empty + + inquire(file=trim(filename), exist=found) + if (.not. found) then + write(LIS_logunit,*)'[WARN] Cannot find ', trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_read_data' + message(3) = ' Cannot find presav2 file ' // & + trim(filename) + message(4) = ' Observation count will be reduced' + if (LIS_masterproc) then + call LIS_alert('LIS.USAF_read_data', & + alert_number, message) + alert_number = alert_number + 1 + end if + return + end if + + iunit = LIS_getNextUnitNumber() + open(iunit, file=trim(filename), iostat=istat) + if (istat .ne. 0) then + write(LIS_logunit,*)'[WARN] Problem opening ', trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_gages_read_data' + message(3) = ' Cannot open file ' // trim(filename) + if (LIS_masterproc) then + call LIS_alert('LIS.USAF_gages_read_data', & + alert_number, message) + alert_number = alert_number + 1 + end if + call LIS_releaseUnitNumber(iunit) + return + end if + + write(LIS_logunit,*) '[INFO] Reading ', trim(filename) + read(iunit, *, iostat=istat) nobs + if (istat .ne. 0) then + write(LIS_logunit,*)'[WARN] Problem reading ', trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_gages_read_data' + message(3) = ' Problem reading file ' // trim(filename) + if (LIS_masterproc) then + call LIS_alert('LIS.USAF_gages_read_data', & + alert_number, message) + alert_number = alert_number + 1 + end if + call LIS_releaseUnitNumber(iunit) ! Closes file + return + end if + + if (nobs .le. 0) then + write(LIS_logunit,*)'[WARN] No precip obs found in ', & + trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_gages_read_data' + message(3) = ' No precip obs found in file ' // trim(filename) + if (LIS_masterproc) then + call LIS_alert('LIS.USAF_gages_read_data', & + alert_number, message) + alert_number = alert_number + 1 + end if + call LIS_releaseUnitNumber(iunit) ! Closes file + return + end if + + allocate(YYYYMMDDhhmmss(nobs)) + allocate(networks(nobs)) + allocate(platforms(nobs)) + allocate(wmocode_id(nobs)) + allocate(fipscode_id(nobs)) + allocate(wmonumbers(nobs)) + allocate(bsn(nobs)) + allocate(lats(nobs)) + allocate(lons(nobs)) + allocate(amts24(nobs)) + allocate(amts21(nobs)) + allocate(amts18(nobs)) + allocate(amts15(nobs)) + allocate(amts12(nobs)) + allocate(amts09(nobs)) + allocate(amts06(nobs)) + allocate(amts03(nobs)) + allocate(amts02(nobs)) + allocate(amts01(nobs)) + allocate(amts00(nobs)) + allocate(durations(nobs)) + allocate(preswx(nobs)) + allocate(pastwx(nobs)) + + do i = 1, nobs + read(iunit, 6000, iostat=istat, err=300, end=300) & + YYYYMMDDhhmmss(i), & + networks(i), platforms(i), & + wmocode_id(i), fipscode_id(i), & + wmonumbers(i), bsn(i), & + lats(i), lons(i), & + amts24(i), amts21(i), amts18(i), & + amts15(i), amts12(i), amts09(i), & + amts06(i), amts03(i), & + amts02(i), amts01(i), & + amts00(i), durations(i), & + preswx(i), pastwx(i) +6000 format (a14, 1x, & + a32, 1x, a32, 1x, & + a2, 1x, a2, 1x, & + i6, 1x, i6, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9, 1x, & + i9, 1x, i9) + end do + + call LIS_releaseUnitNumber(iunit) ! Closes file +300 continue + + ! If read was successful, copy to USAF_gages_t structure. + if (istat .eq. 0) then + call this%new(date10, nobs, YYYYMMDDhhmmss, & + networks, platforms, & + wmocode_id, fipscode_id, & + wmonumbers, bsn, lats, lons, & + amts24, amts21, amts18, amts15, amts12, amts09, amts06, & + amts03, amts02, amts01, & + amts00, durations, preswx, pastwx) + else + write(LIS_logunit,*)'[WARN] Problem reading from ', & + trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_gages_read_data' + message(3) = ' Problem reading from file ' // trim(filename) + if (LIS_masterproc) then + call LIS_alert('LIS.USAF_gages_read_data', & + alert_number, message) + alert_number = alert_number + 1 + end if + end if + + ! Clean up + deallocate(YYYYMMDDhhmmss) + deallocate(networks) + deallocate(platforms) + deallocate(wmocode_id) + deallocate(fipscode_id) + deallocate(wmonumbers) + deallocate(bsn) + deallocate(lats) + deallocate(lons) + deallocate(amts24) + deallocate(amts21) + deallocate(amts18) + deallocate(amts15) + deallocate(amts12) + deallocate(amts09) + deallocate(amts06) + deallocate(amts03) + deallocate(amts02) + deallocate(amts01) + deallocate(amts00) + deallocate(durations) + deallocate(preswx) + deallocate(pastwx) + + ! Handle arrays for unique networks in private method. Also set + ! cdms_flag. + if (istat .eq. 0) then + call set_unique_networks(this) + end if + + !write(LIS_logunit,*)'[INFO] Read in ', nobs, ' gage reports' + end subroutine USAF_gages_read_data + + ! Search USAF_gages_t type for presumed erroneous accumulations. + subroutine USAF_gages_check_gross_errors(this) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + character(10) :: date10 + integer :: india_lowlimit + integer :: india_highlimit + integer :: russia_lowlimit + integer :: russia_highlimit + integer :: threshold + integer :: threshold_india + integer :: nobs + integer :: i + + if (this%cdms_flag) then + india_lowlimit = CDMS_INDIA_LOWLIMIT + india_highlimit = CDMS_INDIA_HIGHLIMIT + russia_lowlimit = CDMS_RUSSIA_LOWLIMIT + russia_highlimit = CDMS_RUSSIA_HIGHLIMIT + else + india_lowlimit = JMOBS_INDIA_LOWLIMIT + india_highlimit = JMOBS_INDIA_HIGHLIMIT + russia_lowlimit = JMOBS_RUSSIA_LOWLIMIT + russia_highlimit = JMOBS_RUSSIA_HIGHLIMIT + end if + date10 = this%date10 + + nobs = this%nobs + do i = 1, nobs + + ! Check for negatives + if (this%amts24(i) < 0) this%amts24(i) = MISSING + if (this%amts21(i) < 0) this%amts21(i) = MISSING + if (this%amts18(i) < 0) this%amts18(i) = MISSING + if (this%amts15(i) < 0) this%amts15(i) = MISSING + if (this%amts12(i) < 0) this%amts12(i) = MISSING + if (this%amts09(i) < 0) this%amts09(i) = MISSING + if (this%amts06(i) < 0) this%amts06(i) = MISSING + if (this%amts03(i) < 0) this%amts03(i) = MISSING + if (this%amts02(i) < 0) this%amts02(i) = MISSING + if (this%amts01(i) < 0) this%amts01(i) = MISSING + if (this%amts00(i) < 0) this%amts00(i) = MISSING + + ! Check for large errors + if (this%amts24(i) > MAX_PCP_24HR) this%amts24(i) = MISSING + if (this%amts21(i) > MAX_PCP_21HR) this%amts21(i) = MISSING + if (this%amts18(i) > MAX_PCP_18HR) this%amts18(i) = MISSING + if (this%amts15(i) > MAX_PCP_15HR) this%amts15(i) = MISSING + if (this%amts12(i) > MAX_PCP_12HR) this%amts12(i) = MISSING + if (this%amts09(i) > MAX_PCP_9HR) this%amts09(i) = MISSING + if (this%amts06(i) > MAX_PCP_6HR) this%amts06(i) = MISSING + if (this%amts03(i) > MAX_PCP_3HR) this%amts03(i) = MISSING + if (this%amts02(i) > MAX_PCP_2HR) this%amts02(i) = MISSING + if (this%amts01(i) > MAX_PCP_1HR) this%amts01(i) = MISSING + + ! Checking miscellaneous accumulations is more complicated. + ! First, see if we have a WMO established duration. + threshold = set_precip_duration_threshold(this%durations(i)) + if (threshold .ne. MISSING) then + if (this%amts00(i) > threshold) then + this%amts00(i) = MISSING + this%durations(i) = MISSING + end if + cycle + end if + + ! Try the "Russia" rule. Three sets of tests before invoking. + if (this%durations(i) .eq. 0 .or. & + this%durations(i) .eq. MISSING) then + + if ((this%wmonumbers(i) .ge. russia_lowlimit .and. & + this%wmonumbers(i) .le. russia_highlimit) .or. & + (this%bsn(i) .ge. russia_lowlimit .and. & + this%bsn(i) .le. russia_highlimit) ) then + + if (date10(9:10) .eq. "00" .or. & + date10(9:10) .eq. "06" .or. & + date10(9:10) .eq. "12" .or. & + date10(9:10) .eq. "18") then + + ! Russia rule (actually, post-Soviet rule). In the + ! past, USAF personnel noted many "Russian" obs were + ! only reported at 00Z and 12Z, and did not use a valid + ! duration flag. These are decoded in the miscellaneous + ! accumulation (amts00). In AGRMET they were treated as + ! 12-hr accumulations. More recently, a spot check in + ! July 2021 showed similar invalid durations in + ! Kazakhstan, Kyrgyzstan, Georgia, Tajiskistan, and + ! Turkenistan at 06Z and 18Z. Since WMO Region VI + ! (Europe) expects 12-hr accumulations at 06Z and 18Z, we + ! assume these rogue reports are also 12-hr + ! accumulations. + + if (this%amts00(i) > MAX_PCP_12HR) then + this%amts00(i) = MISSING + this%durations(i) = MISSING + end if + cycle + end if + end if + end if ! Russia rule + + ! Try the India rule. Two sets of tests. + if (this%durations(i) .eq. 0 .or. & + this%durations(i) .eq. MISSING) then + + if ((this%wmonumbers(i) .ge. india_lowlimit .and. & + this%wmonumbers(i) .le. india_highlimit) .or. & + (this%bsn(i) .ge. india_lowlimit .or. & + this%bsn(i) .le. india_highlimit)) then + + ! If these are from India, we assume duration is from 03Z. + ! But, we will only accept reports at three-hour intervals. + threshold_india = set_india_precip_threshold(date10(9:10)) + if (threshold_india .ne. MISSING) then + if (this%amts00(i) > threshold_india) then + this%amts00(i) = MISSING + this%durations(i) = MISSING + end if + cycle + end if + end if + end if ! India rule + + ! If all else fails, assume 24-hr accumulation + if (this%amts00(i) > MAX_PCP_24HR) then + this%amts00(i) = MISSING + this%durations(i) = MISSING + end if + + end do + end subroutine USAF_gages_check_gross_errors + + ! Check the observations for bad lat/lon values. If found, reset the + ! data to missing. + subroutine check_latlons(this) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + logical :: bad_latlon + integer :: nobs + integer :: i + + nobs = this%nobs + do i = 1, nobs + bad_latlon = .false. + + ! Sometimes a station report is listed with a lat/lon of 0, + ! putting it in the Atlantic Ocean. We check and flag. + if (this%lats(i) == 0 .and. this%lons(i) == 0) bad_latlon = .true. + + ! If we don't have a good lat/lon, the information from the + ! station is useless. So remove it. + if (bad_latlon) then + this%amts24(i) = MISSING + this%amts21(i) = MISSING + this%amts18(i) = MISSING + this%amts15(i) = MISSING + this%amts12(i) = MISSING + this%amts09(i) = MISSING + this%amts06(i) = MISSING + this%amts03(i) = MISSING + this%amts02(i) = MISSING + this%amts01(i) = MISSING + this%amts00(i) = MISSING + this%durations(i) = MISSING + this%preswx(i) = MISSING + this%pastwx(i) = MISSING + end if + end do + end subroutine check_latlons + + ! Search USAF_gages_t type for unique networks, and establish index + ! bounds for each network. Assumes data are sorted. Borrows logic + ! from AGRMET_processobs. + subroutine set_unique_networks(this) + + ! Imports + use LIS_logMod, only: LIS_logunit, LIS_endrun + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + character(32) :: prior_net + integer :: net_count + integer :: nobs + integer :: i + + if (.not. allocated(this%unique_networks)) then + allocate(this%unique_networks(MAX_UNIQUE_NETWORKS)) + end if + this%unique_networks = MISSING_NAME + if (.not. allocated(this%firsts)) then + allocate(this%firsts(MAX_UNIQUE_NETWORKS)) + end if + this%firsts = MISSING + if (.not. allocated(this%lasts)) then + allocate(this%lasts(MAX_UNIQUE_NETWORKS)) + end if + this%lasts = MISSING + + prior_net = MISSING_NAME + + nobs = this%nobs + do i = 1, nobs + if (prior_net .eq. MISSING_NAME) then + this%firsts(1) = i + this%unique_networks(i) = this%networks(i) + net_count = 1 + prior_net = this%networks(i) + else if (this%networks(i) .ne. prior_net) then + this%lasts(net_count) = i - 1 + net_count = net_count + 1 + if (net_count .gt. MAX_UNIQUE_NETWORKS) then + write(LIS_logunit,*) '[ERR] Too many unique networks!' + call LIS_endrun + end if + this%firsts(net_count) = i + this%unique_networks(net_count) = this%networks(i) + prior_net = this%networks(i) + end if + end do + this%lasts(net_count) = this%nobs + + this%num_unique_networks = net_count + + ! Mark if these obs are all legacy CDMS output + this%cdms_flag = .false. + if (net_count .eq. 1) then + if (this%unique_networks(net_count) .eq. "CDMS") then + this%cdms_flag = .true. + end if + end if + end subroutine set_unique_networks + + ! Search USAF_gages_t type for given network and platform, and + ! return index. Based on AGRMET_pcpobs_search + function search_pcpobs(this, network, plat_id, & + wmocode_id, fipscode_id) result(index) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(in) :: this + character(32), intent(in) :: network + character(32), intent(in) :: plat_id + character(2), intent(in) :: wmocode_id + character(2), intent(in) :: fipscode_id + + ! Result + integer :: index + + ! Locals + integer :: first + integer :: middle + integer :: last + integer :: net_index + logical :: found + + index = MISSING + first = 1 + last = this%nobs + found = .false. + + net_index = 1 + + ! Select the appropriate 'first' and 'last' search indices based on + ! requested network + do while ((net_index .le. this%num_unique_networks) .and. & + (.not. found)) + if (network .eq. this%unique_networks(net_index)) then + first = this%firsts(net_index) + last = this%lasts(net_index) + found = .true. + end if + net_index = net_index + 1 + end do + if (.not. found) return + + found = .false. ! Reuse for finding station ID below + do + if ((first .gt. last) .or. found) return + ! Use binary search + middle = (first + last) / 2 + if (plat_id .lt. this%platforms(middle)) then + last = middle - 1 + elseif (plat_id .gt. this%platforms(middle)) then + first = middle + 1 + else + ! Make sure country code matches + if (this%wmocode_id(middle) .eq. wmocode_id .and. & + this%fipscode_id(middle) .eq. fipscode_id) then + found = .true. + index = middle + end if + exit + end if + end do + + end function search_pcpobs + + ! Infer zero precip for certain durations if the accumulations are + ! missing and if present and past weather codes support no precip. + subroutine USAF_gages_use_preswx_pastwx(this) + + ! Defaults + implicit none + + ! Arguments + class(USAF_gages_t), intent(inout) :: this + + ! Locals + integer :: sweden_lowlimit + integer :: sweden_highlimit + integer :: denmark_lowlimit + integer :: denmark_highlimit + integer :: pastwx_duration + integer :: nobs + integer :: i + + if (this%cdms_flag) then + sweden_lowlimit = CDMS_SWEDEN_LOWLIMIT + sweden_highlimit = CDMS_SWEDEN_HIGHLIMIT + denmark_lowlimit = CDMS_DENMARK_LOWLIMIT + denmark_highlimit = CDMS_DENMARK_HIGHLIMIT + else + sweden_lowlimit = JMOBS_SWEDEN_LOWLIMIT + sweden_highlimit = JMOBS_SWEDEN_HIGHLIMIT + denmark_lowlimit = JMOBS_DENMARK_LOWLIMIT + denmark_highlimit = JMOBS_DENMARK_HIGHLIMIT + end if + + nobs = this%nobs + do i = 1, nobs + + ! If we don't have a valid past weather duration, we can't know + ! which precip accumulation to adjust. + pastwx_duration = this%pastwx_durations(i) + if (pastwx_duration .eq. MISSING) cycle + + if (this%preswx(i) .eq. MISSING) cycle + if (this%pastwx(i) .eq. MISSING) cycle + + ! We will only use past and present weather if the appropriate + ! accumulations are missing. + if (pastwx_duration .eq. 6) then + if (this%amts06(i) .ne. MISSING) cycle + if (this%amts03(i) .ne. MISSING) cycle + if (this%amts02(i) .ne. MISSING) cycle + if (this%amts01(i) .ne. MISSING) cycle + end if + + if (pastwx_duration .eq. 3) then + if (this%amts03(i) .ne. MISSING) cycle + if (this%amts02(i) .ne. MISSING) cycle + if (this%amts01(i) .ne. MISSING) cycle + end if + + ! Exclude Danish stations, since reports at non-standard + ! international hours have past weather of only 1 hour. + if ((this%wmonumbers(i) .ge. denmark_lowlimit .and. & + this%wmonumbers(i) .le. denmark_highlimit) .or. & + (this%bsn(i) .ge. denmark_lowlimit .and. & + this%bsn(i) .le. denmark_highlimit)) then + cycle + end if + + ! Exclude Swedish stations, since durations for past weather + ! vary from one to six hours depending on when the report was + ! made. + if ((this%wmonumbers(i) .ge. sweden_lowlimit .and. & + this%wmonumbers(i) .le. sweden_highlimit) .or. & + (this%bsn(i) .ge. sweden_lowlimit .and. & + this%bsn(i) .le. sweden_highlimit)) then + cycle + end if + + ! Exclude Antarctic stations. This is because (1) Australian + ! Antarctic stations are known to have varying past weather + ! durations due to staffing; (2) isolating the Australian + ! stations is difficult due to WMO station ID assignments; and + ! (3) Antarctic stations will probably be subfreezing and have + ! their precip accumulations rejected anyway. For simplicity, we + ! skip any report south of 60S. + if (this%lons(i) .le. -6000) cycle + + ! WMO SYNOP reports use different code tables depending on if the + ! station is manned or automatic. Unfortunately, the indicator + ! for manned vs automatic is not included in the USAF decoded + ! files, so we must be conservative and check for precipitation + ! codes from either scenario. The decision criteria are kept + ! separate in case the USAF file format is changed in the future + ! to include this information. In addition, BUFR has it's own + ! tables, and it is not clear from the USAF decoded files if BUFR + ! or SYNOP was decoded. + + ! First, check present weather for manned station (WMO Code Table + ! 4677; also WMO BUFR Code Table 0 20 003). + select case (this%preswx(i)) + case (50:99) ! Precipitation at station at time of observation + cycle + case (20:27, 29) ! Precip at station in last hour, but not at + cycle ! time of observation + end select + + ! Next, check present weather for automatic station (WMO Code + ! Table 4680; see also WMO BUFR Code Table 0 20 003) + select case (this%preswx(i)) + case (40:48, 50:58, 60:68, 70:78, 89, 90:96) + cycle ! Precipitation at station at time of observation + case (21:26) + cycle ! Precip at station in last hour, but not at time of + ! observation + case (140:148, 150:158, 160:168, 170:178, 180:188, 190:196) + cycle ! BUFR codes for precip at automated station at time of + ! observation + case (121:126) + cycle ! BUFR codes for precip at station in last hour, but + ! not at time of observation + case (250:257, 259, 260:267, 270:279, 280:291) + cycle ! More descriptive BUFR codes for precip at station. + case (510:511) + cycle ! BUFR codes for missing data + end select + + ! Next, check past weather for manned station (WMO Code Table + ! 4561) + select case (this%pastwx(i)) + case (5:9) + cycle + end select + + ! Next, check past weather for automatic station (WMO Code Table + ! 4531, and WMO BUFR Code Table 0 20 004 / 0 20 005) + select case (this%pastwx(i)) + case (4:9) ! WMO Code Table 4531 + cycle + case (14:19) ! BUFR Code Tables + cycle + case (31) ! BUFR code for missing + cycle + end select + + ! At this point, we can infer zero precipitation for the + ! appropriate duration + if (pastwx_duration .eq. 6) then + this%amts06(i) = 0 + this%amts03(i) = 0 + this%amts02(i) = 0 + this%amts01(i) = 0 + else if (pastwx_duration .eq. 3) then + this%amts03(i) = 0 + this%amts02(i) = 0 + this%amts01(i) = 0 + end if + end do + + call this%reconcile_self() + call this%fill_gaps() + end subroutine USAF_gages_use_preswx_pastwx + + ! Method for setting pastwx duration for each report. + subroutine USAF_gages_set_pastwx_durations(this) + implicit none + class(USAF_gages_t), intent(inout) :: this + integer :: nobs + character(10) :: date10 + integer :: i + nobs = this%nobs + do i = 1, nobs + if (this%YYYYMMDDhhmmss(i) .eq. "NULL") then + date10 = this%date10 + else + date10 = this%YYYYMMDDhhmmss(i)(1:10) + end if + this%pastwx_durations(i) = set_pastwx_duration(date10) + end do + end subroutine USAF_gages_set_pastwx_durations + + ! Function for setting duration of past weather report. This is based + ! on WMO SYNOP definition. (Two and one hour durations are also + ! allowed by the WMO, but these require SYNOP reports every two or one + ! hours; and it is not clear from the USAF decoded files when that + ! occurs.) + function set_pastwx_duration(date10) result (duration) + implicit none + character(10), intent(in) :: date10 + integer :: duration + select case (date10(9:10)) + case ('00', '06', '12', '18') + duration = 6 + case ('03', '09', '15', '21') + duration = 3 + case default + duration = MISSING + end select + end function set_pastwx_duration + + ! Return appropriate precipitation threshold based on duration. + ! NOTE: We currently skip 1 hour and 2-hour accumulations. + function set_precip_duration_threshold(duration) result (threshold) + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: duration + + ! Return variable + integer :: threshold + + ! Select appropriate threshold + select case (duration) + case (1) + threshold = MAX_PCP_1HR + case (2) + threshold = MAX_PCP_2HR + case (3) + threshold = MAX_PCP_3HR + case (6) + threshold = MAX_PCP_6HR + case (9) + threshold = MAX_PCP_9HR + case (12) + threshold = MAX_PCP_12HR + case (15) + threshold = MAX_PCP_15HR + case (18) + threshold = MAX_PCP_18HR + case (21) ! Not a WMO established duration, but we'll check anyway. + threshold = MAX_PCP_21HR + case (24) + threshold = MAX_PCP_24HR + case default + threshold = MISSING + end select + + end function set_precip_duration_threshold + + ! Return appropriate precipitation threshold based on report time in + ! India + function set_india_precip_threshold(utc_hour) result (threshold) + + ! Defaults + implicit none + + ! Arguments + character(2), intent(in) :: utc_hour + + ! Return variable + integer :: threshold + + ! Select appropriate threshold. India obs are assumed to accumulate + ! from 03Z + select case (utc_hour) + case ("04") + threshold = MAX_PCP_1HR + case ("05") + threshold = MAX_PCP_2HR + case ("06") + threshold = MAX_PCP_3HR + case ("09") + threshold = MAX_PCP_6HR + case ("12") + threshold = MAX_PCP_9HR + case ("15") + threshold = MAX_PCP_12HR + case ("18") + threshold = MAX_PCP_15HR + case ("21") + threshold = MAX_PCP_18HR + case ("00") + threshold = MAX_PCP_21HR + case ("03") + threshold = MAX_PCP_24HR + case default + threshold = MISSING + end select + + end function set_india_precip_threshold + + ! Method for copying appropriate data to a USAF_ObsData structure + ! for use in data assimilation. + subroutine USAF_copy_to_usaf_obsdata(this, hr, gage_sigma_o_sqr, & + precipObs) + + ! Imports + use LIS_logMod, only: LIS_logunit, LIS_endrun + use USAF_bratsethMod, only: USAF_ObsData, USAF_assignObsData + + ! Defaults + implicit none + + ! Arguments + class(USAF_Gages_t), intent(in) :: this + integer, intent(in) :: hr + real, intent(in) :: gage_sigma_o_sqr + type(USAF_ObsData), intent(inout) :: precipObs + + ! Locals + integer :: i + integer :: num_obs_copied + + ! Sanity checks + if (this%nobs == 0) return + if (hr .ne. 6 .and. hr .ne. 12) then + write(LIS_logunit,*) & + '[ERR] Invalid hour passed to USAF_copy_to_usaf_obsdata' + write(LIS_logunit,*) & + '[ERR] Should be 6 or 12, received ', hr + call LIS_endrun() + end if + + num_obs_copied = 0 + if (hr == 6) then + do i = 1, this%nobs + if (this%amts06(i) < 0) cycle + call USAF_assignObsData(precipObs, & + this%networks(i), & + this%platforms(i), & + real(this%amts06(i)) * 0.1, & + real(this%lats(i)) * 0.01, & + real(this%lons(i)) * 0.01, & + gage_sigma_o_sqr, 0.) + num_obs_copied = num_obs_copied + 1 + end do + write(LIS_logunit,*)'[INFO] Copied ', num_obs_copied, & + ' 6-hr gage reports' + else if (hr == 12) then + do i = 1, this%nobs + if (this%amts12(i) < 0) cycle + call USAF_assignObsData(precipObs, & + this%networks(i), & + this%platforms(i), & + real(this%amts12(i)) * 0.1, & + real(this%lats(i)) * 0.01, & + real(this%lons(i)) * 0.01, & + gage_sigma_o_sqr, 0.) + num_obs_copied = num_obs_copied + 1 + end do + write(LIS_logunit,*)'[INFO] Copied ', num_obs_copied, & + ' 12-hr gage reports' + end if + + + end subroutine USAF_copy_to_usaf_obsdata +end module USAF_GagesMod diff --git a/lis/metforcing/usaf/USAF_ImergHHMod.F90 b/lis/metforcing/usaf/USAF_ImergHHMod.F90 index f84c0b986..10ae967a4 100644 --- a/lis/metforcing/usaf/USAF_ImergHHMod.F90 +++ b/lis/metforcing/usaf/USAF_ImergHHMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -111,8 +111,8 @@ subroutine copyToObsDataImergHHPrecip(this, sigmaOSqr, & type(ImergHHPrecip), intent(in) :: this real, intent(in) :: sigmaOSqr real, intent(in) :: oErrScaleLength - character*10, intent(in) :: net - character*10, intent(in) :: platform + character*32, intent(in) :: net + character*32, intent(in) :: platform type(USAF_ObsData), intent(inout) :: obsData_struc ! Local variables diff --git a/lis/metforcing/usaf/USAF_OBAMod.F90 b/lis/metforcing/usaf/USAF_OBAMod.F90 index a3788ef57..cc38bc448 100644 --- a/lis/metforcing/usaf/USAF_OBAMod.F90 +++ b/lis/metforcing/usaf/USAF_OBAMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -13,6 +13,7 @@ ! REVISION HISTORY: ! 22 Jun 2017 Initial version.........................Eric Kemp/SSAI/NASA ! 07 Sep 2018 Changed EMK_ prefix to USAF_............Eric Kemp/SSAI/NASA +! 29 Nov 2023 Add QC flags............................Eric Kemp/SSAI/NASA ! ! DESCRIPTION: ! Contains data structure and methods for collecting observed, background, @@ -38,6 +39,7 @@ module USAF_OBAMod real, allocatable :: O(:) ! Observation values real, allocatable :: B(:) ! Background values real, allocatable :: A(:) ! Analysis values + integer, allocatable :: qc(:) ! QC code end type OBA public :: OBA @@ -54,6 +56,21 @@ module USAF_OBAMod public :: writeToFile public :: makeFilename + ! Public parameters + integer, parameter, public :: QC_UNKNOWN = 0 + integer, parameter, public :: QC_GOOD = 1 + integer, parameter, public :: QC_REJECT = 2 + integer, parameter, public :: QC_SUSPECT_BACKQC = 3 + integer, parameter, public :: QC_SUSPECT_SUPERSTATQC = 4 + + ! Private parameter + character(11), parameter :: qc_string(5) = (/ & + 'UNKNOWN ', & + 'GOOD ', & + 'REJECT ', & + 'BACKQC ', & + 'SUPERSTATQC'/) + contains !--------------------------------------------------------------------------- @@ -75,7 +92,7 @@ function newOBA(nest,maxobs) result(this) ! Local variables integer :: maxnobs - + if (present(maxobs)) then maxnobs = maxobs else @@ -91,14 +108,16 @@ function newOBA(nest,maxobs) result(this) allocate(this%O(maxnobs)) allocate(this%B(maxnobs)) allocate(this%A(maxnobs)) + allocate(this%qc(maxnobs)) - this%networks(:) = "NULL" - this%platforms(:) = "NULL" - this%latitudes(:) = 0 - this%longitudes(:) = 0 - this%O(:) = 0 - this%B(:) = 0 - this%A(:) = 0 + this%networks = "NULL" + this%platforms = "NULL" + this%latitudes = 0 + this%longitudes = 0 + this%O = 0 + this%B = 0 + this%A = 0 + this%qc = QC_UNKNOWN end function newOBA @@ -118,14 +137,16 @@ subroutine destroyOBA(this) deallocate(this%latitudes) deallocate(this%longitudes) deallocate(this%O) - deallocate(this%B) + deallocate(this%B) deallocate(this%A) + deallocate(this%qc) end subroutine destroyOBA !--------------------------------------------------------------------------- ! Add new diagnostics from one observation to the data structure. - subroutine assignOBA(this,network,platform,latitude,longitude,O,B,A) + subroutine assignOBA(this,network,platform,latitude,longitude,O,B,A, & + qc, set_qc_good) ! Imports use LIS_logmod, only : LIS_logunit @@ -142,10 +163,12 @@ subroutine assignOBA(this,network,platform,latitude,longitude,O,B,A) real, intent(in) :: O real, intent(in) :: B real, intent(in) :: A + integer, intent(in) :: qc + logical, optional, intent(in) :: set_qc_good ! Local variables integer :: nobs - + ! Sanity check. Since this is intended for an operational system, ! just print a warning and return if we see an array bounds problem. nobs = this%nobs @@ -165,7 +188,15 @@ subroutine assignOBA(this,network,platform,latitude,longitude,O,B,A) this%O(nobs) = O this%B(nobs) = B this%A(nobs) = A - + if (present(set_qc_good)) then + if (set_qc_good .and. qc == QC_UNKNOWN) then + this%qc(nobs) = QC_GOOD + else + this%qc(nobs) = qc + end if + else + this%qc(nobs) = qc + end if end subroutine assignOBA !--------------------------------------------------------------------------- @@ -200,12 +231,16 @@ subroutine writeToFile(this,filename) ! Write OBA information to file write(iunit, *, iostat=istat) & - '# Network Platform latitude longitude O B A' + '# Network Platform latitude longitude O B A QC' do j = 1, this%nobs + if (this%qc(j) == QC_REJECT) cycle + if (trim(this%networks(j)) == "SUPEROB") cycle + if (trim(this%networks(j)) == "SUPERGAGE") cycle write(iunit, 1000, iostat=istat) trim(this%networks(j)), & - trim(this%platforms(j)), this%latitudes(j), this%longitudes(j),& - this%O(j), this%B(j), this%A(j) - 1000 format(a10,1x,a10,1x,f8.3,1x,f8.3,1x,f8.3,1x,f8.3,1x,f8.3) + trim(this%platforms(j)), this%latitudes(j), & + this%longitudes(j),& + this%O(j), this%B(j), this%A(j), qc_string(this%qc(j)+1) +1000 format(a10,1x,a10,1x,f8.3,1x,f8.3,1x,f8.3,1x,f8.3,1x,f8.3,1x,a11) end do ! j ! Close file diff --git a/lis/metforcing/usaf/USAF_PreobsReaderMod.F90 b/lis/metforcing/usaf/USAF_PreobsReaderMod.F90 new file mode 100644 index 000000000..e92329c55 --- /dev/null +++ b/lis/metforcing/usaf/USAF_PreobsReaderMod.F90 @@ -0,0 +1,1138 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +! MODULE: USAF_PreobsReaderMod +! +! DESCRIPTION: Contains code for reading USAF preobs files, performing simple +! preprocessing, and adding to gages database. +! +! AUTHOR: Eric Kemp, SSAI/NASA GSFC +! +!------------------------------------------------------------------------------ + +module USAF_PreobsReaderMod + + ! Defaults + implicit none + private + + ! Public routines + public :: USAF_read_preobs + + integer, parameter :: MISSING = -99999999 + +contains + + ! Read preobs files, perform simple preprocessing, and store + ! in database. + subroutine USAF_read_preobs(preobsdir, presavdir, & + use_timestamp, & + year, month, day, hour, use_expanded_station_ids, & + alert_number) + + ! Imports + use ESMF + use LIS_coreMod, only: LIS_masterproc + use LIS_logMod, only: LIS_logunit, LIS_alert, LIS_getNextUnitNumber, & + LIS_releaseUnitNumber + use LIS_mpiMod, only: LIS_mpi_comm + use USAF_GagesMod, only: USAF_Gages_t + + ! Defaults + implicit none + + ! Arguments + character(*), intent(in) :: preobsdir + character(*), intent(in) :: presavdir + integer, intent(in) :: use_timestamp + integer, intent(in) :: year + integer, intent(in) :: month + integer, intent(in) :: day + integer, intent(in) :: hour + integer, intent(in) :: use_expanded_station_ids + integer, intent(inout) :: alert_number + + ! Locals + character(255) :: filename + integer, allocatable :: twfprc(:) + integer, allocatable :: duration(:) + integer, allocatable :: sixprc(:) + integer, allocatable :: mscprc(:) + integer, allocatable :: ilat(:) + integer, allocatable :: ilon(:) + integer, allocatable :: bsn(:) + character(32), allocatable :: network(:) + character(32), allocatable :: plat_id(:) + character(2), allocatable :: wmocode_id(:) + character(2), allocatable :: fipscode_id(:) + integer, allocatable :: pastwx(:) + integer, allocatable :: preswx(:) + integer, allocatable :: wmoblk(:) + integer :: twfprc_tmp + integer :: duration_tmp + integer :: sixprc_tmp + integer :: mscprc_tmp + integer :: ilat_tmp + integer :: ilon_tmp + character(14) :: YYYYMMDDhhmmss_tmp + character(32) :: network_tmp + character(32) :: plat_id_tmp + character(2) :: wmocode_id_tmp, fipscode_id_tmp + integer :: pastwx_tmp + integer :: preswx_tmp + integer :: wmoblk_tmp + integer :: bsn_tmp + integer :: nsize + integer :: nsize_total + integer :: ihemi + logical :: found_file + integer :: ierr + integer :: stncnt + integer :: i + character(10) :: date10 + character(14), allocatable :: YYYYMMDDhhmmss(:) + integer, allocatable :: amts24(:) + integer, allocatable :: amts21(:) + integer, allocatable :: amts18(:) + integer, allocatable :: amts15(:) + integer, allocatable :: amts12(:) + integer, allocatable :: amts09(:) + integer, allocatable :: amts06(:) + integer, allocatable :: amts03(:) + integer, allocatable :: amts02(:) + integer, allocatable :: amts01(:) + integer, allocatable :: amts00(:) + type(USAF_Gages_t) :: obscur, obsprev + integer :: rc + character(255) :: presav_filename + integer :: ipass, j + logical :: exchanges + type(ESMF_Time) :: curtime, prevtime, reporttime + type(ESMF_TimeInterval) :: deltatime, maxdeltatime + integer :: prevyear, prevmonth, prevday, prevhour + logical :: file_exists + integer :: deltahr + character(10) :: prevdate10 + integer :: yyyy, mm, dd, h, m, s + character(255) :: timestring + integer :: iunit + character(255) :: message(20) + + message = '' + + write(LIS_logunit,*)'---------------------------------------------' + + ! Set time limit allowed for report + call esmf_timeintervalset(maxdeltatime, m=5, rc=rc) ! 5 min after + + ! Find the total number of entries in the two hemispheric preobs + ! files for this date/time. This will be the upper-limit for how + ! much memory we allocate for temporary storage. If the newer + ! global preobs file is read, logic in the loop will break out + ! of the loop before the second pass. + nsize_total = 0 + do ihemi = 1, 2 + + call get_preobs_filename(filename, preobsdir, & + use_timestamp, & + ihemi, year, month, day, hour, use_expanded_station_ids) + + inquire(file=trim(filename), exist=found_file) + if (.not. found_file) then + write(LIS_logunit,*) '[WARN] Cannot find ', trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_read_preobs' + message(3) = ' Cannot find file ' // trim(filename) + if (LIS_masterproc) then + alert_number = alert_number + 1 + call LIS_alert('LIS.USAF_read_preobs', & + alert_number, message) + end if + if (use_expanded_station_ids == 1) exit ! These files are global + cycle + end if + + iunit = LIS_getNextUnitNumber() + open(iunit, file=trim(filename), status='old', iostat=ierr) + if (ierr .ne. 0) then + write(LIS_logunit,*) '[WARN] Problem opening ', trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_read_preobs' + message(3) = ' Cannot open file ' // trim(filename) + if (LIS_masterproc) then + alert_number = alert_number + 1 + call LIS_alert('LIS.USAF_read_preobs', & + alert_number, message) + end if + call LIS_releaseUnitNumber(iunit) + if (use_expanded_station_ids == 1) exit ! These files are global + cycle + end if + + nsize = 0 + read(iunit, *, iostat=ierr) nsize + if (ierr .ne. 0) then + write(LIS_logunit,*) '[WARN] Problem reading ', trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_read_preobs' + message(3) = ' Problem reading file ' // trim(filename) + if (LIS_masterproc) then + alert_number = alert_number + 1 + call LIS_alert('LIS.USAF_read_preobs', & + alert_number, message) + end if + call LIS_releaseUnitNumber(iunit) ! Closes file + if (use_expanded_station_ids == 1) exit ! These files are global + cycle + end if + + if (nsize == 0) then + write(LIS_logunit,*)'[WARN] No precip obs found in ', & + trim(filename) + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_read_preobs' + message(3) = ' No precip obs found in ' // trim(filename) + if (LIS_masterproc) then + alert_number = alert_number + 1 + call LIS_alert('LIS.USAF_read_preobs', & + alert_number, message) + end if + else + write(LIS_logunit,*) '[INFO] Will process ', trim(filename) + end if + + nsize_total = nsize_total + nsize + call LIS_releaseUnitNumber(iunit) ! Closes file + if (use_expanded_station_ids == 1) exit ! These files are global + end do + + if (nsize_total == 0) then + write(LIS_logunit,*) '[WARN] No precip obs available!' + return + end if + + ! We now have an upper limit of how many gage reports to save. + allocate(twfprc(nsize_total)) + twfprc = MISSING + allocate(duration(nsize_total)) + duration = MISSING + allocate(sixprc(nsize_total)) + sixprc = MISSING + allocate(mscprc(nsize_total)) + mscprc = MISSING + allocate(ilat(nsize_total)) + ilat = MISSING + allocate(ilon(nsize_total)) + ilon = MISSING + allocate(bsn(nsize_total)) + bsn = MISSING + allocate(network(nsize_total)) + network = "NULL" + allocate(plat_id(nsize_total)) + plat_id = "NULL" + allocate(wmocode_id(nsize_total)) + wmocode_id = "??" + allocate(fipscode_id(nsize_total)) + fipscode_id = "??" + allocate(pastwx(nsize_total)) + pastwx = MISSING + allocate(preswx(nsize_total)) + preswx = MISSING + allocate(wmoblk(nsize_total)) + wmoblk = MISSING + allocate(YYYYMMDDhhmmss(nsize_total)) + YYYYMMDDhhmmss = "NULL" + + write(date10, "(i4.4,i2.2,i2.2,i2.2)") year, month, day, hour + + ! Need to set current time in ESMF for calculations + call esmf_timeset(curtime, yy=year, mm=month, dd=day, h=hour, & + m=0, s=0, rc=rc) + + ! Now begin reading the data in the files, performing simple checks + ! along the way. + stncnt = 0 + do ihemi = 1, 2 + call get_preobs_filename(filename, preobsdir, & + use_timestamp, & + ihemi, year, month, day, hour, use_expanded_station_ids) + + inquire(file=trim(filename), exist=found_file) + if (.not. found_file) then + if (use_expanded_station_ids == 1) exit + cycle + end if + + iunit = LIS_getNextUnitNumber() + open(iunit, file=trim(filename), status='old', iostat=ierr) + if (ierr .ne. 0) then + call LIS_releaseUnitNumber(iunit) + cycle + end if + nsize = 0 + read(iunit, *, iostat=ierr) nsize + if (ierr .ne. 0) then + call LIS_releaseUnitNumber(iunit) ! Closes file + if (use_expanded_station_ids == 1) exit + cycle + end if + + ! Start reading the actual obs + do i = 1, nsize + if (use_expanded_station_ids == 1) then + twfprc_tmp = MISSING + sixprc_tmp = MISSING + read(iunit, 6001, iostat=ierr) YYYYMMDDhhmmss_tmp, & + network_tmp, plat_id_tmp, ilat_tmp, ilon_tmp, & + wmocode_id_tmp, fipscode_id_tmp, wmoblk_tmp, & + mscprc_tmp, duration_tmp, pastwx_tmp, preswx_tmp +6001 format(1x, a14, 1x, a10, 1x, a32, 1x, i9, 1x, i9, 1x, & + a2, 1x, a2, 1x, i9, 1x, i9, 1x, i9, 1x, i9, 1x, i9) + if (wmocode_id_tmp == " ") wmocode_id_tmp = "??" + if (fipscode_id_tmp == " ") fipscode_id_tmp = "??" + else + read(iunit, 6000, iostat=ierr) twfprc_tmp, duration_tmp, & + sixprc_tmp, & + mscprc_tmp, ilat_tmp, ilon_tmp, network_tmp, & + plat_id_tmp, & + pastwx_tmp, preswx_tmp, wmoblk_tmp +6000 format(i10, i10, i10, i10, i10, i10, 1x, a10, 2x, a10 & + ,i10, i10, i10) + wmocode_id_tmp = "??" + fipscode_id_tmp = "??" + YYYYMMDDhhmmss_tmp = date10 // "0000" + end if + + if (ierr .ne. 0) then + write(LIS_logunit,*) & + '[WARN] Problem reading report, skipping line...' + cycle + end if + + ! Skip if lat/lon is 0 (this is interpreted as missing). + if (ilat_tmp == 0 .and. ilon_tmp == 0) cycle + + ! Skip reports that are too much after the analysis time + ! (but allow earlier reports). This is a crude way of + ! allowing for Australian reports that are sometimes one or + ! two hours behind the sub-synoptic times. + if (use_expanded_station_ids == 1) then + read(YYYYMMDDhhmmss_tmp, & + '(I4.4, I2.2, I2.2, I2.2, I2.2, I2.2)') yyyy, mm, dd, & + h, m, s + call esmf_timeset(reporttime, yy=yyyy, mm=mm, dd=dd, & + h=h, m=m, s=s, rc=rc) + deltatime = reporttime - curtime + + call esmf_timeintervalget(deltatime, timestring=timestring, & + rc=rc) + + ! if (deltatime < mindeltatime) cycle + if (deltatime > maxdeltatime) cycle + end if + + ! Don't save 1-hr precip. + ! FIXME...Add special handling in new preobs files to + ! estimate 3-hr accums if enough 1-hr reports are available. + if (duration_tmp .eq. 1) then + mscprc_tmp = MISSING + duration_tmp = MISSING + end if + + ! Skip if no useable data in report. + if (twfprc_tmp == MISSING .and. & + sixprc_tmp == MISSING .and. & + mscprc_tmp == MISSING .and. & + (pastwx_tmp == MISSING .or. & + preswx_tmp == MISSING)) then + cycle + end if + + ! If we don't have FIPS or WMO codes available, try guessing + ! the FIPS code for countries with special rules based on + ! the WIGOS issuer number. + if (fipscode_id_tmp == "??" .and. & + wmocode_id_tmp == "??") then + fipscode_id_tmp = get_fips_from_wigos_issuer(plat_id_tmp) + end if + + ! Set the numeric bsn field. + if (network_tmp .eq. "WMO") then + bsn_tmp = set_bsn_wmo(use_expanded_station_ids, & + plat_id_tmp, fipscode_id_tmp, wmocode_id_tmp) + else if (network_tmp .eq. "CDMS") then + read (plat_id_tmp, '(i32)') bsn_tmp + else + bsn_tmp = 0 + end if + + ! Set the country codes if possible. + if (network_tmp .eq. "CANA") then + wmocode_id_tmp = "CA" + fipscode_id_tmp = "CA" + else if (network_tmp .eq. "FAA") then + wmocode_id_tmp = "US" + fipscode_id_tmp = "US" + end if + + ! Sometimes 6 and 24-hr data are stored in misc. Copy + ! over if necessary, then erase. + if (duration_tmp == 24) then + if (twfprc_tmp == MISSING) then + twfprc_tmp = mscprc_tmp + end if + mscprc_tmp = MISSING + duration_tmp = MISSING + else if (duration_tmp == 6) then + if (sixprc_tmp == MISSING) then + sixprc_tmp = mscprc_tmp + end if + mscprc_tmp = MISSING + duration_tmp = MISSING + end if + + ! If this is the first report, save it. + if (stncnt == 0) then + stncnt = stncnt + 1 + twfprc(stncnt) = twfprc_tmp + duration(stncnt) = duration_tmp + sixprc(stncnt) = sixprc_tmp + mscprc(stncnt) = mscprc_tmp + ilat(stncnt) = ilat_tmp + ilon(stncnt) = ilon_tmp + bsn(stncnt) = bsn_tmp + network(stncnt) = network_tmp + plat_id(stncnt) = plat_id_tmp + wmocode_id(stncnt) = wmocode_id_tmp + fipscode_id(stncnt) = fipscode_id_tmp + pastwx(stncnt) = pastwx_tmp + preswx(stncnt) = preswx_tmp + wmoblk(stncnt) = wmoblk_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + cycle + else + ! Look at the most recent saved gage report, and see if this + ! new entry is from the same station. + if (network(stncnt) .eq. network_tmp .and. & + trim(plat_id(stncnt)) .eq. trim(plat_id_tmp)) then + + ! For newer file format with date/time with each report, + ! pick the more recent date/time for duration other + ! than 1 hour. + if (YYYYMMDDhhmmss(stncnt) < YYYYMMDDhhmmss_tmp .and. & + (twfprc_tmp .ne. MISSING .or. & + sixprc_tmp .ne. MISSING .or. & + mscprc_tmp .ne. MISSING .or. & + (preswx_tmp .ne. MISSING .and. & + pastwx_tmp .ne. MISSING))) then + twfprc(stncnt) = twfprc_tmp + duration(stncnt) = duration_tmp + sixprc(stncnt) = sixprc_tmp + mscprc(stncnt) = mscprc_tmp + ilat(stncnt) = ilat_tmp + ilon(stncnt) = ilon_tmp + bsn(stncnt) = bsn_tmp + network(stncnt) = network_tmp + plat_id(stncnt) = plat_id_tmp + wmocode_id(stncnt) = wmocode_id_tmp + fipscode_id(stncnt) = fipscode_id_tmp + pastwx(stncnt) = pastwx_tmp + preswx(stncnt) = preswx_tmp + wmoblk(stncnt) = wmoblk_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + cycle + end if + + ! Logic for older file format. Code above assigns + ! the file date/time as the report date/time. + ! See if there is any additional information worth + ! saving. The AGRMET logic overwrites the older data + ! with the newer if the newer data is a higher amount. + ! An exception is that "zero" six-hour precip is ignored + ! if 24-hr or 12-hr precip is positive, apparently + ! because "zero" six-hour precip reports in this case are + ! typically from an asynoptic ob. We follow that logic + ! here. + if (YYYYMMDDhhmmss(stncnt) == YYYYMMDDhhmmss_tmp) then + if (twfprc(stncnt) < twfprc_tmp) then + twfprc(stncnt) = twfprc_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + end if + + if (mscprc(stncnt) .eq. MISSING .and. & + mscprc_tmp .ne. MISSING) then + ! We don't have a misc precip stored yet, so do it + ! here. + mscprc(stncnt) = mscprc_tmp + duration(stncnt) = duration_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + else if (duration_tmp > duration(stncnt) .and. & + duration_tmp > 1 .and. & + mscprc_tmp .ne. MISSING) then + ! Try to capture 3-hr or other longer duration + ! precip. + mscprc(stncnt) = mscprc_tmp + duration(stncnt) = duration_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + else if (mscprc_tmp > mscprc(stncnt) .and. & + duration_tmp == duration(stncnt)) then + ! Somewhat mimics AGRMET. Save larger accum for + ! current duration. + mscprc(stncnt) = mscprc_tmp + duration(stncnt) = duration_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + else if ((mscprc_tmp > mscprc(stncnt)) .and. & + (duration_tmp == MISSING .or. & + duration_tmp == 0) .and. & + (duration(stncnt) == MISSING .or. & + duration(stncnt) == 0)) then + ! Somewhat mimics AGRMET. Save larger accum for + ! undefined duration, for use in certain regions + ! (e.g., Russia) + mscprc(stncnt) = mscprc_tmp + duration(stncnt) = duration_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + end if + if ( (twfprc(stncnt) > 0) .or. & + (duration(stncnt) == 12 .and. & + mscprc(stncnt) > 0) ) then + if (sixprc(stncnt) == MISSING .and. & + sixprc_tmp == 0) then + sixprc(stncnt) = MISSING + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + else if (sixprc(stncnt) == 0 .and. & + sixprc_tmp == MISSING) then + sixprc(stncnt) = MISSING + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + else + if (sixprc(stncnt) < sixprc_tmp) then + sixprc(stncnt) = sixprc_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + end if + end if + else + if (sixprc(stncnt) < sixprc_tmp) then + sixprc(stncnt) = sixprc_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + end if + end if + end if + else + ! This isn't the same station, so save it. + !if (trim(network_tmp) == "AMIL" .and. & + ! trim(plat_id_tmp) == "KQTC") then + ! write(LIS_logunit,*)'EMK: KQTC, twfprc = ', twfprc_tmp + !end if + + stncnt = stncnt + 1 + twfprc(stncnt) = twfprc_tmp + duration(stncnt) = duration_tmp + sixprc(stncnt) = sixprc_tmp + mscprc(stncnt) = mscprc_tmp + ilat(stncnt) = ilat_tmp + ilon(stncnt) = ilon_tmp + bsn(stncnt) = bsn_tmp + network(stncnt) = network_tmp + plat_id(stncnt) = plat_id_tmp + wmocode_id(stncnt) = wmocode_id_tmp + fipscode_id(stncnt) = fipscode_id_tmp + pastwx(stncnt) = pastwx_tmp + preswx(stncnt) = preswx_tmp + wmoblk(stncnt) = wmoblk_tmp + YYYYMMDDhhmmss(stncnt) = YYYYMMDDhhmmss_tmp + cycle + end if + end if + end do + + call LIS_releaseUnitNumber(iunit) ! Closes file + + if (use_expanded_station_ids == 1) cycle ! These files are global + end do ! ihemi + + ! Since we combined both the NH and SH files, the resulting list + ! is unsorted. + ! Bubble sort the reports by network. + if (use_expanded_station_ids == 0) then + ipass = 1 + exchanges = .true. + do while ((ipass < stncnt) .and. exchanges) + exchanges = .false. + do j = 1, stncnt - ipass + if (network(j) > network(j+1)) then + call swap_int(twfprc(j), twfprc(j+1)) + call swap_int(duration(j), duration(j+1)) + call swap_int(sixprc(j), sixprc(j+1)) + call swap_int(mscprc(j), mscprc(j+1)) + call swap_int(ilat(j), ilat(j+1)) + call swap_int(ilon(j), ilon(j+1)) + call swap_int(bsn(j), bsn(j+1)) + call swap_char32(network(j), network(j+1)) + call swap_char32(plat_id(j), plat_id(j+1)) + call swap_char2(wmocode_id(j), wmocode_id(j+1)) + call swap_char2(fipscode_id(j), fipscode_id(j+1)) + call swap_int(pastwx(j), pastwx(j+1)) + call swap_int(preswx(j), preswx(j+1)) + call swap_int(wmoblk(j), wmoblk(j+1)) + call swap_char14(YYYYMMDDhhmmss(j), YYYYMMDDhhmmss(j+1)) + exchanges = .true. + end if + end do + ipass = ipass + 1 + end do + + ! Now bubble sort by station ID within the same network + ipass = 1 + exchanges = .true. + do while ((ipass < stncnt) .and. exchanges) + exchanges = .false. + do j = 1, stncnt - ipass + if ((network(j) == network(j+1)) .and. & + (plat_id(j) > plat_id(j+1))) then + call swap_int(twfprc(j), twfprc(j+1)) + call swap_int(duration(j), duration(j+1)) + call swap_int(sixprc(j), sixprc(j+1)) + call swap_int(mscprc(j), mscprc(j+1)) + call swap_int(ilat(j), ilat(j+1)) + call swap_int(ilon(j), ilon(j+1)) + call swap_int(bsn(j), bsn(j+1)) + call swap_char32(network(j), network(j+1)) + call swap_char32(plat_id(j), plat_id(j+1)) + call swap_char2(wmocode_id(j), wmocode_id(j+1)) + call swap_char2(fipscode_id(j), fipscode_id(j+1)) + call swap_int(pastwx(j), pastwx(j+1)) + call swap_int(preswx(j), preswx(j+1)) + call swap_int(wmoblk(j), wmoblk(j+1)) + call swap_char14(YYYYMMDDhhmmss(j), YYYYMMDDhhmmss(j+1)) + exchanges = .true. + end if + end do + ipass = ipass + 1 + end do + end if + + ! Report if any WMO obs are not legacy 5-digit SYNOP + do j = 1, stncnt + if (network(j) .ne. "WMO") cycle + if (.not. len_trim(plat_id(j)) == 5) then + write(LIS_logunit,*) '[INFO] Found non SYNOP WMO station ', & + trim(plat_id(j)) + else if (verify(trim(plat_id(j)), "0123456789") .ne. 0) then + write(LIS_logunit,*) '[INFO] Found non SYNOP WMO station ', & + trim(plat_id(j)) + end if + end do + + ! Copy into Gage_type object + allocate(amts24(nsize_total)) ; amts24 = twfprc + allocate(amts21(nsize_total)) ; amts21 = MISSING + allocate(amts18(nsize_total)) ; amts18 = MISSING + allocate(amts15(nsize_total)) ; amts15 = MISSING + allocate(amts12(nsize_total)) ; amts12 = MISSING + allocate(amts09(nsize_total)) ; amts09 = MISSING + allocate(amts06(nsize_total)) ; amts06 = sixprc + allocate(amts03(nsize_total)) ; amts03 = MISSING + allocate(amts02(nsize_total)) ; amts02 = MISSING + allocate(amts01(nsize_total)) ; amts01 = MISSING + allocate(amts00(nsize_total)) ; amts00 = mscprc + + call obscur%new(date10, stncnt, YYYYMMDDhhmmss, network, plat_id, & + wmocode_id, fipscode_id, wmoblk, bsn, ilat, ilon, & + amts24, amts21, amts18, amts15, amts12, amts09, amts06, & + amts03, amts02, amts01, amts00, duration, preswx, pastwx) + + ! Clean up the temporary arrays + deallocate(twfprc) + deallocate(duration) + deallocate(sixprc) + deallocate(mscprc) + deallocate(ilat) + deallocate(ilon) + deallocate(bsn) + deallocate(network) + deallocate(plat_id) + deallocate(wmocode_id) + deallocate(fipscode_id) + deallocate(pastwx) + deallocate(preswx) + deallocate(wmoblk) + deallocate(YYYYMMDDhhmmss) + deallocate(amts24) + deallocate(amts21) + deallocate(amts18) + deallocate(amts15) + deallocate(amts12) + deallocate(amts09) + deallocate(amts06) + deallocate(amts03) + deallocate(amts02) + deallocate(amts01) + deallocate(amts00) + + ! Check for unphysical values. + call obscur%check_gross_errors() + + ! Reconcile values in same report (shorter durations should not be + ! larger than longer durations) + call obscur%reconcile_self() + + ! Fill gaps if possible + call obscur%fill_gaps() + + ! Use the miscellaneous precip, with special rules for some + ! countries. + call obscur%use_misc_precip() + + ! Leverage present and past weather information to identify + ! zero precip durations. + !EMK...Disable until more accurate inspection of time in new + !preobs files is implemented. + !call obscur%use_preswx_pastwx() + + ! Try fetching presav files from earlier hours and reconcile. + write(LIS_logunit,*)'[INFO] Will compare with earlier gage reports.' + do deltahr = 3, 21, 3 + call esmf_timeintervalset(deltatime, yy=0, mm=0, d=0, & + h=deltahr, m=0, s=0, rc=rc) + prevtime = curtime - deltatime + call esmf_timeget(prevtime, yy=prevyear, mm=prevmonth, & + dd=prevday, h=prevhour, rc=rc) + write(presav_filename,'(A,A,i4.4,i2.2,i2.2,i2.2)') & + trim(presavdir), '/presav2.03hr.', & + prevyear, prevmonth, prevday, prevhour + inquire(file=presav_filename, exist=file_exists) + if (file_exists) then + write(LIS_logunit,*)'[INFO] Comparing against data in ', & + trim(presav_filename) + write(prevdate10,'(i4.4,i2.2,i2.2,i2.2)') & + prevyear, prevmonth, prevday, prevhour + call obsprev%read_data(presav_filename, prevdate10, & + alert_number) + if (deltahr == 3) then + call obscur%reconcile_gages03(obsprev) + else if (deltahr == 6) then + call obscur%reconcile_gages06(obsprev) + else if (deltahr == 9) then + call obscur%reconcile_gages09(obsprev) + else if (deltahr == 12) then + call obscur%reconcile_gages12(obsprev) + else if (deltahr == 15) then + call obscur%reconcile_gages15(obsprev) + else if (deltahr == 18) then + call obscur%reconcile_gages18(obsprev) + else if (deltahr == 21) then + call obscur%reconcile_gages21(obsprev) + end if + call obsprev%delete() + else + write(LIS_logunit,*)'[WARN] Cannot find ', trim(presav_filename) + write(LIS_logunit,*) & + '[WARN] Will skip reconciling with obs from ', & + abs(deltahr),' hours ago' + message(1) = '[WARN] Program: LIS' + message(2) = ' Routine: USAF_read_preobs' + message(3) = ' Cannot find earlier presav2 file ' // & + trim(presav_filename) + message(4) = ' Observation count will be reduced' + if (LIS_masterproc) then + alert_number = alert_number + 1 + call LIS_alert('LIS.USAF_read_preobs', & + alert_number, message) + end if + end if + end do + + ! Correct for overnight reporting issues in South America + write(LIS_logunit,*) & + '[INFO] Correcting overnight reporting in South America' + call obscur%correct_region3_12z() + + ! Have the master process write the data to file. + if (LIS_masterproc) then + write(presav_filename,'(A,A,i4.4,i2.2,i2.2,i2.2)') & + trim(presavdir), '/presav2.03hr.', & + year, month, day, hour + write(LIS_logunit,*)'[INFO] Writing to ', trim(presav_filename) + call obscur%write_data(presav_filename) + end if +#if (defined SPMD) + call MPI_Barrier(LIS_mpi_comm, ierr) +#endif + + ! Clean up + call obscur%delete() + + end subroutine USAF_read_preobs + + ! Generate name of preobs file. Based on code in AGRMET_getpcpobs.F90 + subroutine get_preobs_filename(filename, preobsdir, & + use_timestamp, & + ihemi, year, month, day, hour, use_expanded_station_ids) + + ! Defaults + implicit none + + ! Arguments + character(*), intent(out) :: filename + character(*), intent(in) :: preobsdir + integer, intent(in) :: use_timestamp + integer, intent(in) :: ihemi + integer, intent(in) :: year + integer, intent(in) :: month + integer, intent(in) :: day + integer, intent(in) :: hour + integer, intent(in) :: use_expanded_station_ids + + ! Locals + character(8) :: ftime1 + character(10) :: ftime2 + character(2), parameter :: FHEMI(2) = (/'nh', 'sh'/) + + write(ftime2, '(i4.4, i2.2, i2.2, i2.2)') year, month, day, hour + + if (use_expanded_station_ids == 0) then + !if (use_timestamp == 1) then + ! write(ftime1, '(i4.4, i2.2, i2.2)') & + ! year, month, day + ! filename = ftime1 // '/' // trim(preobsdir) // & + ! '/preobs_' // FHEMI(ihemi) // '.03hr.' // ftime2 + !else + filename = trim(preobsdir) // & + '/preobs_' // FHEMI(ihemi) // '.03hr.' // ftime2 + !endif + else if (use_expanded_station_ids == 1) then + !if (use_timestamp == 1) then + ! write(ftime1, '(i4.4, i2.2, i2.2)') & + ! year, month, day + ! filename = ftime1 // '/' // trim(preobsdir) // & + ! '/preobs_03hr_' // ftime2 // ".txt" + !else + filename = trim(preobsdir) // & + '/preobs_03hr_' // ftime2 // ".txt" + !endif + end if + end subroutine get_preobs_filename + + ! Set block number for a WMO station + function set_bsn_wmo(use_expanded_station_id, plat_id, fipscode_id, & + wmocode_id) result(bsn) + + ! Imports + use USAF_GagesMod, only: JMOBS_SWEDEN_LOWLIMIT, & + JMOBS_DENMARK_LOWLIMIT, JMOBS_RUSSIA_LOWLIMIT, & + JMOBS_INDIA_LOWLIMIT, JMOBS_SRILANKA_LOWLIMIT, & + JMOBS_S_AMER_LOWLIMIT + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: use_expanded_station_id + character(32), intent(in) :: plat_id + character(2), intent(in) :: fipscode_id + character(2), intent(in) :: wmocode_id + + ! Return variable + integer :: bsn + + bsn = 0 + + ! Old preobs files don't have any country codes. Just copy the + ! 5-digit ID and use as is. + if (use_expanded_station_id == 0) then + read(plat_id, '(i5.5)') bsn + return + end if + + ! If this is a legacy 5-digit WMO ID, just copy it. + if (verify(trim(plat_id), "0123456789") == 0 & + .and. len_trim(plat_id) == 5) then + read(plat_id, '(i5.5)') bsn + return + end if + + ! WIGOS supports legacy 5-digit WMO IDs with a special prefix + if (len_trim(plat_id) == 15) then + if (plat_id(1:10) == "0-20000-0-" .and. & + verify(trim(plat_id(11:15)), "0123456789") == 0) then + read(plat_id(11:15), '(i5.5)') bsn + return + end if + end if + + ! Try using the FIPS country code. This code seems to be more + ! accurate than the WMO code. + select case(fipscode_id) + case('SW') + bsn = JMOBS_SWEDEN_LOWLIMIT + return + case('DA') + bsn = JMOBS_DENMARK_LOWLIMIT + return + case('AM', 'AJ', 'BO', 'EN', 'GG', 'LG', 'LH', 'KZ', & + 'KG', 'MD', 'RS', 'TI', 'TX', 'UP', 'UZ') + ! AM is Armenia + ! AJ is Azerbaijan + ! BO is Belarus + ! EN is Estonia + ! GG is Georgia + ! LG is Latvia + ! LH is Lituania + ! KZ is Kazakhstan + ! KG is Kyrgyzstan + ! MD is Moldova + ! RS is Russia + ! TI is Tajikistan + ! TX is Turkmenistan + ! UP is Ukraine + ! UZ is Uzbekistan + bsn = JMOBS_RUSSIA_LOWLIMIT + return + case ("IN") + bsn = JMOBS_INDIA_LOWLIMIT + return + case ("CE") + bsn = JMOBS_SRILANKA_LOWLIMIT + return + case ('AR', 'BL', 'BR', 'CI', 'CO', 'EC', 'FK', 'FG', 'GY', & + 'PA', 'PE', 'SX', 'NS', 'UY', 'VE') + ! AR is Argentina + ! BL is Bolivia + ! BR is Brazil + ! CI is Chile + ! CO is Colombia + ! EC is Ecuador + ! FK is Falkland Islands + ! FG is French Guiana + ! GY is Guyana + ! PA is Paraguay + ! PE is Peru + ! SX is South Georgia and the South Sandwich Islands + ! NS is Suriname + ! UY is Uruguay + ! VE is Venezuela + bsn = JMOBS_S_AMER_LOWLIMIT + return + case default + bsn = 0 + end select + + ! Try using the WMO country code + select case(wmocode_id) + case('SE') + bsn = JMOBS_SWEDEN_LOWLIMIT + return + case('DK') + bsn = JMOBS_DENMARK_LOWLIMIT + return + case('AM', 'AZ', 'BY', 'EE', 'GE', 'LV', 'LT', 'KZ', 'KG', & + 'MD', 'RU', 'TJ', 'TM', 'UA', 'UZ') + ! AM is Armenia + ! AZ is Azerbaijan + ! BY is Belarus + ! EE is Estonia + ! GE is Georgia + ! LV is Latvia + ! LT is Lithuania + ! KZ is Kazakhstan + ! KG is Kyrgyzstan + ! MD is Moldova + ! RU is Russia + ! TJ is Tajikistan + ! TM is Turkmenistan + ! UA is Ukraine + ! UZ is Uzbekistan + bsn = JMOBS_RUSSIA_LOWLIMIT + return + case ("IN") + bsn = JMOBS_INDIA_LOWLIMIT + return + case ("LK") + bsn = JMOBS_SRILANKA_LOWLIMIT + return + case ('AR', 'BO', 'BR', 'CL', 'CO', 'EC', 'FK', 'GF', 'GY', & + 'PY', 'PE', 'GS', 'SR', 'UG', 'VE') + ! AR is Argentina + ! BO is Bolivia + ! BR is Brazil + ! CL is Chile + ! CO is Colombia + ! EC is Ecuador + ! FK is Falkland Islands + ! GF is French Guiana + ! GY is Guyana + ! PY is Paraguay + ! PE is Peru + ! GS is South Georgia and the South Sandwich Islands + ! SR is Suriname + ! UG is Uruguay + ! VE is Venezuela + bsn = JMOBS_S_AMER_LOWLIMIT + return + case default + bsn = 0 + end select + + end function set_bsn_wmo + + subroutine swap_int(var1, var2) + implicit none + integer, intent(inout) :: var1 + integer, intent(inout) :: var2 + integer :: tmp + tmp = var1 + var1 = var2 + var2 = tmp + end subroutine swap_int + + subroutine swap_char2(var1, var2) + implicit none + character(2), intent(inout) :: var1 + character(2), intent(inout) :: var2 + character(2) :: tmp + tmp = var1 + var1 = var2 + var2 = tmp + end subroutine swap_char2 + + subroutine swap_char10(var1, var2) + implicit none + character(10), intent(inout) :: var1 + character(10), intent(inout) :: var2 + character(10) :: tmp + tmp = var1 + var1 = var2 + var2 = tmp + end subroutine swap_char10 + + subroutine swap_char14(var1, var2) + implicit none + character(14), intent(inout) :: var1 + character(14), intent(inout) :: var2 + character(14) :: tmp + tmp = var1 + var1 = var2 + var2 = tmp + end subroutine swap_char14 + + subroutine swap_char32(var1, var2) + implicit none + character(32), intent(inout) :: var1 + character(32), intent(inout) :: var2 + character(32) :: tmp + tmp = var1 + var1 = var2 + var2 = tmp + end subroutine swap_char32 + + ! Try to set FIPS country code based on WIGOS issuer number. Only + ! certain specific countries are checked for (for special accumulation + ! rules). + function get_fips_from_wigos_issuer(stn) result (fips) + + ! Defaults + implicit none + + ! Arguments + character(*),intent(in) :: stn + + ! Return variable + character(2) :: fips + + ! Locals + integer :: idx1, idx2 + integer :: id + + fips = '??' ! First guess + + ! See if this is a WIGOS station ID; if so, the issuer code is the + ! integer string between the first two dashes. If this is not + ! WIGOS, just return. + idx1 = scan(stn,'-') + if (idx1 == 0) return + idx2 = scan(stn(idx1+1:len(stn)),'-') + if (idx2 == 0) return + if (verify(trim(stn(idx1+1:idx2+1)), "0123456789") .ne. 0) return + read(stn(idx1+1:idx2+1), '(i5.5)') id + + ! Select FIPS code for specific countries where we have special rules. + select case(id) + case(752) + fips = 'SW' ! Sweden + case(208) + fips = 'DA' ! Denmark + case(051) ! Post-Soviet countries start here + fips = 'AM' ! Armenia + case(031) + fips = 'AJ' ! Azerbaijan + case(112) + fips = 'BO' ! Belarus + case(233) + fips = 'EN' ! Estonia + case(268) + fips = 'GG' ! Georgia + case(428) + fips = 'LG' ! Latvia + case(440) + fips = 'LH' ! Lithuania + case(398) + fips = 'KZ' ! Kazakhstan + case(417) + fips = 'KG' ! Kyrgyzstan + case(498) + fips = 'MD' ! Moldova + case(643) + fips = 'RS' ! Russia + case(762) + fips = 'TI' ! Tajikistan + case(795) + fips = 'TX' ! Turkmenistan + case(804) + fips = 'UP' ! Ukraine + case(860) + fips = 'UZ' ! Uzbekistan + case(356) ! Post-Soviet countries end here + fips = 'IN' ! India + case(144) + fips = 'CE' ! Sri Lanka + case(032) ! South American countries start here + fips = 'AR' ! Argentina + case(068) + fips = 'BL' ! Bolivia + case(076) + fips = 'BR' ! Brazil + case(152) + fips = 'CI' ! Chile + case(170) + fips = 'CO' ! Columbia + case(218) + fips = 'EC' ! Ecuador + case(238) + fips = 'FK' ! Falkland Islands + case(254) + fips = 'FG' ! French Guiana + case(328) + fips = 'GY' ! Guyana + case(600) + fips = 'PA' ! Paraguay + case(604) + fips = 'PE' ! Peru + case(239) + fips = 'SX' ! South Georgia and the South Sandwich Islands + case(740) + fips = 'NS' ! Suriname + case(858) + fips = 'UY' ! Uruguay + case(862) + fips = 'VE' ! Venezuela + end select + end function get_fips_from_wigos_issuer + +end module USAF_PreobsReaderMod diff --git a/lis/metforcing/usaf/USAF_WWMCA_grib1Mod.F90 b/lis/metforcing/usaf/USAF_WWMCA_grib1Mod.F90 index 4d8b82dfd..87c6fdcb2 100644 --- a/lis/metforcing/usaf/USAF_WWMCA_grib1Mod.F90 +++ b/lis/metforcing/usaf/USAF_WWMCA_grib1Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/USAF_bratsethMod.F90 b/lis/metforcing/usaf/USAF_bratsethMod.F90 index b6dedf826..e79a25ffa 100644 --- a/lis/metforcing/usaf/USAF_bratsethMod.F90 +++ b/lis/metforcing/usaf/USAF_bratsethMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -20,6 +20,12 @@ ! ........................................Eric Kemp/SSAI/NASA ! 03 Jun 2020 Removed Box-Cox transform in precipitation analysis ! ........................................Eric Kemp/SSAI/NASA +! 29 Nov 2023 Pass QC-rejected obs to OBA files.......Eric Kemp/SSAI/NASA +! 12 Mar 2024 Restrict BackQC and SuperstatQC to gage reports. Fixed +! typo in SuperstatQC threshold...........Eric Kemp/SSAI/NASA +! 21 Mar 2024 Changed internal BackQC and SuperstatQC logic to only +! skip for IMERG. This allows use with T, RH, and wind +! speed analyses..........................Eric Kemp/SSAI/NASA ! ! DESCRIPTION: ! @@ -34,7 +40,7 @@ ! ! Bratseth, A M, 1986: Statistical interpolation by means of successive ! corrections. Tellus, 38A, 439-447. -! Cressie, N A C, 1993: Statistics for Spatial Data. Revised Edition, +! Cressie, N A C, 1993: Statistics for Spatial Data. Revised Edition, ! Wiley, New York, 928 pp. ! Daley, R, 1991: Atmospheric Data Analysis. Cambridge University Press, ! Cambridge, UK, 457 pp. @@ -96,8 +102,8 @@ module USAF_bratsethMod type USAF_obsData private integer :: nobs - character*10, allocatable :: net(:) - character*10, allocatable :: platform(:) + character*32, allocatable :: net(:) + character*32, allocatable :: platform(:) real, allocatable :: obs(:) ! Observed variable real, allocatable :: lat(:) ! Latitude of observation (deg N) real, allocatable :: lon(:) ! Longitude of observation (deg E) @@ -144,12 +150,6 @@ module USAF_bratsethMod ! Private constants real, parameter :: MISSING = -9999 - ! Quality control flags. Should these be public? - real, parameter :: QC_UNKNOWN = 0 - real, parameter :: QC_GOOD = 1 - real, parameter :: QC_SUSPECT = 2 - real, parameter :: QC_REJECT = 3 - contains !--------------------------------------------------------------------------- @@ -227,6 +227,9 @@ end subroutine USAF_destroyObsData ! FIXME: Merge with USAF_createObsData subroutine initObsData(this) + ! Imports + use USAF_OBAMod, only: QC_UNKNOWN + ! Defaults implicit none @@ -248,9 +251,10 @@ subroutine initObsData(this) end subroutine InitObsData !--------------------------------------------------------------------------- - ! Loops through contents of ObsData structure and counts all obs with - ! "good" quality control flag. + ! Loops through contents of ObsData structure and counts all obs + ! not flagged for rejection. function USAF_countGoodObs(this) result(goodObs) + use USAF_OBAMod, only: QC_REJECT implicit none type(USAF_ObsData), intent(in) :: this integer :: goodObs @@ -259,6 +263,7 @@ function USAF_countGoodObs(this) result(goodObs) goodObs = 0 do i = 1, this%nobs if (this%qc(i) .ne. QC_REJECT) then + ! QC_SUSPECT obs count as "good" so they are included in OBA goodObs = goodObs + 1 end if end do ! i @@ -270,24 +275,26 @@ end function USAF_countGoodObs ! background field at observation is optional (useful for adding ! "superobservations"). subroutine USAF_assignObsData(this,net,platform,ob,lat,lon,sigmaOSqr, & - oErrScaleLength,back) + oErrScaleLength,back,qc) ! Imports use LIS_logmod, only : LIS_logunit + use USAF_OBAmod, only: QC_UNKNOWN ! Defaults implicit none ! Arguments type(USAF_ObsData),intent(inout) :: this - character(len=10), intent(in) :: net - character(len=10), intent(in) :: platform + character(len=32), intent(in) :: net + character(len=32), intent(in) :: platform real, intent(in) :: ob real, intent(in) :: lat real, intent(in) :: lon real, intent(in) :: sigmaOSqr real, intent(in) :: oErrScaleLength real, optional, intent(in) :: back + integer, optional, intent(in) :: qc ! Local variables integer :: nobs @@ -318,11 +325,16 @@ subroutine USAF_assignObsData(this,net,platform,ob,lat,lon,sigmaOSqr, & end if this%sigmaOSqr(nobs) = sigmaOSqr this%oErrScaleLength(nobs) = oErrScaleLength - this%qc(nobs) = QC_UNKNOWN this%nobs = nobs if (present(back)) then this%back(nobs) = back end if + if (present(qc)) then + this%qc(nobs) = qc + else + this%qc(nobs) = QC_UNKNOWN + end if + ! TRACE_EXIT("bratseth_assign") end subroutine USAF_assignObsData @@ -358,6 +370,7 @@ end subroutine USAF_multObsData subroutine USAF_split6hrGaugeObsData(this,nest,imax,jmax,back4,pcap,p3,p6) ! Imports + use USAF_OBAmod, only: QC_REJECT ! Defaults implicit none @@ -372,7 +385,7 @@ subroutine USAF_split6hrGaugeObsData(this,nest,imax,jmax,back4,pcap,p3,p6) type(USAF_ObsData),intent(out) :: p3 type(USAF_ObsData),intent(out) :: p6 - ! Local variables + ! Local variables integer :: nobs6 real :: tmp_back2(2) real :: tmp_obs2(2) @@ -444,7 +457,7 @@ subroutine USAF_split6hrGaugeObsData(this,nest,imax,jmax,back4,pcap,p3,p6) end if end do - ! Assign + ! Assign if (tmp_obs2(1) .ne. MISSING) then call USAF_assignObsData(p3, this%net(n), this%platform(n), & tmp_obs2(1), this%lat(n), this%lon(n), this%sigmaOSqr(n), & @@ -468,6 +481,7 @@ subroutine USAF_split12hrGaugeObsData(this,nest,imax,jmax,back4,pcap,p3,p6,& p9,p12) ! Imports + use USAF_OBAmod, only: QC_REJECT ! Defaults implicit none @@ -622,12 +636,15 @@ subroutine USAF_addSSMIObsData(this,imax,jmax,ra_tmp,nest) real, allocatable :: xpts(:), ypts(:), rlat(:), rlon(:) real :: sigmaOSqr, ob, xi1, xj1, oErrScaleLength real :: xpnmcaf, ypnmcaf, orient, xmesh, xmeshl - character(len=10) :: net, platform + character(len=32) :: net + character(len=32) :: platform integer :: icount integer :: i,j integer :: count_good_ssmi real, parameter :: FILL = -9999.0 + external :: polarToLatLon + net = "SSMI" platform = "SSMI" sigmaOSqr = agrmet_struc(nest)%bratseth_precip_ssmi_sigma_o_sqr @@ -656,8 +673,8 @@ subroutine USAF_addSSMIObsData(this,imax,jmax,ra_tmp,nest) continue else write(LIS_logunit,*)'[ERR] Invalid imax dimension for SSM/I!' - write(LIS_logunit,*)'Received ', imax - write(LIS_logunit,*)'Only support 512, 1024, or 1400' + write(LIS_logunit,*)'[ERR] Received ', imax + write(LIS_logunit,*)'[ERR] Only support 512, 1024, or 1400' flush(LIS_logunit) call LIS_endrun() end if @@ -724,7 +741,7 @@ subroutine USAF_addSSMIObsData(this,imax,jmax,ra_tmp,nest) if (imax .eq. 1440) then write(LIS_logunit,*)'[ERR] Lat/lon SSM/I data not supported yet!' - write(LIS_logunit,*)'Modify USAF_addSSMIObsData and recompile!' + write(LIS_logunit,*)'[ERR] Modify USAF_addSSMIObsData and recompile!' flush(LIS_logunit) call LIS_endrun() @@ -774,6 +791,8 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) character(len=10) :: yyyymmddhh integer :: c, r + external :: AGRMET_julhr_date10 + TRACE_ENTER("bratseth_getBackNWP") rc = 0 @@ -801,6 +820,8 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) ! EMK...Fetch bias ratio if requested if (agrmet_struc(nest)%back_bias_corr .eq. 1) then call USAF_pcpBackBiasRatio_s2s(nest, yyyymmddhh) + else if (agrmet_struc(nest)%back_bias_corr .eq. 2) then + call USAF_pcpBackBiasRatio_nrt(nest, yyyymmddhh) end if write(LIS_logunit,*) & @@ -824,6 +845,20 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) ! Use GALWEM Bratseth settings if we have the data if (rc .eq. 0) then pcp_src(k) = 'GALWEM' + + ! Apply bias correction to background field + if (agrmet_struc(nest)%back_bias_corr .eq. 2) then + write(LIS_logunit,*) & + '[INFO] Applying IMERG-based bias correction to GALWEM precip' + do r = 1, LIS_rc%gnr(nest) + do c = 1, LIS_rc%gnc(nest) + fg_data_glb(c,r) = & + fg_data_glb(c,r) * & + agrmet_struc(nest)%galwem_nrt_bias_ratio(c,r) + end do + end do + end if + end if endif @@ -851,9 +886,10 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) end if ! Apply bias correction to background field - if (agrmet_struc(nest)%back_bias_corr .eq. 1) then + if (agrmet_struc(nest)%back_bias_corr .eq. 1 .and. & + rc .eq. 0) then write(LIS_logunit,*) & - '[INFO] Applying GALWEM-based bias correction to GFS precip' + '[INFO] Applying GALWEM-based bias correction to GFS precip' do r = 1, LIS_rc%gnr(nest) do c = 1, LIS_rc%gnc(nest) fg_data_glb(c,r) = & @@ -861,6 +897,19 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) agrmet_struc(nest)%pcp_back_bias_ratio(c,r) end do end do + + else if (agrmet_struc(nest)%back_bias_corr .eq. 2 .and. & + rc .eq. 0) then + ! New IMERG option for NRT + write(LIS_logunit,*) & + '[INFO] Applying IMERG-based bias correction to GFS precip' + do r = 1, LIS_rc%gnr(nest) + do c = 1, LIS_rc%gnc(nest) + fg_data_glb(c,r) = & + fg_data_glb(c,r) * & + agrmet_struc(nest)%gfs_nrt_bias_ratio(c,r) + end do + end do end if ! Use GFS Bratseth settings if we have the data @@ -874,7 +923,7 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) call AGRMET_julhr_date10(j3hr, yyyymmddhh) write(LIS_logunit,*) & '[ERR] No NWP background precipitation found for ',yyyymmddhh - write(LIS_logunit,*) ' ABORTING!' + write(LIS_logunit,*) '[ERR] ABORTING!' flush(LIS_logunit) message(:) = '' message(1) = '[ERR] Program: LIS' @@ -884,6 +933,8 @@ subroutine USAF_getBackNWP(nest,back4,pcp_src, use_twelve, j6hr, findex) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_getBackNWP') #endif if(LIS_masterproc) then call LIS_alert( 'LIS.USAF_getBackNWP ', 1, & @@ -946,6 +997,8 @@ subroutine USAF_getSSMIObsData(nest,j6hr,use_twelve,precip3,precip6, & integer :: local_diff_grid integer :: ii,jj,kk,count_good_ssmi ! EMK TEST + external :: agrmet_ssmiprec_filename + TRACE_ENTER("bratseth_getSSMI") routine_name = 'USAF_getSSMIObsData' @@ -1014,9 +1067,9 @@ subroutine USAF_getSSMIObsData(nest,j6hr,use_twelve,precip3,precip6, & write(LIS_logunit,*) ' ' write(LIS_logunit,*) & '[WARN] precip/smiedr: error opening file' - write(LIS_logunit,*)' SSMI data file ', trim(ifil), & + write(LIS_logunit,*)'[WARN] SSMI data file ', trim(ifil), & ' does not exist.' - write(LIS_logunit,*)' SSMI estimates will not be used ',& + write(LIS_logunit,*)'[WARN] SSMI estimates will not be used ',& 'in precip analysis.' write(LIS_logunit,*) ' ' message =' ' @@ -1033,7 +1086,7 @@ subroutine USAF_getSSMIObsData(nest,j6hr,use_twelve,precip3,precip6, & ra(hemi,:,:) = MISSING else - write(LIS_logunit,*) '- READING ',trim(ifil) + write(LIS_logunit,*) '[INFO] READING ',trim(ifil) call LIS_putget( ra(hemi,:,:), 'r', ifil, routine_name, & imax, jmax) end if ! .not. exists @@ -1041,8 +1094,9 @@ subroutine USAF_getSSMIObsData(nest,j6hr,use_twelve,precip3,precip6, & ! Honor option to reset SSMI zero precip values to missing if (.not. use_zeros) then - write(LIS_logunit,*)'- SSMI ZEROS NOT USED' - where ( ra(:,:,:) .eq. 0.0 ) + write(LIS_logunit,*)'[INFO] SSMI ZEROS NOT USED' + where ( .not. ra(:,:,:) > 0.0 .and. & + .not. ra(:,:,:) < 0) ra(:,:,:) = MISSING end where end if @@ -1128,13 +1182,17 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& real, allocatable :: xpts(:), ypts(:), rlat(:), rlon(:) real :: sigmaOSqr, ob, xi1, xj1, oErrScaleLength real :: xpnmcaf, ypnmcaf, orient, xmesh, xmeshl - character(len=10) :: net, platform + character(len=32) :: net + character(len=32) :: platform integer :: count_good_geo_precip, icount integer :: npts integer :: i,j,jj logical, external :: is_geo_corrupted real, allocatable :: gest_temp(:,:,:) + external :: agrmet_geoprec_filename + external :: polarToLatLon + TRACE_ENTER("bratseth_getGeopPrcp") net = "GEOPRECIP" platform = "GEOPRECIP" @@ -1184,7 +1242,7 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& else write(LIS_logunit,*) & '[ERR] Invalid dimension for GEO_PRECIP data!' - write(LIS_logunit,*)'Read ', agrmet_struc(nest)%imax + write(LIS_logunit,*)'[ERR] Read ', agrmet_struc(nest)%imax call LIS_endrun() end if end if @@ -1214,8 +1272,8 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& else write(LIS_logunit,*) & '[ERR] Invalid imax dimension for GEO_PRECIP!' - write(LIS_logunit,*)'Received ',imax - write(LIS_logunit,*)'Only support 512, 1024, or 4096!' + write(LIS_logunit,*)'[ERR] Received ',imax + write(LIS_logunit,*)'[ERR] Only support 512, 1024, or 4096!' flush(LIS_logunit) call LIS_endrun() end if @@ -1242,11 +1300,11 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& inquire( file = trim(ifil), exist = exists) if ( .not. exists ) then write(LIS_logunit,*) & - 'USAF_getGeoPrecipObsData: error opening file ', & + '[WARN] USAF_getGeoPrecipObsData: error opening file ', & trim(ifil) - write(LIS_logunit,*) ' file does not exist' + write(LIS_logunit,*) '[WARN] file does not exist' write(LIS_logunit,*) & - ' geo precip estimate will not be performed' + '[WARN] geo precip estimate will not be performed' message = ' ' message(1) = 'program: LIS' message(2) = ' routine: USAF_getGeoPrecipObsData' @@ -1261,7 +1319,7 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& TRACE_EXIT("bratseth_getGeopPrcp") return endif - write(LIS_logunit,*) '- READING ', trim(ifil) + write(LIS_logunit,*) '[INFO] READING ', trim(ifil) allocate(geoprc(imax,jmax)) @@ -1280,10 +1338,10 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& ! Check for anomalous geoprecip files if (is_geo_corrupted(geoprc, imax, jmax, mo, hemi)) then write(LIS_logunit,*) & - 'USAF_getGeoPrecipObsData: data corrupted - ', & + '[WARN] USAF_getGeoPrecipObsData: data corrupted - ', & trim(ifil) write(LIS_logunit,*) & - ' geo precip estimate will not be performed' + '[WARN] geo precip estimate will not be performed' message = ' ' message(1) = 'program: LIS' message(2) = ' routine: USAF_getGeoPrecipObsData' @@ -1421,7 +1479,7 @@ subroutine USAF_getGeoPrecipObsData(nest,j6hr,use_twelve,precip3,precip6,& write(LIS_logunit,*)& '[ERR] Lat/lon GEO_PRECIP data not supported yet!' write(LIS_logunit,*)& - 'Modify USAF_addGeoPrecipObsData and recompile!' + '[ERR] Modify USAF_addGeoPrecipObsData and recompile!' flush(LIS_logunit) call LIS_endrun() @@ -1460,7 +1518,7 @@ subroutine USAF_interpBackToTypeObsData(this,nest,imax,jmax,back,type) integer,intent(in) :: imax integer,intent(in) :: jmax real, intent(in) :: back(imax,jmax) - character(len=10),intent(in) :: type + character(len=32),intent(in) :: type ! Local variables integer :: nobs @@ -1547,7 +1605,7 @@ subroutine USAF_analyzePrecip(precipAll,nest,back,hourindex,mrgp,precipOBA) use LIS_coreMod, only: LIS_rc, LIS_ews_halo_ind, LIS_ewe_halo_ind, & LIS_nss_halo_ind, LIS_nse_halo_ind, LIS_localPet use LIS_logMod, only: LIS_logunit - use USAF_OBAMod, only: OBA, createOBA,assignOBA + use USAF_OBAMod, only: OBA, createOBA, assignOBA, QC_REJECT ! Defaults implicit none @@ -1565,8 +1623,6 @@ subroutine USAF_analyzePrecip(precipAll,nest,back,hourindex,mrgp,precipOBA) real, allocatable :: invDataDensities(:) real, allocatable :: sumObsEstimates(:) integer :: npasses - integer :: r - character(len=10) :: new_name,type real :: convergeThresh real :: sigmaBSqr integer :: good_obs @@ -1605,7 +1661,7 @@ subroutine USAF_analyzePrecip(precipAll,nest,back,hourindex,mrgp,precipOBA) precipAll%net(j), precipAll%platform(j), & precipAll%lat(j), precipAll%lon(j), & precipAll%obs(j), precipAll%back(j), & - A=0.) + A=0., qc=precipAll%qc(j), set_qc_good=.true.) end do ! j call USAF_destroyObsData(precipAll) TRACE_EXIT("bratseth_analyzePrcp") @@ -1688,6 +1744,9 @@ subroutine interpBack2ObsPts(this,nest,imax,jmax,back, & integer, external :: get_fieldpos real, parameter :: FILL = MISSING + external :: compute_grid_coord + external :: bilinear_interp + ! See if we have any observations available nobs = this%nobs if (nobs .eq. 0) return @@ -1801,6 +1860,8 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & use LIS_coreMod, only: LIS_localPet, LIS_rc use LIS_logMod, only : LIS_logunit, LIS_endrun, LIS_endrun use LIS_mpiMod + use USAF_OBAmod, only: QC_REJECT, QC_SUSPECT_BACKQC, & + QC_SUSPECT_SUPERSTATQC ! Defaults implicit none @@ -1846,6 +1907,8 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_invDataDensities') t1 = MPI_Wtime() #endif @@ -1891,9 +1954,20 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & ! contributions from neighbors. do j = 1, nobs_cr job = jobs_cr_vector(j) + if (this%qc(job) .eq. QC_REJECT) cycle + ! QC_SUSPECT data not used in analysis, but saved for OBA + if (this%qc(job) .eq. QC_SUSPECT_BACKQC) cycle + if (this%qc(job) .eq. QC_SUSPECT_SUPERSTATQC) cycle + do i = 1, nobs_neighbors iob = iobs_neighbors_vector(i) + if (this%qc(iob) .eq. QC_REJECT) cycle + ! QC_SUSPECT data not used in analysis, but saved + ! for OBA + if (this%qc(iob) .eq. QC_SUSPECT_BACKQC) cycle + if (this%qc(iob) .eq. QC_SUSPECT_SUPERSTATQC) cycle + if (iob .eq. job) then dist = 0 else @@ -1910,7 +1984,8 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & else if (trim(this%net(iob)) .eq. trim(this%net(job))) then ! Satellite observations have correlated errors. if (.not. isUncorrObType(this%net(job))) then - if (this%oErrScaleLength(job) .eq. 0) then + if (.not. this%oErrScaleLength(job) > 0 .and. & + .not. this%oErrScaleLength(job) < 0) then write(LIS_logunit,*) & '[ERR]: job, network, oErrScaleLength: ', & job, trim(this%net(job)), & @@ -1952,8 +2027,12 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & allocate(invDataDensities(nobs)) invDataDensities(:) = 0 call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_invDataDensities') call MPI_ALLREDUCE(dataDensities_pet,invDataDensities,nobs,MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_ALLREDUCE call in calc_invDataDensities') #endif ! Clean up @@ -1964,6 +2043,9 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & do j = 1, nobs ! Skip bad data if ( this%qc(j) .eq. QC_REJECT) cycle + ! QC_SUSPECT data not used in analysis, but saved for OBA + if ( this%qc(j) .eq. QC_SUSPECT_BACKQC) cycle + if ( this%qc(j) .eq. QC_SUSPECT_SUPERSTATQC) cycle invDataDensities(j) = & invDataDensities(j)*(sigmaBSqr + this%sigmaOSqr(j)) invDataDensities(j) = 1. / invDataDensities(j) @@ -1971,6 +2053,8 @@ subroutine calc_invDataDensities(this,sigmaBSqr,nest,max_dist, & #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_invDataDensities') t2 = MPI_Wtime() if (verbose) then write(LIS_logunit,*) & @@ -2006,7 +2090,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& use LIS_coreMod, only : LIS_localPet, LIS_rc use LIS_logMod, only : LIS_logunit, LIS_endrun use LIS_mpiMod - use USAF_OBAMod, only: OBA, createOBA, assignOBA + use USAF_OBAMod, only: OBA, createOBA, assignOBA, QC_REJECT, & + QC_SUSPECT_BACKQC, QC_SUSPECT_SUPERSTATQC ! Defaults implicit none @@ -2043,7 +2128,7 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& integer :: imaxabsdiff real :: maxabsdiff, y_prev, y_new, normdev integer :: icount, num_high_dev - integer :: c,r,i,j,iob,job + integer :: c,r,i,j,iob,job,ii integer :: ierr double precision :: t0,t1, t2 logical :: verbose @@ -2076,6 +2161,12 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& call LIS_endrun() end if + ! EMK TEST + !do ii = 1, nobs + ! write(LIS_logunit,*)'EMK: ii, invDataDensity: ', ii, & + ! invDataDensities(ii) + !end do + ! Here we create a 2d hash table storing the index values of each ob ! in linked lists for each LIS grid box. This can help us screen ! out obviously unnecessary ob comparisons later. @@ -2103,6 +2194,11 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& allocate(pprev_ana(nobs)) allocate(pprev_est(nobs)) + pnew_ana = 0 + pnew_ana_pet = 0 + pnew_est = 0 + pnew_est_pet = 0 + pprev_est(:) = this%back(:) ! First guess pprev_ana(:) = this%back(:) ! First guess sumObsEstimates(:) = 0 @@ -2111,6 +2207,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') t0 = MPI_Wtime() #endif @@ -2118,6 +2216,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') t1 = MPI_Wtime() #endif pnew_est_pet(:) = 0 @@ -2158,15 +2258,23 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& do j = 1, nobs_cr job = jobs_cr_vector(j) - if (this%qc(job) .eq. QC_REJECT) then - sumObsEstimates_pet(j) = 0 + if (this%qc(job) .eq. QC_REJECT .or. & + this%qc(job) .eq. QC_SUSPECT_BACKQC .or. & + this%qc(job) .eq. QC_SUSPECT_SUPERSTATQC) then + !sumObsEstimates_pet(j) = 0 + sumObsEstimates_pet(job) = 0 ! EMK FIX 20231129 cycle endif + ! We will allow analysis to be calculated at points + ! being monitored, but these points will not contribute + ! observation data. do i = 1, nobs_neighbors iob = iobs_neighbors_vector(i) - if (this%qc(iob) .eq. QC_REJECT) then + if (this%qc(iob) .eq. QC_REJECT .or. & + this%qc(iob) .eq. QC_SUSPECT_BACKQC .or. & + this%qc(iob) .eq. QC_SUSPECT_SUPERSTATQC) then sumObsEstimates_pet(iob) = 0 cycle endif @@ -2220,11 +2328,19 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& pnew_est(:) = 0 pnew_ana(:) = 0 call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') call MPI_ALLREDUCE(pnew_est_pet, pnew_est, nobs, MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_ALLREDUCE call in calc_obsAnalysis') call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') call MPI_ALLREDUCE(pnew_ana_pet, pnew_ana, nobs, MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_ALLREDUCE call in calc_obsAnalysis') #endif ! Finish analysis and observation estimates for this iteration @@ -2248,8 +2364,12 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& ! Share sumObsEstimates across all processors. sumObsEstimates(:) = 0 call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') call MPI_ALLREDUCE(sumObsEstimates_pet, sumObsEstimates, nobs, & MPI_REAL, MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_ALLREDUCE call in calc_obsAnalysis') #else do j = 1, nobs sumObsEstimates(j) = sum(sumObsEstimates_pet) @@ -2274,7 +2394,9 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& do j = 1, nobs - if (this%qc(j) .eq. QC_REJECT) cycle + if (this%qc(j) .eq. QC_REJECT .or. & + this%qc(j) .eq. QC_SUSPECT_BACKQC .or. & + this%qc(j) .eq. QC_SUSPECT_SUPERSTATQC) cycle ! Check for convergence y_prev = pprev_ana(j) @@ -2287,7 +2409,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& done = .false. end if - ! Updates mean absolute differences against observed values + ! Updates mean absolute differences against observed + ! values if (verbose) then icount = icount + 1 y_est = pnew_est(j) @@ -2298,12 +2421,13 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& diff = y_ana - y_obs mad_ana = mad_ana + abs(diff) - ! A crude check for unusually high normalized deviations. - normdev = (y_obs - y_ana)*(y_obs - y_ana)/this%sigmaOSqr(j) + ! A crude check for unusually high normalized + ! deviations. + normdev = (y_obs - y_ana)*(y_obs - y_ana) / & + this%sigmaOSqr(j) if (normdev .gt. 9) then num_high_dev = num_high_dev + 1 end if - end if pprev_est(j) = pnew_est(j) @@ -2318,6 +2442,20 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& end if end if + ! !EMK TEST + ! do ii = 1, nobs + ! write(LIS_logunit,*) & + ! '[INFO] ii,net,platform,obs, back, ana, est, dataDensity: ', & + ! ii, & + ! trim(this%net(ii)), ' ',& + ! trim(this%platform(ii)), & + ! ' ',this%obs(ii),& + ! ' ',this%back(ii),& + ! ' ',pnew_ana(ii),& + ! ' ',pnew_est(ii),& + ! ' ',1./invDataDensities(ii) + ! end do + if (done) exit ! No more iterations! if (verbose) then @@ -2348,6 +2486,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') t2 = MPI_Wtime() if (verbose) then write(LIS_logunit,*) & @@ -2360,24 +2500,24 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& ! production, we will allow the program to continue instead of ! aborting. !if (npasses .eq. 100) then - if (npasses .eq. 5) then ! For Ops - - write(LIS_logunit,*) & - '[WARN] Bratseth failed to converge after ',npasses, & - ' iterations!' - write(LIS_logunit,*) & - '[WARN] Will stop iterating' - flush(LIS_logunit) - exit - end if + if (npasses .eq. 5) then ! For Ops + + write(LIS_logunit,*) & + '[WARN] Bratseth failed to converge after ',npasses, & + ' iterations!' + write(LIS_logunit,*) & + '[WARN] Will stop iterating' + flush(LIS_logunit) + exit + end if end do ! Iterate until convergence if (verbose) then if (done) then - write(LIS_logunit,*) & + write(LIS_logunit,*) & '[INFO] Bratseth analysis converged after ',npasses, & ' iterations' - endif + endif write(LIS_logunit,*) & '[INFO] Mean absolute difference against obs: ana: ',mad_ana, & ' est: ',mad_est @@ -2385,6 +2525,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_obsAnalysis') t2 = MPI_Wtime() if (verbose) then write(LIS_logunit,*) & @@ -2401,6 +2543,8 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& icount = 0 do j = 1, nobs if (this%qc(j) .eq. QC_REJECT) cycle + if (this%qc(j) .eq. QC_SUSPECT_BACKQC) cycle + if (this%qc(j) .eq. QC_SUSPECT_SUPERSTATQC) cycle if (present(skip)) then if (skip(j)) cycle @@ -2417,6 +2561,7 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& varOBA = createOBA(nest, maxobs=good_obs) do j = 1, nobs if (this%qc(j) .eq. QC_REJECT) cycle + ! Keep QC_SUSPECT obs for OBA if (present(skip)) then if (skip(j)) cycle end if @@ -2426,7 +2571,7 @@ subroutine calc_obsAnalysis(this,sigmaBSqr,nobs,invDataDensities,nest,& call assignOBA(varOBA, & this%net(j), this%platform(j), & this%lat(j), this%lon(j), & - O, B, A) + O, B, A, this%qc(j), set_qc_good=.true.) end do ! j end if @@ -2473,6 +2618,8 @@ subroutine calc_gridAnalysis(this,nest,sigmaBSqr,nobs,invDataDensities,& use LIS_logMod, only : LIS_logunit, LIS_endrun use LIS_LMLCMod, only: LIS_LMLC use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT, QC_SUSPECT_BACKQC, & + QC_SUSPECT_SUPERSTATQC ! Defaults implicit none @@ -2511,12 +2658,14 @@ subroutine calc_gridAnalysis(this,nest,sigmaBSqr,nobs,invDataDensities,& if (nobs .ne. this%nobs) then write(LIS_logunit,*)'[ERR] Array size mismatch in calc_gridAnalysis!' - write(LIS_logunit,*)'nobs, this%nobs = ',nobs, this%nobs + write(LIS_logunit,*)'[ERR] nobs, this%nobs = ',nobs, this%nobs call LIS_endrun() end if #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_gridAnalysis') t1 = MPI_Wtime() #endif @@ -2574,6 +2723,8 @@ subroutine calc_gridAnalysis(this,nest,sigmaBSqr,nobs,invDataDensities,& ! Skip bad observations. if (this%qc(job) .eq. QC_REJECT) cycle + if (this%qc(job) .eq. QC_SUSPECT_BACKQC) cycle + if (this%qc(job) .eq. QC_SUSPECT_SUPERSTATQC) cycle dist = great_circle_distance(locallat,locallon, & this%lat(job), this%lon(job)) @@ -2602,9 +2753,13 @@ subroutine calc_gridAnalysis(this,nest,sigmaBSqr,nobs,invDataDensities,& allocate(mrgp_1d(LIS_rc%gnc(nest)*LIS_rc%gnr(nest))) mrgp_1d(:) = 0 call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_gridAnalysis') call MPI_ALLREDUCE(mrgp_1d_pet,mrgp_1d, & LIS_rc%gnc(nest)*LIS_rc%gnr(nest),MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_ALLREDUCE call in calc_gridAnalysis') deallocate(mrgp_1d_pet) #endif @@ -2631,6 +2786,8 @@ subroutine calc_gridAnalysis(this,nest,sigmaBSqr,nobs,invDataDensities,& #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in calc_gridAnalysis') t2 = MPI_Wtime() write(LIS_logunit,*)'[INFO] Elapsed time for grid analysis is ', & t2 - t1,' seconds' @@ -2765,6 +2922,11 @@ subroutine fldbld_precip_nwp(nest,findex,julhr,src,fc_hr, & integer :: rc2 logical :: first_time + external :: getAVNfilename + external :: AGRMET_getGALWEMfilename + external :: AGRMET_fg2lis_precip + external :: interp_galwem_first_guess + rc = 0 found = .false. @@ -3139,6 +3301,8 @@ subroutine check_grib_file(gribfile,yr1,mo1,da1,hr1,found, & message(3) = ' LIS was not compiled with GRIBAPI or ECCODES support!' #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in check_grib_file') #endif if(LIS_masterproc) then call LIS_alert( 'LIS.check_grib_file', 1, & @@ -3163,12 +3327,14 @@ end subroutine check_grib_file ! ! This implementation is parallelized by distributing work among the ! different LIS ESMF PETs. - subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) + subroutine USAF_superstatQC(this,nest,new_name,silent_rejects) ! Imports use LIS_coreMod, only: LIS_domain, LIS_rc, LIS_localPet use LIS_logMod, only: LIS_logunit, LIS_endrun use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT, QC_SUSPECT_BACKQC, & + QC_SUSPECT_SUPERSTATQC ! Defaults implicit none @@ -3176,8 +3342,7 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) ! Arguments type(USAF_ObsData), intent(inout) :: this integer,intent(in) :: nest - character(len=10), intent(in) :: new_name - character(len=*), optional :: network + character(len=32), intent(in) :: new_name logical,optional,intent(in) :: silent_rejects ! Local variables @@ -3186,7 +3351,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) real :: dlat, dlon integer :: c,r,j real :: ctrlat, ctrlon - character(len=10) :: net_new, platform_new + character(len=32) :: net_new + character(len=32) :: platform_new integer, allocatable :: actions(:), actions_pet(:) real, allocatable :: superobs_pet(:),superlat_pet(:),superlon_pet(:) real, allocatable :: means(:) @@ -3231,6 +3397,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_superstatQC') t1 = MPI_Wtime() #endif @@ -3293,21 +3461,12 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) ! Skip bad data if ( this%qc(j) .eq. QC_REJECT) cycle + if ( this%qc(j) .eq. QC_SUSPECT_BACKQC) cycle + if ( this%qc(j) .eq. QC_SUSPECT_SUPERSTATQC) cycle - ! Screen by type - if (present(network)) then - if (trim(network) .eq. "SSMI") then - if (.not. is_ssmi(this%net(j))) cycle - else if (trim(network) .eq. "GEOPRECIP") then - if (.not. is_geoprecip(this%net(j))) cycle - else if (trim(network) .eq. "CMORPH") then - if (.not. is_cmorph(this%net(j))) cycle - else if (trim(network) .eq. "IMERG") then - if (.not. is_imerg(this%net(j))) cycle - end if - else ! Gauges - if (.not. is_gauge(this%net(j))) cycle - end if + ! Do not apply to IMERG. But allow application to other + ! data sources. + if ( is_imerg(this%net(j)) ) cycle ! Now see which LIS grid box this is in. First, handle latitude. found = .false. @@ -3351,7 +3510,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) if (means(gindex) .eq. MISSING) cycle icount = superob_count(gindex) - threshold = 3 * this%sigmaOSqr(j) * & + ! EMK 12 Mar 2024...Fixed typo in threshold eqn + threshold = 4 * sqrt(this%sigmaOSqr(j)) * & sqrt(real(icount) / real(icount-1)) if (abs(means(gindex) - this%obs(j)) .gt. threshold) then @@ -3392,6 +3552,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) #if (defined SPMD) call MPI_Allreduce(superobs_pet,means,glbcr,MPI_REAL, MPI_SUM, & LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') #else do j = 1, glbcr means(j) = sum(superobs_pet) @@ -3402,6 +3564,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) #if (defined SPMD) call MPI_Allreduce(superob_count_pet,superob_count,glbcr,& MPI_INTEGER, MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') #else do j = 1, glbcr superob_count(j) = sum(superob_count_pet) @@ -3426,35 +3590,49 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_superstatQC') superob_count(:) = 0 call MPI_Allreduce(superob_count_pet, superob_count, glbcr,& MPI_INTEGER, MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') superob_count_pet(:) = 0 superobs(:) = 0 call MPI_Allreduce(superobs_pet, superobs, glbcr, MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') superobs_pet(:) = 0 superlat(:) = 0 call MPI_Allreduce(superlat_pet, superlat, glbcr, MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') superlat_pet(:) = 0 superlon(:) = 0 call MPI_Allreduce(superlon_pet, superlon, glbcr, MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') superlon_pet(:) = 0 superSigmaOSqr(:) = 0 call MPI_Allreduce(superSigmaOSqr_pet, superSigmaOSqr, glbcr, & MPI_REAL, MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') superSigmaOSqr_pet(:) = 0 superOErrScaleLength(:) = 0 call MPI_Allreduce(superOErrScaleLength_pet, & superOErrScaleLength, glbcr, & MPI_REAL, MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') superOErrScaleLength_pet(:) = 0 #endif @@ -3487,9 +3665,13 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_superstatQC') actions(:) = 0 call MPI_Allreduce(actions_pet, actions, nobs,& MPI_INTEGER, MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_superstatQC') actions_pet(:) = 0 #endif end if ! ipass .eq. 3 @@ -3503,7 +3685,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) num_rejected_obs = 0 do j = 1, nobs if (actions(j) .eq. -1) then - this%qc(j) = QC_REJECT + !this%qc(j) = QC_REJECT + this%qc(j) = QC_SUSPECT_SUPERSTATQC ! Don't use, but save for OBA if (.not. silent_rejects_local) then write(LIS_logunit,*) & '[INFO] superstatQC rejection j: ',j, & @@ -3516,7 +3699,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) endif num_rejected_obs = num_rejected_obs + 1 else if (actions(j) .eq. 1) then - this%qc(j) = QC_REJECT ! Was merged into superob + !this%qc(j) = QC_REJECT ! Was merged into superob + this%qc(j) = QC_SUSPECT_SUPERSTATQC ! Don't use, but save for OBA num_merged_obs = num_merged_obs + 1 end if end do ! j @@ -3566,6 +3750,8 @@ subroutine USAF_superstatQC(this,nest,new_name,network,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_superstatQC') t2 = MPI_Wtime() write(LIS_logunit,*) & '[INFO] Elapsed time in superstatQC is ',t2 - t1,' seconds' @@ -3592,6 +3778,7 @@ subroutine USAF_dupQC(this) ! Imports use LIS_logMod, only: LIS_logunit use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT ! Defaults implicit none @@ -3608,7 +3795,8 @@ subroutine USAF_dupQC(this) integer :: count_dups integer :: total_reject_count, total_merge_count, total_create_count real :: mean,back,newlat,newlon,sigmaOSqr,oErrScaleLength - character(len=10) :: net,platform + character(len=32) :: net + character(len=32) :: platform real :: diff integer :: r,c,i integer :: nobs @@ -3626,6 +3814,8 @@ subroutine USAF_dupQC(this) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_dupQC') t1 = MPI_Wtime() #endif @@ -3692,9 +3882,11 @@ subroutine USAF_dupQC(this) ptr => head do i = 1, count_dups diff = this%lat(ptr%ob_index) - this%lat(r) - if (diff .ne. 0) location_issue = .true. + if (.not. diff > 0 .and. & + .not. diff < 0) location_issue = .true. diff = this%lon(ptr%ob_index) - this%lon(r) - if (diff .ne. 0) location_issue = .true. + if (.not. diff > 0 .and. & + .not. diff < 0) location_issue = .true. if (location_issue) exit ! Get out of loop ptr => ptr%next end do ! i @@ -3730,7 +3922,8 @@ subroutine USAF_dupQC(this) reject_all = .false. do i = 1, count_dups diff = this%obs(ptr%ob_index) - this%obs(r) - if (diff .eq. 0) then + if (.not. diff > 0 .and. & + .not. diff < 0) then this%qc(ptr%ob_index) = QC_REJECT total_reject_count = total_reject_count + 1 write(LIS_logunit,*) & @@ -3791,7 +3984,8 @@ subroutine USAF_dupQC(this) if (count_dups .eq. 1 .and. .not. location_issue) then ptr => head diff = this%obs(ptr%ob_index) - this%obs(r) - if (diff .eq. 0) then + if (.not. diff < 0 .and. & + .not. diff > 0) then this%qc(ptr%ob_index) = QC_REJECT total_reject_count = total_reject_count + 1 write(LIS_logunit,*) & @@ -3914,6 +4108,8 @@ subroutine USAF_dupQC(this) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_dupQC') t2 = MPI_Wtime() write(LIS_logunit,*) & '[INFO] Elapsed time in dupQC is ',t2 - t1,' seconds' @@ -3970,7 +4166,7 @@ subroutine reset_negative_values(nest,mrgp) if (ifix > 0) then write(LIS_logunit,6000) ifix 6000 format (/, 1x, 55('-'), & - /, 3x, 'routine reset_negative_values:',& + /, 3x, '[INFO] routine reset_negative_values:',& /, 5x, '# of pts to which negative values were set to zero = ', & i6, /, 1x, 55('-')) end if @@ -3987,6 +4183,8 @@ subroutine USAF_backQC(this,sigmaBSqr,silent_rejects) ! Imports use LIS_logMod, only: LIS_logunit, LIS_endrun use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT, QC_SUSPECT_BACKQC, & + QC_SUSPECT_SUPERSTATQC ! Defaults implicit none @@ -4020,20 +4218,32 @@ subroutine USAF_backQC(this,sigmaBSqr,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_backQC') t1 = MPI_Wtime() #endif + !write(LIS_logunit,*)'EMK: nobs, sigmaBSqr = ', nobs, sigmaBSqr + !flush(LIS_Logunit) + reject_count = 0 do r = 1,nobs ! Skip bad data if ( this%qc(r) .eq. QC_REJECT) cycle + if ( this%qc(r) .eq. QC_SUSPECT_SUPERSTATQC) cycle + if ( this%qc(r) .eq. QC_SUSPECT_BACKQC) cycle + + ! Do not apply to IMERG. But allow application to other data + ! sources. + if ( .not. is_imerg(this%net(r)) ) cycle errorThresh = 4*sqrt(sigmaBSqr + this%sigmaOSqr(r)) absDiff = abs(this%obs(r) - this%back(r)) if (absDiff .gt. errorThresh) then - this%qc(r) = QC_REJECT + !this%qc(r) = QC_REJECT + this%qc(r) = QC_SUSPECT_BACKQC ! Don't use, but save for OBA reject_count = reject_count + 1 @@ -4047,7 +4257,8 @@ subroutine USAF_backQC(this,sigmaBSqr,silent_rejects) ' obs: ',this%obs(r), & ' back: ',this%back(r), & ' abs diff: ', abs(this%obs(r) - this%back(r)), & - ' errorThresh ', errorThresh + ' errorThresh ', errorThresh, & + ' qc: ', this%qc(r) end if end if @@ -4058,6 +4269,8 @@ subroutine USAF_backQC(this,sigmaBSqr,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_backQC') t2 = MPI_Wtime() write(LIS_logunit,*) & '[INFO] Elapsed time in backQC is ',t2 - t1,' seconds' @@ -4069,7 +4282,7 @@ end subroutine USAF_backQC ! Checks if observation network is recognized as a gauge. logical function is_gauge(net) implicit none - character(len=10), intent(in) :: net + character(len=32), intent(in) :: net logical :: answer answer = .false. if (trim(net) .eq. "AMIL") answer = .true. @@ -4092,7 +4305,7 @@ end function is_gauge ! surface stations, all observations should have uncorrelated errors. logical function is_stn(net) implicit none - character(len=10), intent(in) :: net + character(len=32), intent(in) :: net logical :: answer answer = .true. is_stn = answer @@ -4102,7 +4315,7 @@ end function is_stn ! Checks if observation "network" is recognized as SSMI retrievals. logical function is_ssmi(net) implicit none - character(len=10), intent(in) :: net + character(len=32), intent(in) :: net logical :: answer answer = .false. if (trim(net) .eq. "SSMI") answer = .true. @@ -4113,7 +4326,7 @@ end function is_ssmi ! Checks if observation "network" is recognized as GEOPRECIP retrievals. logical function is_geoprecip(net) implicit none - character(len=10), intent(in) :: net + character(len=32), intent(in) :: net logical :: answer answer = .false. if (trim(net) .eq. "GEOPRECIP") answer = .true. @@ -4124,7 +4337,7 @@ end function is_geoprecip ! Checks if observation "network" is recognized as CMORPH estimate. logical function is_cmorph(net) implicit none - character(len=10), intent(in) :: net + character(len=32), intent(in) :: net logical :: answer answer = .false. if (trim(net) .eq. "CMORPH") answer = .true. @@ -4135,7 +4348,7 @@ end function is_cmorph ! Checks if observation "network" is recognized as IMERG retrievals. logical function is_imerg(net) implicit none - character(len=10), intent(in) :: net + character(len=32), intent(in) :: net logical :: answer answer = .false. if (trim(net) .eq. "IMERG") answer = .true. @@ -4367,8 +4580,7 @@ end subroutine destroy_hash2d subroutine build_hash2d(this,nest,imax,jmax,hash2d) ! Imports - use LIS_coreMod, only: LIS_rc, LIS_domain, LIS_localPet - use LIS_logMod, only: LIS_logunit + use LIS_coreMod, only: LIS_rc use LIS_mpiMod ! Defaults @@ -4382,26 +4594,21 @@ subroutine build_hash2d(this,nest,imax,jmax,hash2d) type(hash_list), allocatable, intent(out) :: hash2d(:,:) ! Local variables - real :: dlat, dlon, ctrlat, ctrlon integer :: nobs integer, allocatable :: cols(:), rows(:) - integer :: pet, pet_incr - logical :: found - integer :: j,r,c,gindex - integer :: ierr nobs = this%nobs if (nobs .eq. 0) return ! Get the columns and rows of the observations in the LIS grid - call find_LIS_cols_rows(this,nest,cols,rows) + call find_LIS_cols_rows(this, nest, cols, rows) ! Loop through the collected col, row information and add to the ! hash2d table. - call init_hash2d(LIS_rc%gnc(nest),LIS_rc%gnr(nest),hash2d) + call init_hash2d(LIS_rc%gnc(nest), LIS_rc%gnr(nest), hash2d) imax = LIS_rc%gnc(nest) ! Output jmax = LIS_rc%gnr(nest) ! Output - call insert_hash2d_array(imax,jmax,hash2d,nobs,cols,rows) + call insert_hash2d_array(imax, jmax, hash2d, nobs, cols, rows) ! do j = 1,nobs ! c = cols(j) ! if (c .eq. 0) cycle @@ -4768,6 +4975,7 @@ subroutine find_LIS_cols_rows(this,nest,cols,rows) use LIS_coreMod, only: LIS_rc, LIS_domain, LIS_localPet use LIS_logMod, only: LIS_logunit use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT ! Defaults implicit none @@ -4804,6 +5012,8 @@ subroutine find_LIS_cols_rows(this,nest,cols,rows) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in find_LIS_cols_rows') #endif do j = 1, nobs @@ -4884,8 +5094,12 @@ subroutine find_LIS_cols_rows(this,nest,cols,rows) cols = 0 #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in find_LIS_cols_rows') call MPI_ALLREDUCE(cols_pet,cols,nobs,MPI_INTEGER, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in find_LIS_cols_rows') #else cols(:) = cols_pet(:) #endif @@ -4896,8 +5110,12 @@ subroutine find_LIS_cols_rows(this,nest,cols,rows) rows = 0 #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in find_LIS_cols_rows') call MPI_ALLREDUCE(rows_pet,rows,nobs,MPI_INTEGER, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in find_LIS_cols_rows') #else rows(:) = rows_pet(:) #endif @@ -4910,11 +5128,10 @@ end subroutine find_LIS_cols_rows subroutine USAF_waterQC(this,nest,silent_rejects) ! Imports - use LIS_coreMod, only: LIS_rc use LIS_LMLCMod, only: LIS_LMLC use LIS_logMod, only: LIS_logunit use LIS_mpiMod - + use USAF_OBAmod, only: QC_REJECT ! Defaults implicit none @@ -4949,6 +5166,8 @@ subroutine USAF_waterQC(this,nest,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_waterQC') t1 = MPI_Wtime() #endif @@ -4986,6 +5205,8 @@ subroutine USAF_waterQC(this,nest,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_waterQC') t2 = MPI_Wtime() write(LIS_logunit,*) & '[INFO] Elapsed time in waterQC is ',t2-t1,' seconds' @@ -5009,6 +5230,7 @@ subroutine USAF_snowQC(this,nest,hourindex,threshold,silent_rejects) LIS_ews_ind, LIS_ewe_ind, LIS_nss_ind, LIS_nse_ind use LIS_logMod, only: LIS_logunit use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT ! Defaults implicit none @@ -5046,6 +5268,8 @@ subroutine USAF_snowQC(this,nest,hourindex,threshold,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_snowQC') t1 = MPI_Wtime() #endif @@ -5089,9 +5313,13 @@ subroutine USAF_snowQC(this,nest,hourindex,threshold,silent_rejects) allocate(sfctmp_1d(LIS_rc%gnc(nest)*LIS_rc%gnr(nest))) sfctmp_1d(:) = 0 call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_snowQC') call MPI_ALLREDUCE(sfctmp_1d_pet,sfctmp_1d, & LIS_rc%gnc(nest)*LIS_rc%gnr(nest),MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_snowQC') deallocate(sfctmp_1d_pet) #endif allocate(sfctmp(LIS_rc%gnc(nest), LIS_rc%gnr(nest))) @@ -5168,6 +5396,8 @@ subroutine USAF_snowQC(this,nest,hourindex,threshold,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_snowQC') t2 = MPI_Wtime() write(LIS_logunit,*) & '[INFO] Elapsed time in snowQC is ',t2-t1,' seconds' @@ -5193,6 +5423,7 @@ subroutine USAF_snowDepthQC(this,nest,silent_rejects) use LIS_logMod, only: LIS_logunit use LIS_snowMod, only: LIS_snow_struc use LIS_mpiMod + use USAF_OBAMod, only: QC_REJECT ! Defaults implicit none @@ -5229,6 +5460,8 @@ subroutine USAF_snowDepthQC(this,nest,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_snowDepthQC') t1 = MPI_Wtime() #endif @@ -5280,9 +5513,13 @@ subroutine USAF_snowDepthQC(this,nest,silent_rejects) allocate(snowdepth_1d(LIS_rc%gnc(nest)*LIS_rc%gnr(nest))) snowdepth_1d(:) = 0 call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_snowDepthQC') call MPI_ALLREDUCE(snowdepth_1d_pet,snowdepth_1d, & LIS_rc%gnc(nest)*LIS_rc%gnr(nest),MPI_REAL, & MPI_SUM, LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Allreduce call in USAF_snowDepthQC') deallocate(snowdepth_1d_pet) #endif allocate(snowdepth(LIS_rc%gnc(nest), LIS_rc%gnr(nest))) @@ -5350,6 +5587,8 @@ subroutine USAF_snowDepthQC(this,nest,silent_rejects) #if (defined SPMD) call MPI_Barrier(LIS_MPI_COMM, ierr) + call handle_mpi_error(ierr, & + 'MPI_Barrier call in USAF_snowDepthQC') t2 = MPI_Wtime() write(LIS_logunit,*) & '[INFO] Elapsed time in snowDepthQC is ',t2-t1,' seconds' @@ -5418,7 +5657,7 @@ subroutine USAF_analyzeScreen(screenObs,nest,back,sigmaBSqr, & use LIS_coreMod, only: LIS_rc, LIS_ews_halo_ind, LIS_ewe_halo_ind, & LIS_nss_halo_ind, LIS_nse_halo_ind, LIS_localPet use LIS_logMod, only: LIS_logunit - use USAF_OBAMod, only: OBA, createOBA, assignOBA + use USAF_OBAMod, only: OBA, createOBA, assignOBA, QC_REJECT ! Defaults implicit none @@ -5440,9 +5679,9 @@ subroutine USAF_analyzeScreen(screenObs,nest,back,sigmaBSqr, & real, allocatable :: invDataDensities(:) real, allocatable :: sumObsEstimates(:) integer :: npasses - character(len=10) :: new_name,type + character(len=32) :: new_name,type real :: convergeThresh - integer :: i,j + integer :: j TRACE_ENTER("bratseth_analyzeScrn") ! Initialize analysis field with the background first guess. This will @@ -5471,6 +5710,19 @@ subroutine USAF_analyzeScreen(screenObs,nest,back,sigmaBSqr, & write(LIS_logunit,*)'[INFO] Running dupQC on surface observations' call USAF_dupQC(screenObs) + ! Compare with background field + write(LIS_logunit,*)'[INFO] Running backQC on surface observations' + call USAF_backQC(screenObs,sigmaBSqr) + + ! Create "superobservations" from close reports + ! FIXME: Pass network argument. + new_name = "SUPEROB" + write(LIS_logunit,*)'[INFO] Running superstatQC on surface observations' + call USAF_superstatQC(screenObs,nest,new_name) + type = new_name + call USAF_interpBackToTypeObsData(screenObs,nest, & + LIS_rc%gnc(nest),LIS_rc%gnr(nest),back,type) + ! EMK...Option 2 just captures O and B info, and skips the ! analysis. if (agrmet_struc(nest)%oba_switch .eq. 2) then @@ -5478,30 +5730,18 @@ subroutine USAF_analyzeScreen(screenObs,nest,back,sigmaBSqr, & screenOBA = createOBA(nest,maxobs=goodObs) do j = 1, screenObs%nobs if (screenObs%qc(j) .eq. QC_REJECT) cycle + ! Include the QC_SUSPECT obs in the OBA file call assignOBA(screenOBA, & screenObs%net(j), screenObs%platform(j), & screenObs%lat(j), screenObs%lon(j), & screenObs%obs(j), screenObs%back(j), & - A=0.) + A=0., qc=screenObs%qc(j), set_qc_good=.true.) end do ! j call USAF_destroyObsData(screenObs) TRACE_EXIT("bratseth_analyzeScrn") return ! EMK TEST for O-B end if - ! Compare with background field - write(LIS_logunit,*)'[INFO] Running backQC on surface observations' - call USAF_backQC(screenObs,sigmaBSqr) - - ! Create "superobservations" from close reports - ! FIXME: Pass network argument. - new_name = "SUPEROB" - write(LIS_logunit,*)'[INFO] Running superstatQC on surface observations' - call USAF_superstatQC(screenObs,nest,new_name) - type = new_name - call USAF_interpBackToTypeObsData(screenObs,nest, & - LIS_rc%gnc(nest),LIS_rc%gnr(nest),back,type) - ! At this point, QC is done. Copy the good obs into a new structure ! for the analysis (this will speed up analysis calculations by ! filtering bad obs from the arrays.) @@ -5550,6 +5790,9 @@ end subroutine USAF_analyzeScreen ! been flagged for rejection by quality control. subroutine USAF_filterObsData(this,obsData) + ! Imports + use USAF_OBAMod, only: QC_REJECT + ! Defaults implicit none @@ -5558,18 +5801,20 @@ subroutine USAF_filterObsData(this,obsData) type(USAF_ObsData), intent(in) :: obsData ! Local variables - integer :: j + integer :: j, qc if ( obsData%nobs .eq. 0) return do j = 1, obsData%nobs if (obsData%qc(j) .eq. QC_REJECT) cycle + qc = obsData%qc(j) ! Keep QC_SUSPECT obs for OBA call USAF_assignObsData(this, & obsData%net(j),obsData%platform(j), & obsData%obs(j),obsData%lat(j),obsData%lon(j), & obsData%sigmaOSqr(j), & obsData%oErrScaleLength(j), & - back = obsData%back(j)) + back=obsData%back(j), & + qc=qc) end do ! j end subroutine USAF_filterObsData @@ -5603,7 +5848,7 @@ subroutine USAF_getCMORPHObsData(nest,j6hr,use_twelve, & integer, parameter :: YD = 1649 integer, parameter :: NCMOR = XD*YD real :: precip(XD,YD) - character(len=10) :: net, platform + character(len=32) :: net, platform real :: sigmaOSqr, oErrScaleLength integer :: count_good_obs character(len=120) :: fname @@ -5614,6 +5859,8 @@ subroutine USAF_getCMORPHObsData(nest,j6hr,use_twelve, & integer :: ftn, ios integer :: i,j,k + external :: cmorfile_agrmet + TRACE_ENTER("bratseth_getCMORPH") net = "CMORPH" platform = "CMORPH" @@ -6299,9 +6546,9 @@ subroutine USAF_setBratsethPrecipStats(src,nest) write(LIS_logunit,*) & '[ERR] Unknown source of background precipitation!' write(LIS_logunit,*) & - 'Source is ',trim(src) + '[ERR] Source is ',trim(src) write(LIS_logunit, *) & - 'ABORTING....' + '[ERR] ABORTING....' flush(LIS_logunit) call LIS_endrun() end if @@ -6332,6 +6579,11 @@ subroutine USAF_setBratsethScreenStats(src,n) agrmet_struc(n)%galwem_t2m_back_err_scale_length agrmet_struc(n)%bratseth_t2m_back_sigma_b_sqr = & agrmet_struc(n)%galwem_t2m_back_sigma_b_sqr + + !write(LIS_logunit,*)'EMK: n, GALWEM T2 err = ', n, & + ! agrmet_struc(n)%bratseth_t2m_back_sigma_b_sqr + !flush(LIS_logunit) + agrmet_struc(n)%bratseth_t2m_stn_sigma_o_sqr = & agrmet_struc(n)%galwem_t2m_stn_sigma_o_sqr agrmet_struc(n)%bratseth_t2m_max_dist = & @@ -6360,6 +6612,11 @@ subroutine USAF_setBratsethScreenStats(src,n) agrmet_struc(n)%gfs_t2m_back_err_scale_length agrmet_struc(n)%bratseth_t2m_back_sigma_b_sqr = & agrmet_struc(n)%gfs_t2m_back_sigma_b_sqr + + !write(LIS_logunit,*)'EMK: n, GFS T2 err = ', n, & + ! agrmet_struc(n)%bratseth_t2m_back_sigma_b_sqr + !flush(LIS_Logunit) + agrmet_struc(n)%bratseth_t2m_stn_sigma_o_sqr = & agrmet_struc(n)%gfs_t2m_stn_sigma_o_sqr agrmet_struc(n)%bratseth_t2m_max_dist = & @@ -6387,9 +6644,9 @@ subroutine USAF_setBratsethScreenStats(src,n) write(LIS_logunit,*) & '[ERR] Unknown source of background data!' write(LIS_logunit,*) & - 'Source is ',trim(src) + '[ERR] Source is ',trim(src) write(LIS_logunit, *) & - 'ABORTING....' + '[ERR] ABORTING....' flush(LIS_logunit) call LIS_endrun() end if @@ -6397,14 +6654,13 @@ subroutine USAF_setBratsethScreenStats(src,n) end subroutine USAF_setBratsethScreenStats - ! Read bias ratio for background field + ! Read bias ratio for background field (S2S version, which uses + ! data in the LDT parameter file) subroutine USAF_pcpBackBiasRatio_s2s(n, yyyymmddhh) ! Imports use AGRMET_forcingMod, only: agrmet_struc - use LIS_coreMod, only: LIS_rc, LIS_localPet, & - LIS_ews_halo_ind, LIS_ewe_halo_ind, & - LIS_nss_halo_ind, LIS_nse_halo_ind + use LIS_coreMod, only: LIS_rc use LIS_logMod, only: LIS_logunit, LIS_endrun, LIS_verify #if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) use netcdf @@ -6464,8 +6720,126 @@ subroutine USAF_pcpBackBiasRatio_s2s(n, yyyymmddhh) 'n90_get_var failed for PPT_ratio in LIS param file') call LIS_verify(nf90_close(ncid),& 'nf90_close failed in USAF_pcpBackBiasRatio_s2s') - #endif end subroutine USAF_pcpBackBiasRatio_s2s -end module USAF_bratsethMod + + ! Read bias ratio for background field (NRT version, which uses + ! data in standalone netCDF file) + subroutine USAF_pcpBackBiasRatio_nrt(n, yyyymmddhh) + + ! Imports + use AGRMET_forcingMod, only: agrmet_struc + use LIS_coreMod, only: LIS_rc!, LIS_localPet, & + !LIS_ews_halo_ind, LIS_ewe_halo_ind, & + !LIS_nss_halo_ind, LIS_nse_halo_ind + + use LIS_logMod, only: LIS_logunit, LIS_endrun, LIS_verify +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + use netcdf +#endif + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: n + character(len=10), intent(in) :: yyyymmddhh + + ! Locals + integer :: imonth + logical :: file_exists + integer :: ncid, ppt_ratio_Id + +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + + read(yyyymmddhh(5:6),'(i2.2)') imonth + + ! Accumulations ending at 00Z first of month are part of the + ! *previous* month. So decrement imonth by one in that situation, + ! and reset to 12 (December) at the year change. + if (agrmet_struc(n)%pcp_back_bias_ratio_month .ne. 0) then + if (yyyymmddhh(9:10) .eq. '00' .and. & + yyyymmddhh(7:8) .eq. '01') then + imonth = imonth - 1 + if (imonth .eq. 0) then + imonth = 12 + end if + end if + end if + if (imonth .eq. agrmet_struc(n)%pcp_back_bias_ratio_month .and. & + agrmet_struc(n)%pcp_back_bias_ratio_month .ne. 0) return + + agrmet_struc(n)%pcp_back_bias_ratio_month = imonth + + ! First, update the GFS ratios + inquire(file=agrmet_struc(n)%gfs_nrt_bias_ratio_file, & + exist=file_exists) + if (.not. file_exists) then + write(LIS_logunit,*) '[ERR] Cannot find ', & + trim(agrmet_struc(n)%gfs_nrt_bias_ratio_file) + call LIS_endrun() + end if + call LIS_verify( & + nf90_open(path=agrmet_struc(n)%gfs_nrt_bias_ratio_file, & + mode=NF90_NOWRITE, ncid=ncid), & + 'Error in nf90_open in USAF_pcpBackBiasRatio_nrt') + call LIS_verify(nf90_inq_varid(ncid, "biasRatio", ppt_ratio_Id), & + 'biasRatio field not found in bias file') + call LIS_verify(nf90_get_var(ncid, ppt_ratio_Id, & + agrmet_struc(n)%gfs_nrt_bias_ratio, & + start=(/1,1,imonth/), & + count=(/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)), & + 'n90_get_var failed for biasRatio in LIS param file') + write(LIS_logunit,*) & + '[INFO] Read GFS bias ratios for month ', imonth, & + ' from ', trim(agrmet_struc(n)%gfs_nrt_bias_ratio_file) + call LIS_verify(nf90_close(ncid),& + 'nf90_close failed in USAF_pcpBackBiasRatio_nrt') + + ! Repeat for GALWEM ratios + inquire(file=agrmet_struc(n)%galwem_nrt_bias_ratio_file, & + exist=file_exists) + if (.not. file_exists) then + write(LIS_logunit,*) '[ERR] Cannot find ', & + trim(agrmet_struc(n)%galwem_nrt_bias_ratio_file) + call LIS_endrun() + end if + call LIS_verify( & + nf90_open(path=agrmet_struc(n)%galwem_nrt_bias_ratio_file, & + mode=NF90_NOWRITE, ncid=ncid), & + 'Error in nf90_open in USAF_pcpBackBiasRatio_nrt') + call LIS_verify(nf90_inq_varid(ncid, "biasRatio", ppt_ratio_Id), & + 'biasRatio field not found in bias file') + call LIS_verify(nf90_get_var(ncid, ppt_ratio_Id, & + agrmet_struc(n)%galwem_nrt_bias_ratio, & + start=(/1,1,imonth/), & + count=(/LIS_rc%gnc(n),LIS_rc%gnr(n),1/)),& + 'n90_get_var failed for biasRatio in LIS param file') + write(LIS_logunit,*) & + '[INFO] Read GALWEM bias ratios for month ', imonth, & + ' from ', trim(agrmet_struc(n)%galwem_nrt_bias_ratio_file) + call LIS_verify(nf90_close(ncid),& + 'nf90_close failed in USAF_pcpBackBiasRatio_nrt') + +#endif + + end subroutine USAF_pcpBackBiasRatio_nrt + + subroutine handle_mpi_error(errorcode, msg) + use LIS_logMod, only: LIS_logunit, LIS_endrun + use LIS_mpiMod + implicit none + integer, intent(in) :: errorcode + character(*), intent(in) :: msg + character*(MPI_MAX_ERROR_STRING) :: buf + integer :: resultlen, ierr + if (errorcode .ne. MPI_SUCCESS) then + write(LIS_logunit,*)'[ERR] ', trim(msg) + call MPI_error_string(errorcode, buf, resultlen, ierr) + write(LIS_logunit,*)'[ERR] MPI error: ', trim(buf) + flush(LIS_logunit) + call LIS_endrun() + end if + end subroutine handle_mpi_error + end module USAF_bratsethMod diff --git a/lis/metforcing/usaf/USAF_getpcpobs.F90 b/lis/metforcing/usaf/USAF_getpcpobs.F90 new file mode 100644 index 000000000..cf702b306 --- /dev/null +++ b/lis/metforcing/usaf/USAF_getpcpobs.F90 @@ -0,0 +1,116 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! ROUTINE: USAF_getpcpcobs +! +! REVISION HISTORY: +! 17 Oct 2023 Initial version. Eric Kemp/SSAI/NASA. +! +! DESCRIPTION: +! New routine to retrieve precip observations and process with new +! USAF_Gages library. Supports legacy hemispheric and new global +! preobs file formats, and new presav2 file format. Borrows heavily +! from older AGRMET_getpcpobs subroutine. +!-------------------------------------------------------------------------- + +subroutine USAF_getpcpobs(n, j6hr, month, use_twelve, pcp_src, & + use_expanded_station_ids, alert_number, precip6, precip12) + + ! Imports + use AGRMET_forcingMod, only: agrmet_struc + use ESMF + use LIS_coreMod, only: LIS_rc + use LIS_logMod, only: LIS_logunit + use LIS_timeMgrMod, only: LIS_tick, LIS_julhr_date + use USAF_bratsethMod, only: USAF_ObsData, USAF_setbratsethprecipstats + use USAF_GagesMod, only : USAF_Gages_t + use USAF_PreobsReaderMod, only: USAF_read_preobs + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: n + integer, intent(in) :: j6hr + integer, intent(in) :: month + logical, intent(in) :: use_twelve + character*6, intent(in) :: pcp_src(4) + integer, intent(in) :: use_expanded_station_ids + integer, intent(inout):: alert_number + type(USAF_ObsData), intent(inout) :: precip6 + type(USAF_ObsData), intent(inout) :: precip12 + + ! Locals + integer :: j3hr + integer :: k + integer :: yr, mo, da, hr + character*255 :: preobsdir + character*8 :: yyyymmdd + character*10 :: yyyymmddhh + character*255 :: presav_filename + logical :: file_exists + type(USAF_Gages_t) :: obscur + + if (use_twelve) then + k = 3 + else + k = 1 + end if + + do j3hr = j6hr+3, j6hr+6, 3 + + ! Set Bratseth error statistics based on source of background field. + call USAF_setBratsethPrecipStats(pcp_src(k), n) + + call LIS_julhr_date(j3hr, yr, mo, da, hr) + if (agrmet_struc(n)%use_timestamp == 1) then + write(unit=yyyymmdd, fmt='(i4.4, i2.2, i2.2)') & + yr, mo, da + preobsdir = trim(agrmet_struc(n)%agrmetdir) // '/' & + // yyyymmdd // '/' & + // trim(agrmet_struc(n)%cdmsdir) // '/' + else + preobsdir = trim(agrmet_struc(n)%agrmetdir) // '/' & + // trim(agrmet_struc(n)%cdmsdir) // '/' + end if + + ! Read appropriate preobs file(s), intercompare with older presav2 + ! files, and create new presav2 file for current date/time. + call USAF_read_preobs(preobsdir, & + trim(agrmet_struc(n)%analysisdir), & + agrmet_struc(n)%use_timestamp, yr, mo, da, hr, & + use_expanded_station_ids, alert_number) + + ! If this is a synoptic time, read the presav2 file back in and + ! populate the appropriate USAF_ObsData object. + if ( mod(j3hr, 6) == 0 ) then + write(presav_filename,'(A,A,i4.4,i2.2,i2.2,i2.2)') & + trim(agrmet_struc(n)%analysisdir), '/presav2.03hr.', & + yr, mo, da, hr + inquire(file=presav_filename, exist=file_exists) + if (file_exists) then + write(yyyymmddhh,'(i4.4,i2.2,i2.2,i2.2)') & + yr, mo, da, hr + call obscur%read_data(presav_filename, yyyymmddhh, & + alert_number) + if (use_twelve) then + call obscur%copy_to_usaf_obsdata(12, & + agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & + precip12) + else + call obscur%copy_to_usaf_obsdata(6, & + agrmet_struc(n)%bratseth_precip_gauge_sigma_o_sqr, & + precip6) + end if + end if + end if + k = k + 1 + end do + +end subroutine USAF_getpcpobs diff --git a/lis/metforcing/usaf/USAF_sfcval.F90 b/lis/metforcing/usaf/USAF_sfcval.F90 index 989f6ff45..047d21e03 100644 --- a/lis/metforcing/usaf/USAF_sfcval.F90 +++ b/lis/metforcing/usaf/USAF_sfcval.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/compute_cod_based_clouds.F90 b/lis/metforcing/usaf/compute_cod_based_clouds.F90 index 6da9cbf2f..fd8158db5 100644 --- a/lis/metforcing/usaf/compute_cod_based_clouds.F90 +++ b/lis/metforcing/usaf/compute_cod_based_clouds.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/compute_type_based_clouds.F90 b/lis/metforcing/usaf/compute_type_based_clouds.F90 index 67c974bbb..f3805a862 100644 --- a/lis/metforcing/usaf/compute_type_based_clouds.F90 +++ b/lis/metforcing/usaf/compute_type_based_clouds.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/finalize_agrmet.F90 b/lis/metforcing/usaf/finalize_agrmet.F90 index 0a97ff567..9959ef967 100644 --- a/lis/metforcing/usaf/finalize_agrmet.F90 +++ b/lis/metforcing/usaf/finalize_agrmet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/get_agrmet.F90 b/lis/metforcing/usaf/get_agrmet.F90 index 422e7434a..00a2d2d72 100644 --- a/lis/metforcing/usaf/get_agrmet.F90 +++ b/lis/metforcing/usaf/get_agrmet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/interp_agrmetvar.F90 b/lis/metforcing/usaf/interp_agrmetvar.F90 index 1175b943e..00fd0ae8b 100644 --- a/lis/metforcing/usaf/interp_agrmetvar.F90 +++ b/lis/metforcing/usaf/interp_agrmetvar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/process_cloud_layers.F90 b/lis/metforcing/usaf/process_cloud_layers.F90 index d1f569d73..08d22f0c7 100644 --- a/lis/metforcing/usaf/process_cloud_layers.F90 +++ b/lis/metforcing/usaf/process_cloud_layers.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/read_cod.F90 b/lis/metforcing/usaf/read_cod.F90 index 5e82b3b9c..3e2d982d1 100644 --- a/lis/metforcing/usaf/read_cod.F90 +++ b/lis/metforcing/usaf/read_cod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/readagrmetforcing.F90 b/lis/metforcing/usaf/readagrmetforcing.F90 index 9cbb80d7a..2025fd88c 100644 --- a/lis/metforcing/usaf/readagrmetforcing.F90 +++ b/lis/metforcing/usaf/readagrmetforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/readagrmetforcinganalysis.F90 b/lis/metforcing/usaf/readagrmetforcinganalysis.F90 index 343930b41..36a69a52e 100644 --- a/lis/metforcing/usaf/readagrmetforcinganalysis.F90 +++ b/lis/metforcing/usaf/readagrmetforcinganalysis.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/readagrmetpcpforcing.F90 b/lis/metforcing/usaf/readagrmetpcpforcing.F90 index b875ff14e..083c15479 100644 --- a/lis/metforcing/usaf/readagrmetpcpforcing.F90 +++ b/lis/metforcing/usaf/readagrmetpcpforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -267,7 +267,7 @@ subroutine readagrmetpcpforcing(n,findex, order) ! precip12Imerg_tmp integer :: hourindex integer :: k1,k2,k3,k4 - character(len=10) :: type + character(len=32) :: type character(len=10) :: yyyymmddhh character(len=50) :: pathOBA logical :: found_inq @@ -280,9 +280,10 @@ subroutine readagrmetpcpforcing(n,findex, order) integer*2 :: imerg_plp_thresh real :: imerg_sigmaOSqr real :: imerg_oErrScaleLength - character(len=10) :: imerg_net, imerg_platform + character(len=32) :: imerg_net, imerg_platform real :: sigmaBSqr - character(len=10) :: new_name + character(len=32) :: new_name + integer :: use_expanded_station_ids data alert_number / 0 / data srcwts /100.0,50.0,4.0,4.0,1.0,1.0,60.0,1.0/ data addrad /0, -1, -2, -4, -5, -5, 0, -2/ @@ -399,14 +400,18 @@ subroutine readagrmetpcpforcing(n,findex, order) write(LIS_logunit,*) & '[INFO] Fetching 6-hr gage data' call USAF_createObsData(precip_6hr_gage_tmp,n,maxobs=15000) - call AGRMET_getpcpobs(n, julbeg, LIS_rc%mo, prcpwe, & - use_twelve, p6, p12, alert_number, precip_6hr_gage_tmp, & - precip_12hr_gage_tmp, & - pcp_src) + !call AGRMET_getpcpobs(n, julbeg, LIS_rc%mo, prcpwe, & + ! use_twelve, p6, p12, alert_number, precip_6hr_gage_tmp, & + ! precip_12hr_gage_tmp, & + ! pcp_src) + use_expanded_station_ids = agrmet_struc(n)%pcpobsfmt - 1 + call USAF_getpcpobs(n, julbeg, LIS_rc%mo, use_twelve, & + pcp_src, use_expanded_station_ids, alert_number, & + precip_6hr_gage_tmp, precip_12hr_gage_tmp) ! Reject data over water write(LIS_logunit,*) & - '[INFO] Running waterQC on 0-6 hr gauge observations' + '[INFO] Running waterQC on 6 hr gauge observations' call USAF_waterQC(precip_6hr_gage_tmp,n) nobs_good = USAF_countGoodObs(precip_6hr_gage_tmp) nobs_good_extra = nint(nobs_good*1.10) @@ -523,25 +528,25 @@ subroutine readagrmetpcpforcing(n,findex, order) silent_rejects=.true.) ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly SSMI obs, set ',ii - call USAF_backQC(precip_3hrly_ssmi_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + !if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly SSMI obs, set ',ii + ! call USAF_backQC(precip_3hrly_ssmi_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + !end if ! Create "superobservations" from close SSMI retrievals - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERSSMI" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly SSMI obs, set ',ii - call USAF_superstatQC(precip_3hrly_SSMI_tmp(ii),n,new_name, & - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_ssmi_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + !if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERSSMI" + ! write(LIS_logunit,*) & + ! '[INFO] Running superstatQC on 3hrly SSMI obs, set ',ii + ! call USAF_superstatQC(precip_3hrly_SSMI_tmp(ii),n,new_name, & + ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_ssmi_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + !end if ! Filter out the bad obs nobs_good = USAF_countGoodObs(precip_3hrly_ssmi_tmp(ii)) @@ -608,26 +613,27 @@ subroutine readagrmetpcpforcing(n,findex, order) silent_rejects=.true.) ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly GEOPRECIP obs, set ',ii - call USAF_backQC(precip_3hrly_geop_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + !if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly GEOPRECIP obs, set ',ii + ! call USAF_backQC(precip_3hrly_geop_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + !end if ! Create "superobservations" from close obs - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERGEO" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly GEOPRECIP obs, set ',& - ii - call USAF_superstatQC(precip_3hrly_geop_tmp(ii),n,new_name,& - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_geop_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERGEO" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly GEOPRECIP obs, set ',& + ! ! ii + ! !call USAF_superstatQC(precip_3hrly_geop_tmp(ii),n,new_name,& + ! ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_geop_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if + ! Filter the bad obs nobs_good = USAF_countGoodObs(precip_3hrly_geop_tmp(ii)) call USAF_createObsData(precip_3hrly_geop(ii),n, & @@ -692,26 +698,26 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_snowDepthQC(precip_3hrly_cmorph_tmp(ii),n, & silent_rejects=.true.) - ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly CMORPH obs, set ',ii - call USAF_backQC(precip_3hrly_cmorph_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + ! ! Compare with background field + ! if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly CMORPH obs, set ',ii + ! call USAF_backQC(precip_3hrly_cmorph_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + ! end if ! Create "superobservations" from close CMORPH retrievals - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERCMRPH" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly CMORPH obs, set ',ii - call USAF_superstatQC(precip_3hrly_cmorph_tmp(ii),n,new_name, & - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_cmorph_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERCMRPH" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly CMORPH obs, set ',ii + ! !call USAF_superstatQC(precip_3hrly_cmorph_tmp(ii),n,new_name, & + ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_cmorph_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if ! Filter out the bad obs nobs_good = USAF_countGoodObs(precip_3hrly_cmorph_tmp(ii)) @@ -782,26 +788,27 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_snowDepthQC(precip_3hrly_imerg_tmp(ii),n, & silent_rejects=.true.) - ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly IMERG obs, set ',ii - call USAF_backQC(precip_3hrly_imerg_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + ! ! Compare with background field + ! if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly IMERG obs, set ',ii + ! call USAF_backQC(precip_3hrly_imerg_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + ! end if ! Create "superobservations" from close IMERG retrievals - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERIMERG" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly IMERG obs, set ',ii - call USAF_superstatQC(precip_3hrly_imerg_tmp(ii),n,new_name, & - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_imerg_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERIMERG" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly IMERG obs, set ',ii + ! !call USAF_superstatQC(precip_3hrly_imerg_tmp(ii),n,new_name, & + ! ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_imerg_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if + ! Filter out bad obs nobs_good = USAF_countGoodObs(precip_3hrly_imerg_tmp(ii)) call USAF_createObsData(precip_3hrly_imerg(ii),n, & @@ -912,20 +919,28 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_createObsData(precip_12hr_gage_tmp,n,maxobs=15000) ! EMK...Call this twice to ensure we get obs for first two time ! levels. - call AGRMET_getpcpobs(n, julbeg, LIS_rc%mo, prcpwe, & - .false., p6, p12, alert_number,precip_6hr_gage_tmp, & - precip_12hr_gage_tmp, & - pcp_src) - call AGRMET_getpcpobs(n, julbeg+6, LIS_rc%mo, prcpwe, & - .true., p6, p12, alert_number,precip_6hr_gage_tmp, & - precip_12hr_gage_tmp, & - pcp_src) + !call AGRMET_getpcpobs(n, julbeg, LIS_rc%mo, prcpwe, & + ! .false., p6, p12, alert_number,precip_6hr_gage_tmp, & + ! precip_12hr_gage_tmp, & + ! pcp_src) + !call AGRMET_getpcpobs(n, julbeg+6, LIS_rc%mo, prcpwe, & + ! .true., p6, p12, alert_number,precip_6hr_gage_tmp, & + ! precip_12hr_gage_tmp, & + ! pcp_src) + use_expanded_station_ids = agrmet_struc(n)%pcpobsfmt - 1 + call USAF_getpcpobs(n, julbeg, LIS_rc%mo, .false., pcp_src, & + use_expanded_station_ids, alert_number, & + precip_6hr_gage_tmp, precip_12hr_gage_tmp) + call USAF_getpcpobs(n, julbeg+6, LIS_rc%mo, .true., pcp_src, & + use_expanded_station_ids, alert_number, & + precip_6hr_gage_tmp, precip_12hr_gage_tmp) + ! Not needed at this point since we have the 12hr accum call USAF_destroyObsData(precip_6hr_gage_tmp) ! Reject and filter out gage reports over water write(LIS_logunit,*) & - '[INFO] Running waterQC on 6-12 hr gauge observations' + '[INFO] Running waterQC on 12 hr gauge observations' call USAF_waterQC(precip_12hr_gage_tmp,n) nobs_good = USAF_countGoodObs(precip_12hr_gage_tmp) nobs_good_extra = nint(nobs_good*1.10) @@ -1054,26 +1069,26 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_snowDepthQC(precip_3hrly_ssmi_tmp(ii),n, & silent_rejects=.true.) - ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly SSMI obs, set ',ii - call USAF_backQC(precip_3hrly_ssmi_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + ! ! Compare with background field + ! if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly SSMI obs, set ',ii + ! call USAF_backQC(precip_3hrly_ssmi_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + ! end if ! Create "superobservations" from close SSMI reports - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERSSMI" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly SSMI obs, set ',ii - call USAF_superstatQC(precip_3hrly_ssmi_tmp(ii),n,new_name, & - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_ssmi_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERSSMI" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly SSMI obs, set ',ii + ! !call USAF_superstatQC(precip_3hrly_ssmi_tmp(ii),n,new_name, & + ! ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_ssmi_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if ! Filter out the bad obs nobs_good = USAF_countGoodObs(precip_3hrly_ssmi_tmp(ii)) @@ -1147,27 +1162,27 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_snowDepthQC(precip_3hrly_geop_tmp(ii),n, & silent_rejects=.true.) - ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly GEOPRECIP obs, set ',ii - call USAF_backQC(precip_3hrly_geop_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + ! ! Compare with background field + ! if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly GEOPRECIP obs, set ',ii + ! call USAF_backQC(precip_3hrly_geop_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + ! end if ! Create "superobservations" from close GEOPRECIP reports - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERGEO" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly GEOPRECIP obs, set ',& - ii - call USAF_superstatQC(precip_3hrly_geop_tmp(ii),n,new_name, & - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_geop_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERGEO" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly GEOPRECIP obs, set ',& + ! ! ii + ! !call USAF_superstatQC(precip_3hrly_geop_tmp(ii),n,new_name, & + ! ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_geop_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if ! Filter out bad obs nobs_good = USAF_countGoodObs(precip_3hrly_geop_tmp(ii)) @@ -1239,27 +1254,27 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_snowDepthQC(precip_3hrly_cmorph_tmp(ii),n, & silent_rejects=.true.) - ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly CMORPH obs, set ',ii - call USAF_backQC(precip_3hrly_cmorph_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + ! ! Compare with background field + ! if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly CMORPH obs, set ',ii + ! call USAF_backQC(precip_3hrly_cmorph_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + ! end if ! Create "superobservations" from close CMORPH reports - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERCMRPH" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly CMORPH obs, set ',& - ii - call USAF_superstatQC(precip_3hrly_cmorph_tmp(ii),n,new_name, & - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_cmorph_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERCMRPH" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly CMORPH obs, set ',& + ! ! ii + ! !call USAF_superstatQC(precip_3hrly_cmorph_tmp(ii),n,new_name, & + ! ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_cmorph_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if ! Filter out bad obs nobs_good = USAF_countGoodObs(precip_3hrly_cmorph_tmp(ii)) @@ -1331,27 +1346,27 @@ subroutine readagrmetpcpforcing(n,findex, order) call USAF_snowDepthQC(precip_3hrly_imerg_tmp(ii),n, & silent_rejects=.true.) - ! Compare with background field - if (agrmet_struc(n)%skip_backqc .ne. 1) then - write(LIS_logunit,*) & - '[INFO] Running backQC on 3hrly IMERG obs, set ',ii - call USAF_backQC(precip_3hrly_imerg_tmp(ii),sigmaBSqr, & - silent_rejects=.true.) - end if + ! ! Compare with background field + ! if (agrmet_struc(n)%skip_backqc .ne. 1) then + ! write(LIS_logunit,*) & + ! '[INFO] Running backQC on 3hrly IMERG obs, set ',ii + ! call USAF_backQC(precip_3hrly_imerg_tmp(ii),sigmaBSqr, & + ! silent_rejects=.true.) + ! end if ! Create "superobservations" from close IMERG reports - if (agrmet_struc(n)%skip_superstatqc .ne. 1) then - new_name = "SUPERIMERG" - write(LIS_logunit,*) & - '[INFO] Running superstatQC on 3hrly IMERG obs, set ',& - ii - call USAF_superstatQC(precip_3hrly_imerg_tmp(ii),n,new_name,& - silent_rejects=.true.) - type = new_name - call USAF_interpBackToTypeObsData(precip_3hrly_imerg_tmp(ii),& - n, & - LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) - end if + ! if (agrmet_struc(n)%skip_superstatqc .ne. 1) then + ! new_name = "SUPERIMERG" + ! !write(LIS_logunit,*) & + ! ! '[INFO] Running superstatQC on 3hrly IMERG obs, set ',& + ! ! ii + ! !call USAF_superstatQC(precip_3hrly_imerg_tmp(ii),n,new_name,& + ! ! silent_rejects=.true.) + ! type = new_name + ! call USAF_interpBackToTypeObsData(precip_3hrly_imerg_tmp(ii),& + ! n, & + ! LIS_rc%gnc(n),LIS_rc%gnr(n),back4(:,:,ii),type) + ! end if ! Filter out the bad obs nobs_good = USAF_countGoodObs(precip_3hrly_imerg_tmp(ii)) diff --git a/lis/metforcing/usaf/readagrmetpcpforcinganalysis.F90 b/lis/metforcing/usaf/readagrmetpcpforcinganalysis.F90 index ac7d4352e..cbaa27a81 100644 --- a/lis/metforcing/usaf/readagrmetpcpforcinganalysis.F90 +++ b/lis/metforcing/usaf/readagrmetpcpforcinganalysis.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -127,13 +127,13 @@ subroutine readagrmetpcpforcinganalysis(n,findex, order) //'.03hr.'//date10_03 endif - write(LIS_logunit,*)' - READING precip ',ifil + write(LIS_logunit,*)'[INFO] READING precip ',ifil inquire(file=ifil,exist=exists) if(exists) then call LIS_putget(gi(hemi,:,:), 'r', ifil, & routine_name, agrmet_struc(n)%imax, agrmet_struc(n)%jmax ) else - write(LIS_logunit,*) 'premrg file does not exist' + write(LIS_logunit,*) '[ERR] premrg file does not exist' write(LIS_logunit,*) ifil call LIS_endrun() endif diff --git a/lis/metforcing/usaf/readcrd_agrmet.F90 b/lis/metforcing/usaf/readcrd_agrmet.F90 index 05452a3a4..ebac8311a 100644 --- a/lis/metforcing/usaf/readcrd_agrmet.F90 +++ b/lis/metforcing/usaf/readcrd_agrmet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -40,7 +40,7 @@ subroutine readcrd_agrmet() use LIS_logMod, only : LIS_logunit, LIS_verify, LIS_abort, & LIS_endrun #if (defined SPMD) - use LIS_mpiMod, only: LIS_MPI_COMM + use LIS_mpiMod #endif use LIS_pluginIndices, only : LIS_agrmetrunId use AGRMET_forcingMod, only : agrmet_struc @@ -62,12 +62,13 @@ subroutine readcrd_agrmet() integer, external :: LIS_create_subdirs integer :: tmp_imerg_plp_thresh integer :: ierr + logical :: use_nrt_bias_files ! EMK call ESMF_ConfigFindLabel(LIS_config,"AGRMET forcing directory:",rc=rc) do n=1,LIS_rc%nnest call ESMF_ConfigGetAttribute(LIS_config,agrmet_struc(n)%agrmetdir,rc=rc) - write(LIS_logunit,*)'Using AGRMET forcing' - write(LIS_logunit,*) 'AGRMET forcing directory :',agrmet_struc(n)%agrmetdir + write(LIS_logunit,*)'[INFO] Using AGRMET forcing' + write(LIS_logunit,*) '[INFO] AGRMET forcing directory: ', trim(agrmet_struc(n)%agrmetdir) enddo call ESMF_ConfigFindLabel(LIS_config,"AGRMET first guess source:",rc=rc) @@ -194,6 +195,65 @@ subroutine readcrd_agrmet() do n=1,LIS_rc%nnest call ESMF_ConfigGetAttribute(LIS_config,agrmet_struc(n)%pcpobswch,rc=rc) enddo + + ! EMK...Precip observation file formats + call ESMF_ConfigFindLabel(LIS_config,"AGRMET precip obs file format:", & + rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + agrmet_struc(n)%pcpobsfmt, rc=rc) + if (agrmet_struc(n)%pcpobsfmt .ne. 1 .and. & + agrmet_struc(n)%pcpobsfmt .ne. 2) then + write(LIS_logunit,*) & + "[ERR] Bad 'AGRMET precip obs file format:' option" + write(LIS_logunit,*) & + '[ERR] Expected 1 or 2, found ', agrmet_struc(n)%pcpobsfmt + write(LIS_logunit,*) '[ERR] Aborting...' + + flush(LIS_logunit) + message(1) = & + '[ERR] Illegal value for AGRMET precip obs file format' +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) +#endif + if (LIS_masterproc) then + call LIS_abort(message) + else + call sleep(10) + call LIS_endrun() + end if + end if + enddo + + ! EMK...Sfc observation file formats + call ESMF_ConfigFindLabel(LIS_config,"AGRMET sfc obs file format:", & + rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + agrmet_struc(n)%sfcobsfmt, rc=rc) + if (agrmet_struc(n)%sfcobsfmt .ne. 1 .and. & + agrmet_struc(n)%sfcobsfmt .ne. 2) then + write(LIS_logunit,*) & + "[ERR] Bad 'AGRMET sfc obs file format:' option" + write(LIS_logunit,*) & + '[ERR] Expected 1 or 2, found ', agrmet_struc(n)%sfcobsfmt + write(LIS_logunit,*) '[ERR] Aborting...' + + flush(LIS_logunit) + message(1) = & + '[ERR] Illegal value for AGRMET sfc obs file format' +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) +#endif + if (LIS_masterproc) then + call LIS_abort(message) + else + call sleep(10) + call LIS_endrun() + end if + end if + enddo + call ESMF_ConfigFindLabel(LIS_config,"AGRMET native imax:",rc=rc) do n=1,LIS_rc%nnest call ESMF_ConfigGetAttribute(LIS_config,agrmet_struc(n)%imaxnative,rc=rc) @@ -1091,16 +1151,59 @@ subroutine readcrd_agrmet() call LIS_verify(rc, & "[ERR] AGRMET PPT Background bias correction option: not specified in config file") if (agrmet_struc(n)%back_bias_corr .lt. 0 .or. & - agrmet_struc(n)%back_bias_corr .gt. 1) then + agrmet_struc(n)%back_bias_corr .gt. 2) then call LIS_verify(rc, & - "[ERR] AGRMET PPT Background bias correction option: bad value in config file, set 0 or 1") + "[ERR] AGRMET PPT Background bias correction option: bad value in config file, set 0, 1, or 2") end if if (agrmet_struc(n)%back_bias_corr .eq. 1) then allocate(agrmet_struc(n)%pcp_back_bias_ratio(LIS_rc%gnc(n),LIS_rc%gnr(n))) agrmet_struc(n)%pcp_back_bias_ratio = 1. agrmet_struc(n)%pcp_back_bias_ratio_month = 0 + else if (agrmet_struc(n)%back_bias_corr .eq. 2) then + + allocate(agrmet_struc(n)%gfs_nrt_bias_ratio( & + LIS_rc%gnc(n),LIS_rc%gnr(n))) + allocate(agrmet_struc(n)%galwem_nrt_bias_ratio( & + LIS_rc%gnc(n),LIS_rc%gnr(n))) + agrmet_struc(n)%gfs_nrt_bias_ratio = 1. + agrmet_struc(n)%galwem_nrt_bias_ratio = 1. + agrmet_struc(n)%pcp_back_bias_ratio_month = 0 end if - enddo ! n + end do + + ! EMK Add support for NRT bias files for GFS and GALWEM + use_nrt_bias_files = .false. + do n = 1, LIS_rc%nnest + if (agrmet_struc(n)%back_bias_corr .eq. 2) then + use_nrt_bias_files = .true. + exit + end if + end do + + if (use_nrt_bias_files) then + call ESMF_ConfigFindLabel(LIS_config, & + "AGRMET PPT GFS NRT bias file:", rc=rc) + call LIS_verify(rc, & + "[ERR] AGRMET PPT GFS NRT bias file: not specified in config file") + + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + agrmet_struc(n)%gfs_nrt_bias_ratio_file, rc=rc) + call LIS_verify(rc, & + "[ERR] AGRMET PPT GFS NRT bias file: not specified in config file") + end do + + call ESMF_ConfigFindLabel(LIS_config, & + "AGRMET PPT GALWEM NRT bias file:", rc=rc) + call LIS_verify(rc, & + "[ERR] AGRMET PPT GALWEM NRT bias file: not specified in config file") + do n = 1, LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, & + agrmet_struc(n)%galwem_nrt_bias_ratio_file, rc=rc) + call LIS_verify(rc, & + "[ERR] AGRMET PPT GALWEM NRT bias file: not specified in config file") + end do + end if do n=1,LIS_rc%nnest agrmet_struc(n)%radProcessInterval = 1 @@ -1126,7 +1229,7 @@ subroutine readcrd_agrmet() if (LIS_masterproc) then ios = LIS_create_subdirs(len_trim(c_string),trim(c_string)) if (ios .ne. 0) then - write(LIS_logunit,*)'ERR creating directory ', & + write(LIS_logunit,*)'[ERR] Cannot create directory ', & trim(agrmet_struc(n)%analysisdir) flush(LIS_logunit) end if diff --git a/lis/metforcing/usaf/reset_agrmet.F90 b/lis/metforcing/usaf/reset_agrmet.F90 index e6e8e0fea..89be4d0b5 100644 --- a/lis/metforcing/usaf/reset_agrmet.F90 +++ b/lis/metforcing/usaf/reset_agrmet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/retrieve_agrmetvar.F90 b/lis/metforcing/usaf/retrieve_agrmetvar.F90 index 1bbda0e68..9bcf34ba7 100644 --- a/lis/metforcing/usaf/retrieve_agrmetvar.F90 +++ b/lis/metforcing/usaf/retrieve_agrmetvar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/usaf/timeinterp_agrmet.F90 b/lis/metforcing/usaf/timeinterp_agrmet.F90 index a016c3b48..f4ecf2303 100644 --- a/lis/metforcing/usaf/timeinterp_agrmet.F90 +++ b/lis/metforcing/usaf/timeinterp_agrmet.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/0Intro_vicforcing.txt b/lis/metforcing/vicforcing.4.1.2/0Intro_vicforcing.txt index 4ba3bad3d..bb4bc9a41 100755 --- a/lis/metforcing/vicforcing.4.1.2/0Intro_vicforcing.txt +++ b/lis/metforcing/vicforcing.4.1.2/0Intro_vicforcing.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90 b/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90 index c7f595997..cf8830ae3 100755 --- a/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90 +++ b/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90.tinterp b/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90.tinterp index ff9affe7e..60914374d 100755 --- a/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90.tinterp +++ b/lis/metforcing/vicforcing.4.1.2/getvicforcing.F90.tinterp @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/readviccrd.F90 b/lis/metforcing/vicforcing.4.1.2/readviccrd.F90 index d04a17184..6a8fe89f1 100755 --- a/lis/metforcing/vicforcing.4.1.2/readviccrd.F90 +++ b/lis/metforcing/vicforcing.4.1.2/readviccrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90 b/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90 index 5ff0dad56..dabc6047c 100755 --- a/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90 +++ b/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90.tinterp b/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90.tinterp index 611cd412d..a5daf029b 100755 --- a/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90.tinterp +++ b/lis/metforcing/vicforcing.4.1.2/time_interp_vicforcing.F90.tinterp @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/vic412_read_gridded_forcing_data.F90 b/lis/metforcing/vicforcing.4.1.2/vic412_read_gridded_forcing_data.F90 index b5016d5cc..bb0874ed6 100755 --- a/lis/metforcing/vicforcing.4.1.2/vic412_read_gridded_forcing_data.F90 +++ b/lis/metforcing/vicforcing.4.1.2/vic412_read_gridded_forcing_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/vic_forcingMod.F90 b/lis/metforcing/vicforcing.4.1.2/vic_forcingMod.F90 index e63c2ab46..76b8fb8ea 100755 --- a/lis/metforcing/vicforcing.4.1.2/vic_forcingMod.F90 +++ b/lis/metforcing/vicforcing.4.1.2/vic_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/vicforcing_finalize.F90 b/lis/metforcing/vicforcing.4.1.2/vicforcing_finalize.F90 index a45dd51a4..d59acce38 100755 --- a/lis/metforcing/vicforcing.4.1.2/vicforcing_finalize.F90 +++ b/lis/metforcing/vicforcing.4.1.2/vicforcing_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing.4.1.2/vicforcing_reset.F90 b/lis/metforcing/vicforcing.4.1.2/vicforcing_reset.F90 index 32a39613a..fb7fd54db 100755 --- a/lis/metforcing/vicforcing.4.1.2/vicforcing_reset.F90 +++ b/lis/metforcing/vicforcing.4.1.2/vicforcing_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/0Intro_vicforcing.txt b/lis/metforcing/vicforcing/0Intro_vicforcing.txt index 4ba3bad3d..bb4bc9a41 100644 --- a/lis/metforcing/vicforcing/0Intro_vicforcing.txt +++ b/lis/metforcing/vicforcing/0Intro_vicforcing.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/getvicforcing.F90 b/lis/metforcing/vicforcing/getvicforcing.F90 index e79484933..c33325558 100644 --- a/lis/metforcing/vicforcing/getvicforcing.F90 +++ b/lis/metforcing/vicforcing/getvicforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/getvicforcing.F90.tinterp b/lis/metforcing/vicforcing/getvicforcing.F90.tinterp index ff9affe7e..60914374d 100644 --- a/lis/metforcing/vicforcing/getvicforcing.F90.tinterp +++ b/lis/metforcing/vicforcing/getvicforcing.F90.tinterp @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/readviccrd.F90 b/lis/metforcing/vicforcing/readviccrd.F90 index d1268aaef..a0ac8da88 100644 --- a/lis/metforcing/vicforcing/readviccrd.F90 +++ b/lis/metforcing/vicforcing/readviccrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/time_interp_vicforcing.F90 b/lis/metforcing/vicforcing/time_interp_vicforcing.F90 index 46f34a2c8..49abef3d2 100644 --- a/lis/metforcing/vicforcing/time_interp_vicforcing.F90 +++ b/lis/metforcing/vicforcing/time_interp_vicforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/time_interp_vicforcing.F90.tinterp b/lis/metforcing/vicforcing/time_interp_vicforcing.F90.tinterp index 611cd412d..a5daf029b 100644 --- a/lis/metforcing/vicforcing/time_interp_vicforcing.F90.tinterp +++ b/lis/metforcing/vicforcing/time_interp_vicforcing.F90.tinterp @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/vic411_read_gridded_forcing_data.F90 b/lis/metforcing/vicforcing/vic411_read_gridded_forcing_data.F90 index ac06a0938..b95e4074b 100644 --- a/lis/metforcing/vicforcing/vic411_read_gridded_forcing_data.F90 +++ b/lis/metforcing/vicforcing/vic411_read_gridded_forcing_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/vic_forcingMod.F90 b/lis/metforcing/vicforcing/vic_forcingMod.F90 index b3f678711..2647babde 100644 --- a/lis/metforcing/vicforcing/vic_forcingMod.F90 +++ b/lis/metforcing/vicforcing/vic_forcingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/vicforcing_finalize.F90 b/lis/metforcing/vicforcing/vicforcing_finalize.F90 index f69bd76ed..f8b463884 100644 --- a/lis/metforcing/vicforcing/vicforcing_finalize.F90 +++ b/lis/metforcing/vicforcing/vicforcing_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/metforcing/vicforcing/vicforcing_reset.F90 b/lis/metforcing/vicforcing/vicforcing_reset.F90 index 3fdbcb895..54dd34bc3 100644 --- a/lis/metforcing/vicforcing/vicforcing_reset.F90 +++ b/lis/metforcing/vicforcing/vicforcing_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/offline/lisdrv.F90 b/lis/offline/lisdrv.F90 index 428241531..dee7ccfbe 100644 --- a/lis/offline/lisdrv.F90 +++ b/lis/offline/lisdrv.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/0Intro_paramest.txt b/lis/optUE/0Intro_paramest.txt index bcee4c2b8..0880f0275 100644 --- a/lis/optUE/0Intro_paramest.txt +++ b/lis/optUE/0Intro_paramest.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/DEMC/DEMCAlgorithm.F90 b/lis/optUE/algorithm/DEMC/DEMCAlgorithm.F90 index 34c2e300d..6048ac7db 100644 --- a/lis/optUE/algorithm/DEMC/DEMCAlgorithm.F90 +++ b/lis/optUE/algorithm/DEMC/DEMCAlgorithm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/DEMC/DEMC_varctl.F90 b/lis/optUE/algorithm/DEMC/DEMC_varctl.F90 index 0cf7353ba..74939421d 100644 --- a/lis/optUE/algorithm/DEMC/DEMC_varctl.F90 +++ b/lis/optUE/algorithm/DEMC/DEMC_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/DEMCz/0Intro_demc.txt b/lis/optUE/algorithm/DEMCz/0Intro_demc.txt index 30352420a..c91202c7a 100644 --- a/lis/optUE/algorithm/DEMCz/0Intro_demc.txt +++ b/lis/optUE/algorithm/DEMCz/0Intro_demc.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/DEMCz/DEMCzAlgorithm.F90 b/lis/optUE/algorithm/DEMCz/DEMCzAlgorithm.F90 index 56fed4aab..be6a6b4b9 100644 --- a/lis/optUE/algorithm/DEMCz/DEMCzAlgorithm.F90 +++ b/lis/optUE/algorithm/DEMCz/DEMCzAlgorithm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/DEMCz/DEMCz_varctl.F90 b/lis/optUE/algorithm/DEMCz/DEMCz_varctl.F90 index 191bc1164..4115fbc6c 100644 --- a/lis/optUE/algorithm/DEMCz/DEMCz_varctl.F90 +++ b/lis/optUE/algorithm/DEMCz/DEMCz_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/ES/ES_varctl.F90 b/lis/optUE/algorithm/ES/ES_varctl.F90 index fc89ac9db..6fc782045 100644 --- a/lis/optUE/algorithm/ES/ES_varctl.F90 +++ b/lis/optUE/algorithm/ES/ES_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/ES/EnumeratedSearch.F90 b/lis/optUE/algorithm/ES/EnumeratedSearch.F90 index a62213870..bc8ea29ac 100644 --- a/lis/optUE/algorithm/ES/EnumeratedSearch.F90 +++ b/lis/optUE/algorithm/ES/EnumeratedSearch.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/GA/0Intro_ga.txt b/lis/optUE/algorithm/GA/0Intro_ga.txt index 151b2a41a..c67afc669 100644 --- a/lis/optUE/algorithm/GA/0Intro_ga.txt +++ b/lis/optUE/algorithm/GA/0Intro_ga.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/GA/GA_varctl.F90 b/lis/optUE/algorithm/GA/GA_varctl.F90 index 7b8ec7849..b366503b7 100644 --- a/lis/optUE/algorithm/GA/GA_varctl.F90 +++ b/lis/optUE/algorithm/GA/GA_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/GA/GeneticAlgorithm.F90 b/lis/optUE/algorithm/GA/GeneticAlgorithm.F90 index 8a26d3f07..e09c1451d 100644 --- a/lis/optUE/algorithm/GA/GeneticAlgorithm.F90 +++ b/lis/optUE/algorithm/GA/GeneticAlgorithm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/LM/LM_varctl.F90 b/lis/optUE/algorithm/LM/LM_varctl.F90 index 7427f9247..729a0a299 100755 --- a/lis/optUE/algorithm/LM/LM_varctl.F90 +++ b/lis/optUE/algorithm/LM/LM_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/LM/LevenbergMarquardt.F90 b/lis/optUE/algorithm/LM/LevenbergMarquardt.F90 index f07985ea8..11a4fe809 100755 --- a/lis/optUE/algorithm/LM/LevenbergMarquardt.F90 +++ b/lis/optUE/algorithm/LM/LevenbergMarquardt.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/MCSIM/MCSIMAlgorithm.F90 b/lis/optUE/algorithm/MCSIM/MCSIMAlgorithm.F90 index 97b75c5af..c78bb804e 100644 --- a/lis/optUE/algorithm/MCSIM/MCSIMAlgorithm.F90 +++ b/lis/optUE/algorithm/MCSIM/MCSIMAlgorithm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/MCSIM/MCSIM_varctl.F90 b/lis/optUE/algorithm/MCSIM/MCSIM_varctl.F90 index 5f2a738da..353718e8a 100644 --- a/lis/optUE/algorithm/MCSIM/MCSIM_varctl.F90 +++ b/lis/optUE/algorithm/MCSIM/MCSIM_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/RWMCMC/RWMCMCAlgorithm.F90 b/lis/optUE/algorithm/RWMCMC/RWMCMCAlgorithm.F90 index 1e36321d4..2356e9082 100644 --- a/lis/optUE/algorithm/RWMCMC/RWMCMCAlgorithm.F90 +++ b/lis/optUE/algorithm/RWMCMC/RWMCMCAlgorithm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/RWMCMC/RWMCMC_varctl.F90 b/lis/optUE/algorithm/RWMCMC/RWMCMC_varctl.F90 index c1433ca25..10e34af06 100644 --- a/lis/optUE/algorithm/RWMCMC/RWMCMC_varctl.F90 +++ b/lis/optUE/algorithm/RWMCMC/RWMCMC_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/SCEUA/SCEUA_varctl.F90 b/lis/optUE/algorithm/SCEUA/SCEUA_varctl.F90 index 15de943ab..56b5f2e35 100755 --- a/lis/optUE/algorithm/SCEUA/SCEUA_varctl.F90 +++ b/lis/optUE/algorithm/SCEUA/SCEUA_varctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/algorithm/SCEUA/ShuffledComplexEvolution.F90 b/lis/optUE/algorithm/SCEUA/ShuffledComplexEvolution.F90 index 0361e156f..c2cfc9356 100755 --- a/lis/optUE/algorithm/SCEUA/ShuffledComplexEvolution.F90 +++ b/lis/optUE/algorithm/SCEUA/ShuffledComplexEvolution.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LL/LLobjFunc_Mod.F90 b/lis/optUE/type/paramestim/objfunc/LL/LLobjFunc_Mod.F90 index 0a8ea6802..022eff4a4 100755 --- a/lis/optUE/type/paramestim/objfunc/LL/LLobjFunc_Mod.F90 +++ b/lis/optUE/type/paramestim/objfunc/LL/LLobjFunc_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LL/computeLLestimate.F90 b/lis/optUE/type/paramestim/objfunc/LL/computeLLestimate.F90 index 196a0da3f..3198114df 100755 --- a/lis/optUE/type/paramestim/objfunc/LL/computeLLestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LL/computeLLestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LL/resetLLestimate.F90 b/lis/optUE/type/paramestim/objfunc/LL/resetLLestimate.F90 index 9b98b9040..2eda5add4 100755 --- a/lis/optUE/type/paramestim/objfunc/LL/resetLLestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LL/resetLLestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LL/updateLLestimate.F90 b/lis/optUE/type/paramestim/objfunc/LL/updateLLestimate.F90 index 820d907a2..a2056031b 100755 --- a/lis/optUE/type/paramestim/objfunc/LL/updateLLestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LL/updateLLestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LM/LMobjFunc_Mod.F90 b/lis/optUE/type/paramestim/objfunc/LM/LMobjFunc_Mod.F90 index 0c5092189..1816bf415 100755 --- a/lis/optUE/type/paramestim/objfunc/LM/LMobjFunc_Mod.F90 +++ b/lis/optUE/type/paramestim/objfunc/LM/LMobjFunc_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LM/computeLMestimate.F90 b/lis/optUE/type/paramestim/objfunc/LM/computeLMestimate.F90 index e214a0e1b..27a79b777 100755 --- a/lis/optUE/type/paramestim/objfunc/LM/computeLMestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LM/computeLMestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LM/resetLMestimate.F90 b/lis/optUE/type/paramestim/objfunc/LM/resetLMestimate.F90 index d8111f8ca..28aaddec1 100755 --- a/lis/optUE/type/paramestim/objfunc/LM/resetLMestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LM/resetLMestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LM/updateLMestimate.F90 b/lis/optUE/type/paramestim/objfunc/LM/updateLMestimate.F90 index 85c37460d..91263735e 100755 --- a/lis/optUE/type/paramestim/objfunc/LM/updateLMestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LM/updateLMestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LS/LSobjFunc_Mod.F90 b/lis/optUE/type/paramestim/objfunc/LS/LSobjFunc_Mod.F90 index a47db5a39..aa30f1300 100644 --- a/lis/optUE/type/paramestim/objfunc/LS/LSobjFunc_Mod.F90 +++ b/lis/optUE/type/paramestim/objfunc/LS/LSobjFunc_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LS/computeLSestimate.F90 b/lis/optUE/type/paramestim/objfunc/LS/computeLSestimate.F90 index f8bd9a06a..85065c41a 100644 --- a/lis/optUE/type/paramestim/objfunc/LS/computeLSestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LS/computeLSestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LS/resetLSestimate.F90 b/lis/optUE/type/paramestim/objfunc/LS/resetLSestimate.F90 index 3439d2a40..18e672883 100644 --- a/lis/optUE/type/paramestim/objfunc/LS/resetLSestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LS/resetLSestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/LS/updateLSestimate.F90 b/lis/optUE/type/paramestim/objfunc/LS/updateLSestimate.F90 index 2b9af73b7..26137bb9c 100644 --- a/lis/optUE/type/paramestim/objfunc/LS/updateLSestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/LS/updateLSestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/P/PobjFunc_Mod.F90 b/lis/optUE/type/paramestim/objfunc/P/PobjFunc_Mod.F90 index 7b3cf9bdd..a3895deef 100755 --- a/lis/optUE/type/paramestim/objfunc/P/PobjFunc_Mod.F90 +++ b/lis/optUE/type/paramestim/objfunc/P/PobjFunc_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/P/computePestimate.F90 b/lis/optUE/type/paramestim/objfunc/P/computePestimate.F90 index a522352ed..724793c6f 100755 --- a/lis/optUE/type/paramestim/objfunc/P/computePestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/P/computePestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/P/resetPestimate.F90 b/lis/optUE/type/paramestim/objfunc/P/resetPestimate.F90 index 89fe05bda..73a4516b5 100755 --- a/lis/optUE/type/paramestim/objfunc/P/resetPestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/P/resetPestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/objfunc/P/updatePestimate.F90 b/lis/optUE/type/paramestim/objfunc/P/updatePestimate.F90 index ddfa7b29f..bf1b1a007 100755 --- a/lis/optUE/type/paramestim/objfunc/P/updatePestimate.F90 +++ b/lis/optUE/type/paramestim/objfunc/P/updatePestimate.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/AMSRE_SR/AMSRE_SR_em_obsMod.F90 b/lis/optUE/type/paramestim/obs/AMSRE_SR/AMSRE_SR_em_obsMod.F90 index 53afd32bd..dce5b0e13 100755 --- a/lis/optUE/type/paramestim/obs/AMSRE_SR/AMSRE_SR_em_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/AMSRE_SR/AMSRE_SR_em_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/AMSRE_SR/read_AMSRE_SRdata.F90 b/lis/optUE/type/paramestim/obs/AMSRE_SR/read_AMSRE_SRdata.F90 index 1841e9eae..54cd69130 100755 --- a/lis/optUE/type/paramestim/obs/AMSRE_SR/read_AMSRE_SRdata.F90 +++ b/lis/optUE/type/paramestim/obs/AMSRE_SR/read_AMSRE_SRdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/AMSRE_SR/reset_AMSRE_SRObsdata.F90 b/lis/optUE/type/paramestim/obs/AMSRE_SR/reset_AMSRE_SRObsdata.F90 index 097dbf187..36b76b615 100644 --- a/lis/optUE/type/paramestim/obs/AMSRE_SR/reset_AMSRE_SRObsdata.F90 +++ b/lis/optUE/type/paramestim/obs/AMSRE_SR/reset_AMSRE_SRObsdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/AMSRE_SR/write_AMSRE_SR_em_obs_data.F90 b/lis/optUE/type/paramestim/obs/AMSRE_SR/write_AMSRE_SR_em_obs_data.F90 index aadd26cb2..b8cb9f400 100755 --- a/lis/optUE/type/paramestim/obs/AMSRE_SR/write_AMSRE_SR_em_obs_data.F90 +++ b/lis/optUE/type/paramestim/obs/AMSRE_SR/write_AMSRE_SR_em_obs_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARM/ARMdata_module.F90 b/lis/optUE/type/paramestim/obs/ARM/ARMdata_module.F90 index 9690b519b..1cca1beb5 100644 --- a/lis/optUE/type/paramestim/obs/ARM/ARMdata_module.F90 +++ b/lis/optUE/type/paramestim/obs/ARM/ARMdata_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARM/read_ARMdata.F90 b/lis/optUE/type/paramestim/obs/ARM/read_ARMdata.F90 index 76fdaffd0..8f83812d7 100644 --- a/lis/optUE/type/paramestim/obs/ARM/read_ARMdata.F90 +++ b/lis/optUE/type/paramestim/obs/ARM/read_ARMdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARM/reset_ARMdata.F90 b/lis/optUE/type/paramestim/obs/ARM/reset_ARMdata.F90 index bd61fc9ef..14afb84a0 100644 --- a/lis/optUE/type/paramestim/obs/ARM/reset_ARMdata.F90 +++ b/lis/optUE/type/paramestim/obs/ARM/reset_ARMdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARM/write_ARMdata.F90 b/lis/optUE/type/paramestim/obs/ARM/write_ARMdata.F90 index 3be00ed5b..656c572a1 100644 --- a/lis/optUE/type/paramestim/obs/ARM/write_ARMdata.F90 +++ b/lis/optUE/type/paramestim/obs/ARM/write_ARMdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARSsm/ARSsm_obsMod.F90 b/lis/optUE/type/paramestim/obs/ARSsm/ARSsm_obsMod.F90 index 2ebb220de..770aeba03 100755 --- a/lis/optUE/type/paramestim/obs/ARSsm/ARSsm_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/ARSsm/ARSsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARSsm/read_ARSsmobs.F90 b/lis/optUE/type/paramestim/obs/ARSsm/read_ARSsmobs.F90 index 1e9d95509..9e5a234e9 100755 --- a/lis/optUE/type/paramestim/obs/ARSsm/read_ARSsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/ARSsm/read_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARSsm/reset_ARSsmobs.F90 b/lis/optUE/type/paramestim/obs/ARSsm/reset_ARSsmobs.F90 index e895b7c2c..bcdda69b6 100755 --- a/lis/optUE/type/paramestim/obs/ARSsm/reset_ARSsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/ARSsm/reset_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ARSsm/write_ARSsmobs.F90 b/lis/optUE/type/paramestim/obs/ARSsm/write_ARSsmobs.F90 index e48fb1dcb..c4d1ff460 100755 --- a/lis/optUE/type/paramestim/obs/ARSsm/write_ARSsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/ARSsm/write_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Ameriflux/AmerifluxobsMod.F90 b/lis/optUE/type/paramestim/obs/Ameriflux/AmerifluxobsMod.F90 index 0b866b242..1263cf7cb 100755 --- a/lis/optUE/type/paramestim/obs/Ameriflux/AmerifluxobsMod.F90 +++ b/lis/optUE/type/paramestim/obs/Ameriflux/AmerifluxobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Ameriflux/read_AmerifluxObs.F90 b/lis/optUE/type/paramestim/obs/Ameriflux/read_AmerifluxObs.F90 index 314ab501e..d86a4ad69 100755 --- a/lis/optUE/type/paramestim/obs/Ameriflux/read_AmerifluxObs.F90 +++ b/lis/optUE/type/paramestim/obs/Ameriflux/read_AmerifluxObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Ameriflux/read_ameriflux_station.F90 b/lis/optUE/type/paramestim/obs/Ameriflux/read_ameriflux_station.F90 index 9a0e57ac0..560d762cb 100644 --- a/lis/optUE/type/paramestim/obs/Ameriflux/read_ameriflux_station.F90 +++ b/lis/optUE/type/paramestim/obs/Ameriflux/read_ameriflux_station.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Ameriflux/write_AmerifluxObs.F90 b/lis/optUE/type/paramestim/obs/Ameriflux/write_AmerifluxObs.F90 index af503846d..f78bac400 100755 --- a/lis/optUE/type/paramestim/obs/Ameriflux/write_AmerifluxObs.F90 +++ b/lis/optUE/type/paramestim/obs/Ameriflux/write_AmerifluxObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/CNRS/CNRS_em_obsMod.F90 b/lis/optUE/type/paramestim/obs/CNRS/CNRS_em_obsMod.F90 index 04bcfd94c..406c02d52 100755 --- a/lis/optUE/type/paramestim/obs/CNRS/CNRS_em_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/CNRS/CNRS_em_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata.F90 b/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata.F90 index 9f43f0bb1..f1706a302 100755 --- a/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata.F90 +++ b/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata_MPDI.F90 b/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata_MPDI.F90 index 37679bba9..3e6903ae6 100644 --- a/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata_MPDI.F90 +++ b/lis/optUE/type/paramestim/obs/CNRS/read_CNRSdata_MPDI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/CNRS/reset_CNRS_em_obs_data.F90 b/lis/optUE/type/paramestim/obs/CNRS/reset_CNRS_em_obs_data.F90 index 8f71e75a8..7df7ad4aa 100644 --- a/lis/optUE/type/paramestim/obs/CNRS/reset_CNRS_em_obs_data.F90 +++ b/lis/optUE/type/paramestim/obs/CNRS/reset_CNRS_em_obs_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/CNRS/write_CNRS_em_obs_data.F90 b/lis/optUE/type/paramestim/obs/CNRS/write_CNRS_em_obs_data.F90 index 423adf005..a26814005 100755 --- a/lis/optUE/type/paramestim/obs/CNRS/write_CNRS_em_obs_data.F90 +++ b/lis/optUE/type/paramestim/obs/CNRS/write_CNRS_em_obs_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/EmptyObs/Empty_obsMod.F90 b/lis/optUE/type/paramestim/obs/EmptyObs/Empty_obsMod.F90 index 2b42e4b87..79f8f3e4b 100644 --- a/lis/optUE/type/paramestim/obs/EmptyObs/Empty_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/EmptyObs/Empty_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/FLUXNET/FLUXNETdata_module.F90 b/lis/optUE/type/paramestim/obs/FLUXNET/FLUXNETdata_module.F90 index 0776712c9..4d85da472 100644 --- a/lis/optUE/type/paramestim/obs/FLUXNET/FLUXNETdata_module.F90 +++ b/lis/optUE/type/paramestim/obs/FLUXNET/FLUXNETdata_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/FLUXNET/read_FLUXNETdata.F90 b/lis/optUE/type/paramestim/obs/FLUXNET/read_FLUXNETdata.F90 index 6fcf2e089..f42c64c7c 100644 --- a/lis/optUE/type/paramestim/obs/FLUXNET/read_FLUXNETdata.F90 +++ b/lis/optUE/type/paramestim/obs/FLUXNET/read_FLUXNETdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/FLUXNET/reset_FLUXNETdata.F90 b/lis/optUE/type/paramestim/obs/FLUXNET/reset_FLUXNETdata.F90 index e37ac80d9..939139b32 100644 --- a/lis/optUE/type/paramestim/obs/FLUXNET/reset_FLUXNETdata.F90 +++ b/lis/optUE/type/paramestim/obs/FLUXNET/reset_FLUXNETdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/FLUXNET/write_FLUXNETdata.F90 b/lis/optUE/type/paramestim/obs/FLUXNET/write_FLUXNETdata.F90 index db8606b32..d6a3f49ee 100644 --- a/lis/optUE/type/paramestim/obs/FLUXNET/write_FLUXNETdata.F90 +++ b/lis/optUE/type/paramestim/obs/FLUXNET/write_FLUXNETdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Global_LS_data/GlobalLSDataMod.F90 b/lis/optUE/type/paramestim/obs/Global_LS_data/GlobalLSDataMod.F90 index 85fb18c96..ced19d1f5 100644 --- a/lis/optUE/type/paramestim/obs/Global_LS_data/GlobalLSDataMod.F90 +++ b/lis/optUE/type/paramestim/obs/Global_LS_data/GlobalLSDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Global_LS_data/read_GlobalLSObsdata.F90 b/lis/optUE/type/paramestim/obs/Global_LS_data/read_GlobalLSObsdata.F90 index 0a6aaa5f8..137c125a7 100755 --- a/lis/optUE/type/paramestim/obs/Global_LS_data/read_GlobalLSObsdata.F90 +++ b/lis/optUE/type/paramestim/obs/Global_LS_data/read_GlobalLSObsdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Global_LS_data/reset_GlobalLSObsData.F90 b/lis/optUE/type/paramestim/obs/Global_LS_data/reset_GlobalLSObsData.F90 index c59038837..5b82c3d40 100644 --- a/lis/optUE/type/paramestim/obs/Global_LS_data/reset_GlobalLSObsData.F90 +++ b/lis/optUE/type/paramestim/obs/Global_LS_data/reset_GlobalLSObsData.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Global_LS_data/write_GlobalLSObsdata.F90 b/lis/optUE/type/paramestim/obs/Global_LS_data/write_GlobalLSObsdata.F90 index 3bfb10059..f4a2dea33 100755 --- a/lis/optUE/type/paramestim/obs/Global_LS_data/write_GlobalLSObsdata.F90 +++ b/lis/optUE/type/paramestim/obs/Global_LS_data/write_GlobalLSObsdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ISCCP_Tskin/ISCCP_Tskinobs_module.F90 b/lis/optUE/type/paramestim/obs/ISCCP_Tskin/ISCCP_Tskinobs_module.F90 index 95f112ae0..67fd2a6aa 100755 --- a/lis/optUE/type/paramestim/obs/ISCCP_Tskin/ISCCP_Tskinobs_module.F90 +++ b/lis/optUE/type/paramestim/obs/ISCCP_Tskin/ISCCP_Tskinobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ISCCP_Tskin/read_ISCCP_Tskindata.F90 b/lis/optUE/type/paramestim/obs/ISCCP_Tskin/read_ISCCP_Tskindata.F90 index c6e7c5360..e8be73c71 100755 --- a/lis/optUE/type/paramestim/obs/ISCCP_Tskin/read_ISCCP_Tskindata.F90 +++ b/lis/optUE/type/paramestim/obs/ISCCP_Tskin/read_ISCCP_Tskindata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ISMNsm/ISMNsm_obsMod.F90 b/lis/optUE/type/paramestim/obs/ISMNsm/ISMNsm_obsMod.F90 index dab7b9173..e712ebea4 100755 --- a/lis/optUE/type/paramestim/obs/ISMNsm/ISMNsm_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/ISMNsm/ISMNsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ISMNsm/read_ISMNsmobs.F90 b/lis/optUE/type/paramestim/obs/ISMNsm/read_ISMNsmobs.F90 index 0502e4df7..e3488ee53 100755 --- a/lis/optUE/type/paramestim/obs/ISMNsm/read_ISMNsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/ISMNsm/read_ISMNsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ISMNsm/reset_ISMNsmobs.F90 b/lis/optUE/type/paramestim/obs/ISMNsm/reset_ISMNsmobs.F90 index d3507e63c..33993a5cd 100755 --- a/lis/optUE/type/paramestim/obs/ISMNsm/reset_ISMNsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/ISMNsm/reset_ISMNsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/ISMNsm/write_ISMNsmobs.F90 b/lis/optUE/type/paramestim/obs/ISMNsm/write_ISMNsmobs.F90 index cf59df0ae..d8c0e366f 100755 --- a/lis/optUE/type/paramestim/obs/ISMNsm/write_ISMNsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/ISMNsm/write_ISMNsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 index bd9865c29..c55c50e33 100755 --- a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/LPRM_AMSREsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/read_LPRM_AMSREsmdata.F90 b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/read_LPRM_AMSREsmdata.F90 index 012109114..590290211 100755 --- a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/read_LPRM_AMSREsmdata.F90 +++ b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/read_LPRM_AMSREsmdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/reset_LPRM_AMSREsmObsdata.F90 b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/reset_LPRM_AMSREsmObsdata.F90 index cfdccb07e..5907f9abc 100644 --- a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/reset_LPRM_AMSREsmObsdata.F90 +++ b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/reset_LPRM_AMSREsmObsdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/write_LPRM_AMSREsm_obs_data.F90 b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/write_LPRM_AMSREsm_obs_data.F90 index a41a728eb..67bbe96a9 100755 --- a/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/write_LPRM_AMSREsm_obs_data.F90 +++ b/lis/optUE/type/paramestim/obs/LPRM_AMSREsm/write_LPRM_AMSREsm_obs_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Macon_LS_data/MaconLSDataMod.F90 b/lis/optUE/type/paramestim/obs/Macon_LS_data/MaconLSDataMod.F90 index 35e40c9c7..cc67480e9 100644 --- a/lis/optUE/type/paramestim/obs/Macon_LS_data/MaconLSDataMod.F90 +++ b/lis/optUE/type/paramestim/obs/Macon_LS_data/MaconLSDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Macon_LS_data/read_MaconLSObsdata.F90 b/lis/optUE/type/paramestim/obs/Macon_LS_data/read_MaconLSObsdata.F90 index 08ffea4fe..3e61e53b5 100755 --- a/lis/optUE/type/paramestim/obs/Macon_LS_data/read_MaconLSObsdata.F90 +++ b/lis/optUE/type/paramestim/obs/Macon_LS_data/read_MaconLSObsdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/Macon_LS_data/write_MaconLSObsdata.F90 b/lis/optUE/type/paramestim/obs/Macon_LS_data/write_MaconLSObsdata.F90 index 28beed2f4..5f54d3c0b 100755 --- a/lis/optUE/type/paramestim/obs/Macon_LS_data/write_MaconLSObsdata.F90 +++ b/lis/optUE/type/paramestim/obs/Macon_LS_data/write_MaconLSObsdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/SMAPsm/SMAPsm_obsMod.F90 b/lis/optUE/type/paramestim/obs/SMAPsm/SMAPsm_obsMod.F90 index 98689f4d7..774c4947e 100644 --- a/lis/optUE/type/paramestim/obs/SMAPsm/SMAPsm_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/SMAPsm/SMAPsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/SMAPsm/read_SMAPsmobs.F90 b/lis/optUE/type/paramestim/obs/SMAPsm/read_SMAPsmobs.F90 index d9e8c1e1c..4986f0323 100644 --- a/lis/optUE/type/paramestim/obs/SMAPsm/read_SMAPsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/SMAPsm/read_SMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/SMAPsm/reset_SMAPsmobs.F90 b/lis/optUE/type/paramestim/obs/SMAPsm/reset_SMAPsmobs.F90 index 17a5f26f1..107d13fe5 100644 --- a/lis/optUE/type/paramestim/obs/SMAPsm/reset_SMAPsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/SMAPsm/reset_SMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/SMAPsm/write_SMAPsmobs.F90 b/lis/optUE/type/paramestim/obs/SMAPsm/write_SMAPsmobs.F90 index ad87a302f..fa5a777d8 100644 --- a/lis/optUE/type/paramestim/obs/SMAPsm/write_SMAPsmobs.F90 +++ b/lis/optUE/type/paramestim/obs/SMAPsm/write_SMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/UAsnow/UAsnow_obsMod.F90 b/lis/optUE/type/paramestim/obs/UAsnow/UAsnow_obsMod.F90 index c4d5e775d..f8b1284bc 100644 --- a/lis/optUE/type/paramestim/obs/UAsnow/UAsnow_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/UAsnow/UAsnow_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/UAsnow/read_UAsnowobs.F90 b/lis/optUE/type/paramestim/obs/UAsnow/read_UAsnowobs.F90 index 42f25b7df..b367c97c0 100644 --- a/lis/optUE/type/paramestim/obs/UAsnow/read_UAsnowobs.F90 +++ b/lis/optUE/type/paramestim/obs/UAsnow/read_UAsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/UAsnow/reset_UAsnowobs.F90 b/lis/optUE/type/paramestim/obs/UAsnow/reset_UAsnowobs.F90 index 77d92805b..e626edf02 100644 --- a/lis/optUE/type/paramestim/obs/UAsnow/reset_UAsnowobs.F90 +++ b/lis/optUE/type/paramestim/obs/UAsnow/reset_UAsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/UAsnow/write_UAsnowobs.F90 b/lis/optUE/type/paramestim/obs/UAsnow/write_UAsnowobs.F90 index 749f815ff..27a9c40e0 100644 --- a/lis/optUE/type/paramestim/obs/UAsnow/write_UAsnowobs.F90 +++ b/lis/optUE/type/paramestim/obs/UAsnow/write_UAsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/USDA_ARSsm/USDA_ARSsm_obsMod.F90 b/lis/optUE/type/paramestim/obs/USDA_ARSsm/USDA_ARSsm_obsMod.F90 index 26411a205..d0eee6c89 100755 --- a/lis/optUE/type/paramestim/obs/USDA_ARSsm/USDA_ARSsm_obsMod.F90 +++ b/lis/optUE/type/paramestim/obs/USDA_ARSsm/USDA_ARSsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/USDA_ARSsm/read_USDA_ARSsmdata.F90 b/lis/optUE/type/paramestim/obs/USDA_ARSsm/read_USDA_ARSsmdata.F90 index b16beb13f..fd5c09a0c 100755 --- a/lis/optUE/type/paramestim/obs/USDA_ARSsm/read_USDA_ARSsmdata.F90 +++ b/lis/optUE/type/paramestim/obs/USDA_ARSsm/read_USDA_ARSsmdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/USDA_ARSsm/reset_USDA_ARSsm_obs_data.F90 b/lis/optUE/type/paramestim/obs/USDA_ARSsm/reset_USDA_ARSsm_obs_data.F90 index cb0fe8860..20aad58b9 100644 --- a/lis/optUE/type/paramestim/obs/USDA_ARSsm/reset_USDA_ARSsm_obs_data.F90 +++ b/lis/optUE/type/paramestim/obs/USDA_ARSsm/reset_USDA_ARSsm_obs_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/USDA_ARSsm/write_USDA_ARSsm_obs_data.F90 b/lis/optUE/type/paramestim/obs/USDA_ARSsm/write_USDA_ARSsm_obs_data.F90 index 5b515e6e4..c0421de04 100755 --- a/lis/optUE/type/paramestim/obs/USDA_ARSsm/write_USDA_ARSsm_obs_data.F90 +++ b/lis/optUE/type/paramestim/obs/USDA_ARSsm/write_USDA_ARSsm_obs_data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/pesynsm1/pesynsm1data_module.F90 b/lis/optUE/type/paramestim/obs/pesynsm1/pesynsm1data_module.F90 index a6331ea12..f746f64d4 100755 --- a/lis/optUE/type/paramestim/obs/pesynsm1/pesynsm1data_module.F90 +++ b/lis/optUE/type/paramestim/obs/pesynsm1/pesynsm1data_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/pesynsm1/read_pesynsm1data.F90 b/lis/optUE/type/paramestim/obs/pesynsm1/read_pesynsm1data.F90 index e2e8e63c9..62c173675 100755 --- a/lis/optUE/type/paramestim/obs/pesynsm1/read_pesynsm1data.F90 +++ b/lis/optUE/type/paramestim/obs/pesynsm1/read_pesynsm1data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/template/read_templateObs.F90 b/lis/optUE/type/paramestim/obs/template/read_templateObs.F90 index 7ba0fc8a7..84dfee52a 100644 --- a/lis/optUE/type/paramestim/obs/template/read_templateObs.F90 +++ b/lis/optUE/type/paramestim/obs/template/read_templateObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/template/reset_templateObs.F90 b/lis/optUE/type/paramestim/obs/template/reset_templateObs.F90 index 568afc974..bc1c2a580 100644 --- a/lis/optUE/type/paramestim/obs/template/reset_templateObs.F90 +++ b/lis/optUE/type/paramestim/obs/template/reset_templateObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/template/templateObs_module.F90 b/lis/optUE/type/paramestim/obs/template/templateObs_module.F90 index 983a48417..abe580407 100644 --- a/lis/optUE/type/paramestim/obs/template/templateObs_module.F90 +++ b/lis/optUE/type/paramestim/obs/template/templateObs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/template/write_templateObs.F90 b/lis/optUE/type/paramestim/obs/template/write_templateObs.F90 index 65d9672ce..e48c1d2fa 100644 --- a/lis/optUE/type/paramestim/obs/template/write_templateObs.F90 +++ b/lis/optUE/type/paramestim/obs/template/write_templateObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/wgPBMRsm/read_wgPBMRsmdata.F90 b/lis/optUE/type/paramestim/obs/wgPBMRsm/read_wgPBMRsmdata.F90 index d256d6333..3e7a109bc 100755 --- a/lis/optUE/type/paramestim/obs/wgPBMRsm/read_wgPBMRsmdata.F90 +++ b/lis/optUE/type/paramestim/obs/wgPBMRsm/read_wgPBMRsmdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/wgPBMRsm/reset_wgPBMRsmdata.F90 b/lis/optUE/type/paramestim/obs/wgPBMRsm/reset_wgPBMRsmdata.F90 index f8345bc1b..39e7a4451 100644 --- a/lis/optUE/type/paramestim/obs/wgPBMRsm/reset_wgPBMRsmdata.F90 +++ b/lis/optUE/type/paramestim/obs/wgPBMRsm/reset_wgPBMRsmdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/wgPBMRsm/wgPBMRsmobs_module.F90 b/lis/optUE/type/paramestim/obs/wgPBMRsm/wgPBMRsmobs_module.F90 index ffb6f8b26..277941c2f 100755 --- a/lis/optUE/type/paramestim/obs/wgPBMRsm/wgPBMRsmobs_module.F90 +++ b/lis/optUE/type/paramestim/obs/wgPBMRsm/wgPBMRsmobs_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/optUE/type/paramestim/obs/wgPBMRsm/write_wgPBMRsmdata.F90 b/lis/optUE/type/paramestim/obs/wgPBMRsm/write_wgPBMRsmdata.F90 index 4fc6fdb15..a1312a53a 100755 --- a/lis/optUE/type/paramestim/obs/wgPBMRsm/write_wgPBMRsmdata.F90 +++ b/lis/optUE/type/paramestim/obs/wgPBMRsm/write_wgPBMRsmdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/0Intro_params.txt b/lis/params/0Intro_params.txt index 86de4595d..26b317b32 100644 --- a/lis/params/0Intro_params.txt +++ b/lis/params/0Intro_params.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/albedo/ALMIPII/read_ALMIPIIalbedo.F90 b/lis/params/albedo/ALMIPII/read_ALMIPIIalbedo.F90 index 5b2ae03bf..f3e94e9d5 100644 --- a/lis/params/albedo/ALMIPII/read_ALMIPIIalbedo.F90 +++ b/lis/params/albedo/ALMIPII/read_ALMIPIIalbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/albedo/ALMIPII/setup_ALMIPIIalbedo.F90 b/lis/params/albedo/ALMIPII/setup_ALMIPIIalbedo.F90 index dd50bb3f8..887c4ee37 100644 --- a/lis/params/albedo/ALMIPII/setup_ALMIPIIalbedo.F90 +++ b/lis/params/albedo/ALMIPII/setup_ALMIPIIalbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/emissivity/ALMIPII/read_ALMIPIIemiss.F90 b/lis/params/emissivity/ALMIPII/read_ALMIPIIemiss.F90 index 47329584c..88561f7e1 100644 --- a/lis/params/emissivity/ALMIPII/read_ALMIPIIemiss.F90 +++ b/lis/params/emissivity/ALMIPII/read_ALMIPIIemiss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/emissivity/ALMIPII/setup_ALMIPIIemiss.F90 b/lis/params/emissivity/ALMIPII/setup_ALMIPIIemiss.F90 index ee0d3bc9a..9110ded6a 100644 --- a/lis/params/emissivity/ALMIPII/setup_ALMIPIIemiss.F90 +++ b/lis/params/emissivity/ALMIPII/setup_ALMIPIIemiss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/0Intro_greenness.txt b/lis/params/gfrac/0Intro_greenness.txt index 1d6d57742..a78f9d644 100644 --- a/lis/params/gfrac/0Intro_greenness.txt +++ b/lis/params/gfrac/0Intro_greenness.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/ALMIPII/read_ALMIPIIgfrac.F90 b/lis/params/gfrac/ALMIPII/read_ALMIPIIgfrac.F90 index 5bb5c11c4..ccc2c6f07 100644 --- a/lis/params/gfrac/ALMIPII/read_ALMIPIIgfrac.F90 +++ b/lis/params/gfrac/ALMIPII/read_ALMIPIIgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/ALMIPII/setup_ALMIPIIgfrac.F90 b/lis/params/gfrac/ALMIPII/setup_ALMIPIIgfrac.F90 index c31b825e5..38fc005c5 100644 --- a/lis/params/gfrac/ALMIPII/setup_ALMIPIIgfrac.F90 +++ b/lis/params/gfrac/ALMIPII/setup_ALMIPIIgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/NESDISWeekly/read_NESDISgfrac.F90 b/lis/params/gfrac/NESDISWeekly/read_NESDISgfrac.F90 index 0ef54e64d..2e73bec06 100644 --- a/lis/params/gfrac/NESDISWeekly/read_NESDISgfrac.F90 +++ b/lis/params/gfrac/NESDISWeekly/read_NESDISgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/NESDISWeekly/setup_NESDISgfrac.F90 b/lis/params/gfrac/NESDISWeekly/setup_NESDISgfrac.F90 index 6a9b17929..ed97d4293 100644 --- a/lis/params/gfrac/NESDISWeekly/setup_NESDISgfrac.F90 +++ b/lis/params/gfrac/NESDISWeekly/setup_NESDISgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/SPORTDaily/SPORTgfracMod.F90 b/lis/params/gfrac/SPORTDaily/SPORTgfracMod.F90 index 0bbfef462..9f00d8cc5 100644 --- a/lis/params/gfrac/SPORTDaily/SPORTgfracMod.F90 +++ b/lis/params/gfrac/SPORTDaily/SPORTgfracMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/SPORTDaily/cppfunmodis.h b/lis/params/gfrac/SPORTDaily/cppfunmodis.h index fb6ab6cb2..e66333cc3 100644 --- a/lis/params/gfrac/SPORTDaily/cppfunmodis.h +++ b/lis/params/gfrac/SPORTDaily/cppfunmodis.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/SPORTDaily/gvf_binary_reader_modis.h b/lis/params/gfrac/SPORTDaily/gvf_binary_reader_modis.h index 82f4bb151..0b8dc044f 100644 --- a/lis/params/gfrac/SPORTDaily/gvf_binary_reader_modis.h +++ b/lis/params/gfrac/SPORTDaily/gvf_binary_reader_modis.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/SPORTDaily/read_SPORTgfrac.F90 b/lis/params/gfrac/SPORTDaily/read_SPORTgfrac.F90 index 86412de0b..d0a065559 100644 --- a/lis/params/gfrac/SPORTDaily/read_SPORTgfrac.F90 +++ b/lis/params/gfrac/SPORTDaily/read_SPORTgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/SPORTDaily/read_gvf_binary_modis.cc b/lis/params/gfrac/SPORTDaily/read_gvf_binary_modis.cc index 30a0f559e..c898681ce 100644 --- a/lis/params/gfrac/SPORTDaily/read_gvf_binary_modis.cc +++ b/lis/params/gfrac/SPORTDaily/read_gvf_binary_modis.cc @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/SPORTDaily/setup_SPORTgfrac.F90 b/lis/params/gfrac/SPORTDaily/setup_SPORTgfrac.F90 index ce3f5ba7e..db9e72a53 100644 --- a/lis/params/gfrac/SPORTDaily/setup_SPORTgfrac.F90 +++ b/lis/params/gfrac/SPORTDaily/setup_SPORTgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/VIIRSDaily/VIIRSgfracMod.F90 b/lis/params/gfrac/VIIRSDaily/VIIRSgfracMod.F90 index 0294b1798..30f6be38b 100644 --- a/lis/params/gfrac/VIIRSDaily/VIIRSgfracMod.F90 +++ b/lis/params/gfrac/VIIRSDaily/VIIRSgfracMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/VIIRSDaily/cppfunviirs.h b/lis/params/gfrac/VIIRSDaily/cppfunviirs.h index 52fd850e0..f90a4be3e 100644 --- a/lis/params/gfrac/VIIRSDaily/cppfunviirs.h +++ b/lis/params/gfrac/VIIRSDaily/cppfunviirs.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/VIIRSDaily/gvf_binary_reader_viirs.h b/lis/params/gfrac/VIIRSDaily/gvf_binary_reader_viirs.h index c5f56d12d..b0f932f95 100644 --- a/lis/params/gfrac/VIIRSDaily/gvf_binary_reader_viirs.h +++ b/lis/params/gfrac/VIIRSDaily/gvf_binary_reader_viirs.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/VIIRSDaily/read_VIIRSgfrac.F90 b/lis/params/gfrac/VIIRSDaily/read_VIIRSgfrac.F90 index 52328004e..0d85342ea 100644 --- a/lis/params/gfrac/VIIRSDaily/read_VIIRSgfrac.F90 +++ b/lis/params/gfrac/VIIRSDaily/read_VIIRSgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/VIIRSDaily/read_gvf_binary_viirs.cc b/lis/params/gfrac/VIIRSDaily/read_gvf_binary_viirs.cc index 779371c06..cc7762f08 100644 --- a/lis/params/gfrac/VIIRSDaily/read_gvf_binary_viirs.cc +++ b/lis/params/gfrac/VIIRSDaily/read_gvf_binary_viirs.cc @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/gfrac/VIIRSDaily/setup_VIIRSgfrac.F90 b/lis/params/gfrac/VIIRSDaily/setup_VIIRSgfrac.F90 index 29b0c9420..f58c9950c 100644 --- a/lis/params/gfrac/VIIRSDaily/setup_VIIRSgfrac.F90 +++ b/lis/params/gfrac/VIIRSDaily/setup_VIIRSgfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/0Intro_lai.txt b/lis/params/lai/0Intro_lai.txt index 6c57641d2..e4acd1190 100644 --- a/lis/params/lai/0Intro_lai.txt +++ b/lis/params/lai/0Intro_lai.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/ALMIPII/read_ALMIPIIlai.F90 b/lis/params/lai/ALMIPII/read_ALMIPIIlai.F90 index 324477888..e049f28d3 100644 --- a/lis/params/lai/ALMIPII/read_ALMIPIIlai.F90 +++ b/lis/params/lai/ALMIPII/read_ALMIPIIlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/ALMIPII/setup_ALMIPIIlai.F90 b/lis/params/lai/ALMIPII/setup_ALMIPIIlai.F90 index a7110710f..88b94079a 100644 --- a/lis/params/lai/ALMIPII/setup_ALMIPIIlai.F90 +++ b/lis/params/lai/ALMIPII/setup_ALMIPIIlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/MODIS/read_MODISlai.F90 b/lis/params/lai/MODIS/read_MODISlai.F90 index 1c4c7a25b..e8b60a2d8 100644 --- a/lis/params/lai/MODIS/read_MODISlai.F90 +++ b/lis/params/lai/MODIS/read_MODISlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/MODIS/read_MODISsai.F90 b/lis/params/lai/MODIS/read_MODISsai.F90 index 3247d73f9..c8b3db4b9 100644 --- a/lis/params/lai/MODIS/read_MODISsai.F90 +++ b/lis/params/lai/MODIS/read_MODISsai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/MODIS/setup_MODISlai.F90 b/lis/params/lai/MODIS/setup_MODISlai.F90 index 0fcecbb42..41f6d28c7 100644 --- a/lis/params/lai/MODIS/setup_MODISlai.F90 +++ b/lis/params/lai/MODIS/setup_MODISlai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/MODIS_RT/read_MODIS_RT_lai.F90 b/lis/params/lai/MODIS_RT/read_MODIS_RT_lai.F90 index b6fb92d96..494995fbd 100644 --- a/lis/params/lai/MODIS_RT/read_MODIS_RT_lai.F90 +++ b/lis/params/lai/MODIS_RT/read_MODIS_RT_lai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/MODIS_RT/read_MODIS_RT_sai.F90 b/lis/params/lai/MODIS_RT/read_MODIS_RT_sai.F90 index 43006f8e4..e681e6895 100644 --- a/lis/params/lai/MODIS_RT/read_MODIS_RT_sai.F90 +++ b/lis/params/lai/MODIS_RT/read_MODIS_RT_sai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/lai/MODIS_RT/setup_MODIS_RT_lai.F90 b/lis/params/lai/MODIS_RT/setup_MODIS_RT_lai.F90 index 9e5b76669..22c1f42c8 100644 --- a/lis/params/lai/MODIS_RT/setup_MODIS_RT_lai.F90 +++ b/lis/params/lai/MODIS_RT/setup_MODIS_RT_lai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/roughness/ALMIPII/read_ALMIPIIroughness.F90 b/lis/params/roughness/ALMIPII/read_ALMIPIIroughness.F90 index eeefa2796..bc545a174 100644 --- a/lis/params/roughness/ALMIPII/read_ALMIPIIroughness.F90 +++ b/lis/params/roughness/ALMIPII/read_ALMIPIIroughness.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/params/roughness/ALMIPII/setup_ALMIPIIroughness.F90 b/lis/params/roughness/ALMIPII/setup_ALMIPIIroughness.F90 index ddd6669ac..b81a87bbb 100644 --- a/lis/params/roughness/ALMIPII/setup_ALMIPIIroughness.F90 +++ b/lis/params/roughness/ALMIPII/setup_ALMIPIIroughness.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/0Intro_plugins.txt b/lis/plugins/0Intro_plugins.txt index 4446d3a26..2214ad1b6 100644 --- a/lis/plugins/0Intro_plugins.txt +++ b/lis/plugins/0Intro_plugins.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_DAobs_pluginMod.F90 b/lis/plugins/LIS_DAobs_pluginMod.F90 index 14491b275..b369b69fb 100644 --- a/lis/plugins/LIS_DAobs_pluginMod.F90 +++ b/lis/plugins/LIS_DAobs_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -251,6 +251,10 @@ subroutine LIS_DAobs_plugin use NASASMAPsm_Mod, only : NASASMAPsm_setup #endif +#if ( defined DA_CDF_TRANSFER_NASA_SMAPSM ) + use cdfTransfer_NASASMAPsm_Mod, only : cdfTransfer_NASASMAPsm_setup +#endif + !YK #if ( defined DA_OBS_SMOS_NRT_NN ) use SMOSNRTNNL2sm_Mod, only : SMOSNRTNNL2sm_setup @@ -451,6 +455,10 @@ subroutine LIS_DAobs_plugin external read_NASASMAPsm, write_NASASMAPsmobs #endif +#if ( defined DA_CDF_TRANSFER_NASA_SMAPSM ) + external read_cdfTransfer_NASASMAPsm, write_cdfTransfer_NASASMAPsmobs +#endif + !YK #if ( defined DA_OBS_SMOS_NRT_NN ) external read_SMOSNRTNNL2sm, write_SMOSNRTNNL2smobs @@ -838,6 +846,16 @@ subroutine LIS_DAobs_plugin write_NASASMAPsmobs) #endif +#if ( defined DA_CDF_TRANSFER_NASA_SMAPSM ) + call registerdaobsclass(trim(LIS_CDFTRANSFERNASASMAPsmobsId),"LSM") + call registerdaobssetup(trim(LIS_CDFTRANSFERNASASMAPsmobsId)//char(0),& + cdfTransfer_NASASMAPsm_setup) + call registerreaddaobs(trim(LIS_CDFTRANSFERNASASMAPsmobsId)//char(0),& + read_cdfTransfer_NASASMAPsm) + call registerwritedaobs(trim(LIS_CDFTRANSFERNASASMAPsmobsId)//char(0),& + write_cdfTransfer_NASASMAPsmobs) +#endif + !YK #if ( defined DA_OBS_SMOS_NRT_NN ) call registerdaobsclass(trim(LIS_SMOSNRTNNL2smobsId),"LSM") diff --git a/lis/plugins/LIS_ObjFunc_pluginMod.F90 b/lis/plugins/LIS_ObjFunc_pluginMod.F90 index 65100d504..3248eea61 100644 --- a/lis/plugins/LIS_ObjFunc_pluginMod.F90 +++ b/lis/plugins/LIS_ObjFunc_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_PEobs_pluginMod.F90 b/lis/plugins/LIS_PEobs_pluginMod.F90 index 4e92b2096..ce38d46e0 100644 --- a/lis/plugins/LIS_PEobs_pluginMod.F90 +++ b/lis/plugins/LIS_PEobs_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_RTM_pluginMod.F90 b/lis/plugins/LIS_RTM_pluginMod.F90 index d7fcff1d7..b5ffd3d57 100644 --- a/lis/plugins/LIS_RTM_pluginMod.F90 +++ b/lis/plugins/LIS_RTM_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_RTMoptue_pluginMod.F90 b/lis/plugins/LIS_RTMoptue_pluginMod.F90 index a8fc3b1f8..f8997a12d 100644 --- a/lis/plugins/LIS_RTMoptue_pluginMod.F90 +++ b/lis/plugins/LIS_RTMoptue_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_biasEstimation_pluginMod.F90 b/lis/plugins/LIS_biasEstimation_pluginMod.F90 index 471e0b03f..e5fed519f 100644 --- a/lis/plugins/LIS_biasEstimation_pluginMod.F90 +++ b/lis/plugins/LIS_biasEstimation_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_dataassim_pluginMod.F90 b/lis/plugins/LIS_dataassim_pluginMod.F90 index ae5ab3d6e..c1c73423e 100644 --- a/lis/plugins/LIS_dataassim_pluginMod.F90 +++ b/lis/plugins/LIS_dataassim_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_forecastAlg_pluginMod.F90 b/lis/plugins/LIS_forecastAlg_pluginMod.F90 index a8a09cc03..cbe0a3a7c 100644 --- a/lis/plugins/LIS_forecastAlg_pluginMod.F90 +++ b/lis/plugins/LIS_forecastAlg_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_glaciermodel_pluginMod.F90 b/lis/plugins/LIS_glaciermodel_pluginMod.F90 index a82d645d4..e239a4b8c 100644 --- a/lis/plugins/LIS_glaciermodel_pluginMod.F90 +++ b/lis/plugins/LIS_glaciermodel_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_glacierrouting_pluginMod.F90 b/lis/plugins/LIS_glacierrouting_pluginMod.F90 index 9ae380533..f90d20699 100644 --- a/lis/plugins/LIS_glacierrouting_pluginMod.F90 +++ b/lis/plugins/LIS_glacierrouting_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_irrigationmodel_pluginMod.F90 b/lis/plugins/LIS_irrigationmodel_pluginMod.F90 index ea4206662..0adcf510a 100644 --- a/lis/plugins/LIS_irrigationmodel_pluginMod.F90 +++ b/lis/plugins/LIS_irrigationmodel_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lakemodel_pluginMod.F90 b/lis/plugins/LIS_lakemodel_pluginMod.F90 index b9c00728b..5a50b525f 100644 --- a/lis/plugins/LIS_lakemodel_pluginMod.F90 +++ b/lis/plugins/LIS_lakemodel_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_landslidemodel_pluginMod.F90 b/lis/plugins/LIS_landslidemodel_pluginMod.F90 index 102d3df13..12ceac307 100644 --- a/lis/plugins/LIS_landslidemodel_pluginMod.F90 +++ b/lis/plugins/LIS_landslidemodel_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lsm_pluginMod.F90 b/lis/plugins/LIS_lsm_pluginMod.F90 index ef2bcea66..a5c2fdda5 100644 --- a/lis/plugins/LIS_lsm_pluginMod.F90 +++ b/lis/plugins/LIS_lsm_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lsmcpl_pluginMod.F90 b/lis/plugins/LIS_lsmcpl_pluginMod.F90 index b363ad517..124498659 100644 --- a/lis/plugins/LIS_lsmcpl_pluginMod.F90 +++ b/lis/plugins/LIS_lsmcpl_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lsmda_pluginMod.F90 b/lis/plugins/LIS_lsmda_pluginMod.F90 index d7915469e..b146699a1 100644 --- a/lis/plugins/LIS_lsmda_pluginMod.F90 +++ b/lis/plugins/LIS_lsmda_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -2689,6 +2689,26 @@ subroutine LIS_lsmda_plugin trim(LIS_NASASMAPsmobsId )//char(0),NoahMP401_descale_soilm) call registerlsmdaupdatestate(trim(LIS_noahmp401Id)//"+"//& trim(LIS_NASASMAPsmobsId )//char(0),NoahMP401_updatesoilm) +!MN +! Noah-MP.4.0.1 SMAP(NASA) soil moisture with CDF Transfer + call registerlsmdainit(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_dasoilm_init) + call registerlsmdagetstatevar(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_getsoilm) + call registerlsmdasetstatevar(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_setsoilm) + call registerlsmdagetobspred(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_getsmpred) + call registerlsmdaqcstate(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_qcsoilm) + call registerlsmdaqcobsstate(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_qc_soilmobs) + call registerlsmdascalestatevar(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_scale_soilm) + call registerlsmdadescalestatevar(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_descale_soilm) + call registerlsmdaupdatestate(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_CDFTRANSFERNASASMAPsmobsId )//char(0),NoahMP401_updatesoilm) !YK ! Noah-MP.4.0.1 SMOS NRT NN soil moisture diff --git a/lis/plugins/LIS_lsmirrigation_pluginMod.F90 b/lis/plugins/LIS_lsmirrigation_pluginMod.F90 index 09f8e5900..df9422e95 100644 --- a/lis/plugins/LIS_lsmirrigation_pluginMod.F90 +++ b/lis/plugins/LIS_lsmirrigation_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lsmoptue_pluginMod.F90 b/lis/plugins/LIS_lsmoptue_pluginMod.F90 index 498248ca2..ecdb8b252 100644 --- a/lis/plugins/LIS_lsmoptue_pluginMod.F90 +++ b/lis/plugins/LIS_lsmoptue_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lsmrouting_pluginMod.F90 b/lis/plugins/LIS_lsmrouting_pluginMod.F90 index e6fa53b61..3055ab43b 100644 --- a/lis/plugins/LIS_lsmrouting_pluginMod.F90 +++ b/lis/plugins/LIS_lsmrouting_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_lsmrtm_pluginMod.F90 b/lis/plugins/LIS_lsmrtm_pluginMod.F90 index 421c62db6..cabe3d512 100644 --- a/lis/plugins/LIS_lsmrtm_pluginMod.F90 +++ b/lis/plugins/LIS_lsmrtm_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_metforcing_pluginMod.F90 b/lis/plugins/LIS_metforcing_pluginMod.F90 index 0d2c148d3..9136d42bf 100644 --- a/lis/plugins/LIS_metforcing_pluginMod.F90 +++ b/lis/plugins/LIS_metforcing_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -136,6 +136,10 @@ subroutine LIS_metforcing_plugin use merra2_forcingMod #endif +#if ( defined MF_GEOS_IT ) + use geosit_forcingMod +#endif + #if ( defined MF_ERA5 ) use era5_forcingMod #endif @@ -304,6 +308,10 @@ subroutine LIS_metforcing_plugin use galwemge_forcingMod #endif +#if ( defined MF_MOGREPS_G_FORECAST ) + use mogrepsg_forcingMod +#endif + #if ( defined MF_MET_TEMPLATE ) external get_metForcTemplate external timeinterp_metForcTemplate @@ -380,6 +388,13 @@ subroutine LIS_metforcing_plugin external reset_merra2 #endif +#if ( defined MF_GEOS_IT ) + external get_geosit + external timeinterp_geosit + external finalize_geosit + external reset_geosit +#endif + #if ( defined MF_ERA5 ) external get_era5 external timeinterp_era5 @@ -656,8 +671,19 @@ subroutine LIS_metforcing_plugin external reset_galwemge #endif +#if ( defined MF_MOGREPS_G_FORECAST ) + external get_mogrepsg + external timeinterp_mogrepsg + external finalize_mogrepsg + external reset_mogrepsg +#endif + + external :: registerinitmetforc + external :: registerretrievemetforc + external :: registertimeinterpmetforc + external :: registerfinalmetforc + external :: registerresetmetforc - #if ( defined MF_MET_TEMPLATE ) ! - Meteorological Forcing Template: call registerinitmetforc(trim(LIS_metForcTemplateId)//char(0), & @@ -778,6 +804,16 @@ subroutine LIS_metforcing_plugin call registerfinalmetforc(trim(LIS_merra2Id)//char(0),finalize_merra2) #endif +#if ( defined MF_GEOS_IT ) +! - GEOS-IT Forcing: + call registerinitmetforc(trim(LIS_geositId)//char(0),init_geosit) + call registerretrievemetforc(trim(LIS_geositId)//char(0),get_geosit) + call registertimeinterpmetforc(trim(LIS_geositId)//char(0), & + timeinterp_geosit) + call registerresetmetforc(trim(LIS_geositId)//char(0),reset_geosit) + call registerfinalmetforc(trim(LIS_geositId)//char(0),finalize_geosit) +#endif + #if ( defined MF_ERA5) ! - ERA5 Reanalysis Forcing: call registerinitmetforc(trim(LIS_era5Id)//char(0),init_ERA5) @@ -1181,6 +1217,15 @@ subroutine LIS_metforcing_plugin call registerresetmetforc(trim(LIS_galwemgeId)//char(0),reset_galwemge) #endif +#if ( defined MF_MOGREPS_G_FORECAST) + call registerinitmetforc(trim(LIS_mogrepsgId)//char(0),init_mogrepsg) + call registerretrievemetforc(trim(LIS_mogrepsgId)//char(0),get_mogrepsg) + call registertimeinterpmetforc(trim(LIS_mogrepsgId)//char(0), & + timeinterp_mogrepsg) + call registerfinalmetforc(trim(LIS_mogrepsgId)//char(0),finalize_mogrepsg) + call registerresetmetforc(trim(LIS_mogrepsgId)//char(0),reset_mogrepsg) +#endif + end subroutine LIS_metforcing_plugin end module LIS_metforcing_pluginMod diff --git a/lis/plugins/LIS_openwatermodel_pluginMod.F90 b/lis/plugins/LIS_openwatermodel_pluginMod.F90 index b642dd3d0..0b69a954b 100644 --- a/lis/plugins/LIS_openwatermodel_pluginMod.F90 +++ b/lis/plugins/LIS_openwatermodel_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_optUEAlgorithm_pluginMod.F90 b/lis/plugins/LIS_optUEAlgorithm_pluginMod.F90 index d6cd0a5ca..30eef409b 100644 --- a/lis/plugins/LIS_optUEAlgorithm_pluginMod.F90 +++ b/lis/plugins/LIS_optUEAlgorithm_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_param_pluginMod.F90 b/lis/plugins/LIS_param_pluginMod.F90 index 520cf05b6..4833ab7aa 100644 --- a/lis/plugins/LIS_param_pluginMod.F90 +++ b/lis/plugins/LIS_param_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_perturb_pluginMod.F90 b/lis/plugins/LIS_perturb_pluginMod.F90 index 1771672ef..d7633324f 100644 --- a/lis/plugins/LIS_perturb_pluginMod.F90 +++ b/lis/plugins/LIS_perturb_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_pluginIndices.F90 b/lis/plugins/LIS_pluginIndices.F90 index 78752007f..c6623509a 100644 --- a/lis/plugins/LIS_pluginIndices.F90 +++ b/lis/plugins/LIS_pluginIndices.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -89,11 +89,12 @@ module LIS_pluginIndices character*50, public, parameter :: LIS_cableId = "CABLE" character*50, public, parameter :: LIS_fasstId = "FASST" !character*50, public, parameter :: LIS_sheelsId = "SHEELS" - character*50, public, parameter :: LIS_clsmf25Id = "CLSM F2.5" - character*50, public, parameter :: LIS_geowrsi2Id = "GeoWRSI.2" + character*50, public, parameter :: LIS_clsmf25Id = "CLSM F2.5" + character*50, public, parameter :: LIS_geowrsi2Id = "GeoWRSI.2" character*50, public, parameter :: LIS_rdhm356lsmId = "RDHM.3.5.6" character*50, public, parameter :: LIS_summa1Id = "SUMMA.1.0" - character*50, public, parameter :: LIS_Crocus81Id = "Crocus8.1" + character*50, public, parameter :: LIS_Crocus81Id = "Crocus8.1" + character*50, public, parameter :: LIS_snowmodelId = "SnowModel" !------------------------------------------------------------------------- ! Lake models @@ -134,6 +135,7 @@ module LIS_pluginIndices character*50, public, parameter :: LIS_gldasId = "GLDAS" character*50, public, parameter :: LIS_gfsId = "GFS" character*50, public, parameter :: LIS_merra2Id = "MERRA2" + character*50, public, parameter :: LIS_geositId = "GEOS-IT" character*50, public, parameter :: LIS_cmapId = "CMAP" character*50, public, parameter :: LIS_chirps2Id = "CHIRPS2" @@ -175,6 +177,7 @@ module LIS_pluginIndices character*50, public, parameter :: LIS_gddpId = "GDDP" character*50, public, parameter :: LIS_galwemId = "GALWEM forecast" character*50, public, parameter :: LIS_galwemgeId = "GALWEM-GE forecast" + character*50, public, parameter :: LIS_mogrepsgId = "MOGREPS-G forecast" !------------------------------------------------------------------------- ! land surface parameters @@ -270,6 +273,8 @@ module LIS_pluginIndices "SMOS(NESDIS) soil moisture" character*50, public, parameter :: LIS_NASASMAPsmobsId = & "SMAP(NASA) soil moisture" + character*50, public, parameter :: LIS_CDFTRANSFERNASASMAPsmobsId = & + "SMAP(NASA) soil moisture with CDF Transfer" !MN character*50, public, parameter :: LIS_SMOSNRTNNL2smobsId = & "SMOS NRT NN soil moisture" !YK character*50, public, parameter :: LIS_SMAPEOPLsmobsId = & diff --git a/lis/plugins/LIS_routing_pluginMod.F90 b/lis/plugins/LIS_routing_pluginMod.F90 index 54359ca5f..4f90ba619 100644 --- a/lis/plugins/LIS_routing_pluginMod.F90 +++ b/lis/plugins/LIS_routing_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_routingda_pluginMod.F90 b/lis/plugins/LIS_routingda_pluginMod.F90 index cbca913f3..ed48987a0 100644 --- a/lis/plugins/LIS_routingda_pluginMod.F90 +++ b/lis/plugins/LIS_routingda_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_runmode_pluginMod.F90 b/lis/plugins/LIS_runmode_pluginMod.F90 index 4b229f977..92abc766b 100644 --- a/lis/plugins/LIS_runmode_pluginMod.F90 +++ b/lis/plugins/LIS_runmode_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_runoffdata_pluginMod.F90 b/lis/plugins/LIS_runoffdata_pluginMod.F90 index 2edfe697b..d9577327a 100644 --- a/lis/plugins/LIS_runoffdata_pluginMod.F90 +++ b/lis/plugins/LIS_runoffdata_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/plugins/LIS_sublsm_pluginMod.F90 b/lis/plugins/LIS_sublsm_pluginMod.F90 index b13c74d5d..2b866f83c 100644 --- a/lis/plugins/LIS_sublsm_pluginMod.F90 +++ b/lis/plugins/LIS_sublsm_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -20,8 +20,9 @@ module LIS_sublsm_pluginMod ! model computations, corresponding to each of the LSMs used in LIS. ! ! !REVISION HISTORY: -! 09 Oct 03 Sujay Kumar Initial Specification -! 04 Jun 21 Mahdi Navari Modified for Naoh.3.9 +! 09 Oct 2003 Sujay Kumar Initial Specification +! 04 Jun 2021 Mahdi Navari Modified for Naoh.3.9 +! 12 Aug 2021 Kristi Arsenault Added SnowModel ! !EOP implicit none @@ -45,73 +46,73 @@ module LIS_sublsm_pluginMod ! \begin{description} ! \item[Initialization] ! Definition of LSM variables -! (to be registered using {\tt registerlsminit} and later called -! using {\tt lsminit}) +! (to be registered using {\tt registersublsminit} and later called +! using {\tt sublsminit}) ! \item[Setup] ! Initialization of parameters -! (to be registered using {\tt registerlsmsetup} and later called -! using {\tt lsmsetup}) +! (to be registered using {\tt registersublsmsetup} and later called +! using {\tt sublsmsetup}) ! \item[Run] ! Routines to execute LSM on a single gridcell for single timestep -! (to be registered using {\tt registerlsmrun} and later called -! using {\tt lsmrun}) +! (to be registered using {\tt registersublsmrun} and later called +! using {\tt sublsmrun}) ! \item[Read restart] ! Routines to read a restart file for an LSM run -! (to be registered using {\tt registerlsmrestart} and later called -! using {\tt lsmrestart}) +! (to be registered using {\tt registersublsmrestart} and later called +! using {\tt sublsmrestart}) ! \item[Forcing transfer to model tiles] ! Routines to transfer an array of given forcing to model tiles -! (to be registered using {\tt registerlsmf2t} and later called -! using {\tt lsmf2t}) +! (to be registered using {\tt registersublsmf2t} and later called +! using {\tt sublsmf2t}) ! \item[Write restart] ! Routines to write a restart file -! (to be registered using {\tt registerlsmwrst} and later called -! using {\tt lsmwrst}) +! (to be registered using {\tt registersublsmwrst} and later called +! using {\tt sublsmwrst}) ! \item[Finalize] ! Routines to cleanup LSM data structures -! (to be registered using {\tt registerlsmfinalize} and later called -! using {\tt lsmfinalize}) +! (to be registered using {\tt registersublsmfinalize} and later called +! using {\tt sublsmfinalize}) ! \end{description} ! ! The user-defined functions are included in the registry using a -! single index. For example, consider the Noah LSM is +! single index. For example, consider the Crocus LSM is ! incorporated in the registry with an index of 1 and ! is invoked later by the following calls ! ! \begin{verbatim} -! call registerlsminit(1,noah_lsm_ini) -! call registerlsmsetup(1,noah_setup) -! call registerlsmf2t(1,noah_f2t) -! call registerlsmrun(1,noah_main) -! call registerlsmrestart(1,noahrst) -! call registerlsmdynsetup(1,noah_dynsetup) -! call registerlsmwrst(1,noah_writerst) -! call registerlsmfinalize(1,noah_finalize) +! call registersublsminit(1,noah_lsm_ini) +! call registersublsmsetup(1,noah_setup) +! call registersublsmf2t(1,noah_f2t) +! call registersublsmrun(1,noah_main) +! call registersublsmrestart(1,noahrst) +! call registersublsmdynsetup(1,noah_dynsetup) +! call registersublsmwrst(1,noah_writerst) +! call registersublsmfinalize(1,noah_finalize) ! \end{verbatim} ! ! The functions registered above are invoked using generic calls as ! follows: ! ! \begin{verbatim} -! call lsminit(1) - calls noah_lsm_ini -! call lsmsetup(1) - calls noah_setup -! call lsmf2t(1) - calls noah_f2t -! call lsmrun(1) - calls noah_main -! call lsmdynsetup(1) - calls noah_dynsetup -! call lsmwrst(1) - calls noah_writerst -! call lsmfinalize(1) - calls noah_finalize +! call sublsminit(1) - calls noah_lsm_ini +! call sublsmsetup(1) - calls noah_setup +! call sublsmf2t(1) - calls noah_f2t +! call sublsmrun(1) - calls noah_main +! call sublsmdynsetup(1) - calls noah_dynsetup +! call sublsmwrst(1) - calls noah_writerst +! call sublsmfinalize(1) - calls noah_finalize ! \end{verbatim} ! ! In the LIS code, the above calls are typically invoked in the ! following manner. ! \begin{verbatim} -! call lsminit(lis%lsm) -! call lsmsetup(lis%lsm) -! call lsmf2t(lis%lsm) -! call lsmrun(lis%lsm) -! call lsmdynsetup(lis%lsm) -! call lsmwrst(lis%lsm) -! call lsmfinalize(lis%lsm) +! call sublsminit(lis%lsm) +! call sublsmsetup(lis%lsm) +! call sublsmf2t(lis%lsm) +! call sublsmrun(lis%lsm) +! call sublsmdynsetup(lis%lsm) +! call sublsmwrst(lis%lsm) +! call sublsmfinalize(lis%lsm) ! \end{verbatim} ! where $lis\%lsm$ is set through the configuration ! utility, enabling the user make a selection at runtime. @@ -124,6 +125,11 @@ subroutine LIS_sublsm_plugin #if ( defined SM_Crocus_8_1 ) use Crocus81_lsmMod, only : Crocus81_ini #endif + +#if ( defined SM_SNOWMODEL ) + use snowmodel_lsmMod, only : snowmodel_init +#endif + implicit none #if ( defined SM_Crocus_8_1 ) @@ -155,6 +161,26 @@ subroutine LIS_sublsm_plugin #endif +#if ( defined SM_SNOWMODEL ) + external snowmodel_main + external snowmodel_setup + external snowmodel_readrst + external snowmodel_dynsetup + external snowmodel_f2t + external snowmodel_writerst + external snowmodel_finalize + external snowmodel_reset + + external snowmodel_setLSMimport + external snowmodel_getLSMexport + +#if ( defined SM_NOAHMP_4_0_1 ) + external NoahMP401_getSnowModelexport + external NoahMP401_setSnowModelimport +#endif + +#endif + #if ( defined SM_Crocus_8_1 ) call registersublsminit(trim(LIS_Crocus81Id)//char(0),Crocus81_ini) call registersublsmsetup(trim(LIS_Crocus81Id)//char(0),Crocus81_setup) @@ -192,6 +218,36 @@ subroutine LIS_sublsm_plugin #endif + + +#if ( defined SM_SNOWMODEL ) + call registersublsminit(trim(LIS_snowmodelId)//char(0),snowmodel_init) + call registersublsmsetup(trim(LIS_snowmodelId)//char(0),snowmodel_setup) + call registersublsmf2t(trim(LIS_snowmodelId)//"+"& + //trim(LIS_retroId)//char(0),snowmodel_f2t) + call registersublsmf2t(trim(LIS_snowmodelId)//"+"//& + trim(LIS_agrmetrunId)//char(0),snowmodel_f2t) + call registersublsmrun(trim(LIS_snowmodelId)//char(0),snowmodel_main) + call registersublsmrestart(trim(LIS_snowmodelId)//char(0),snowmodel_readrst) + call registersublsmdynsetup(trim(LIS_snowmodelId)//char(0),snowmodel_dynsetup) + call registersublsmwrst(trim(LIS_snowmodelId)//char(0),snowmodel_writerst) + call registersublsmfinalize(trim(LIS_snowmodelId)//char(0),snowmodel_finalize) + call registersublsmreset(trim(LIS_snowmodelId)//char(0),snowmodel_reset) + + ! Wirings between NoahMP and SnowModel + call registersublsmsetLSMimport(trim(LIS_snowmodelId)//char(0),& + Snowmodel_setLSMimport) + +#if ( defined SM_NOAHMP_4_0_1 ) + call registerlsm2sublsmgetexport(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_snowmodelId)//char(0),NoahMP401_getSnowModelexport) + call registerlsmsetsublsmimport(trim(LIS_noahmp401Id)//char(0),& + NoahMP401_setSnowModelimport) + call registersublsm2lsmgetexport(trim(LIS_noahmp401Id)//"+"//& + trim(LIS_snowmodelId)//char(0),SnowModel_getLSMexport) +#endif +#endif + end subroutine LIS_sublsm_plugin end module LIS_sublsm_pluginMod diff --git a/lis/routing/HYMAP2_router/HYMAP2_evapMod.F90 b/lis/routing/HYMAP2_router/HYMAP2_evapMod.F90 index 0d2b165e9..6a8bf4d0a 100755 --- a/lis/routing/HYMAP2_router/HYMAP2_evapMod.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_evapMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_initMod.F90 b/lis/routing/HYMAP2_router/HYMAP2_initMod.F90 index 0591ccaa2..771c93005 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_initMod.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_initMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_model.F90 b/lis/routing/HYMAP2_router/HYMAP2_model.F90 index cacc64bec..b194ecad3 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_model.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_model.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_modelMod.F90 b/lis/routing/HYMAP2_router/HYMAP2_modelMod.F90 index 38f55e2a5..c5d1ce205 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_modelMod.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_modelMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_model_core.F90 b/lis/routing/HYMAP2_router/HYMAP2_model_core.F90 index 8f47eb4e6..3ae2700e3 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_model_core.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_model_core.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_resopMod.F90 b/lis/routing/HYMAP2_router/HYMAP2_resopMod.F90 index 618240f7a..4148197e0 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_resopMod.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_resopMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_routingMod.F90 b/lis/routing/HYMAP2_router/HYMAP2_routingMod.F90 index f83fd24ac..c75b75b57 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_routingMod.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_routing_output.F90 b/lis/routing/HYMAP2_router/HYMAP2_routing_output.F90 index 5a60fc0dd..89e41d046 100755 --- a/lis/routing/HYMAP2_router/HYMAP2_routing_output.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routing_output.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_routing_readrst.F90 b/lis/routing/HYMAP2_router/HYMAP2_routing_readrst.F90 index 32427dd20..855787704 100755 --- a/lis/routing/HYMAP2_router/HYMAP2_routing_readrst.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routing_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_routing_reset.F90 b/lis/routing/HYMAP2_router/HYMAP2_routing_reset.F90 index e94a18cdc..bed8246dd 100755 --- a/lis/routing/HYMAP2_router/HYMAP2_routing_reset.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routing_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 b/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 index a091240c0..072bb8d59 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_routing_writerst.F90 b/lis/routing/HYMAP2_router/HYMAP2_routing_writerst.F90 index 70e1935e8..9896c940f 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_routing_writerst.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routing_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/HYMAP2_urbanMod.F90 b/lis/routing/HYMAP2_router/HYMAP2_urbanMod.F90 index a08bfa8e4..ac91cf4ee 100755 --- a/lis/routing/HYMAP2_router/HYMAP2_urbanMod.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_urbanMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_daWL_Mod.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_daWL_Mod.F90 index 365b61ae5..096959051 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_daWL_Mod.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_daWL_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_descale_WL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_descale_WL.F90 index e3d0e0972..75a572ffc 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_descale_WL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_descale_WL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_getStateSpaceSize.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_getStateSpaceSize.F90 index cf76cacab..762c7152c 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_getStateSpaceSize.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_getStateSpaceSize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWL.F90 index bb720e08e..8843a3f07 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWLpred.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWLpred.F90 index 527384d22..fb29e50de 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWLpred.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_getWLpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_qcWL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_qcWL.F90 index 80e0d393b..5f08b3f14 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_qcWL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_qcWL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_qc_WLobs.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_qc_WLobs.F90 index ba407b972..a9fca41cd 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_qc_WLobs.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_qc_WLobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_scale_WL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_scale_WL.F90 index aef5039df..077ae1d33 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_scale_WL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_scale_WL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_setPertStates.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_setPertStates.F90 index d361191e3..539f5bcf2 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_setPertStates.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_setPertStates.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_setWL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_setWL.F90 index b391d3ce2..96a445d82 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_setWL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_setWL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_updateWL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_updateWL.F90 index 101aa12cc..59316b91f 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_updateWL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_updateWL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/da_WL/HYMAP2_write_WL.F90 b/lis/routing/HYMAP2_router/da_WL/HYMAP2_write_WL.F90 index 09716e2e6..b7dbe96c3 100644 --- a/lis/routing/HYMAP2_router/da_WL/HYMAP2_write_WL.F90 +++ b/lis/routing/HYMAP2_router/da_WL/HYMAP2_write_WL.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 index d34066b0b..134f34452 100755 --- a/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 index 7a481b39d..e7f214781 100755 --- a/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 index d6556ca2c..a9138d071 100755 --- a/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 index c7c7d3048..0a8dad14c 100755 --- a/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 index 44e74a1dc..ee5c4afeb 100755 --- a/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 index 2a901f4f5..781c87517 100755 --- a/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 index aadc11f54..a7741fbd6 100755 --- a/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 index 05d106863..a298e2acd 100755 --- a/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 index 0b31aea54..602cb0922 100755 --- a/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 index 6ecfadfa2..c31863dce 100755 --- a/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 index c1ca594f9..9ea8a50a4 100755 --- a/lis/routing/HYMAP2_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 index df66824d6..d43d0d4f9 100755 --- a/lis/routing/HYMAP2_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 index 979e0b6ec..20785c75a 100755 --- a/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 index 61bc6e7ac..ceb72b61d 100755 --- a/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_initMod.F90 b/lis/routing/HYMAP_router/HYMAP_initMod.F90 index b7dfab840..76279603d 100755 --- a/lis/routing/HYMAP_router/HYMAP_initMod.F90 +++ b/lis/routing/HYMAP_router/HYMAP_initMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_modelMod.F90 b/lis/routing/HYMAP_router/HYMAP_modelMod.F90 index 99b18a52d..89ce63751 100755 --- a/lis/routing/HYMAP_router/HYMAP_modelMod.F90 +++ b/lis/routing/HYMAP_router/HYMAP_modelMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_routingMod.F90 b/lis/routing/HYMAP_router/HYMAP_routingMod.F90 index 955c485e6..92dfb4e45 100755 --- a/lis/routing/HYMAP_router/HYMAP_routingMod.F90 +++ b/lis/routing/HYMAP_router/HYMAP_routingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_routing_output.F90 b/lis/routing/HYMAP_router/HYMAP_routing_output.F90 index 6eca06ede..fde1fe2b4 100755 --- a/lis/routing/HYMAP_router/HYMAP_routing_output.F90 +++ b/lis/routing/HYMAP_router/HYMAP_routing_output.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_routing_readrst.F90 b/lis/routing/HYMAP_router/HYMAP_routing_readrst.F90 index 6fe27b8d9..a9a4cc75f 100755 --- a/lis/routing/HYMAP_router/HYMAP_routing_readrst.F90 +++ b/lis/routing/HYMAP_router/HYMAP_routing_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_routing_run.F90 b/lis/routing/HYMAP_router/HYMAP_routing_run.F90 index 2c713e9cf..ab2cf71f6 100755 --- a/lis/routing/HYMAP_router/HYMAP_routing_run.F90 +++ b/lis/routing/HYMAP_router/HYMAP_routing_run.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/HYMAP_routing_writerst.F90 b/lis/routing/HYMAP_router/HYMAP_routing_writerst.F90 index 22e10ffb1..05b9c351a 100755 --- a/lis/routing/HYMAP_router/HYMAP_routing_writerst.F90 +++ b/lis/routing/HYMAP_router/HYMAP_routing_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/model.F90 b/lis/routing/HYMAP_router/model.F90 index 35be276da..5cbeed5c3 100755 --- a/lis/routing/HYMAP_router/model.F90 +++ b/lis/routing/HYMAP_router/model.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 index d34066b0b..134f34452 100755 --- a/lis/routing/HYMAP_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/ERAILanddata/ERAILandrunoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 index 7a481b39d..e7f214781 100755 --- a/lis/routing/HYMAP_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/ERAILanddata/readERAILandrunoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 index d6556ca2c..a9138d071 100755 --- a/lis/routing/HYMAP_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/GLDAS1data/GLDAS1runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 index f0888156e..f51b53336 100755 --- a/lis/routing/HYMAP_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/GLDAS1data/readGLDAS1runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 index aca1cdd09..2473bd319 100755 --- a/lis/routing/HYMAP_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/GLDAS2data/GLDAS2runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 index a0fa31e94..eea5ed92f 100755 --- a/lis/routing/HYMAP_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/GLDAS2data/readGLDAS2runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 index df59062d7..986d8f034 100755 --- a/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/GWBMIPrunoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 index 2da7c2711..377dfa8fb 100755 --- a/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/GWBMIPdata/readGWBMIPrunoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/LISoutput/LISrunoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/LISoutput/LISrunoffdataMod.F90 index 9e62623df..5c9111d73 100755 --- a/lis/routing/HYMAP_router/runoffdata/LISoutput/LISrunoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/LISoutput/LISrunoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/LISoutput/readLISrunoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/LISoutput/readLISrunoffdata.F90 index 8a9ad6280..e47eff77d 100755 --- a/lis/routing/HYMAP_router/runoffdata/LISoutput/readLISrunoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/LISoutput/readLISrunoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 index c1ca594f9..9ea8a50a4 100755 --- a/lis/routing/HYMAP_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/MERRA2data/MERRA2runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 index df66824d6..d43d0d4f9 100755 --- a/lis/routing/HYMAP_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/MERRA2data/readMERRA2runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 b/lis/routing/HYMAP_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 index 979e0b6ec..20785c75a 100755 --- a/lis/routing/HYMAP_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 +++ b/lis/routing/HYMAP_router/runoffdata/NLDAS2data/NLDAS2runoffdataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/HYMAP_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 b/lis/routing/HYMAP_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 index 4cb8a7155..948a3ef20 100755 --- a/lis/routing/HYMAP_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 +++ b/lis/routing/HYMAP_router/runoffdata/NLDAS2data/readNLDAS2runoffdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/NLDAS_router/NLDAS_routingMod.F90 b/lis/routing/NLDAS_router/NLDAS_routingMod.F90 index 30028d796..11e4c24ea 100644 --- a/lis/routing/NLDAS_router/NLDAS_routingMod.F90 +++ b/lis/routing/NLDAS_router/NLDAS_routingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/NLDAS_router/NLDAS_routing_output.F90 b/lis/routing/NLDAS_router/NLDAS_routing_output.F90 index 7b39390a9..e11412fdf 100644 --- a/lis/routing/NLDAS_router/NLDAS_routing_output.F90 +++ b/lis/routing/NLDAS_router/NLDAS_routing_output.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/NLDAS_router/NLDAS_routing_readrst.F90 b/lis/routing/NLDAS_router/NLDAS_routing_readrst.F90 index 9ad44ad95..b78ba9b8d 100644 --- a/lis/routing/NLDAS_router/NLDAS_routing_readrst.F90 +++ b/lis/routing/NLDAS_router/NLDAS_routing_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/NLDAS_router/NLDAS_routing_run.F90 b/lis/routing/NLDAS_router/NLDAS_routing_run.F90 index dbfbdbcb0..6b75c1d5c 100644 --- a/lis/routing/NLDAS_router/NLDAS_routing_run.F90 +++ b/lis/routing/NLDAS_router/NLDAS_routing_run.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/NLDAS_router/NLDAS_routing_writerst.F90 b/lis/routing/NLDAS_router/NLDAS_routing_writerst.F90 index aeb95e285..92e80eb44 100644 --- a/lis/routing/NLDAS_router/NLDAS_routing_writerst.F90 +++ b/lis/routing/NLDAS_router/NLDAS_routing_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/RAPID_check_domain_size.F90 b/lis/routing/RAPID_router/RAPID_check_domain_size.F90 index eebc19127..09863d6be 100644 --- a/lis/routing/RAPID_router/RAPID_check_domain_size.F90 +++ b/lis/routing/RAPID_router/RAPID_check_domain_size.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/RAPID_model_main.F90 b/lis/routing/RAPID_router/RAPID_model_main.F90 index 2297aafba..d41262136 100644 --- a/lis/routing/RAPID_router/RAPID_model_main.F90 +++ b/lis/routing/RAPID_router/RAPID_model_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/RAPID_routingMod.F90 b/lis/routing/RAPID_router/RAPID_routingMod.F90 index 4fc8ecb72..171e9d25b 100644 --- a/lis/routing/RAPID_router/RAPID_routingMod.F90 +++ b/lis/routing/RAPID_router/RAPID_routingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/RAPID_routing_output.F90 b/lis/routing/RAPID_router/RAPID_routing_output.F90 index 70d8ab01e..d97fdfb2a 100644 --- a/lis/routing/RAPID_router/RAPID_routing_output.F90 +++ b/lis/routing/RAPID_router/RAPID_routing_output.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/RAPID_routing_readrst.F90 b/lis/routing/RAPID_router/RAPID_routing_readrst.F90 index 8fa30cb85..86253fa24 100644 --- a/lis/routing/RAPID_router/RAPID_routing_readrst.F90 +++ b/lis/routing/RAPID_router/RAPID_routing_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/RAPID_routing_run.F90 b/lis/routing/RAPID_router/RAPID_routing_run.F90 index 6264b0938..65fc7686f 100644 --- a/lis/routing/RAPID_router/RAPID_routing_run.F90 +++ b/lis/routing/RAPID_router/RAPID_routing_run.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -198,6 +198,7 @@ subroutine RAPID_routing_run(n) writeint=RAPID_routing_struc(n)%outInterval) ! run RAPID +#ifdef PETSc call RAPID_model_main (n,RAPID_routing_struc(n)%bQinit,RAPID_routing_struc(n)%bQfinal,RAPID_routing_struc(n)%bV, & RAPID_routing_struc(n)%bhum,RAPID_routing_struc(n)%bfor,RAPID_routing_struc(n)%bdam, & RAPID_routing_struc(n)%binfluence,RAPID_routing_struc(n)%buq, & @@ -209,7 +210,7 @@ subroutine RAPID_routing_run(n) RAPID_routing_struc(n)%nmlfile,qout_filename, & LIS_rc%gnc(n),LIS_rc%gnr(n),surface_runoff,baseflow,RAPID_routing_struc(n)%initCheck, & RAPID_routing_struc(n)%dt,RAPID_routing_struc(n)%routingInterval) - +#endif deallocate(surface_runoff) deallocate(baseflow) diff --git a/lis/routing/RAPID_router/RAPID_routing_writerst.F90 b/lis/routing/RAPID_router/RAPID_routing_writerst.F90 index e6cef6b76..925a3aced 100644 --- a/lis/routing/RAPID_router/RAPID_routing_writerst.F90 +++ b/lis/routing/RAPID_router/RAPID_routing_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/routing/RAPID_router/src/rapid_Vlat.F90 b/lis/routing/RAPID_router/src/rapid_Vlat.F90 index 5c2903711..33359df9a 100755 --- a/lis/routing/RAPID_router/src/rapid_Vlat.F90 +++ b/lis/routing/RAPID_router/src/rapid_Vlat.F90 @@ -1,3 +1,12 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- !******************************************************************************* !Subroutine - rapid_Vlat !******************************************************************************* diff --git a/lis/routing/RAPID_router/src/rapid_Vlat_30Apr2021.back b/lis/routing/RAPID_router/src/rapid_Vlat_30Apr2021.back deleted file mode 100755 index 8beae689a..000000000 --- a/lis/routing/RAPID_router/src/rapid_Vlat_30Apr2021.back +++ /dev/null @@ -1,337 +0,0 @@ -!******************************************************************************* -!Subroutine - rapid_Vlat -!******************************************************************************* -subroutine rapid_Vlat(runoff_nc_file) - -!PURPOSE -!This coupler allows to convert runoff information from a land surface model -!to a volume of water entering RAPID river reaches. - -!Dec 17, 2020: Yeosang Yoon, Initial Implementation - -#include -use petscvec -use netcdf - -!use rapid_var, only : & -! rank,ierr,IS_nc_status,IS_nc_id_fil_Vlat,IS_nc_id_var_Vlat, & -! IS_nc_id_var_time,IS_nc_id_var_time_bnds,IS_nc_id_var_crs, & -! IS_nc_id_var_lon,IS_nc_id_var_lat,IS_nc_id_var_Vlat_err, & -! IS_riv_tot,IS_riv_bas,IS_time,JS_time,ZS_TauR, & -! YV_title,YV_institution,YV_comment, & -! YV_time_units,ZS_crs_sma,ZS_crs_iflat, & -! ZV_riv_tot_lon,ZV_riv_tot_lat,IV_time,IM_time_bnds, & -! ZV_riv_tot_bQlat,ZV_riv_tot_vQlat,ZV_riv_tot_caQlat,ZS_dtUQ, & -! ZV_riv_tot_cdownQlat,IS_radius, & -! IV_nc_start,IV_nc_count, & -! IV_riv_loc1,IV_riv_index,ZV_read_riv_tot,ZV_Vlat, & -! Runoff_path,Weight_table_file - -use rapid_var, only : & - rank,ierr,IS_time,JS_time,IS_riv_bas, & - ZS_TauR,ZS_crs_sma,ZS_crs_iflat, & - IV_time,IM_time_bnds,IV_riv_loc1,IV_riv_index, & - ZV_read_riv_tot,ZV_Vlat,Runoff_path,weight_table_file - -implicit none - -!******************************************************************************* -!Declaration of variables -!******************************************************************************* -! Arguments -character(len=200), intent(in) :: runoff_nc_file -!character(len=256) :: m3_nc_file - -! Weight table file -integer, dimension(:), allocatable :: rivid ! ID of the each river reach -integer, dimension(:), allocatable :: npt ! -integer, dimension(:), allocatable :: idx_i,idx_j ! i,j index of the grid cell where the contributing catchment centroid -real, dimension(:), allocatable :: area_sqm ! area of its contributing catchment in m2 -real, dimension(:), allocatable :: lat, lon ! lat, lon of LSM - -!character(len=256) :: weight_table_file -character(len=200) :: buf -integer :: nreach -integer :: ncid, var_runsf, var_runsb ! variables for netcdf - -! Runoff data are in kg/m2 accumulated over a time step -real, dimension(:,:), allocatable :: runsf ! surface runoff -real, dimension(:,:), allocatable :: runsb ! subsurface runoff -integer :: nlon, nlat - - -integer :: nreach_new -integer :: col, row ! -real :: conversion_factor=0.001 !convert from kg/m^2 (i.e. mm) to m - -integer, dimension(:), allocatable :: rivid_new -real, dimension(:), allocatable :: m3_riv ! inflow data to RAPID river reaches are in m3 accumulated over a time step -real :: m3_riv_np - -integer :: eof, status -integer :: i,j,k -!integer :: dim_rivid, dim_time, dimids(2) ! variables for netcdf -!integer :: var_m3_riv, var_rivid ! variables for netcdf - -!******************************************************************************* -! Reads weight_table file -!******************************************************************************* -! check number of reach in wieght table file -open(45,file=weight_table_file,status='old',action='read') -read(45,'(A)',iostat=eof) buf ! read header in weight table -nreach=1; -do - read(45,*,iostat=eof) buf - if (eof/=0) exit - - nreach=nreach+1 -end do -nreach=nreach-1 ! adjust size -close(45) - -! allocate sizes -allocate(rivid(nreach)) -allocate(area_sqm(nreach)) -allocate(idx_i(nreach)) -allocate(idx_j(nreach)) -allocate(npt(nreach)) -allocate(lat(nreach)) -allocate(lon(nreach)) - -! read weight table file -open(45,file=weight_table_file,status='old',action='read') -read(45,'(A)',iostat=eof) buf ! read header in weight table - -nreach=1 -do - read(45,*,iostat=eof) rivid(nreach),area_sqm(nreach), & - idx_i(nreach),idx_j(nreach),npt(nreach),lon(nreach),lat(nreach) - if (eof/=0) exit - nreach=nreach+1 -end do -nreach=nreach-1 -close(45) - -!------------------------------------------------------------------------------- -!Read runoff file -!------------------------------------------------------------------------------- -! initialization -nlon=192 -nlat=372 - -allocate(runsf(nlon,nlat)) -allocate(runsb(nlon,nlat)) - -runsf(1:nlon,1:nlat)=0 -runsb(1:nlon,1:nlat)=0 - -! open the file. NF90_NOWRITE tells netCDF we want read-only access to the file -status=nf90_open(trim(runoff_nc_file), NF90_NOWRITE, ncid) - -! get the varid of the data variable, based on its name -status=nf90_inq_varid(ncid,'Qs_inst', var_runsf) -status=nf90_inq_varid(ncid,'Qsb_inst', var_runsb) -! read the data. -status=nf90_get_var(ncid, var_runsf, runsf) -status=nf90_get_var(ncid, var_runsb, runsb) -! close the file, freeing all resources. -status=nf90_close(ncid) - -!------------------------------------------------------------------------------- -! Obtain a new subset of data & Calculate water inflows -!------------------------------------------------------------------------------- -! initialization -j=1 -k=1 -allocate(m3_riv(IS_riv_bas)) -allocate(rivid_new(IS_riv_bas)) - -do i=1,nreach - m3_riv(k)=0; - - ! check if all npoints points correspond to the same streamID - if (npt(i) > 1) then - if (i > 1 .AND. (rivid(i-1) == rivid(i))) CYCLE - - do j=1,npt(i) - col=idx_i(i+j-1)+1 - row=idx_j(i+j-1)+1 - - !Set negative values to zero including fill values (i.e., -9999) - if (runsf(col,row)<0) runsf(col,row)=0 - if (runsb(col,row)<0) runsb(col,row)=0 - - ! combine data - m3_riv_np=(runsf(col,row) & - +runsb(col,row))*ZS_TauR & !kg m-2 s-1 -> kg m-2 - *area_sqm(i+j-1)*conversion_factor !kg m-2 (mm) -> m - m3_riv(k)=m3_riv(k)+m3_riv_np - - end do - rivid_new(k)=rivid(i) - k=k+1 - else - col=idx_i(i)+1 - row=idx_j(i)+1 - - !Set negative values to zero including fill values (i.e., -9999) - if (runsf(col,row)<0) runsf(col,col)=0 - if (runsb(col,row)<0) runsb(col,col)=0 - - m3_riv(k)=(runsf(col,row) & - +runsb(col,row))*ZS_TauR & !kg m-2 s-1 -> kg m-2 - *area_sqm(i)*conversion_factor !kg m-2 (mm) -> m - - rivid_new(k)=rivid(k) - k=k+1 - end if -end do - -nreach_new=k-1 - -!******************************************************************************* -! open Vlat_file (from rapid_open_Vlat_file.F90) -!******************************************************************************* - -!if (rank==0) then -! open(99,file=Vlat_file,status='old') -! close(99) -! IS_nc_status=NF90_OPEN(Vlat_file,NF90_NOWRITE,IS_nc_id_fil_Vlat) -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'m3_riv',IS_nc_id_var_Vlat) -! if (IS_nc_status<0) IS_nc_id_var_Vlat=-9999 -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'time',IS_nc_id_var_time) -! if (IS_nc_status<0) IS_nc_id_var_time=-9999 -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'time_bnds', \ -! IS_nc_id_var_time_bnds) -! if (IS_nc_status<0) IS_nc_id_var_time_bnds=-9999 -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'lon',IS_nc_id_var_lon) -! if (IS_nc_status<0) IS_nc_id_var_lon=-9999 -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'lat',IS_nc_id_var_lat) -! if (IS_nc_status<0) IS_nc_id_var_lat=-9999 -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'crs',IS_nc_id_var_crs) -! if (IS_nc_status<0) IS_nc_id_var_crs=-9999 -! IS_nc_status=NF90_INQ_VARID(IS_nc_id_fil_Vlat,'m3_riv_err', \ -! IS_nc_id_var_Vlat_err) -! if (IS_nc_status<0) IS_nc_id_var_Vlat_err=-9999 - !A negative value for IS_nc_id_var_* is used if the variable doesn't exist, - !this is because the default value of "1" might match another existing - !variable. -!end if - -!******************************************************************************* -! set metadata for Vlat_file (from rapid_meta_Vlat_file.F90) -!******************************************************************************* -!Read global attributes -!if (rank==0) then -! IS_nc_status=NF90_GET_ATT(IS_nc_id_fil_Vlat,NF90_GLOBAL, \ -! "title", YV_title) -! IS_nc_status=NF90_GET_ATT(IS_nc_id_fil_Vlat,NF90_GLOBAL, \ -! "institution", YV_institution) -! IS_nc_status=NF90_GET_ATT(IS_nc_id_fil_Vlat,NF90_GLOBAL, \ -! "comment", YV_comment) -!end if - -!Read variable attributes -if (rank==0) then -! IS_nc_status=NF90_GET_ATT(IS_nc_id_fil_Vlat,IS_nc_id_var_time, \ -! "units", YV_time_units) -! IS_nc_status=NF90_GET_ATT(IS_nc_id_fil_Vlat,IS_nc_id_var_crs, \ -! "semi_major_axis", ZS_crs_sma) -! IS_nc_status=NF90_GET_ATT(IS_nc_id_fil_Vlat,IS_nc_id_var_crs, \ -! "inverse_flattening", ZS_crs_iflat) - - ZS_crs_sma=6378137.0 ! semi major axis of the spheroid - ZS_crs_iflat=298.257223563 ! inverse flattening of the spheroid -end if - -!Read space and time variable values -! TODO: re-review lon/lat, time, time_bnds variables -!if (rank==0) then -! if (IS_nc_id_var_lon>=0) then -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_lon, \ -! ZV_riv_tot_lon,(/1/),(/IS_riv_tot/)) -! end if -! if (IS_nc_id_var_lat>=0) then -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_lat, \ -! ZV_riv_tot_lat,(/1/),(/IS_riv_tot/)) -! end if -! if (IS_nc_id_var_time>=0) then -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_time, \ -! IV_time,(/1/),(/IS_time/)) -! end if -! if (IS_nc_id_var_time_bnds>=0) then -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_time_bnds, \ -! IM_time_bnds,(/1,1/),(/2,IS_time/)) -! end if -!end if - -!Read uncertainty quantification inputs, convert from volume to flow -! TODO: re-review later -!if (rank==0) then -! if (IS_nc_id_var_Vlat_err>=0) then -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_Vlat_err, \ -! ZV_riv_tot_bQlat,(/1,1/),(/IS_riv_tot,1/)) -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_Vlat_err, \ -! ZV_riv_tot_vQlat,(/1,2/),(/IS_riv_tot,1/)) -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_Vlat_err, \ -! ZV_riv_tot_caQlat,(/1,3/),(/IS_riv_tot,1/)) -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_Vlat_err, \ -! ZV_riv_tot_cdownQlat,(/1,4/),(/IS_riv_tot,IS_radius/)) - -! ZV_riv_tot_bQlat=sign(sqrt(abs(ZV_riv_tot_bQlat)),ZV_riv_tot_bQlat)/ZS_dtUQ -! ZV_riv_tot_vQlat=ZV_riv_tot_vQlat/(ZS_dtUQ**2) -! ZV_riv_tot_caQlat=ZV_riv_tot_caQlat/(ZS_dtUQ**2) -! ZV_riv_tot_cdownQlat=ZV_riv_tot_cdownQlat/(ZS_dtUQ**2) -! end if -!end if - -!Check temporal consistency if metadata present -if (IV_time(1)/=-9999) then - do JS_time=1,IS_time-1 - if (IV_time(JS_time+1)-IV_time(JS_time)/=int(ZS_TauR)) then - !Checking that interval between values of the time variable is ZS_TauR - print '(a53)','Inconsistent time intervals in namelist and Vlat_file' - stop 99 - end if - end do -end if - -if (IM_time_bnds(1,1)/=-9999) then - do JS_time=1,IS_time-1 - if (IM_time_bnds(1,JS_time+1)-IM_time_bnds(1,JS_time)/=int(ZS_TauR)) then - !Checking that interval between values of the time_bnd variable is ZS_TauR - print '(a53)','Inconsistent time intervals in namelist and Vlat_file' - stop 99 - end if - end do - do JS_time=1,IS_time - if (IM_time_bnds(2,JS_time)-IM_time_bnds(1,JS_time)/=int(ZS_TauR)) then - !Checking that interval for each value of the time_bnd variable is ZS_TauR - print '(a53)','Inconsistent time intervals in namelist and Vlat_file' - stop 99 - end if - end do -end if - -!******************************************************************************* -! Read Vlat_file (from rapid_read_Vlat_file.F90) -!******************************************************************************* - -! read file -if (rank==0) then -! IS_nc_status=NF90_GET_VAR(IS_nc_id_fil_Vlat,IS_nc_id_var_Vlat, & -! ZV_read_riv_tot,IV_nc_start,IV_nc_count) - ZV_read_riv_tot=m3_riv(1:nreach_new) -end if - -! Set values in PETSc vector -if (rank==0) then - call VecSetValues(ZV_Vlat,IS_riv_bas,IV_riv_loc1, & - ZV_read_riv_tot(IV_riv_index),INSERT_VALUES,ierr) -end if - -! Assemble PETSc vector -call VecAssemblyBegin(ZV_Vlat,ierr) -call VecAssemblyEnd(ZV_Vlat,ierr) - -end subroutine rapid_Vlat diff --git a/lis/rtms/CRTM/CRTM_handlerMod.F90 b/lis/rtms/CRTM/CRTM_handlerMod.F90 index 2a88a9c6d..c9e84d89a 100644 --- a/lis/rtms/CRTM/CRTM_handlerMod.F90 +++ b/lis/rtms/CRTM/CRTM_handlerMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM/readCRTMcrd.F90 b/lis/rtms/CRTM/readCRTMcrd.F90 index 39e3ad35a..a346fccbd 100644 --- a/lis/rtms/CRTM/readCRTMcrd.F90 +++ b/lis/rtms/CRTM/readCRTMcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2/CRTM2_handlerMod.F90 b/lis/rtms/CRTM2/CRTM2_handlerMod.F90 index 0d15c46b4..330eb7459 100644 --- a/lis/rtms/CRTM2/CRTM2_handlerMod.F90 +++ b/lis/rtms/CRTM2/CRTM2_handlerMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2/readCRTM2crd.F90 b/lis/rtms/CRTM2/readCRTM2crd.F90 index 50effa8da..6a7e9ade5 100644 --- a/lis/rtms/CRTM2/readCRTM2crd.F90 +++ b/lis/rtms/CRTM2/readCRTM2crd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/CRTM2_EMMod.F90 b/lis/rtms/CRTM2EM/CRTM2_EMMod.F90 index 3c6be200c..d9749dec3 100644 --- a/lis/rtms/CRTM2EM/CRTM2_EMMod.F90 +++ b/lis/rtms/CRTM2EM/CRTM2_EMMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/CRTM2EM_peMod.F90 b/lis/rtms/CRTM2EM/pe/CRTM2EM_peMod.F90 index 01d49f011..c92750d2f 100644 --- a/lis/rtms/CRTM2EM/pe/CRTM2EM_peMod.F90 +++ b/lis/rtms/CRTM2EM/pe/CRTM2EM_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/CRTM2EM_set_pedecvars.F90 b/lis/rtms/CRTM2EM/pe/CRTM2EM_set_pedecvars.F90 index ea3323169..20ac2533a 100644 --- a/lis/rtms/CRTM2EM/pe/CRTM2EM_set_pedecvars.F90 +++ b/lis/rtms/CRTM2EM/pe/CRTM2EM_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_getpeobspred_AMSRE_SR.F90 b/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_getpeobspred_AMSRE_SR.F90 index 94ad1c395..d2da89946 100644 --- a/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_getpeobspred_AMSRE_SR.F90 +++ b/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_getpeobspred_AMSRE_SR.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_setupobspred_AMSRE_SR.F90 b/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_setupobspred_AMSRE_SR.F90 index 92346d77e..991562c5b 100755 --- a/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_setupobspred_AMSRE_SR.F90 +++ b/lis/rtms/CRTM2EM/pe/obspred/AMSRE_SR/CRTM2EM_setupobspred_AMSRE_SR.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS.F90 b/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS.F90 index fb445ce1e..96202fd0f 100644 --- a/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS.F90 +++ b/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS_MPDI.F90 b/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS_MPDI.F90 index f392e3d46..3a9662a2d 100644 --- a/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS_MPDI.F90 +++ b/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_getpeobspred_CNRS_MPDI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_setupobspred_CNRS.F90 b/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_setupobspred_CNRS.F90 index 848f59e8b..b840063d5 100644 --- a/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_setupobspred_CNRS.F90 +++ b/lis/rtms/CRTM2EM/pe/obspred/CNRS/CRTM2EM_setupobspred_CNRS.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/CRTM2EM/readCRTM2EMcrd.F90 b/lis/rtms/CRTM2EM/readCRTM2EMcrd.F90 index 07244d868..152ae4b43 100644 --- a/lis/rtms/CRTM2EM/readCRTM2EMcrd.F90 +++ b/lis/rtms/CRTM2EM/readCRTM2EMcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/CMEM3_Mod.F90 b/lis/rtms/LIS-CMEM3/CMEM3_Mod.F90 index 91864eecc..1db477379 100644 --- a/lis/rtms/LIS-CMEM3/CMEM3_Mod.F90 +++ b/lis/rtms/LIS-CMEM3/CMEM3_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/pe/CMEM3_param_reset.F90 b/lis/rtms/LIS-CMEM3/pe/CMEM3_param_reset.F90 index 91800d175..cec21043d 100755 --- a/lis/rtms/LIS-CMEM3/pe/CMEM3_param_reset.F90 +++ b/lis/rtms/LIS-CMEM3/pe/CMEM3_param_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/pe/CMEM3_peMod.F90 b/lis/rtms/LIS-CMEM3/pe/CMEM3_peMod.F90 index 959f889c1..377bb1199 100644 --- a/lis/rtms/LIS-CMEM3/pe/CMEM3_peMod.F90 +++ b/lis/rtms/LIS-CMEM3/pe/CMEM3_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/pe/CMEM3_set_pedecvars.F90 b/lis/rtms/LIS-CMEM3/pe/CMEM3_set_pedecvars.F90 index b4feed9ef..cac9bf2ee 100644 --- a/lis/rtms/LIS-CMEM3/pe/CMEM3_set_pedecvars.F90 +++ b/lis/rtms/LIS-CMEM3/pe/CMEM3_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_getpeobspred_AMSRE_SR.F90 b/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_getpeobspred_AMSRE_SR.F90 index c069a8d56..060fa5aa3 100644 --- a/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_getpeobspred_AMSRE_SR.F90 +++ b/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_getpeobspred_AMSRE_SR.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_setupobspred_AMSRE_SR.F90 b/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_setupobspred_AMSRE_SR.F90 index f64af3361..222b85d04 100755 --- a/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_setupobspred_AMSRE_SR.F90 +++ b/lis/rtms/LIS-CMEM3/pe/obspred/AMSRE_SR/CMEM3_setupobspred_AMSRE_SR.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/LIS-CMEM3/readCMEM3crd.F90 b/lis/rtms/LIS-CMEM3/readCMEM3crd.F90 index ae800de26..5310fbeb8 100644 --- a/lis/rtms/LIS-CMEM3/readCMEM3crd.F90 +++ b/lis/rtms/LIS-CMEM3/readCMEM3crd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/rtms/TauOmegaRTM/TauOmegaRTM_Mod.F90 b/lis/rtms/TauOmegaRTM/TauOmegaRTM_Mod.F90 index ee7b217cc..f029d700e 100644 --- a/lis/rtms/TauOmegaRTM/TauOmegaRTM_Mod.F90 +++ b/lis/rtms/TauOmegaRTM/TauOmegaRTM_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/0Intro_runmodes.txt b/lis/runmodes/0Intro_runmodes.txt index a3546ef6a..1f5046bb5 100644 --- a/lis/runmodes/0Intro_runmodes.txt +++ b/lis/runmodes/0Intro_runmodes.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/RTMforward/RTMforward_runMod.F90 b/lis/runmodes/RTMforward/RTMforward_runMod.F90 index f2517c220..63268b10d 100644 --- a/lis/runmodes/RTMforward/RTMforward_runMod.F90 +++ b/lis/runmodes/RTMforward/RTMforward_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/agrmetmode/agrmet_runMod.F90 b/lis/runmodes/agrmetmode/agrmet_runMod.F90 index 02f6c77d4..47874598a 100644 --- a/lis/runmodes/agrmetmode/agrmet_runMod.F90 +++ b/lis/runmodes/agrmetmode/agrmet_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/forecast/forecast_runMod.F90 b/lis/runmodes/forecast/forecast_runMod.F90 index 10e0b3b35..ce9f579ee 100644 --- a/lis/runmodes/forecast/forecast_runMod.F90 +++ b/lis/runmodes/forecast/forecast_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/gce_cpl_mode/lis_gce_init.F90 b/lis/runmodes/gce_cpl_mode/lis_gce_init.F90 index 2b26cf435..2b444cd3b 100644 --- a/lis/runmodes/gce_cpl_mode/lis_gce_init.F90 +++ b/lis/runmodes/gce_cpl_mode/lis_gce_init.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/gce_cpl_mode/lis_gce_run.F90 b/lis/runmodes/gce_cpl_mode/lis_gce_run.F90 index 920faa9a1..75b5b6a92 100644 --- a/lis/runmodes/gce_cpl_mode/lis_gce_run.F90 +++ b/lis/runmodes/gce_cpl_mode/lis_gce_run.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/gce_cpl_mode/lisgceGridCompMod.F90 b/lis/runmodes/gce_cpl_mode/lisgceGridCompMod.F90 index 8c90e654b..30ceaa29b 100644 --- a/lis/runmodes/gce_cpl_mode/lisgceGridCompMod.F90 +++ b/lis/runmodes/gce_cpl_mode/lisgceGridCompMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/gce_cpl_mode/lisgceexport_module.F90 b/lis/runmodes/gce_cpl_mode/lisgceexport_module.F90 index e37819e83..f042cc6e1 100644 --- a/lis/runmodes/gce_cpl_mode/lisgceexport_module.F90 +++ b/lis/runmodes/gce_cpl_mode/lisgceexport_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/gce_cpl_mode/lisgceimport_module.F90 b/lis/runmodes/gce_cpl_mode/lisgceimport_module.F90 index 045f45977..38d8f207b 100644 --- a/lis/runmodes/gce_cpl_mode/lisgceimport_module.F90 +++ b/lis/runmodes/gce_cpl_mode/lisgceimport_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/landslide_optUE/landslideOptUE_runMod.F90 b/lis/runmodes/landslide_optUE/landslideOptUE_runMod.F90 index c470931d8..2de20cc7a 100644 --- a/lis/runmodes/landslide_optUE/landslideOptUE_runMod.F90 +++ b/lis/runmodes/landslide_optUE/landslideOptUE_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/nuopc_cpl_mode/LIS_ESMF_Extensions.F90 b/lis/runmodes/nuopc_cpl_mode/LIS_ESMF_Extensions.F90 index 417e636d2..1fe8d4f56 100644 --- a/lis/runmodes/nuopc_cpl_mode/LIS_ESMF_Extensions.F90 +++ b/lis/runmodes/nuopc_cpl_mode/LIS_ESMF_Extensions.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Cap.F90 b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Cap.F90 index d9f1e56e2..171ec96a9 100644 --- a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Cap.F90 +++ b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Cap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_DataCopy.F90 b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_DataCopy.F90 index 6392a3085..d0ba2546a 100644 --- a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_DataCopy.F90 +++ b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_DataCopy.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Gluecode.F90 b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Gluecode.F90 index 7c24c7959..09d969d93 100644 --- a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Gluecode.F90 +++ b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Gluecode.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Macros.h b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Macros.h index ffa262514..634680f57 100644 --- a/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Macros.h +++ b/lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Macros.h @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/paramEstimation/0Intro_optUE.txt b/lis/runmodes/paramEstimation/0Intro_optUE.txt index c108510f6..f48b66c75 100644 --- a/lis/runmodes/paramEstimation/0Intro_optUE.txt +++ b/lis/runmodes/paramEstimation/0Intro_optUE.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/paramEstimation/paramEstim_runMod.F90 b/lis/runmodes/paramEstimation/paramEstim_runMod.F90 index b004ea3bc..d0c06dcc0 100755 --- a/lis/runmodes/paramEstimation/paramEstim_runMod.F90 +++ b/lis/runmodes/paramEstimation/paramEstim_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/retrospective/0Intro_retrospective.txt b/lis/runmodes/retrospective/0Intro_retrospective.txt index 61abfb373..9f2d76f8d 100644 --- a/lis/runmodes/retrospective/0Intro_retrospective.txt +++ b/lis/runmodes/retrospective/0Intro_retrospective.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/retrospective/retrospective_runMod.F90 b/lis/runmodes/retrospective/retrospective_runMod.F90 index eb4a98061..3bfebf596 100644 --- a/lis/runmodes/retrospective/retrospective_runMod.F90 +++ b/lis/runmodes/retrospective/retrospective_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/smootherDA/smootherDA_runMod.F90 b/lis/runmodes/smootherDA/smootherDA_runMod.F90 index e686c476c..7db51d70b 100755 --- a/lis/runmodes/smootherDA/smootherDA_runMod.F90 +++ b/lis/runmodes/smootherDA/smootherDA_runMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/wrf_cpl_mode/LISWRFGridCompMod.F90 b/lis/runmodes/wrf_cpl_mode/LISWRFGridCompMod.F90 index 967cf39c9..7c54659ea 100755 --- a/lis/runmodes/wrf_cpl_mode/LISWRFGridCompMod.F90 +++ b/lis/runmodes/wrf_cpl_mode/LISWRFGridCompMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/wrf_cpl_mode/LISWRFexport_module.F90 b/lis/runmodes/wrf_cpl_mode/LISWRFexport_module.F90 index ba1ed24dc..a001de5e9 100755 --- a/lis/runmodes/wrf_cpl_mode/LISWRFexport_module.F90 +++ b/lis/runmodes/wrf_cpl_mode/LISWRFexport_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/wrf_cpl_mode/LISWRFimport_module.F90 b/lis/runmodes/wrf_cpl_mode/LISWRFimport_module.F90 index cbfb14e87..fb67475ee 100755 --- a/lis/runmodes/wrf_cpl_mode/LISWRFimport_module.F90 +++ b/lis/runmodes/wrf_cpl_mode/LISWRFimport_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/wrf_cpl_mode/liswrffinalize_coupled.F90 b/lis/runmodes/wrf_cpl_mode/liswrffinalize_coupled.F90 index 0cd905db7..dc2435f43 100755 --- a/lis/runmodes/wrf_cpl_mode/liswrffinalize_coupled.F90 +++ b/lis/runmodes/wrf_cpl_mode/liswrffinalize_coupled.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/wrf_cpl_mode/liswrfinit_coupled.F90 b/lis/runmodes/wrf_cpl_mode/liswrfinit_coupled.F90 index cad2887f7..e8a1c1f0b 100755 --- a/lis/runmodes/wrf_cpl_mode/liswrfinit_coupled.F90 +++ b/lis/runmodes/wrf_cpl_mode/liswrfinit_coupled.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/runmodes/wrf_cpl_mode/liswrfrun_coupled.F90 b/lis/runmodes/wrf_cpl_mode/liswrfrun_coupled.F90 index e76fe31d2..e2b74ac9d 100755 --- a/lis/runmodes/wrf_cpl_mode/liswrfrun_coupled.F90 +++ b/lis/runmodes/wrf_cpl_mode/liswrfrun_coupled.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/kwm_date_utilities_noahgl3911.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/kwm_date_utilities_noahgl3911.F90 index c69611756..e69c9c73a 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/kwm_date_utilities_noahgl3911.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/kwm_date_utilities_noahgl3911.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_Mod.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_Mod.F90 index 4f33951d1..1d510dc13 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_Mod.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_coldstart.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_coldstart.F90 index c2a66c775..bedb45b85 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_coldstart.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_dynsetup.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_dynsetup.F90 index a1c652734..e9129b874 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_dynsetup.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_f2t.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_f2t.F90 index e1d1fa346..42bbe6c86 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_f2t.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_finalize.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_finalize.F90 index 378c1f7a5..400366b75 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_finalize.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_main.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_main.F90 index 8bf1bda5b..993c4f26b 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_main.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_module.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_module.F90 index 16e06e36f..1ad5afad8 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_module.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readcrd.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readcrd.F90 index 5543a0881..f195fc70f 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readcrd.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readrst.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readrst.F90 index 5b0187770..5226888f8 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readrst.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_setup.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_setup.F90 index a1013afe7..94a772891 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_setup.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_writerst.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_writerst.F90 index 6a93c11eb..97a0defa3 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_writerst.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/noahmpglacier3911_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_hymap2.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_hymap2.F90 index 361a2864c..45ef9c9c6 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_mm.F90 b/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_mm.F90 index de0710673..5d8afd75e 100644 --- a/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_mm.F90 +++ b/lis/surfacemodels/glacier/noahmp.3.9.1.1/routing/noahmpglacier3911_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_Mod.F90 b/lis/surfacemodels/glacier/template/templateGL_Mod.F90 index 469f22574..73d5fbb15 100644 --- a/lis/surfacemodels/glacier/template/templateGL_Mod.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_dynsetup.F90 b/lis/surfacemodels/glacier/template/templateGL_dynsetup.F90 index 427568b8d..afff1e414 100644 --- a/lis/surfacemodels/glacier/template/templateGL_dynsetup.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_f2t.F90 b/lis/surfacemodels/glacier/template/templateGL_f2t.F90 index fbe171015..1cf3f0f60 100644 --- a/lis/surfacemodels/glacier/template/templateGL_f2t.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_finalize.F90 b/lis/surfacemodels/glacier/template/templateGL_finalize.F90 index a4b2a4c7d..2357466fc 100644 --- a/lis/surfacemodels/glacier/template/templateGL_finalize.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_getrunoffs_mm.F90 b/lis/surfacemodels/glacier/template/templateGL_getrunoffs_mm.F90 index d659569bc..12f86314c 100644 --- a/lis/surfacemodels/glacier/template/templateGL_getrunoffs_mm.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_main.F90 b/lis/surfacemodels/glacier/template/templateGL_main.F90 index 4bf9ab754..cc4c191c6 100644 --- a/lis/surfacemodels/glacier/template/templateGL_main.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_readcrd.F90 b/lis/surfacemodels/glacier/template/templateGL_readcrd.F90 index b7e6895b1..71e56f2b1 100644 --- a/lis/surfacemodels/glacier/template/templateGL_readcrd.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_readrst.F90 b/lis/surfacemodels/glacier/template/templateGL_readrst.F90 index 3b9c55d64..66e07363d 100644 --- a/lis/surfacemodels/glacier/template/templateGL_readrst.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_setup.F90 b/lis/surfacemodels/glacier/template/templateGL_setup.F90 index dc83fe544..328c02de5 100644 --- a/lis/surfacemodels/glacier/template/templateGL_setup.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/glacier/template/templateGL_writerst.F90 b/lis/surfacemodels/glacier/template/templateGL_writerst.F90 index 0bf624716..f1492196a 100644 --- a/lis/surfacemodels/glacier/template/templateGL_writerst.F90 +++ b/lis/surfacemodels/glacier/template/templateGL_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_Mod.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_Mod.F90 index 146ce4c64..2669d67bc 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_Mod.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_coldstart.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_coldstart.F90 index a5f8060b2..8dcc336e4 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_coldstart.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_dynsetup.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_dynsetup.F90 index 8d44eedb5..d9291a60c 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_dynsetup.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_f2t.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_f2t.F90 index b8143b03f..5785fbff7 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_f2t.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_finalize.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_finalize.F90 index f15c66061..15df52701 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_finalize.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_main.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_main.F90 index 381a6a485..ec7b704e8 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_main.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_module.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_module.F90 index c238d6c6e..352850154 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_module.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_readcrd.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_readcrd.F90 index 8429df107..980f63c26 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_readcrd.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_readrst.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_readrst.F90 index 2db2aa3de..756a3b1ad 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_readrst.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_setup.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_setup.F90 index 42d3945a3..9a21587c3 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_setup.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/FLake1_writerst.F90 b/lis/surfacemodels/lake/FLake.1.0/FLake1_writerst.F90 index 996204d0c..192b3465b 100644 --- a/lis/surfacemodels/lake/FLake.1.0/FLake1_writerst.F90 +++ b/lis/surfacemodels/lake/FLake.1.0/FLake1_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/lake/FLake.1.0/lis7_flake_2013.f90 b/lis/surfacemodels/lake/FLake.1.0/lis7_flake_2013.f90 index 4b8c53def..09132d48c 100755 --- a/lis/surfacemodels/lake/FLake.1.0/lis7_flake_2013.f90 +++ b/lis/surfacemodels/lake/FLake.1.0/lis7_flake_2013.f90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/0Intro_lsms.txt b/lis/surfacemodels/land/0Intro_lsms.txt index 028b1919d..746b6ce03 100644 --- a/lis/surfacemodels/land/0Intro_lsms.txt +++ b/lis/surfacemodels/land/0Intro_lsms.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_coldstart.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_coldstart.F90 index 8df05d4eb..c2199aba1 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_coldstart.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_dynsetup.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_dynsetup.F90 index e848166f5..6175ba00a 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_dynsetup.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_f2t.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_f2t.F90 index 79ca38d9f..057c3d768 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_f2t.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_finalize.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_finalize.F90 index 16bd6902d..bd9b8e12e 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_finalize.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_lsmMod.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_lsmMod.F90 index 3d161b356..cb63f04d2 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_lsmMod.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_main.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_main.F90 index a5d020039..61cd2a3fb 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_main.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_module.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_module.F90 index 077bb0605..764db3531 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_module.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readcrd.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readcrd.F90 index b1afb08b0..d448b693f 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readcrd.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readrst.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readrst.F90 index 39bf93076..1535fd6ed 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readrst.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_setup.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_setup.F90 index 626d99762..cc65cc616 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_setup.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_writerst.F90 b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_writerst.F90 index d482c0cf5..d4c1d28a3 100644 --- a/lis/surfacemodels/land/awral.6.0.0/AWRAL600_writerst.F90 +++ b/lis/surfacemodels/land/awral.6.0.0/AWRAL600_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/0Intro_cable.txt b/lis/surfacemodels/land/cable/0Intro_cable.txt index 47d7359b4..e07ba278a 100644 --- a/lis/surfacemodels/land/cable/0Intro_cable.txt +++ b/lis/surfacemodels/land/cable/0Intro_cable.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_coldstart.F90 b/lis/surfacemodels/land/cable/cable_coldstart.F90 index 075a8fe16..fb1ea6a59 100644 --- a/lis/surfacemodels/land/cable/cable_coldstart.F90 +++ b/lis/surfacemodels/land/cable/cable_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_driver.F90 b/lis/surfacemodels/land/cable/cable_driver.F90 index 90ab81e76..86ed72950 100644 --- a/lis/surfacemodels/land/cable/cable_driver.F90 +++ b/lis/surfacemodels/land/cable/cable_driver.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_dynsetup.F90 b/lis/surfacemodels/land/cable/cable_dynsetup.F90 index fce99d2b4..db983a4ab 100644 --- a/lis/surfacemodels/land/cable/cable_dynsetup.F90 +++ b/lis/surfacemodels/land/cable/cable_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_f2t.F90 b/lis/surfacemodels/land/cable/cable_f2t.F90 index 17180fdaa..f61ec128d 100644 --- a/lis/surfacemodels/land/cable/cable_f2t.F90 +++ b/lis/surfacemodels/land/cable/cable_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_finalize.F90 b/lis/surfacemodels/land/cable/cable_finalize.F90 index e2d88d652..902e0ee0c 100644 --- a/lis/surfacemodels/land/cable/cable_finalize.F90 +++ b/lis/surfacemodels/land/cable/cable_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_listime.F90 b/lis/surfacemodels/land/cable/cable_listime.F90 index b7e6e8604..61512fe8b 100644 --- a/lis/surfacemodels/land/cable/cable_listime.F90 +++ b/lis/surfacemodels/land/cable/cable_listime.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_lsmMod.F90 b/lis/surfacemodels/land/cable/cable_lsmMod.F90 index 8903d1e74..0020219e3 100644 --- a/lis/surfacemodels/land/cable/cable_lsmMod.F90 +++ b/lis/surfacemodels/land/cable/cable_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_module.F90 b/lis/surfacemodels/land/cable/cable_module.F90 index 90fb52256..020f28142 100644 --- a/lis/surfacemodels/land/cable/cable_module.F90 +++ b/lis/surfacemodels/land/cable/cable_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_readcrd.F90 b/lis/surfacemodels/land/cable/cable_readcrd.F90 index 1d36afe9c..a9868020b 100644 --- a/lis/surfacemodels/land/cable/cable_readcrd.F90 +++ b/lis/surfacemodels/land/cable/cable_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_readrst.F90 b/lis/surfacemodels/land/cable/cable_readrst.F90 index ed05865be..4e9263c62 100644 --- a/lis/surfacemodels/land/cable/cable_readrst.F90 +++ b/lis/surfacemodels/land/cable/cable_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_setsoilparms.F90 b/lis/surfacemodels/land/cable/cable_setsoilparms.F90 index 1d1468e59..9d8bf048c 100644 --- a/lis/surfacemodels/land/cable/cable_setsoilparms.F90 +++ b/lis/surfacemodels/land/cable/cable_setsoilparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_setup.F90 b/lis/surfacemodels/land/cable/cable_setup.F90 index fc45e2e08..577d4b5d6 100644 --- a/lis/surfacemodels/land/cable/cable_setup.F90 +++ b/lis/surfacemodels/land/cable/cable_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_setvegparms.F90 b/lis/surfacemodels/land/cable/cable_setvegparms.F90 index 019f9521b..0ea4c6652 100644 --- a/lis/surfacemodels/land/cable/cable_setvegparms.F90 +++ b/lis/surfacemodels/land/cable/cable_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cable_writerst.F90 b/lis/surfacemodels/land/cable/cable_writerst.F90 index 5667c6bba..7f8756e71 100644 --- a/lis/surfacemodels/land/cable/cable_writerst.F90 +++ b/lis/surfacemodels/land/cable/cable_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_setwrfexport.F90 b/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_setwrfexport.F90 index 6b0c2f7b2..e9715222a 100644 --- a/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_setwrfexport.F90 +++ b/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_wrf_f2t.F90 b/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_wrf_f2t.F90 index 3f334c3f5..b0e6b7783 100644 --- a/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_wrf_f2t.F90 +++ b/lis/surfacemodels/land/cable/cpl_wrf_noesmf/cable_wrf_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/0Intro_clm2.txt b/lis/surfacemodels/land/clm2/0Intro_clm2.txt index 3c2175d30..58f5dc29c 100644 --- a/lis/surfacemodels/land/clm2/0Intro_clm2.txt +++ b/lis/surfacemodels/land/clm2/0Intro_clm2.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeochem/Biogeochemistry.F90 b/lis/surfacemodels/land/clm2/biogeochem/Biogeochemistry.F90 index a90e1bd7a..9d2ad36c7 100644 --- a/lis/surfacemodels/land/clm2/biogeochem/Biogeochemistry.F90 +++ b/lis/surfacemodels/land/clm2/biogeochem/Biogeochemistry.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeochem/DustEmissionMod.F90 b/lis/surfacemodels/land/clm2/biogeochem/DustEmissionMod.F90 index c7580f517..4d735a34b 100644 --- a/lis/surfacemodels/land/clm2/biogeochem/DustEmissionMod.F90 +++ b/lis/surfacemodels/land/clm2/biogeochem/DustEmissionMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeochem/VOCEmission.F90 b/lis/surfacemodels/land/clm2/biogeochem/VOCEmission.F90 index f0b3ce2d8..4cb83d051 100644 --- a/lis/surfacemodels/land/clm2/biogeochem/VOCEmission.F90 +++ b/lis/surfacemodels/land/clm2/biogeochem/VOCEmission.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/BalanceCheck.F90 b/lis/surfacemodels/land/clm2/biogeophys/BalanceCheck.F90 index caa1b492e..ee18e672a 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/BalanceCheck.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/BalanceCheck.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/BareGroundFluxes.F90 b/lis/surfacemodels/land/clm2/biogeophys/BareGroundFluxes.F90 index a309762ae..6be991d9d 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/BareGroundFluxes.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/BareGroundFluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics1.F90 b/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics1.F90 index a420ebd14..f631398e3 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics1.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics2.F90 b/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics2.F90 index 35ccfc558..b08a841a7 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics2.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics_Lake.F90 b/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics_Lake.F90 index 5ea39f25e..a7f96371d 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics_Lake.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Biogeophysics_Lake.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/CanopyFluxes.F90 b/lis/surfacemodels/land/clm2/biogeophys/CanopyFluxes.F90 index d0b571541..ad7a75d33 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/CanopyFluxes.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/CanopyFluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/CombineSnowLayers.F90 b/lis/surfacemodels/land/clm2/biogeophys/CombineSnowLayers.F90 index 6aca11d67..b48bf6400 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/CombineSnowLayers.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/CombineSnowLayers.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Combo.F90 b/lis/surfacemodels/land/clm2/biogeophys/Combo.F90 index 3327bcb69..4b2b3e84c 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Combo.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Combo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/DivideSnowLayers.F90 b/lis/surfacemodels/land/clm2/biogeophys/DivideSnowLayers.F90 index c80828045..fb8868d41 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/DivideSnowLayers.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/DivideSnowLayers.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Drainage.F90 b/lis/surfacemodels/land/clm2/biogeophys/Drainage.F90 index 18d6fd6e3..b59632aa6 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Drainage.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Drainage.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/FrictionVelocity.F90 b/lis/surfacemodels/land/clm2/biogeophys/FrictionVelocity.F90 index 6dd3f655f..b7f578a1c 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/FrictionVelocity.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/FrictionVelocity.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Hydrology1.F90 b/lis/surfacemodels/land/clm2/biogeophys/Hydrology1.F90 index de2781502..c992bb4c8 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Hydrology1.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Hydrology1.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Hydrology2.F90 b/lis/surfacemodels/land/clm2/biogeophys/Hydrology2.F90 index 9ebc6424a..37c859cb3 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Hydrology2.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Hydrology2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Hydrology_Lake.F90 b/lis/surfacemodels/land/clm2/biogeophys/Hydrology_Lake.F90 index c24e5d14c..aa8c2c402 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Hydrology_Lake.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Hydrology_Lake.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Infiltration.F90 b/lis/surfacemodels/land/clm2/biogeophys/Infiltration.F90 index 2a950591f..521140f75 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Infiltration.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Infiltration.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/LatentHCond.F90 b/lis/surfacemodels/land/clm2/biogeophys/LatentHCond.F90 index 16d3d9aaf..02b6910a5 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/LatentHCond.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/LatentHCond.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/MoninObukIni.F90 b/lis/surfacemodels/land/clm2/biogeophys/MoninObukIni.F90 index 83ca293b2..3ace9759d 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/MoninObukIni.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/MoninObukIni.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/PhaseChange.F90 b/lis/surfacemodels/land/clm2/biogeophys/PhaseChange.F90 index b1dacaf33..ef3058b4b 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/PhaseChange.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/PhaseChange.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/QSatclm.F90 b/lis/surfacemodels/land/clm2/biogeophys/QSatclm.F90 index 27d1d9c16..658df5d1a 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/QSatclm.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/QSatclm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SensibleHCond.F90 b/lis/surfacemodels/land/clm2/biogeophys/SensibleHCond.F90 index e246636c4..6452e52dd 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SensibleHCond.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SensibleHCond.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SnowAge.F90 b/lis/surfacemodels/land/clm2/biogeophys/SnowAge.F90 index 21adffd79..531922f52 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SnowAge.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SnowAge.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SnowAlbedo.F90 b/lis/surfacemodels/land/clm2/biogeophys/SnowAlbedo.F90 index 9415477a8..33d52250d 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SnowAlbedo.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SnowAlbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SnowCompaction.F90 b/lis/surfacemodels/land/clm2/biogeophys/SnowCompaction.F90 index 2d7d70517..2829e938e 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SnowCompaction.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SnowCompaction.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SnowWater.F90 b/lis/surfacemodels/land/clm2/biogeophys/SnowWater.F90 index 6936d39a1..71238f873 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SnowWater.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SnowWater.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SoilAlbedo.F90 b/lis/surfacemodels/land/clm2/biogeophys/SoilAlbedo.F90 index 2743bddda..4a7694e3c 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SoilAlbedo.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SoilAlbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SoilTemperature.F90 b/lis/surfacemodels/land/clm2/biogeophys/SoilTemperature.F90 index 3e06fee3a..202505a31 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SoilTemperature.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SoilTemperature.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SoilThermProp.F90 b/lis/surfacemodels/land/clm2/biogeophys/SoilThermProp.F90 index 8dcb6f06a..b13f49656 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SoilThermProp.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SoilThermProp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SoilWater.F90 b/lis/surfacemodels/land/clm2/biogeophys/SoilWater.F90 index 353fff6c1..34e097860 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SoilWater.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SoilWater.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/StabilityFunc.F90 b/lis/surfacemodels/land/clm2/biogeophys/StabilityFunc.F90 index 2dbb31ce5..f4df3ae5a 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/StabilityFunc.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/StabilityFunc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Stomata.F90 b/lis/surfacemodels/land/clm2/biogeophys/Stomata.F90 index 77db5aa11..bcce19a0c 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Stomata.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Stomata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SurfaceAlbedo.F90 b/lis/surfacemodels/land/clm2/biogeophys/SurfaceAlbedo.F90 index 7a33e82f9..8a6a719d2 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SurfaceAlbedo.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SurfaceAlbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SurfaceRadiation.F90 b/lis/surfacemodels/land/clm2/biogeophys/SurfaceRadiation.F90 index dcde1e648..3763be0a6 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SurfaceRadiation.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SurfaceRadiation.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/SurfaceRunoff.F90 b/lis/surfacemodels/land/clm2/biogeophys/SurfaceRunoff.F90 index 525ffbd0a..7c6e867e6 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/SurfaceRunoff.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/SurfaceRunoff.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/Tridiagonal.F90 b/lis/surfacemodels/land/clm2/biogeophys/Tridiagonal.F90 index beb24a35e..5ca2d5d52 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/Tridiagonal.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/Tridiagonal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/TwoStream.F90 b/lis/surfacemodels/land/clm2/biogeophys/TwoStream.F90 index c62e1d9d7..1a4157212 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/TwoStream.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/TwoStream.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/biogeophys/WetIceHydrology.F90 b/lis/surfacemodels/land/clm2/biogeophys/WetIceHydrology.F90 index d42bce95b..5fe0c9e9c 100644 --- a/lis/surfacemodels/land/clm2/biogeophys/WetIceHydrology.F90 +++ b/lis/surfacemodels/land/clm2/biogeophys/WetIceHydrology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/calendr.F90 b/lis/surfacemodels/land/clm2/camclm_share/calendr.F90 index 2399105e4..562dd13ed 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/calendr.F90 +++ b/lis/surfacemodels/land/clm2/camclm_share/calendr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/datetime.F90 b/lis/surfacemodels/land/clm2/camclm_share/datetime.F90 index 8380e8dc8..db7d81bcf 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/datetime.F90 +++ b/lis/surfacemodels/land/clm2/camclm_share/datetime.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/fileutils.F90 b/lis/surfacemodels/land/clm2/camclm_share/fileutils.F90 index a693ef1af..de620862c 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/fileutils.F90 +++ b/lis/surfacemodels/land/clm2/camclm_share/fileutils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/gauaw_mod.F90 b/lis/surfacemodels/land/clm2/camclm_share/gauaw_mod.F90 index 9297cd177..4e2778237 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/gauaw_mod.F90 +++ b/lis/surfacemodels/land/clm2/camclm_share/gauaw_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/ioFileMod.F90 b/lis/surfacemodels/land/clm2/camclm_share/ioFileMod.F90 index 99a5b8c5d..3185d7bd1 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/ioFileMod.F90 +++ b/lis/surfacemodels/land/clm2/camclm_share/ioFileMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/linebuf_stdout.c b/lis/surfacemodels/land/clm2/camclm_share/linebuf_stdout.c index 018b1ab71..4d06d2f07 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/linebuf_stdout.c +++ b/lis/surfacemodels/land/clm2/camclm_share/linebuf_stdout.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/camclm_share/wrap_nf.F90 b/lis/surfacemodels/land/clm2/camclm_share/wrap_nf.F90 index 7a2dd8f67..29a47bd36 100644 --- a/lis/surfacemodels/land/clm2/camclm_share/wrap_nf.F90 +++ b/lis/surfacemodels/land/clm2/camclm_share/wrap_nf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/canhtset.F90 b/lis/surfacemodels/land/clm2/canhtset.F90 index 5d37c9329..1fc3dd639 100644 --- a/lis/surfacemodels/land/clm2/canhtset.F90 +++ b/lis/surfacemodels/land/clm2/canhtset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_dynsetup.F90 b/lis/surfacemodels/land/clm2/clm2_dynsetup.F90 index c422f71e7..80c5d341d 100644 --- a/lis/surfacemodels/land/clm2/clm2_dynsetup.F90 +++ b/lis/surfacemodels/land/clm2/clm2_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_finalize.F90 b/lis/surfacemodels/land/clm2/clm2_finalize.F90 index 68a9c128e..8fdbe5194 100644 --- a/lis/surfacemodels/land/clm2/clm2_finalize.F90 +++ b/lis/surfacemodels/land/clm2/clm2_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_lairead.F90 b/lis/surfacemodels/land/clm2/clm2_lairead.F90 index dfd49a39b..a607b8fb2 100644 --- a/lis/surfacemodels/land/clm2/clm2_lairead.F90 +++ b/lis/surfacemodels/land/clm2/clm2_lairead.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_lsmMod.F90 b/lis/surfacemodels/land/clm2/clm2_lsmMod.F90 index beeb78f6b..c0de91551 100644 --- a/lis/surfacemodels/land/clm2/clm2_lsmMod.F90 +++ b/lis/surfacemodels/land/clm2/clm2_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_main.F90 b/lis/surfacemodels/land/clm2/clm2_main.F90 index d7649e1c3..b8cb9dad4 100644 --- a/lis/surfacemodels/land/clm2/clm2_main.F90 +++ b/lis/surfacemodels/land/clm2/clm2_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_readrestart.F90 b/lis/surfacemodels/land/clm2/clm2_readrestart.F90 index e0e467db0..531439ae6 100644 --- a/lis/surfacemodels/land/clm2/clm2_readrestart.F90 +++ b/lis/surfacemodels/land/clm2/clm2_readrestart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_setup.F90 b/lis/surfacemodels/land/clm2/clm2_setup.F90 index 3c893818c..a2d778a32 100644 --- a/lis/surfacemodels/land/clm2/clm2_setup.F90 +++ b/lis/surfacemodels/land/clm2/clm2_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2_writerestart.F90 b/lis/surfacemodels/land/clm2/clm2_writerestart.F90 index 649353976..f4bdbcf1a 100644 --- a/lis/surfacemodels/land/clm2/clm2_writerestart.F90 +++ b/lis/surfacemodels/land/clm2/clm2_writerestart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/clm2type.F90 b/lis/surfacemodels/land/clm2/clm2type.F90 index 8b920a73c..8b382135d 100644 --- a/lis/surfacemodels/land/clm2/clm2type.F90 +++ b/lis/surfacemodels/land/clm2/clm2type.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_setwrfesmfexport.F90 b/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_setwrfesmfexport.F90 index d844ef28a..353e78815 100755 --- a/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_setwrfesmfexport.F90 +++ b/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_setwrfesmfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_wrf_esmff2t.F90 b/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_wrf_esmff2t.F90 index 1fee61403..722acd086 100644 --- a/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_wrf_esmff2t.F90 +++ b/lis/surfacemodels/land/clm2/cpl_wrf_esmf/clm2_wrf_esmff2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_setwrfexport.F90 b/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_setwrfexport.F90 index 9884ac966..a01b3d340 100755 --- a/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_setwrfexport.F90 +++ b/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_wrf_f2t.F90 b/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_wrf_f2t.F90 index c9fdbbb0c..70fcebdd2 100755 --- a/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_wrf_f2t.F90 +++ b/lis/surfacemodels/land/clm2/cpl_wrf_noesmf/clm2_wrf_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_const_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_const_mod.F90 index 1b89b68c4..27461e6c5 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_const_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_const_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_file_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_file_mod.F90 index e4d557343..4e28eda73 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_file_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_file_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_kind_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_kind_mod.F90 index ba6fcc969..df6b6334c 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_kind_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_kind_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_msg_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_msg_mod.F90 index 0c31b94a0..7893b2d63 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_msg_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_msg_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_orb_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_orb_mod.F90 index 3e2fd0cda..e1e17f9e3 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_orb_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_orb_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_sys_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_sys_mod.F90 index 15f2ac9f9..f54930240 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_sys_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_sys_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_timer_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_timer_mod.F90 index 62ad80b16..b6168ff7a 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_timer_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_timer_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_fwrap.c b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_fwrap.c index 792ada0cd..afbd25187 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_fwrap.c +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_fwrap.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_mod.F90 b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_mod.F90 index 74ce257f7..ec24bebe6 100644 --- a/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_mod.F90 +++ b/lis/surfacemodels/land/clm2/csm_share/clm2_shr_vmath_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_lst/clm2_descale_lst.F90 b/lis/surfacemodels/land/clm2/da_lst/clm2_descale_lst.F90 index f7ff26b4d..8666b01d7 100644 --- a/lis/surfacemodels/land/clm2/da_lst/clm2_descale_lst.F90 +++ b/lis/surfacemodels/land/clm2/da_lst/clm2_descale_lst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_lst/clm2_getlst.F90 b/lis/surfacemodels/land/clm2/da_lst/clm2_getlst.F90 index be32ad1f5..ee6a3b5c4 100755 --- a/lis/surfacemodels/land/clm2/da_lst/clm2_getlst.F90 +++ b/lis/surfacemodels/land/clm2/da_lst/clm2_getlst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_lst/clm2_getsynlstpred.F90 b/lis/surfacemodels/land/clm2/da_lst/clm2_getsynlstpred.F90 index d3a6c2b79..a46e7a8b6 100644 --- a/lis/surfacemodels/land/clm2/da_lst/clm2_getsynlstpred.F90 +++ b/lis/surfacemodels/land/clm2/da_lst/clm2_getsynlstpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_lst/clm2_qclst.F90 b/lis/surfacemodels/land/clm2/da_lst/clm2_qclst.F90 index d7673f707..59694bbe3 100644 --- a/lis/surfacemodels/land/clm2/da_lst/clm2_qclst.F90 +++ b/lis/surfacemodels/land/clm2/da_lst/clm2_qclst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_lst/clm2_scale_lst.F90 b/lis/surfacemodels/land/clm2/da_lst/clm2_scale_lst.F90 index 189a65df7..4e17404c8 100755 --- a/lis/surfacemodels/land/clm2/da_lst/clm2_scale_lst.F90 +++ b/lis/surfacemodels/land/clm2/da_lst/clm2_scale_lst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_lst/clm2_setlst.F90 b/lis/surfacemodels/land/clm2/da_lst/clm2_setlst.F90 index 89c140a0c..9fdc4076b 100644 --- a/lis/surfacemodels/land/clm2/da_lst/clm2_setlst.F90 +++ b/lis/surfacemodels/land/clm2/da_lst/clm2_setlst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_descale_snow.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_descale_snow.F90 index 3c2a43aef..52a34038e 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_descale_snow.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_getsnowvars.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_getsnowvars.F90 index 07350d3b2..8ddf34fc0 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_getsnowvars.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_getsnwdpred.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_getsnwdpred.F90 index c8950be63..fee19d6ca 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_getsnwdpred.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_getswepred.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_getswepred.F90 index 99662e404..3a9efb9fe 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_getswepred.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_map_sca.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_map_sca.F90 index fe9ee1644..c6516760d 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_map_sca.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_map_sca.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_qc_snowobs.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_qc_snowobs.F90 index e9902eb68..2dda77563 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_qc_snowobs.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_qcsnow.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_qcsnow.F90 index ed5af5962..fdfba4173 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_qcsnow.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_scale_snow.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_scale_snow.F90 index 19e5d1fbe..b1e44af0a 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_scale_snow.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_setsnowvars.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_setsnowvars.F90 index e832a8294..d6dec4964 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_setsnowvars.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_transform_obssca.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_transform_obssca.F90 index 4ed447804..2a60c2e12 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_transform_obssca.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_transform_obssca.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_snow/clm2_updatesnowvars.F90 b/lis/surfacemodels/land/clm2/da_snow/clm2_updatesnowvars.F90 index cf0333413..37b5f2f06 100644 --- a/lis/surfacemodels/land/clm2/da_snow/clm2_updatesnowvars.F90 +++ b/lis/surfacemodels/land/clm2/da_snow/clm2_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_descale_soilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_descale_soilm.F90 index c9742654a..cde460218 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_descale_soilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_getsoilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_getsoilm.F90 index aafccba4c..bc28a8cfe 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_getsoilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_getsynsmpred.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_getsynsmpred.F90 index 75a17584c..fb7e8a143 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_getsynsmpred.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_getsynsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_qcsoilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_qcsoilm.F90 index ab5e39c9a..a449eac34 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_qcsoilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_scale_soilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_scale_soilm.F90 index 5df70743d..8c42825cd 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_scale_soilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_setsoilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_setsoilm.F90 index 2733c6ccb..5c026037d 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_setsoilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_updatesoilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_updatesoilm.F90 index f49372658..735a34106 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_updatesoilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/da_soilm/clm2_write_soilm.F90 b/lis/surfacemodels/land/clm2/da_soilm/clm2_write_soilm.F90 index 9fd76b86b..287b53f2f 100644 --- a/lis/surfacemodels/land/clm2/da_soilm/clm2_write_soilm.F90 +++ b/lis/surfacemodels/land/clm2/da_soilm/clm2_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Allocation.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Allocation.F90 index 79b0e619c..6a1fedb2c 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Allocation.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Allocation.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/EcosystemDyn.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/EcosystemDyn.F90 index 347441567..d794c2e31 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/EcosystemDyn.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/EcosystemDyn.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Fire.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Fire.F90 index 863dd5866..2d8833b5e 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Fire.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Fire.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/FireSeason.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/FireSeason.F90 index aefee8fd1..bdf6ece78 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/FireSeason.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/FireSeason.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Kill.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Kill.F90 index cbfab266e..b7102dc4c 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Kill.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Kill.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/LitterSOM.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/LitterSOM.F90 index 3c7a20f73..26accc244 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/LitterSOM.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/LitterSOM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Mortality.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Mortality.F90 index 54fb0e8e9..e5420caa5 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Mortality.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Mortality.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Phenology.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Phenology.F90 index 3a3792c09..937ec6415 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Phenology.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Phenology.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Reproduction.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Reproduction.F90 index 21d0bc431..261b77e64 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Reproduction.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Reproduction.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/Turnover.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/Turnover.F90 index 1a05958e2..bddd1f7a3 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/Turnover.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/Turnover.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/ecosysdyn/accumDGVM.F90 b/lis/surfacemodels/land/clm2/ecosysdyn/accumDGVM.F90 index 0a8b3a763..3a727a1f9 100644 --- a/lis/surfacemodels/land/clm2/ecosysdyn/accumDGVM.F90 +++ b/lis/surfacemodels/land/clm2/ecosysdyn/accumDGVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/iniTimeConst.F90 b/lis/surfacemodels/land/clm2/iniTimeConst.F90 index 8411f234d..b593f35aa 100644 --- a/lis/surfacemodels/land/clm2/iniTimeConst.F90 +++ b/lis/surfacemodels/land/clm2/iniTimeConst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/iniTimeVar.F90 b/lis/surfacemodels/land/clm2/iniTimeVar.F90 index 014c66ca7..234d1db76 100644 --- a/lis/surfacemodels/land/clm2/iniTimeVar.F90 +++ b/lis/surfacemodels/land/clm2/iniTimeVar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/atm_lndMod.F90 b/lis/surfacemodels/land/clm2/main/atm_lndMod.F90 index 29960d6b7..c637e2898 100644 --- a/lis/surfacemodels/land/clm2/main/atm_lndMod.F90 +++ b/lis/surfacemodels/land/clm2/main/atm_lndMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/clm2_accumulMod.F90 b/lis/surfacemodels/land/clm2/main/clm2_accumulMod.F90 index 2257fb967..778d67d01 100644 --- a/lis/surfacemodels/land/clm2/main/clm2_accumulMod.F90 +++ b/lis/surfacemodels/land/clm2/main/clm2_accumulMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/clm2_areaMod.F90 b/lis/surfacemodels/land/clm2/main/clm2_areaMod.F90 index c29f07f12..563977ca6 100644 --- a/lis/surfacemodels/land/clm2/main/clm2_areaMod.F90 +++ b/lis/surfacemodels/land/clm2/main/clm2_areaMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/clm2_atmdrvMod.F90 b/lis/surfacemodels/land/clm2/main/clm2_atmdrvMod.F90 index 782a29f33..1e5ad58b8 100644 --- a/lis/surfacemodels/land/clm2/main/clm2_atmdrvMod.F90 +++ b/lis/surfacemodels/land/clm2/main/clm2_atmdrvMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/clm2_varcon.F90 b/lis/surfacemodels/land/clm2/main/clm2_varcon.F90 index e6a51e0e2..7509619aa 100644 --- a/lis/surfacemodels/land/clm2/main/clm2_varcon.F90 +++ b/lis/surfacemodels/land/clm2/main/clm2_varcon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/clm2_varpar.F90 b/lis/surfacemodels/land/clm2/main/clm2_varpar.F90 index 67f8b6a8e..a34d052e9 100644 --- a/lis/surfacemodels/land/clm2/main/clm2_varpar.F90 +++ b/lis/surfacemodels/land/clm2/main/clm2_varpar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/clm2_varsur.F90 b/lis/surfacemodels/land/clm2/main/clm2_varsur.F90 index 8e762b5b5..23c2aa4f0 100644 --- a/lis/surfacemodels/land/clm2/main/clm2_varsur.F90 +++ b/lis/surfacemodels/land/clm2/main/clm2_varsur.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/lnd_atmMod.F90 b/lis/surfacemodels/land/clm2/main/lnd_atmMod.F90 index 56c01cf09..116a2eb9b 100644 --- a/lis/surfacemodels/land/clm2/main/lnd_atmMod.F90 +++ b/lis/surfacemodels/land/clm2/main/lnd_atmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/pft_varcon.F90 b/lis/surfacemodels/land/clm2/main/pft_varcon.F90 index c878f6d66..1e7f7098d 100644 --- a/lis/surfacemodels/land/clm2/main/pft_varcon.F90 +++ b/lis/surfacemodels/land/clm2/main/pft_varcon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/snowdp2lev.F90 b/lis/surfacemodels/land/clm2/main/snowdp2lev.F90 index 4a0f013ca..a235823f1 100644 --- a/lis/surfacemodels/land/clm2/main/snowdp2lev.F90 +++ b/lis/surfacemodels/land/clm2/main/snowdp2lev.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/main/surfFileMod.F90 b/lis/surfacemodels/land/clm2/main/surfFileMod.F90 index 8c2408447..0898cc863 100644 --- a/lis/surfacemodels/land/clm2/main/surfFileMod.F90 +++ b/lis/surfacemodels/land/clm2/main/surfFileMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mkglacier.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mkglacier.F90 index fb588147a..5c3948514 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mkglacier.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mkglacier.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mkgridMod.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mkgridMod.F90 index ca6b5ff12..38d482353 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mkgridMod.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mkgridMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mklai.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mklai.F90 index eabb39e0e..08c045904 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mklai.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mklai.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mklanwat.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mklanwat.F90 index 67aff2814..afae2cd72 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mklanwat.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mklanwat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mkmxovr.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mkmxovr.F90 index 11f9db33a..bc997f381 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mkmxovr.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mkmxovr.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mkpft.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mkpft.F90 index 893f0de93..a96f44468 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mkpft.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mkpft.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mkrank.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mkrank.F90 index e8d30338d..5bd5647c8 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mkrank.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mkrank.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mksoicol.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mksoicol.F90 index 370391338..6778d1ac5 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mksoicol.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mksoicol.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mksoitex.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mksoitex.F90 index fd189172e..f1b602931 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mksoitex.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mksoitex.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mksrfdatMod.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mksrfdatMod.F90 index d5fd926c6..3fe91a25c 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mksrfdatMod.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mksrfdatMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/mksrfdata/mkurban.F90 b/lis/surfacemodels/land/clm2/mksrfdata/mkurban.F90 index 330184fd5..5f5222fe8 100644 --- a/lis/surfacemodels/land/clm2/mksrfdata/mkurban.F90 +++ b/lis/surfacemodels/land/clm2/mksrfdata/mkurban.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/readclm2crd.F90 b/lis/surfacemodels/land/clm2/readclm2crd.F90 index 340093055..ab624b028 100644 --- a/lis/surfacemodels/land/clm2/readclm2crd.F90 +++ b/lis/surfacemodels/land/clm2/readclm2crd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/riverroute/RtmMod.F90 b/lis/surfacemodels/land/clm2/riverroute/RtmMod.F90 index f29946243..ff8f6b1af 100644 --- a/lis/surfacemodels/land/clm2/riverroute/RtmMod.F90 +++ b/lis/surfacemodels/land/clm2/riverroute/RtmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack2d.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack2d.F90 index 34fea3269..f3cdf3bbe 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack2d.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack2d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack3d.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack3d.F90 index 9cea18a75..138201545 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack3d.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack3d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack4d.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack4d.F90 index 3fcb6fc09..3d981e257 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack4d.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferpack4d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack2d.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack2d.F90 index c04bc756e..9e59d9bd0 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack2d.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack2d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack3d.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack3d.F90 index d080bb7be..71f45e561 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack3d.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack3d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack4d.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack4d.F90 index 3cb4bf0fa..b3ad81389 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack4d.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/bufferunpack4d.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/debug.h b/lis/surfacemodels/land/clm2/utils/pilgrim/debug.h index b73746388..b8fc35c1d 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/debug.h +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/debug.h @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/debugutilitiesmodule.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/debugutilitiesmodule.F90 index 9064983a9..65eea11a7 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/debugutilitiesmodule.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/debugutilitiesmodule.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/decompmodule.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/decompmodule.F90 index 314f13fd5..351e61614 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/decompmodule.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/decompmodule.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/ghostmodule.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/ghostmodule.F90 index c102e3908..d85f4880e 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/ghostmodule.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/ghostmodule.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/parutilitiesmodule.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/parutilitiesmodule.F90 index 0b0d4c99f..ee155e74d 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/parutilitiesmodule.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/parutilitiesmodule.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/pilgrim.h b/lis/surfacemodels/land/clm2/utils/pilgrim/pilgrim.h index b3cfebc30..18d71804f 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/pilgrim.h +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/pilgrim.h @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/puminterfaces.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/puminterfaces.F90 index dd687f152..b35b26116 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/puminterfaces.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/puminterfaces.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/pilgrim/redistributemodule.F90 b/lis/surfacemodels/land/clm2/utils/pilgrim/redistributemodule.F90 index 99b12270e..7e1b84501 100644 --- a/lis/surfacemodels/land/clm2/utils/pilgrim/redistributemodule.F90 +++ b/lis/surfacemodels/land/clm2/utils/pilgrim/redistributemodule.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/f_wrappers.c b/lis/surfacemodels/land/clm2/utils/timing/f_wrappers.c index 29ae425e2..1b8f220dd 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/f_wrappers.c +++ b/lis/surfacemodels/land/clm2/utils/timing/f_wrappers.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/get_cpustamp.c b/lis/surfacemodels/land/clm2/utils/timing/get_cpustamp.c index 2a0415eed..cf3cf481c 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/get_cpustamp.c +++ b/lis/surfacemodels/land/clm2/utils/timing/get_cpustamp.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/get_thread_num.c b/lis/surfacemodels/land/clm2/utils/timing/get_thread_num.c index 49e167d24..38f65e743 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/get_thread_num.c +++ b/lis/surfacemodels/land/clm2/utils/timing/get_thread_num.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/gpt.h b/lis/surfacemodels/land/clm2/utils/timing/gpt.h index 6ceb8b4df..9b544d34c 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/gpt.h +++ b/lis/surfacemodels/land/clm2/utils/timing/gpt.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_error.c b/lis/surfacemodels/land/clm2/utils/timing/t_error.c index 1af24ce73..b7010ceed 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_error.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_error.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_initialize.c b/lis/surfacemodels/land/clm2/utils/timing/t_initialize.c index 954b54662..fc86e8ad5 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_initialize.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_initialize.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_pclstr.c b/lis/surfacemodels/land/clm2/utils/timing/t_pclstr.c index e93a63966..80379a81c 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_pclstr.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_pclstr.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_pr.c b/lis/surfacemodels/land/clm2/utils/timing/t_pr.c index 004febd13..a3777f04d 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_pr.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_pr.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_reset.c b/lis/surfacemodels/land/clm2/utils/timing/t_reset.c index af8bd1ff3..317b30325 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_reset.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_reset.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_setoption.c b/lis/surfacemodels/land/clm2/utils/timing/t_setoption.c index 2f5fe0b86..816731ed9 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_setoption.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_setoption.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_stamp.c b/lis/surfacemodels/land/clm2/utils/timing/t_stamp.c index 669b660a2..cb47fb452 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_stamp.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_stamp.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_start.c b/lis/surfacemodels/land/clm2/utils/timing/t_start.c index f59be06dd..fdc123ad0 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_start.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_start.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clm2/utils/timing/t_stop.c b/lis/surfacemodels/land/clm2/utils/timing/t_stop.c index 7140d159c..a26db42cf 100644 --- a/lis/surfacemodels/land/clm2/utils/timing/t_stop.c +++ b/lis/surfacemodels/land/clm2/utils/timing/t_stop.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/0Intro_clsmf25.txt b/lis/surfacemodels/land/clsm.f2.5/0Intro_clsmf25.txt index e4f22318a..27d44e47f 100755 --- a/lis/surfacemodels/land/clsm.f2.5/0Intro_clsmf25.txt +++ b/lis/surfacemodels/land/clsm.f2.5/0Intro_clsmf25.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_DragCoefficientsMod.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_DragCoefficientsMod.F90 index 01a6cd1c2..beccb9fd7 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_DragCoefficientsMod.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_DragCoefficientsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_MAPL_constants.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_MAPL_constants.F90 index f77f7bd6d..63c6b14c1 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_MAPL_constants.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_MAPL_constants.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_compute_land_parameters.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_compute_land_parameters.F90 index 1e6042ec7..3002a1ae3 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_compute_land_parameters.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_compute_land_parameters.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_constants.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_constants.F90 index 4c2680585..d74fbb5f7 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_constants.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_constants.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_diagn_routines.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_diagn_routines.F90 index abd6cff92..8e388f66b 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_diagn_routines.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_diagn_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_drv_types.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_drv_types.F90 index 40788954a..3512c7e28 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_drv_types.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_drv_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_dynsetup.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_dynsetup.F90 index dec072eeb..9cb001f88 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_dynsetup.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_esat_qsat.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_esat_qsat.F90 index 2242db3e0..46cd6c6d5 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_esat_qsat.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_esat_qsat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_f2t.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_f2t.F90 index 9d03579b5..0175ede1b 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_f2t.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_finalize.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_finalize.F90 index b13488395..f88370475 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_finalize.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_lsmMod.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_lsmMod.F90 index 9839e3153..20a83584b 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_lsmMod.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_main.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_main.F90 index 15bd441dd..a407ff864 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_main.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_model.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_model.F90 index 86899e335..1dfcd60f6 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_model.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_model.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_modis_alb_types.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_modis_alb_types.F90 index 47018236a..1e8b8c82d 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_modis_alb_types.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_modis_alb_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_pmonth_stage4.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_pmonth_stage4.F90 index 304894890..49141f1a9 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_pmonth_stage4.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_pmonth_stage4.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_readcrd.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_readcrd.F90 index bfcf93abd..af491943d 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_readcrd.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_readrst.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_readrst.F90 index f6159bcc5..5d1564e89 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_readrst.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_relayer_snow.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_relayer_snow.F90 index 27860e87d..c80b4e4a8 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_relayer_snow.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_relayer_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_reset.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_reset.F90 index c947af55f..5f7281bd5 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_reset.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_setup.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_setup.F90 index a5ea37d03..392175821 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_setup.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_sibalb_coeff.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_sibalb_coeff.F90 index 339b9a084..c9ffeb091 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_sibalb_coeff.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_sibalb_coeff.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_surfacelayer.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_surfacelayer.F90 index d23d88712..c2e353445 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_surfacelayer.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_surfacelayer.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_turb.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_turb.F90 index 547bce854..f5da85cb1 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_turb.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_turb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_types.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_types.F90 index a18bc3ef5..5c4877269 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_types.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_types.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/clsmf25_writerst.F90 b/lis/surfacemodels/land/clsm.f2.5/clsmf25_writerst.F90 index 902741e7b..4bea85288 100644 --- a/lis/surfacemodels/land/clsm.f2.5/clsmf25_writerst.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/clsmf25_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_dasnow_Mod.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_dasnow_Mod.F90 index 115cd343c..322345a55 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_descale_snow.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_descale_snow.F90 index 777f43f03..7a2867257 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_descale_snow.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnowvars.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnowvars.F90 index dae7fb7c1..6bc4b9758 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnowvars.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnwdpred.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnwdpred.F90 index ed265a35c..c12839e3d 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnwdpred.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qc_snowobs.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qc_snowobs.F90 index 51f7fcbdf..b194597ef 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qc_snowobs.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qcsnow.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qcsnow.F90 index 9e06c6030..fb9461408 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qcsnow.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_scale_snow.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_scale_snow.F90 index a17ea40c2..20a5b7841 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_scale_snow.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_setsnowvars.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_setsnowvars.F90 index 0493d6448..a703a4af1 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_setsnowvars.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_snow_DAlog.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_snow_DAlog.F90 index 4f4f0a192..eec7e35a5 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_snow_DAlog.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_snow_DAlog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_updatesnowvars.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_updatesnowvars.F90 index 834cfc759..beb21a713 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_updatesnowvars.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_wrtswe.F90 b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_wrtswe.F90 index 1f8d85348..3fe0db646 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_wrtswe.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_snow/clsmf25_wrtswe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_dasoilm_Mod.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_dasoilm_Mod.F90 index abe5dfe7c..7ec0360a6 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_descale_soilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_descale_soilm.F90 index f6e4afa91..2499223d1 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_descale_soilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsmpred.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsmpred.F90 index ef1772011..c1bd736a0 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsmpred.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsoilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsoilm.F90 index 939bd4626..aeb41ff82 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsoilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qc_soilmobs.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qc_soilmobs.F90 index 3da2450cb..4890a5e82 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qcsoilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qcsoilm.F90 index 07023e278..bb6939daf 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qcsoilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_scale_soilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_scale_soilm.F90 index 4a76b6d32..b52d72a42 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_scale_soilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_setsoilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_setsoilm.F90 index bb4935a50..aa5e6a816 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_setsoilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_soilm_DAlog.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_soilm_DAlog.F90 index d6ece4180..66a583ab1 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_soilm_DAlog.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_soilm_DAlog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_updatesoilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_updatesoilm.F90 index f44c5e902..fe110b734 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_updatesoilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_write_soilm.F90 b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_write_soilm.F90 index 6e6aa71a2..892be4500 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_write_soilm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_soilm/clsmf25_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_datws_Mod.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_datws_Mod.F90 index 2430b05db..9dbc3cb09 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_datws_Mod.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_datws_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_descale_tws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_descale_tws.F90 index f157a3757..006cedafa 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_descale_tws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_descale_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettws.F90 index 82ff8de72..898c8185f 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettwspred.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettwspred.F90 index 696f6f809..57275f4be 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettwspred.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_gettwspred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qc_twsobs.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qc_twsobs.F90 index b5e373e22..b6e445d14 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qc_twsobs.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qc_twsobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qctws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qctws.F90 index eb3ea8847..d4c65e6e4 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qctws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_qctws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_scale_tws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_scale_tws.F90 index f5f8f669a..f5e084e7b 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_scale_tws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_scale_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_settws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_settws.F90 index 1922e509b..dc60fa7de 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_settws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_settws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_tws_DAlogMod.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_tws_DAlogMod.F90 index dfba68d02..440536173 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_tws_DAlogMod.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_tws_DAlogMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_update_tws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_update_tws.F90 index 848a49b86..d4041135f 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_update_tws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_update_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_write_tws.F90 b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_write_tws.F90 index 24019d158..597df017a 100644 --- a/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_write_tws.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/da_tws/clsmf25_write_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/irrigation/clsmf25_getirrigationstates.F90 b/lis/surfacemodels/land/clsm.f2.5/irrigation/clsmf25_getirrigationstates.F90 index fc21a1a9a..6e84e9231 100644 --- a/lis/surfacemodels/land/clsm.f2.5/irrigation/clsmf25_getirrigationstates.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/irrigation/clsmf25_getirrigationstates.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs.F90 b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs.F90 index 37613ab50..22a14829e 100644 --- a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_hymap2.F90 b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_hymap2.F90 index 7469ae26c..03d758b05 100755 --- a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_mm.F90 b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_mm.F90 index f3dc38cdd..c880e12fd 100644 --- a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getsws_hymap2.F90 b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getsws_hymap2.F90 index 3144828b5..69ff79db1 100644 --- a/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getsws_hymap2.F90 +++ b/lis/surfacemodels/land/clsm.f2.5/routing/clsmf25_getsws_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/0Intro_geowrsi2.txt b/lis/surfacemodels/land/geowrsi.2/0Intro_geowrsi2.txt index b342e412d..b0090d258 100644 --- a/lis/surfacemodels/land/geowrsi.2/0Intro_geowrsi2.txt +++ b/lis/surfacemodels/land/geowrsi.2/0Intro_geowrsi2.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_arraymgmt_module.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_arraymgmt_module.F90 index 2215cd45a..b62362dd7 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_arraymgmt_module.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_arraymgmt_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_dynsetup.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_dynsetup.F90 index 6c0f51f74..f6a288238 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_dynsetup.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_f2t.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_f2t.F90 index 3d44268f4..e80ec9ed4 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_f2t.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_finalize.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_finalize.F90 index fb17f1c87..1bb163fc7 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_finalize.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_lsmMod.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_lsmMod.F90 index 35bfc2b1a..a83c0466b 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_lsmMod.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_main.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_main.F90 index f94bec23c..a738f2e3d 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_main.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_module.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_module.F90 index d9fe3fa4b..8815213ee 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_module.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_physics_module.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_physics_module.F90 index ec2d99928..3db87d035 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_physics_module.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_physics_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readInputSettings.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readInputSettings.F90 index 0016bc82f..92b7a126f 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readInputSettings.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readInputSettings.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readSOS_Bilfile.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readSOS_Bilfile.F90 index 8c11cc3c2..85b6e1900 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readSOS_Bilfile.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readSOS_Bilfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readcrd.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readcrd.F90 index 88ae53239..13552fe3f 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readcrd.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readrst.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readrst.F90 index cdbd1d497..05a63e28e 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_readrst.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_set_gcoords.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_set_gcoords.F90 index 3cc436eb8..6002cffd4 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_set_gcoords.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_set_gcoords.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_setup.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_setup.F90 index d2e6b99c5..32a35c2ec 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_setup.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_writeSOS_Bilfile.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_writeSOS_Bilfile.F90 index b32ef994a..194d00440 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_writeSOS_Bilfile.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_writeSOS_Bilfile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/geowrsi.2/geowrsi2_writerst.F90 b/lis/surfacemodels/land/geowrsi.2/geowrsi2_writerst.F90 index 75fcd5147..03202978e 100644 --- a/lis/surfacemodels/land/geowrsi.2/geowrsi2_writerst.F90 +++ b/lis/surfacemodels/land/geowrsi.2/geowrsi2_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/0Intro_hyssib.txt b/lis/surfacemodels/land/hyssib/0Intro_hyssib.txt index 4a7d1e27b..916c8eda2 100644 --- a/lis/surfacemodels/land/hyssib/0Intro_hyssib.txt +++ b/lis/surfacemodels/land/hyssib/0Intro_hyssib.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_coldstart.F90 b/lis/surfacemodels/land/hyssib/hyssib_coldstart.F90 index fc7431286..f0c37617e 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_coldstart.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_dynsetup.F90 b/lis/surfacemodels/land/hyssib/hyssib_dynsetup.F90 index c64813168..bc55ba3c0 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_dynsetup.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_f2t.F90 b/lis/surfacemodels/land/hyssib/hyssib_f2t.F90 index 432e143ff..8ffa4bca7 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_f2t.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_finalize.F90 b/lis/surfacemodels/land/hyssib/hyssib_finalize.F90 index c430395ee..781440fc9 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_finalize.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_gfrac.F90 b/lis/surfacemodels/land/hyssib/hyssib_gfrac.F90 index f8655ff49..70828debb 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_gfrac.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_gfrac.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_lsmMod.F90 b/lis/surfacemodels/land/hyssib/hyssib_lsmMod.F90 index 343b47073..2039acb63 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_lsmMod.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_main.F90 b/lis/surfacemodels/land/hyssib/hyssib_main.F90 index 9b36e11c8..1229efebc 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_main.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_mapvegc.F90 b/lis/surfacemodels/land/hyssib/hyssib_mapvegc.F90 index 3f42f52ec..99472fcb7 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_mapvegc.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_mapvegc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_module.F90 b/lis/surfacemodels/land/hyssib/hyssib_module.F90 index 0a186b61d..c6dada8be 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_module.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_readcrd.F90 b/lis/surfacemodels/land/hyssib/hyssib_readcrd.F90 index 4b164bb06..ff8a198af 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_readcrd.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_readrst.F90 b/lis/surfacemodels/land/hyssib/hyssib_readrst.F90 index 4b6514948..d5cb58743 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_readrst.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_settbot.F90 b/lis/surfacemodels/land/hyssib/hyssib_settbot.F90 index 88abe24d7..4a4fca12d 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_settbot.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_settbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_settopostd.F90 b/lis/surfacemodels/land/hyssib/hyssib_settopostd.F90 index 9ba1c3061..0c2a05acb 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_settopostd.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_settopostd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_setup.F90 b/lis/surfacemodels/land/hyssib/hyssib_setup.F90 index c95b56d50..03bf1ecf8 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_setup.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_setvegparms.F90 b/lis/surfacemodels/land/hyssib/hyssib_setvegparms.F90 index 4ef24bc0e..89b03edc3 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_setvegparms.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_totinit.F90 b/lis/surfacemodels/land/hyssib/hyssib_totinit.F90 index 1e6e12ade..f46b38bdb 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_totinit.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_totinit.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssib_writerst.F90 b/lis/surfacemodels/land/hyssib/hyssib_writerst.F90 index f68789f9f..49367f63d 100644 --- a/lis/surfacemodels/land/hyssib/hyssib_writerst.F90 +++ b/lis/surfacemodels/land/hyssib/hyssib_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssibalb_module.F90 b/lis/surfacemodels/land/hyssib/hyssibalb_module.F90 index fd0159830..24bc057b6 100755 --- a/lis/surfacemodels/land/hyssib/hyssibalb_module.F90 +++ b/lis/surfacemodels/land/hyssib/hyssibalb_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/hyssib/hyssibveg_module.F90 b/lis/surfacemodels/land/hyssib/hyssibveg_module.F90 index 266aef0e5..69d63403c 100755 --- a/lis/surfacemodels/land/hyssib/hyssibveg_module.F90 +++ b/lis/surfacemodels/land/hyssib/hyssibveg_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/ancil_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/ancil_to_tile.F90 index 7508d817a..dbb090e7f 100644 --- a/lis/surfacemodels/land/jules.5.0/ancil_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/ancil_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/bvoc_vars_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/bvoc_vars_to_tile.F90 index 41d495b3f..8706f6168 100644 --- a/lis/surfacemodels/land/jules.5.0/bvoc_vars_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/bvoc_vars_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/couple_jules_to_lis.sh b/lis/surfacemodels/land/jules.5.0/couple_jules_to_lis.sh index aff70c649..15ecc73c3 100755 --- a/lis/surfacemodels/land/jules.5.0/couple_jules_to_lis.sh +++ b/lis/surfacemodels/land/jules.5.0/couple_jules_to_lis.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_dasnodep_Mod.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_dasnodep_Mod.F90 index 50a8380e8..ee19606c2 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_dasnodep_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_dasnodep_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_descale_snodep.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_descale_snodep.F90 index 207c70d1f..39eb7ab11 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_descale_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodeppred.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodeppred.F90 index b373f57ff..d20f7bd92 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodeppred.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodepvars.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodepvars.F90 index d70436f05..a789d771b 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodepvars.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_map_snodep.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_map_snodep.F90 index 4b077626d..ac371e8a1 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_map_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qc_snodepobs.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qc_snodepobs.F90 index 24991415c..780b9c196 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qcsnodep.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qcsnodep.F90 index e09597529..a4de6f464 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qcsnodep.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_scale_snodep.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_scale_snodep.F90 index 348f92576..85e201188 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_scale_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_setsnodepvars.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_setsnodepvars.F90 index 9812b58b1..e7383135f 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_setsnodepvars.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_snodep_update.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_snodep_update.F90 index dedd1215d..431586325 100644 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_snodep_update.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_snodep_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_transform_snodep.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_transform_snodep.F90 index 31d512268..fb4c753b4 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_transform_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_updatesnodep.F90 b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_updatesnodep.F90 index ade4603ba..da93c79e1 100755 --- a/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_updatesnodep.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_snodep/jules50_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_dasoilm_Mod.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_dasoilm_Mod.F90 index 85254b15a..12be1645a 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_descale_soilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_descale_soilm.F90 index 82427effc..cc6071576 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_descale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getLbandTbPred.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getLbandTbPred.F90 index 8bf03b20a..8835b57ba 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsmpred.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsmpred.F90 index f5c0b0d33..9d9434dec 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsmpred.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsoilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsoilm.F90 index 002cb663a..e45d994fe 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qc_soilmobs.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qc_soilmobs.F90 index 205aa595f..b168e5328 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qcsoilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qcsoilm.F90 index 72dcc9a41..8c0f12284 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qcsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_scale_soilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_scale_soilm.F90 index ff963c9e8..4a6c5c918 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_scale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_setsoilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_setsoilm.F90 index 60fadc471..15dea1ffd 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_setsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_updatesoilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_updatesoilm.F90 index 2e9973187..c337ed4ac 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_updatesoilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_write_soilm.F90 b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_write_soilm.F90 index 8acb01c84..e95f246c8 100644 --- a/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_write_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_soilm/jules50_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_dausafsi_Mod.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_dausafsi_Mod.F90 index 5ed4d5ec6..b90fff919 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_dausafsi_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_dausafsi_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_descale_usafsi.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_descale_usafsi.F90 index 84af53675..e1f8a440a 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_descale_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_descale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsipred.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsipred.F90 index 9217039ca..dc57ef496 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsipred.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsipred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsivars.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsivars.F90 index 7baacd32c..bf5cbc8f0 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsivars.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_getusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_map_usafsi.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_map_usafsi.F90 index ba3bbce21..356a55c6e 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_map_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_map_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qc_usafsiobs.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qc_usafsiobs.F90 index 3f6855536..916e1a9c7 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qc_usafsiobs.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qc_usafsiobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qcusafsi.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qcusafsi.F90 index b28c663c0..bd04c5908 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qcusafsi.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_qcusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_scale_usafsi.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_scale_usafsi.F90 index eed74230e..02b9782c0 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_scale_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_scale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_setusafsivars.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_setusafsivars.F90 index 4583da751..b0861e53a 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_setusafsivars.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_setusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_transform_usafsi.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_transform_usafsi.F90 index 38ce2ec6b..06db58904 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_transform_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_transform_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_updateusafsi.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_updateusafsi.F90 index 9cea70352..ae3acd687 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_updateusafsi.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_updateusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_usafsi_update.F90 b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_usafsi_update.F90 index 443623afa..be86e4a3a 100644 --- a/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_usafsi_update.F90 +++ b/lis/surfacemodels/land/jules.5.0/da_usafsi/jules50_usafsi_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/debug_latlon.F90 b/lis/surfacemodels/land/jules.5.0/debug_latlon.F90 index e36a1ec95..295150b63 100644 --- a/lis/surfacemodels/land/jules.5.0/debug_latlon.F90 +++ b/lis/surfacemodels/land/jules.5.0/debug_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/fluxes_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/fluxes_to_tile.F90 index 0d8684193..7d31b153d 100644 --- a/lis/surfacemodels/land/jules.5.0/fluxes_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/fluxes_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_coldstart.F90 b/lis/surfacemodels/land/jules.5.0/jules50_coldstart.F90 index adabea70d..68f3c2d81 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_coldstart.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_dynsetup.F90 b/lis/surfacemodels/land/jules.5.0/jules50_dynsetup.F90 index 8834196ee..4337fdb9e 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_dynsetup.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_f2t.F90 b/lis/surfacemodels/land/jules.5.0/jules50_f2t.F90 index 115c4c7e4..7126b5e8e 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_f2t.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_finalize.F90 b/lis/surfacemodels/land/jules.5.0/jules50_finalize.F90 index 644a45584..b1193b8d2 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_finalize.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_getrunoffs.F90 b/lis/surfacemodels/land/jules.5.0/jules50_getrunoffs.F90 index 08cb098f6..edaf9a342 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_getrunoffs.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_initialize.F90 b/lis/surfacemodels/land/jules.5.0/jules50_initialize.F90 index 6caf9de79..fc0d8f66d 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_initialize.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_initialize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_lsmMod.F90 b/lis/surfacemodels/land/jules.5.0/jules50_lsmMod.F90 index 0c1e09071..f70c450de 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_lsmMod.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_main.F90 b/lis/surfacemodels/land/jules.5.0/jules50_main.F90 index dec997a1d..70e4fb18c 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_main.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_main.F90.original b/lis/surfacemodels/land/jules.5.0/jules50_main.F90.original index c201f6a59..717ba8d31 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_main.F90.original +++ b/lis/surfacemodels/land/jules.5.0/jules50_main.F90.original @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_module.F90 b/lis/surfacemodels/land/jules.5.0/jules50_module.F90 index 9a0409e17..4f87cb8a6 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_module.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_read_multilevel_param.F90 b/lis/surfacemodels/land/jules.5.0/jules50_read_multilevel_param.F90 index 897fc5cb1..e0f346e3a 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_read_multilevel_param.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_read_multilevel_param.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_readcrd.F90 b/lis/surfacemodels/land/jules.5.0/jules50_readcrd.F90 index 013c06884..4aa0038a6 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_readcrd.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_readrst.F90 b/lis/surfacemodels/land/jules.5.0/jules50_readrst.F90 index 3ab07d029..e46e87735 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_readrst.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_setup.F90 b/lis/surfacemodels/land/jules.5.0/jules50_setup.F90 index c33f28200..69d104d76 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_setup.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules50_writerst.F90 b/lis/surfacemodels/land/jules.5.0/jules50_writerst.F90 index 7363993b2..bdc9327ae 100644 --- a/lis/surfacemodels/land/jules.5.0/jules50_writerst.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules50_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules_internal_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/jules_internal_to_tile.F90 index 171f4b78e..0d2c0d373 100644 --- a/lis/surfacemodels/land/jules.5.0/jules_internal_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/jules_internal_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/jules_lis_exchange.f90 b/lis/surfacemodels/land/jules.5.0/jules_lis_exchange.f90 index 22fbaaee6..7fab94c63 100644 --- a/lis/surfacemodels/land/jules.5.0/jules_lis_exchange.f90 +++ b/lis/surfacemodels/land/jules.5.0/jules_lis_exchange.f90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/l_to_rc.F90 b/lis/surfacemodels/land/jules.5.0/l_to_rc.F90 index 876760a77..993d1ad4a 100644 --- a/lis/surfacemodels/land/jules.5.0/l_to_rc.F90 +++ b/lis/surfacemodels/land/jules.5.0/l_to_rc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/lis_control.F90 b/lis/surfacemodels/land/jules.5.0/lis_control.F90 index e2551ab40..e040c31a7 100644 --- a/lis/surfacemodels/land/jules.5.0/lis_control.F90 +++ b/lis/surfacemodels/land/jules.5.0/lis_control.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/prog_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/prog_to_tile.F90 index d12f1d298..23c6ecbdc 100644 --- a/lis/surfacemodels/land/jules.5.0/prog_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/prog_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/ps_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/ps_to_tile.F90 index 8e75c1b17..28bae6f86 100644 --- a/lis/surfacemodels/land/jules.5.0/ps_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/ps_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_hymap2.F90 b/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_hymap2.F90 index 40f324153..c28706dd5 100644 --- a/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_hymap2.F90 @@ -1,7 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- -! NASA Goddard Space Flight Center Land Information System (LIS) v7.2 +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 ! -! Copyright (c) 2015 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_mm.F90 b/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_mm.F90 index 487e3e30f..2df87ff0c 100644 --- a/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_rapid.F90 b/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_rapid.F90 index ea637a3af..03e957042 100644 --- a/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_rapid.F90 +++ b/lis/surfacemodels/land/jules.5.0/routing/jules50_getrunoffs_rapid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/routing/jules50_getsws_hymap2.F90 b/lis/surfacemodels/land/jules.5.0/routing/jules50_getsws_hymap2.F90 index fa7532754..08ea96c8a 100644 --- a/lis/surfacemodels/land/jules.5.0/routing/jules50_getsws_hymap2.F90 +++ b/lis/surfacemodels/land/jules.5.0/routing/jules50_getsws_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/sf_diag_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/sf_diag_to_tile.F90 index 160825994..98e823041 100644 --- a/lis/surfacemodels/land/jules.5.0/sf_diag_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/sf_diag_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_ancil.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_ancil.F90 index 06c174e52..6d58c0cd0 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_ancil.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_ancil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_bvoc_vars.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_bvoc_vars.F90 index 94f8f5e0d..b02b573c4 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_bvoc_vars.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_bvoc_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_fluxes.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_fluxes.F90 index 38976069d..24846620c 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_fluxes.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_fluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_forcing.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_forcing.F90 index 780ab7aa3..c3422cb8b 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_forcing.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_forcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_jules_internal.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_jules_internal.F90 index 5b903ff99..7b93fe861 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_jules_internal.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_jules_internal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_prog.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_prog.F90 index e48011f50..d96167d03 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_prog.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_prog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_ps.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_ps.F90 index f16c6aaf5..b061c79ff 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_ps.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_ps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_sf_diag.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_sf_diag.F90 index f1b09d896..c818cf666 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_sf_diag.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_sf_diag.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_top_pdm.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_top_pdm.F90 index 58b9752b2..7325f9b12 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_top_pdm.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_top_pdm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/tile_to_trifctl.F90 b/lis/surfacemodels/land/jules.5.0/tile_to_trifctl.F90 index f4697fb88..15b7acee8 100644 --- a/lis/surfacemodels/land/jules.5.0/tile_to_trifctl.F90 +++ b/lis/surfacemodels/land/jules.5.0/tile_to_trifctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/top_pdm_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/top_pdm_to_tile.F90 index 385f90dda..69b6dd782 100644 --- a/lis/surfacemodels/land/jules.5.0/top_pdm_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/top_pdm_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.0/trifctl_to_tile.F90 b/lis/surfacemodels/land/jules.5.0/trifctl_to_tile.F90 index dc668ce21..da03421f0 100644 --- a/lis/surfacemodels/land/jules.5.0/trifctl_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.0/trifctl_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/ancil_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/ancil_to_tile.F90 index 6b7dd8769..dfcaf95db 100644 --- a/lis/surfacemodels/land/jules.5.1/ancil_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/ancil_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/bvoc_vars_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/bvoc_vars_to_tile.F90 index 7db34366e..8bcc25dc6 100644 --- a/lis/surfacemodels/land/jules.5.1/bvoc_vars_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/bvoc_vars_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/couple_jules_to_lis.sh b/lis/surfacemodels/land/jules.5.1/couple_jules_to_lis.sh index d3330d008..2043f0626 100755 --- a/lis/surfacemodels/land/jules.5.1/couple_jules_to_lis.sh +++ b/lis/surfacemodels/land/jules.5.1/couple_jules_to_lis.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/debug_latlon.F90 b/lis/surfacemodels/land/jules.5.1/debug_latlon.F90 index e36a1ec95..295150b63 100644 --- a/lis/surfacemodels/land/jules.5.1/debug_latlon.F90 +++ b/lis/surfacemodels/land/jules.5.1/debug_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/fluxes_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/fluxes_to_tile.F90 index 0feb3c166..242f66d11 100644 --- a/lis/surfacemodels/land/jules.5.1/fluxes_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/fluxes_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_coldstart.F90 b/lis/surfacemodels/land/jules.5.1/jules51_coldstart.F90 index 8abf853f4..70cb03694 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_coldstart.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_dynsetup.F90 b/lis/surfacemodels/land/jules.5.1/jules51_dynsetup.F90 index 03619949d..1c11bcb2f 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_dynsetup.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_f2t.F90 b/lis/surfacemodels/land/jules.5.1/jules51_f2t.F90 index 0fc49503e..ce823a4f3 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_f2t.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_finalize.F90 b/lis/surfacemodels/land/jules.5.1/jules51_finalize.F90 index 00591fc0a..f51c96859 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_finalize.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_getrunoffs.F90 b/lis/surfacemodels/land/jules.5.1/jules51_getrunoffs.F90 index 31199ccd3..81e7d6822 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_getrunoffs.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_initialize.F90 b/lis/surfacemodels/land/jules.5.1/jules51_initialize.F90 index 5bc9e27e8..9b2e0c617 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_initialize.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_initialize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_lsmMod.F90 b/lis/surfacemodels/land/jules.5.1/jules51_lsmMod.F90 index 8294175a7..c6e822669 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_lsmMod.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_main.F90 b/lis/surfacemodels/land/jules.5.1/jules51_main.F90 index 5361f7446..e15a54c72 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_main.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_module.F90 b/lis/surfacemodels/land/jules.5.1/jules51_module.F90 index e8f0f639d..17af270eb 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_module.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_read_multilevel_param.F90 b/lis/surfacemodels/land/jules.5.1/jules51_read_multilevel_param.F90 index 4921fad4f..560881794 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_read_multilevel_param.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_read_multilevel_param.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_readcrd.F90 b/lis/surfacemodels/land/jules.5.1/jules51_readcrd.F90 index ca4c87303..3f022a888 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_readcrd.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_readrst.F90 b/lis/surfacemodels/land/jules.5.1/jules51_readrst.F90 index 616e5d679..da2068b82 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_readrst.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_setup.F90 b/lis/surfacemodels/land/jules.5.1/jules51_setup.F90 index 4f268b75b..c454a84d2 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_setup.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules51_writerst.F90 b/lis/surfacemodels/land/jules.5.1/jules51_writerst.F90 index dd06fdd2d..05d98b28f 100644 --- a/lis/surfacemodels/land/jules.5.1/jules51_writerst.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules51_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules_internal_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/jules_internal_to_tile.F90 index 6a4d0e5d8..ea48c097b 100644 --- a/lis/surfacemodels/land/jules.5.1/jules_internal_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules_internal_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/jules_lis_exchange.F90 b/lis/surfacemodels/land/jules.5.1/jules_lis_exchange.F90 index 22fbaaee6..7fab94c63 100644 --- a/lis/surfacemodels/land/jules.5.1/jules_lis_exchange.F90 +++ b/lis/surfacemodels/land/jules.5.1/jules_lis_exchange.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/l_to_rc.F90 b/lis/surfacemodels/land/jules.5.1/l_to_rc.F90 index ecbfd2e2b..50e664687 100644 --- a/lis/surfacemodels/land/jules.5.1/l_to_rc.F90 +++ b/lis/surfacemodels/land/jules.5.1/l_to_rc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/lis_control.F90 b/lis/surfacemodels/land/jules.5.1/lis_control.F90 index 26cbb3c14..f6ff68137 100644 --- a/lis/surfacemodels/land/jules.5.1/lis_control.F90 +++ b/lis/surfacemodels/land/jules.5.1/lis_control.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/prog_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/prog_to_tile.F90 index 60063640a..e624a7cd2 100644 --- a/lis/surfacemodels/land/jules.5.1/prog_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/prog_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/ps_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/ps_to_tile.F90 index ccd470763..5a1800105 100644 --- a/lis/surfacemodels/land/jules.5.1/ps_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/ps_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/sf_diag_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/sf_diag_to_tile.F90 index e497846cd..28a6b0ca9 100644 --- a/lis/surfacemodels/land/jules.5.1/sf_diag_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/sf_diag_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_ancil.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_ancil.F90 index 33d9d6614..49227b21d 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_ancil.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_ancil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_bvoc_vars.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_bvoc_vars.F90 index 61baa8c75..7f03e50fc 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_bvoc_vars.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_bvoc_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_fluxes.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_fluxes.F90 index 503d52401..25304d5f9 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_fluxes.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_fluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_forcing.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_forcing.F90 index 45cad16e1..13fc418a3 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_forcing.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_forcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_jules_internal.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_jules_internal.F90 index cd3a9746c..260b29318 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_jules_internal.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_jules_internal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_prog.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_prog.F90 index 217c1415a..4f38b583b 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_prog.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_prog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_ps.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_ps.F90 index 2f392d4cb..a3001d458 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_ps.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_ps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_sf_diag.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_sf_diag.F90 index 240dbcf51..795fff986 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_sf_diag.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_sf_diag.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_top_pdm.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_top_pdm.F90 index 6d7ce3367..90fad386b 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_top_pdm.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_top_pdm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/tile_to_trifctl.F90 b/lis/surfacemodels/land/jules.5.1/tile_to_trifctl.F90 index da092a081..e40a5c852 100644 --- a/lis/surfacemodels/land/jules.5.1/tile_to_trifctl.F90 +++ b/lis/surfacemodels/land/jules.5.1/tile_to_trifctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/top_pdm_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/top_pdm_to_tile.F90 index 1019a81f5..10ddecc94 100644 --- a/lis/surfacemodels/land/jules.5.1/top_pdm_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/top_pdm_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.1/trifctl_to_tile.F90 b/lis/surfacemodels/land/jules.5.1/trifctl_to_tile.F90 index fc8ed5106..5c38fb7d6 100644 --- a/lis/surfacemodels/land/jules.5.1/trifctl_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.1/trifctl_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/ancil_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/ancil_to_tile.F90 index 69d207e28..783a57379 100644 --- a/lis/surfacemodels/land/jules.5.2/ancil_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/ancil_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/bvoc_vars_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/bvoc_vars_to_tile.F90 index 97f611660..d9dbf0e85 100644 --- a/lis/surfacemodels/land/jules.5.2/bvoc_vars_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/bvoc_vars_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/couple_jules_to_lis.sh b/lis/surfacemodels/land/jules.5.2/couple_jules_to_lis.sh index d3330d008..2043f0626 100755 --- a/lis/surfacemodels/land/jules.5.2/couple_jules_to_lis.sh +++ b/lis/surfacemodels/land/jules.5.2/couple_jules_to_lis.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_dasoilm_Mod.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_dasoilm_Mod.F90 index a836bc795..4d7050385 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_descale_soilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_descale_soilm.F90 index efecce0c0..c8181554e 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_descale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getLbandTbPred.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getLbandTbPred.F90 index d89b3a8ee..898010113 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsmpred.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsmpred.F90 index a23614492..cb5944628 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsmpred.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsoilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsoilm.F90 index 523efa225..2cd4f6427 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qc_soilmobs.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qc_soilmobs.F90 index ad5e0c0ef..bc0bcc60d 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qcsoilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qcsoilm.F90 index a9f6f61ff..d3373903d 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qcsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_scale_soilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_scale_soilm.F90 index 92af8fa90..4bb1d7d0d 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_scale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_setsoilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_setsoilm.F90 index d3c1beeed..12f164b36 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_setsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_updatesoilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_updatesoilm.F90 index adb832bb7..54e86df7b 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_updatesoilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_write_soilm.F90 b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_write_soilm.F90 index 55ff510eb..cfb7e14a6 100644 --- a/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_write_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.2/da_soilm/jules52_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/debug_latlon.F90 b/lis/surfacemodels/land/jules.5.2/debug_latlon.F90 index e36a1ec95..295150b63 100644 --- a/lis/surfacemodels/land/jules.5.2/debug_latlon.F90 +++ b/lis/surfacemodels/land/jules.5.2/debug_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/fluxes_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/fluxes_to_tile.F90 index 567472ce6..bf97e9015 100644 --- a/lis/surfacemodels/land/jules.5.2/fluxes_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/fluxes_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_coldstart.F90 b/lis/surfacemodels/land/jules.5.2/jules52_coldstart.F90 index 21c3b8a5f..36d26ab20 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_coldstart.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_dynsetup.F90 b/lis/surfacemodels/land/jules.5.2/jules52_dynsetup.F90 index 5b2b09caa..199d3d544 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_dynsetup.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_f2t.F90 b/lis/surfacemodels/land/jules.5.2/jules52_f2t.F90 index 042af5e32..5d406885b 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_f2t.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_finalize.F90 b/lis/surfacemodels/land/jules.5.2/jules52_finalize.F90 index c6a45a6ba..de40f95d1 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_finalize.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_getrunoffs.F90 b/lis/surfacemodels/land/jules.5.2/jules52_getrunoffs.F90 index 40d06e251..2f72c328b 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_getrunoffs.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_initialize.F90 b/lis/surfacemodels/land/jules.5.2/jules52_initialize.F90 index f7046f5ec..cb1d983cd 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_initialize.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_initialize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_lsmMod.F90 b/lis/surfacemodels/land/jules.5.2/jules52_lsmMod.F90 index eaca8dd58..1119d8c8b 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_lsmMod.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_main.F90 b/lis/surfacemodels/land/jules.5.2/jules52_main.F90 index b0d19bb2d..ea33131a3 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_main.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_module.F90 b/lis/surfacemodels/land/jules.5.2/jules52_module.F90 index f52f5054b..a9ac3a12f 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_module.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_read_multilevel_param.F90 b/lis/surfacemodels/land/jules.5.2/jules52_read_multilevel_param.F90 index 9c4a160af..136aa9e29 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_read_multilevel_param.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_read_multilevel_param.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_readcrd.F90 b/lis/surfacemodels/land/jules.5.2/jules52_readcrd.F90 index 4c2c46fa0..19af47359 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_readcrd.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_readrst.F90 b/lis/surfacemodels/land/jules.5.2/jules52_readrst.F90 index 5c1d6d9a8..d651fdeb6 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_readrst.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_setup.F90 b/lis/surfacemodels/land/jules.5.2/jules52_setup.F90 index d4101b592..75af7f520 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_setup.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules52_writerst.F90 b/lis/surfacemodels/land/jules.5.2/jules52_writerst.F90 index 141ff4cd8..de55ec0f2 100644 --- a/lis/surfacemodels/land/jules.5.2/jules52_writerst.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules52_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules_internal_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/jules_internal_to_tile.F90 index dbc683a44..fa2c3aa3d 100644 --- a/lis/surfacemodels/land/jules.5.2/jules_internal_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules_internal_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/jules_lis_exchange.F90 b/lis/surfacemodels/land/jules.5.2/jules_lis_exchange.F90 index 22fbaaee6..7fab94c63 100644 --- a/lis/surfacemodels/land/jules.5.2/jules_lis_exchange.F90 +++ b/lis/surfacemodels/land/jules.5.2/jules_lis_exchange.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/l_to_rc.F90 b/lis/surfacemodels/land/jules.5.2/l_to_rc.F90 index 876760a77..993d1ad4a 100644 --- a/lis/surfacemodels/land/jules.5.2/l_to_rc.F90 +++ b/lis/surfacemodels/land/jules.5.2/l_to_rc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/lis_control.F90 b/lis/surfacemodels/land/jules.5.2/lis_control.F90 index c8f8e4f55..e897b5e1e 100755 --- a/lis/surfacemodels/land/jules.5.2/lis_control.F90 +++ b/lis/surfacemodels/land/jules.5.2/lis_control.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/prog_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/prog_to_tile.F90 index be0721908..d3cead31c 100644 --- a/lis/surfacemodels/land/jules.5.2/prog_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/prog_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/ps_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/ps_to_tile.F90 index eb4d2b14a..2505ca40e 100644 --- a/lis/surfacemodels/land/jules.5.2/ps_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/ps_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/routing/jules52_getrunoffs_mm.F90 b/lis/surfacemodels/land/jules.5.2/routing/jules52_getrunoffs_mm.F90 index ea917121e..8c5afb058 100644 --- a/lis/surfacemodels/land/jules.5.2/routing/jules52_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/jules.5.2/routing/jules52_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/sf_diag_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/sf_diag_to_tile.F90 index e93dbcb04..7e8cbae60 100644 --- a/lis/surfacemodels/land/jules.5.2/sf_diag_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/sf_diag_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_ancil.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_ancil.F90 index fc64a6572..93d8c595d 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_ancil.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_ancil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_bvoc_vars.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_bvoc_vars.F90 index a77971c16..b290943c5 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_bvoc_vars.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_bvoc_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_fluxes.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_fluxes.F90 index 8e6e68cd4..028081811 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_fluxes.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_fluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_forcing.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_forcing.F90 index 66482abab..033d177a7 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_forcing.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_forcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_jules_internal.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_jules_internal.F90 index e8abaac66..3afe78582 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_jules_internal.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_jules_internal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_prog.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_prog.F90 index 2b610ba14..a090cce51 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_prog.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_prog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_ps.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_ps.F90 index 28a1c4b41..42a32bf0a 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_ps.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_ps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_sf_diag.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_sf_diag.F90 index 459802ac9..5da9661d4 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_sf_diag.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_sf_diag.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_top_pdm.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_top_pdm.F90 index d6bc248c7..02d8beac8 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_top_pdm.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_top_pdm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/tile_to_trifctl.F90 b/lis/surfacemodels/land/jules.5.2/tile_to_trifctl.F90 index 9e06fea08..aa17e5d9f 100644 --- a/lis/surfacemodels/land/jules.5.2/tile_to_trifctl.F90 +++ b/lis/surfacemodels/land/jules.5.2/tile_to_trifctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/top_pdm_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/top_pdm_to_tile.F90 index 9c65c71f2..d295c7c8f 100644 --- a/lis/surfacemodels/land/jules.5.2/top_pdm_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/top_pdm_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.2/trifctl_to_tile.F90 b/lis/surfacemodels/land/jules.5.2/trifctl_to_tile.F90 index dfb8e6d06..509931e27 100644 --- a/lis/surfacemodels/land/jules.5.2/trifctl_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.2/trifctl_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/ancil_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/ancil_to_tile.F90 index 2e8093b14..beb6c1320 100644 --- a/lis/surfacemodels/land/jules.5.3/ancil_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/ancil_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/bvoc_vars_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/bvoc_vars_to_tile.F90 index 9a0ef0bc5..cc22bea37 100644 --- a/lis/surfacemodels/land/jules.5.3/bvoc_vars_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/bvoc_vars_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/couple_jules_to_lis.sh b/lis/surfacemodels/land/jules.5.3/couple_jules_to_lis.sh index 7bf73fe0f..bcaf7636b 100755 --- a/lis/surfacemodels/land/jules.5.3/couple_jules_to_lis.sh +++ b/lis/surfacemodels/land/jules.5.3/couple_jules_to_lis.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_dasoilm_Mod.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_dasoilm_Mod.F90 index f969703c8..4a34d350f 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_descale_soilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_descale_soilm.F90 index 217862539..787e39fb5 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_descale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getLbandTbPred.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getLbandTbPred.F90 index 09a9d71a0..14d3aa5af 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsmpred.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsmpred.F90 index 031569b0c..18ab01d2a 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsmpred.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsoilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsoilm.F90 index 290b158d8..9ff2db746 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qc_soilmobs.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qc_soilmobs.F90 index 0b99ad04c..ac674cfd5 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qcsoilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qcsoilm.F90 index fc4cdd282..54b3891b0 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qcsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_scale_soilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_scale_soilm.F90 index e52d30b88..78bd703e4 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_scale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_setsoilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_setsoilm.F90 index 49ea15d7d..10fcd58c1 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_setsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_updatesoilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_updatesoilm.F90 index e38c71f55..6d9867272 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_updatesoilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_write_soilm.F90 b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_write_soilm.F90 index 5e5a6ba4e..5ab9042b6 100644 --- a/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_write_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.3/da_soilm/jules53_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/debug_latlon.F90 b/lis/surfacemodels/land/jules.5.3/debug_latlon.F90 index e36a1ec95..295150b63 100644 --- a/lis/surfacemodels/land/jules.5.3/debug_latlon.F90 +++ b/lis/surfacemodels/land/jules.5.3/debug_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/fluxes_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/fluxes_to_tile.F90 index 61a70a43b..c98b7afb2 100644 --- a/lis/surfacemodels/land/jules.5.3/fluxes_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/fluxes_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_coldstart.F90 b/lis/surfacemodels/land/jules.5.3/jules53_coldstart.F90 index 27406d9b2..d25f0b280 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_coldstart.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_dynsetup.F90 b/lis/surfacemodels/land/jules.5.3/jules53_dynsetup.F90 index 5033ea3ca..3129e55ef 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_dynsetup.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_f2t.F90 b/lis/surfacemodels/land/jules.5.3/jules53_f2t.F90 index 0ac28f911..199ad0ad1 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_f2t.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_finalize.F90 b/lis/surfacemodels/land/jules.5.3/jules53_finalize.F90 index 2c9a9d8f8..dcd873dee 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_finalize.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_getrunoffs.F90 b/lis/surfacemodels/land/jules.5.3/jules53_getrunoffs.F90 index 1913c7a89..e979b8796 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_getrunoffs.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_initialize.F90 b/lis/surfacemodels/land/jules.5.3/jules53_initialize.F90 index 93bad2c22..d762b293b 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_initialize.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_initialize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_lsmMod.F90 b/lis/surfacemodels/land/jules.5.3/jules53_lsmMod.F90 index c57fdc23b..8319a3d63 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_lsmMod.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_main.F90 b/lis/surfacemodels/land/jules.5.3/jules53_main.F90 index c9bd32dbf..41097bcc2 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_main.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_module.F90 b/lis/surfacemodels/land/jules.5.3/jules53_module.F90 index 82cb1ffd3..bd52599ef 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_module.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_read_multilevel_param.F90 b/lis/surfacemodels/land/jules.5.3/jules53_read_multilevel_param.F90 index f654b5630..5828edf6b 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_read_multilevel_param.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_read_multilevel_param.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_readcrd.F90 b/lis/surfacemodels/land/jules.5.3/jules53_readcrd.F90 index 73a83e9c3..09d759afa 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_readcrd.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_readrst.F90 b/lis/surfacemodels/land/jules.5.3/jules53_readrst.F90 index 1a812c72b..a9c6945b8 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_readrst.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_setup.F90 b/lis/surfacemodels/land/jules.5.3/jules53_setup.F90 index 1267039b0..f9911cde2 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_setup.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules53_writerst.F90 b/lis/surfacemodels/land/jules.5.3/jules53_writerst.F90 index 73405e42a..d4c2d7b9c 100644 --- a/lis/surfacemodels/land/jules.5.3/jules53_writerst.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules53_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules_internal_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/jules_internal_to_tile.F90 index eb311a0e5..e0b71c51b 100644 --- a/lis/surfacemodels/land/jules.5.3/jules_internal_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules_internal_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/jules_lis_exchange.F90 b/lis/surfacemodels/land/jules.5.3/jules_lis_exchange.F90 index 22fbaaee6..7fab94c63 100644 --- a/lis/surfacemodels/land/jules.5.3/jules_lis_exchange.F90 +++ b/lis/surfacemodels/land/jules.5.3/jules_lis_exchange.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/l_to_rc.F90 b/lis/surfacemodels/land/jules.5.3/l_to_rc.F90 index 876760a77..993d1ad4a 100644 --- a/lis/surfacemodels/land/jules.5.3/l_to_rc.F90 +++ b/lis/surfacemodels/land/jules.5.3/l_to_rc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/lis_control.F90 b/lis/surfacemodels/land/jules.5.3/lis_control.F90 index b8aa87100..4e09fa4db 100755 --- a/lis/surfacemodels/land/jules.5.3/lis_control.F90 +++ b/lis/surfacemodels/land/jules.5.3/lis_control.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/prog_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/prog_to_tile.F90 index e1561796e..d8fb7b51f 100644 --- a/lis/surfacemodels/land/jules.5.3/prog_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/prog_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/ps_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/ps_to_tile.F90 index f127a9fd1..b4951b5e2 100644 --- a/lis/surfacemodels/land/jules.5.3/ps_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/ps_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90 b/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90 index 1504510d6..6ca291b09 100644 --- a/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90.0 b/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90.0 index ea917121e..8c5afb058 100644 --- a/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90.0 +++ b/lis/surfacemodels/land/jules.5.3/routing/jules53_getrunoffs_mm.F90.0 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/sf_diag_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/sf_diag_to_tile.F90 index 7e8b3dfce..80ecd4fe1 100644 --- a/lis/surfacemodels/land/jules.5.3/sf_diag_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/sf_diag_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_ancil.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_ancil.F90 index 2cfaf3bb0..f962e1d24 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_ancil.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_ancil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_bvoc_vars.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_bvoc_vars.F90 index 199f3e6b2..2960b597d 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_bvoc_vars.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_bvoc_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_fluxes.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_fluxes.F90 index 64f16abeb..2c100c2ca 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_fluxes.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_fluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_forcing.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_forcing.F90 index ec78f5a6e..f660b45d6 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_forcing.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_forcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_jules_internal.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_jules_internal.F90 index 13e045b8e..325717007 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_jules_internal.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_jules_internal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_prog.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_prog.F90 index a9047e42f..e216d036e 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_prog.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_prog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_ps.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_ps.F90 index e15786939..4f46fcdf0 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_ps.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_ps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_sf_diag.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_sf_diag.F90 index 1aa10bc68..cd5bbb95f 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_sf_diag.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_sf_diag.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_top_pdm.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_top_pdm.F90 index c943b94f7..70ddeb699 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_top_pdm.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_top_pdm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/tile_to_trifctl.F90 b/lis/surfacemodels/land/jules.5.3/tile_to_trifctl.F90 index 8f5361d9f..b556ebe62 100644 --- a/lis/surfacemodels/land/jules.5.3/tile_to_trifctl.F90 +++ b/lis/surfacemodels/land/jules.5.3/tile_to_trifctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/top_pdm_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/top_pdm_to_tile.F90 index 9f65d6612..dfc4ff881 100644 --- a/lis/surfacemodels/land/jules.5.3/top_pdm_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/top_pdm_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.3/trifctl_to_tile.F90 b/lis/surfacemodels/land/jules.5.3/trifctl_to_tile.F90 index b2427ac4f..c5fd59209 100644 --- a/lis/surfacemodels/land/jules.5.3/trifctl_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.3/trifctl_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/ancil_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/ancil_to_tile.F90 index 18ff7a83e..eb6c12431 100644 --- a/lis/surfacemodels/land/jules.5.4/ancil_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/ancil_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/bvoc_vars_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/bvoc_vars_to_tile.F90 index c79a4f422..dadeba143 100644 --- a/lis/surfacemodels/land/jules.5.4/bvoc_vars_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/bvoc_vars_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/couple_jules_to_lis.sh b/lis/surfacemodels/land/jules.5.4/couple_jules_to_lis.sh index 94fa12eb9..cbd207954 100755 --- a/lis/surfacemodels/land/jules.5.4/couple_jules_to_lis.sh +++ b/lis/surfacemodels/land/jules.5.4/couple_jules_to_lis.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/debug_latlon.F90 b/lis/surfacemodels/land/jules.5.4/debug_latlon.F90 index e36a1ec95..295150b63 100644 --- a/lis/surfacemodels/land/jules.5.4/debug_latlon.F90 +++ b/lis/surfacemodels/land/jules.5.4/debug_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/fluxes_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/fluxes_to_tile.F90 index cb739eb83..75f93d7d6 100644 --- a/lis/surfacemodels/land/jules.5.4/fluxes_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/fluxes_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_coldstart.F90 b/lis/surfacemodels/land/jules.5.4/jules54_coldstart.F90 index 05651a5f3..517ccbd42 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_coldstart.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_dynsetup.F90 b/lis/surfacemodels/land/jules.5.4/jules54_dynsetup.F90 index e69b67c0f..995978bfc 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_dynsetup.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_f2t.F90 b/lis/surfacemodels/land/jules.5.4/jules54_f2t.F90 index d165f361a..3b41ea8d2 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_f2t.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_finalize.F90 b/lis/surfacemodels/land/jules.5.4/jules54_finalize.F90 index e226160c8..27da8a105 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_finalize.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_getrunoffs.F90 b/lis/surfacemodels/land/jules.5.4/jules54_getrunoffs.F90 index 2e71cc137..3dc116d7a 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_getrunoffs.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_initialize.F90 b/lis/surfacemodels/land/jules.5.4/jules54_initialize.F90 index cba7f54e4..c608b25ba 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_initialize.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_initialize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_lsmMod.F90 b/lis/surfacemodels/land/jules.5.4/jules54_lsmMod.F90 index 3c763e1e1..d0d260c73 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_lsmMod.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_main.F90 b/lis/surfacemodels/land/jules.5.4/jules54_main.F90 index e946a27c1..a75b26360 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_main.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_module.F90 b/lis/surfacemodels/land/jules.5.4/jules54_module.F90 index b29088c71..5a0aeb90f 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_module.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_read_multilevel_param.F90 b/lis/surfacemodels/land/jules.5.4/jules54_read_multilevel_param.F90 index 3b688ad27..cf6c39545 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_read_multilevel_param.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_read_multilevel_param.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_readcrd.F90 b/lis/surfacemodels/land/jules.5.4/jules54_readcrd.F90 index 24727aae2..6e5e1e79f 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_readcrd.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_readrst.F90 b/lis/surfacemodels/land/jules.5.4/jules54_readrst.F90 index cba056263..1a12cbacf 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_readrst.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_setup.F90 b/lis/surfacemodels/land/jules.5.4/jules54_setup.F90 index a7b67be1f..99c605944 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_setup.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules54_writerst.F90 b/lis/surfacemodels/land/jules.5.4/jules54_writerst.F90 index 681a0938a..ac2fe631c 100644 --- a/lis/surfacemodels/land/jules.5.4/jules54_writerst.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules54_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules_internal_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/jules_internal_to_tile.F90 index 07f4f0c66..d97112a50 100644 --- a/lis/surfacemodels/land/jules.5.4/jules_internal_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules_internal_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/jules_lis_exchange.F90 b/lis/surfacemodels/land/jules.5.4/jules_lis_exchange.F90 index 22fbaaee6..7fab94c63 100644 --- a/lis/surfacemodels/land/jules.5.4/jules_lis_exchange.F90 +++ b/lis/surfacemodels/land/jules.5.4/jules_lis_exchange.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/l_to_rc.F90 b/lis/surfacemodels/land/jules.5.4/l_to_rc.F90 index 876760a77..993d1ad4a 100644 --- a/lis/surfacemodels/land/jules.5.4/l_to_rc.F90 +++ b/lis/surfacemodels/land/jules.5.4/l_to_rc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/lis_control.F90 b/lis/surfacemodels/land/jules.5.4/lis_control.F90 index 9a9cd0b0f..c92d18608 100755 --- a/lis/surfacemodels/land/jules.5.4/lis_control.F90 +++ b/lis/surfacemodels/land/jules.5.4/lis_control.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/prog_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/prog_to_tile.F90 index 44a9f5a13..6eabe84b6 100644 --- a/lis/surfacemodels/land/jules.5.4/prog_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/prog_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/ps_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/ps_to_tile.F90 index 044f17e6e..d2ebbd091 100644 --- a/lis/surfacemodels/land/jules.5.4/ps_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/ps_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/sf_diag_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/sf_diag_to_tile.F90 index 054bd8cc5..09d33db75 100644 --- a/lis/surfacemodels/land/jules.5.4/sf_diag_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/sf_diag_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_ancil.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_ancil.F90 index c8ab6b849..61f7c82cb 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_ancil.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_ancil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_bvoc_vars.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_bvoc_vars.F90 index dd25d3180..df997d952 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_bvoc_vars.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_bvoc_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_fluxes.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_fluxes.F90 index 7a20e3603..8d22b2f74 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_fluxes.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_fluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_forcing.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_forcing.F90 index cfe123acf..0ffce2bbb 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_forcing.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_forcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_jules_internal.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_jules_internal.F90 index ea61d4f50..9eb5e18aa 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_jules_internal.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_jules_internal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_prog.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_prog.F90 index 4b421aa08..90fed2fd4 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_prog.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_prog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_ps.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_ps.F90 index 1076d02c8..c676c5721 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_ps.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_ps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_sf_diag.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_sf_diag.F90 index 3f59cc204..90be0257c 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_sf_diag.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_sf_diag.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_top_pdm.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_top_pdm.F90 index 189850fe6..bbb356217 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_top_pdm.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_top_pdm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/tile_to_trifctl.F90 b/lis/surfacemodels/land/jules.5.4/tile_to_trifctl.F90 index 14b60241b..446325cae 100644 --- a/lis/surfacemodels/land/jules.5.4/tile_to_trifctl.F90 +++ b/lis/surfacemodels/land/jules.5.4/tile_to_trifctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/top_pdm_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/top_pdm_to_tile.F90 index 1da2f179c..432e28c89 100644 --- a/lis/surfacemodels/land/jules.5.4/top_pdm_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/top_pdm_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.4/trifctl_to_tile.F90 b/lis/surfacemodels/land/jules.5.4/trifctl_to_tile.F90 index 4b3e50532..add97e938 100644 --- a/lis/surfacemodels/land/jules.5.4/trifctl_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.4/trifctl_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/ancil_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/ancil_to_tile.F90 index 82db0e87f..0a76a59f9 100755 --- a/lis/surfacemodels/land/jules.5.x/ancil_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/ancil_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/bvoc_vars_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/bvoc_vars_to_tile.F90 index 9b2af26d2..a10553acf 100755 --- a/lis/surfacemodels/land/jules.5.x/bvoc_vars_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/bvoc_vars_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/couple_jules_to_lis.sh b/lis/surfacemodels/land/jules.5.x/couple_jules_to_lis.sh index 94fa12eb9..cbd207954 100755 --- a/lis/surfacemodels/land/jules.5.x/couple_jules_to_lis.sh +++ b/lis/surfacemodels/land/jules.5.x/couple_jules_to_lis.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_dasnodep_Mod.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_dasnodep_Mod.F90 index f399e3b7c..02bc4a539 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_dasnodep_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_dasnodep_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_descale_snodep.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_descale_snodep.F90 index ea21b69a8..57cb68e49 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_descale_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodeppred.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodeppred.F90 index d0234fdfe..ad4d1c9ad 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodeppred.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodepvars.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodepvars.F90 index 7cb2adbae..24bf01311 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodepvars.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_map_snodep.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_map_snodep.F90 index cb5cfbcb7..195d95521 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_map_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qc_snodepobs.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qc_snodepobs.F90 index 256c7fb7c..77a51dba8 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qcsnodep.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qcsnodep.F90 index 4e4d5b32e..b19fa2d20 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qcsnodep.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_scale_snodep.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_scale_snodep.F90 index ed0770def..c14d42627 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_scale_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_setsnodepvars.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_setsnodepvars.F90 index ac1599d3f..d259faca3 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_setsnodepvars.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_snodep_update.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_snodep_update.F90 index 170d1c905..cb2d7fa9e 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_snodep_update.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_snodep_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_transform_snodep.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_transform_snodep.F90 index c62b7d324..5d01a7900 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_transform_snodep.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_updatesnodep.F90 b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_updatesnodep.F90 index 384c8d768..d20847fc2 100755 --- a/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_updatesnodep.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_snodep/jules5x_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_dasoilm_Mod.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_dasoilm_Mod.F90 index f4142b6aa..ba9c1ed26 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_descale_soilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_descale_soilm.F90 index e7a8baa1f..5bbf5b339 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_descale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getLbandTbPred.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getLbandTbPred.F90 index f8ff419f0..028e907ed 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsmpred.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsmpred.F90 index cf083d5bf..f82141d22 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsmpred.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsoilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsoilm.F90 index e5004df1c..c14eeaafd 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qc_soilmobs.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qc_soilmobs.F90 index bf0195751..84de07913 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qcsoilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qcsoilm.F90 index 9abfba077..c9cd84f31 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qcsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_scale_soilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_scale_soilm.F90 index 8f53344b8..a4b34309a 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_scale_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_setsoilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_setsoilm.F90 index c8586d9b9..cfbfc5417 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_setsoilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_updatesoilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_updatesoilm.F90 index ab38a0e92..4aa95cd5b 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_updatesoilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_write_soilm.F90 b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_write_soilm.F90 index c7aa548d5..cda9af477 100755 --- a/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_write_soilm.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_soilm/jules5x_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_dausafsi_Mod.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_dausafsi_Mod.F90 index f48cfb061..f0bf60021 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_dausafsi_Mod.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_dausafsi_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_descale_usafsi.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_descale_usafsi.F90 index b31f1a51a..d4c1fa593 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_descale_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_descale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsipred.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsipred.F90 index fd37e6cb2..7a774edfb 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsipred.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsipred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsivars.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsivars.F90 index e6e84ecdf..b03ad6a1e 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsivars.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_getusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_map_usafsi.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_map_usafsi.F90 index 952ec7837..d81a215ec 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_map_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_map_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qc_usafsiobs.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qc_usafsiobs.F90 index 13c844f33..d2b7339a7 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qc_usafsiobs.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qc_usafsiobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qcusafsi.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qcusafsi.F90 index 2fba8c037..abfb3ff0c 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qcusafsi.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_qcusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_scale_usafsi.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_scale_usafsi.F90 index c57b0139c..029d24e6b 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_scale_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_scale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_setusafsivars.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_setusafsivars.F90 index ceea198ec..4eb624b96 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_setusafsivars.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_setusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_transform_usafsi.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_transform_usafsi.F90 index aefceefaf..a1d977ad3 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_transform_usafsi.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_transform_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_updateusafsi.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_updateusafsi.F90 index bd397f80f..2fdec70de 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_updateusafsi.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_updateusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_usafsi_update.F90 b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_usafsi_update.F90 index 7061510a3..46037b79b 100644 --- a/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_usafsi_update.F90 +++ b/lis/surfacemodels/land/jules.5.x/da_usafsi/jules5x_usafsi_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/debug_latlon.F90 b/lis/surfacemodels/land/jules.5.x/debug_latlon.F90 index e36a1ec95..295150b63 100755 --- a/lis/surfacemodels/land/jules.5.x/debug_latlon.F90 +++ b/lis/surfacemodels/land/jules.5.x/debug_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/fluxes_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/fluxes_to_tile.F90 index f9f430137..aa06d9a8d 100755 --- a/lis/surfacemodels/land/jules.5.x/fluxes_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/fluxes_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_coldstart.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_coldstart.F90 index 4c4278220..99de079c9 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_coldstart.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_dynsetup.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_dynsetup.F90 index 9fbe567d0..7a8abf3bf 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_dynsetup.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_f2t.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_f2t.F90 index 1f7bde983..35a639842 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_f2t.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_finalize.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_finalize.F90 index 15bfeb2b7..02e73b85b 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_finalize.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_getrunoffs.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_getrunoffs.F90 index 1d76c4d88..f4899b9ef 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_getrunoffs.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_initialize.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_initialize.F90 index 80a47b3d1..5ba0c5f0d 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_initialize.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_initialize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_lsmMod.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_lsmMod.F90 index a77087a61..307c49aba 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_lsmMod.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_main.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_main.F90 index cf1d86269..5582ae4af 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_main.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_module.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_module.F90 index 06bf5d9f7..c13f82fd8 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_module.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_read_multilevel_param.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_read_multilevel_param.F90 index e588c55cf..363ff1ec1 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_read_multilevel_param.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_read_multilevel_param.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_readcrd.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_readcrd.F90 index 817b7204c..19871155e 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_readcrd.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_readrst.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_readrst.F90 index efd0f3c23..1e45c5cdb 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_readrst.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_setup.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_setup.F90 index 6e9d33e2a..80a9bf21f 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_setup.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules5x_writerst.F90 b/lis/surfacemodels/land/jules.5.x/jules5x_writerst.F90 index e77448bdd..13e26e832 100755 --- a/lis/surfacemodels/land/jules.5.x/jules5x_writerst.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules5x_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules_internal_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/jules_internal_to_tile.F90 index f46ba9c13..792a603dc 100755 --- a/lis/surfacemodels/land/jules.5.x/jules_internal_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules_internal_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/jules_lis_exchange.F90 b/lis/surfacemodels/land/jules.5.x/jules_lis_exchange.F90 index 22fbaaee6..7fab94c63 100755 --- a/lis/surfacemodels/land/jules.5.x/jules_lis_exchange.F90 +++ b/lis/surfacemodels/land/jules.5.x/jules_lis_exchange.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/l_to_rc.F90 b/lis/surfacemodels/land/jules.5.x/l_to_rc.F90 index 876760a77..993d1ad4a 100755 --- a/lis/surfacemodels/land/jules.5.x/l_to_rc.F90 +++ b/lis/surfacemodels/land/jules.5.x/l_to_rc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/lis_control.F90 b/lis/surfacemodels/land/jules.5.x/lis_control.F90 index a5b39428e..084b7fbe3 100755 --- a/lis/surfacemodels/land/jules.5.x/lis_control.F90 +++ b/lis/surfacemodels/land/jules.5.x/lis_control.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/prog_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/prog_to_tile.F90 index 717f1a7ef..e13e887ba 100755 --- a/lis/surfacemodels/land/jules.5.x/prog_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/prog_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/ps_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/ps_to_tile.F90 index abef03b81..70a079676 100755 --- a/lis/surfacemodels/land/jules.5.x/ps_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/ps_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90 b/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90 index 1c3e5e4d1..0a699f459 100755 --- a/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90.0 b/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90.0 index ea917121e..8c5afb058 100755 --- a/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90.0 +++ b/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_mm.F90.0 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_rapid.F90 b/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_rapid.F90 index a13ec5063..f44437825 100755 --- a/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_rapid.F90 +++ b/lis/surfacemodels/land/jules.5.x/routing/jules5x_getrunoffs_rapid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/sf_diag_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/sf_diag_to_tile.F90 index b2c755978..f1fbda92c 100755 --- a/lis/surfacemodels/land/jules.5.x/sf_diag_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/sf_diag_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_ancil.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_ancil.F90 index 88cd92be4..02233c2a4 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_ancil.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_ancil.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_bvoc_vars.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_bvoc_vars.F90 index 983f29d6f..1152af4ea 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_bvoc_vars.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_bvoc_vars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_fluxes.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_fluxes.F90 index 1a979d7d0..d02e13a26 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_fluxes.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_fluxes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_forcing.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_forcing.F90 index 3c17357df..8775bac85 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_forcing.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_forcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_jules_internal.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_jules_internal.F90 index 61ebb76af..acc37cb0d 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_jules_internal.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_jules_internal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_prog.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_prog.F90 index 1ba992254..86cd04037 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_prog.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_prog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_ps.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_ps.F90 index 2b29f7a65..c5aea0501 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_ps.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_ps.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_sf_diag.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_sf_diag.F90 index 0a492ec26..fa09b2145 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_sf_diag.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_sf_diag.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_top_pdm.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_top_pdm.F90 index 3c8e8bf12..c2ba825a1 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_top_pdm.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_top_pdm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/tile_to_trifctl.F90 b/lis/surfacemodels/land/jules.5.x/tile_to_trifctl.F90 index f14717068..7aa757a2c 100755 --- a/lis/surfacemodels/land/jules.5.x/tile_to_trifctl.F90 +++ b/lis/surfacemodels/land/jules.5.x/tile_to_trifctl.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/top_pdm_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/top_pdm_to_tile.F90 index 642465190..5cf03fe99 100755 --- a/lis/surfacemodels/land/jules.5.x/top_pdm_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/top_pdm_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/jules.5.x/trifctl_to_tile.F90 b/lis/surfacemodels/land/jules.5.x/trifctl_to_tile.F90 index dcab8fb3b..a5af5d176 100755 --- a/lis/surfacemodels/land/jules.5.x/trifctl_to_tile.F90 +++ b/lis/surfacemodels/land/jules.5.x/trifctl_to_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/0Intro_mosaic.txt b/lis/surfacemodels/land/mosaic/0Intro_mosaic.txt index a5f3b1a69..2a587a84d 100644 --- a/lis/surfacemodels/land/mosaic/0Intro_mosaic.txt +++ b/lis/surfacemodels/land/mosaic/0Intro_mosaic.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_descale_soilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_descale_soilm.F90 index aac85c18a..139805ba6 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_descale_soilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_getsoilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_getsoilm.F90 index c86c53dae..c6ccabe77 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_getsoilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_getsynsmpred.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_getsynsmpred.F90 index 232765f09..fc863c3dc 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_getsynsmpred.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_getsynsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_qcsoilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_qcsoilm.F90 index 98bf88777..4d96a1b8d 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_qcsoilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_scale_soilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_scale_soilm.F90 index 83c1f2e64..c94932a56 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_scale_soilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_setsoilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_setsoilm.F90 index 68d293332..6c7be950f 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_setsoilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_updatesoilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_updatesoilm.F90 index 6465949d9..4b5058389 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_updatesoilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/da_soilm/mos_write_soilm.F90 b/lis/surfacemodels/land/mosaic/da_soilm/mos_write_soilm.F90 index ebd87051b..8ee314c05 100644 --- a/lis/surfacemodels/land/mosaic/da_soilm/mos_write_soilm.F90 +++ b/lis/surfacemodels/land/mosaic/da_soilm/mos_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mapsib2umd.F90 b/lis/surfacemodels/land/mosaic/mapsib2umd.F90 index ad89e15c7..64c2f1d0b 100644 --- a/lis/surfacemodels/land/mosaic/mapsib2umd.F90 +++ b/lis/surfacemodels/land/mosaic/mapsib2umd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_coldstart.F90 b/lis/surfacemodels/land/mosaic/mos_coldstart.F90 index 31939db82..0667ac1a8 100644 --- a/lis/surfacemodels/land/mosaic/mos_coldstart.F90 +++ b/lis/surfacemodels/land/mosaic/mos_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_f2t.F90 b/lis/surfacemodels/land/mosaic/mos_f2t.F90 index ea3ac12b4..ae063e19c 100644 --- a/lis/surfacemodels/land/mosaic/mos_f2t.F90 +++ b/lis/surfacemodels/land/mosaic/mos_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_finalize.F90 b/lis/surfacemodels/land/mosaic/mos_finalize.F90 index 50663a55b..161f4b40d 100644 --- a/lis/surfacemodels/land/mosaic/mos_finalize.F90 +++ b/lis/surfacemodels/land/mosaic/mos_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_lsmMod.F90 b/lis/surfacemodels/land/mosaic/mos_lsmMod.F90 index 6bb43cf1a..4c30f900c 100644 --- a/lis/surfacemodels/land/mosaic/mos_lsmMod.F90 +++ b/lis/surfacemodels/land/mosaic/mos_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_main.F90 b/lis/surfacemodels/land/mosaic/mos_main.F90 index ab6d46331..370967ff0 100644 --- a/lis/surfacemodels/land/mosaic/mos_main.F90 +++ b/lis/surfacemodels/land/mosaic/mos_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_module.F90 b/lis/surfacemodels/land/mosaic/mos_module.F90 index 5ed4fca7b..014b3e76e 100644 --- a/lis/surfacemodels/land/mosaic/mos_module.F90 +++ b/lis/surfacemodels/land/mosaic/mos_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_readrestart.F90 b/lis/surfacemodels/land/mosaic/mos_readrestart.F90 index 9022ad7e0..3cb92026a 100644 --- a/lis/surfacemodels/land/mosaic/mos_readrestart.F90 +++ b/lis/surfacemodels/land/mosaic/mos_readrestart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_setup.F90 b/lis/surfacemodels/land/mosaic/mos_setup.F90 index daec5dd58..ac6336e4f 100644 --- a/lis/surfacemodels/land/mosaic/mos_setup.F90 +++ b/lis/surfacemodels/land/mosaic/mos_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_tile.F90 b/lis/surfacemodels/land/mosaic/mos_tile.F90 index 2af44fc31..350e4ee9e 100644 --- a/lis/surfacemodels/land/mosaic/mos_tile.F90 +++ b/lis/surfacemodels/land/mosaic/mos_tile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mos_writerst.F90 b/lis/surfacemodels/land/mosaic/mos_writerst.F90 index 219bb1957..f493cf976 100644 --- a/lis/surfacemodels/land/mosaic/mos_writerst.F90 +++ b/lis/surfacemodels/land/mosaic/mos_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/mosdynp.F90 b/lis/surfacemodels/land/mosaic/mosdynp.F90 index e8d48d0a0..11e702682 100644 --- a/lis/surfacemodels/land/mosaic/mosdynp.F90 +++ b/lis/surfacemodels/land/mosaic/mosdynp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/moslairead.F90.notemp b/lis/surfacemodels/land/mosaic/moslairead.F90.notemp index 769f2c464..a42737b83 100644 --- a/lis/surfacemodels/land/mosaic/moslairead.F90.notemp +++ b/lis/surfacemodels/land/mosaic/moslairead.F90.notemp @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/paramb.F90 b/lis/surfacemodels/land/mosaic/paramb.F90 index 396c1a719..83e3ecc57 100644 --- a/lis/surfacemodels/land/mosaic/paramb.F90 +++ b/lis/surfacemodels/land/mosaic/paramb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/readmoscrd.F90 b/lis/surfacemodels/land/mosaic/readmoscrd.F90 index 15cb5e11a..cf5b184a5 100644 --- a/lis/surfacemodels/land/mosaic/readmoscrd.F90 +++ b/lis/surfacemodels/land/mosaic/readmoscrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/setmosp.F90 b/lis/surfacemodels/land/mosaic/setmosp.F90 index 968be7aa2..91cbb2622 100644 --- a/lis/surfacemodels/land/mosaic/setmosp.F90 +++ b/lis/surfacemodels/land/mosaic/setmosp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/sfc_cmem3/mos_sfc2cmem3.F90 b/lis/surfacemodels/land/mosaic/sfc_cmem3/mos_sfc2cmem3.F90 index fa53dd420..f54f90653 100644 --- a/lis/surfacemodels/land/mosaic/sfc_cmem3/mos_sfc2cmem3.F90 +++ b/lis/surfacemodels/land/mosaic/sfc_cmem3/mos_sfc2cmem3.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/sibalb_module.F90 b/lis/surfacemodels/land/mosaic/sibalb_module.F90 index dd9dcf51b..4f227371b 100644 --- a/lis/surfacemodels/land/mosaic/sibalb_module.F90 +++ b/lis/surfacemodels/land/mosaic/sibalb_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/texture.F90 b/lis/surfacemodels/land/mosaic/texture.F90 index 4afd38e8f..2fd5672bb 100644 --- a/lis/surfacemodels/land/mosaic/texture.F90 +++ b/lis/surfacemodels/land/mosaic/texture.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/mosaic/umd_sibalb.F90 b/lis/surfacemodels/land/mosaic/umd_sibalb.F90 index 1381fb10d..16f578157 100644 --- a/lis/surfacemodels/land/mosaic/umd_sibalb.F90 +++ b/lis/surfacemodels/land/mosaic/umd_sibalb.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/0Intro_noah271.txt b/lis/surfacemodels/land/noah.2.7.1/0Intro_noah271.txt index 001301481..f74ac5a56 100644 --- a/lis/surfacemodels/land/noah.2.7.1/0Intro_noah271.txt +++ b/lis/surfacemodels/land/noah.2.7.1/0Intro_noah271.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.old b/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.old index 6a5298e9b..094ee2bab 100755 --- a/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.old +++ b/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.wrf b/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.wrf index 3d3ae5f95..a395b1550 100755 --- a/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.wrf +++ b/lis/surfacemodels/land/noah.2.7.1/SFLXALL_SRC_VER_2.7.1.F90.wrf @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_gce_f2t.F90 b/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_gce_f2t.F90 index 78821213b..a17e54ec4 100644 --- a/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_gce_f2t.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_gce_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_setgceexport.F90 b/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_setgceexport.F90 index f2351f5e4..5ee6be42b 100755 --- a/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_setgceexport.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/cpl_gce/noah271_setgceexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_setwrfesmfexport.F90 b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_setwrfesmfexport.F90 index ef2a761da..4945bb818 100755 --- a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_setwrfesmfexport.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_setwrfesmfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_wrf_esmff2t.F90 b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_wrf_esmff2t.F90 index ce27eb639..08a3add69 100644 --- a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_wrf_esmff2t.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_esmf/noah271_wrf_esmff2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_setwrfexport.F90 b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_setwrfexport.F90 index 43401f89e..e5960c067 100755 --- a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_setwrfexport.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_wrf_f2t.F90 b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_wrf_f2t.F90 index bdaa84b9d..2875690ab 100755 --- a/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_wrf_f2t.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/cpl_wrf_noesmf/noah271_wrf_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_descale_multism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_descale_multism.F90 index 7f8a0a288..e4fe2c03a 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_descale_multism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_descale_multism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultism.F90 index 086cf9bb9..e4c93c4f1 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultismpred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultismpred.F90 index 6fd343152..62c9a3ba6 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultismpred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_getmultismpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_qcmultism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_qcmultism.F90 index 555d093c8..64b994320 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_qcmultism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_qcmultism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_scale_multism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_scale_multism.F90 index fc3c0a640..13fe50e1b 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_scale_multism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_scale_multism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_setmultism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_setmultism.F90 index 42eb581d6..07c16444e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_setmultism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_setmultism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_updatemultism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_updatemultism.F90 index 4e17b3e5a..8390060c6 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_updatemultism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_updatemultism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_write_multism.F90 b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_write_multism.F90 index 1ff858f72..e4ad4a498 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_write_multism.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_multism/noah271_write_multism.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_descale_scf.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_descale_scf.F90 index dea721003..6e398ab34 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_descale_scf.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_descale_scf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfpred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfpred.F90 index 0972d811b..fbd306d1a 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfpred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfvars.F90 index ce1c59cd9..d95c6d026 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_getscfvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_map_scf.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_map_scf.F90 index e73208ac6..ed987a13b 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_map_scf.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_map_scf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_qc_scf.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_qc_scf.F90 index 157ce9907..fd585d5b8 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_qc_scf.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_qc_scf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_scale_scf.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_scale_scf.F90 index 25e157a82..8a1646d6f 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_scale_scf.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_scale_scf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_setscfvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_setscfvars.F90 index 6b6474c4b..7d74f112b 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_setscfvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_setscfvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_transform_scf.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_transform_scf.F90 index 47326278f..aa245411e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_transform_scf.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_transform_scf.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_updatescfvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_updatescfvars.F90 index 1c7b56be2..ad771b8a9 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_updatescfvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_scf/noah271_updatescfvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_dasnow_Mod.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_dasnow_Mod.F90 index 22161084d..4975aa09e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_getsnodepvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_getsnodepvars.F90 index 6edbf9d7c..3c2e6fccf 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_map_snodep.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_map_snodep.F90 index 083d0953d..bbf6275a9 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_map_snodep.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_qcsnodep.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_qcsnodep.F90 index 8647d1e15..cc046140e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_qcsnodep.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_setsnodepvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_setsnodepvars.F90 index 8f84a62d4..f51099b22 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_transform_snodep.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_transform_snodep.F90 index 57c207cb5..02febd9a6 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_transform_snodep.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_updatesnodep.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_updatesnodep.F90 index 5419ba7a8..312a7b948 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_updatesnodep.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snodep/noah271_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_descale_snow.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_descale_snow.F90 index f84186d1b..67a0a7c48 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_descale_snow.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getscapred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getscapred.F90 index 6c3fef4a3..7903d497d 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getscapred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getscapred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsnowvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsnowvars.F90 index bf4ae108e..c0dbc10d1 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsnowvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsynswepred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsynswepred.F90 index 9d2fa0980..09ec02292 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsynswepred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_getsynswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_snow.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_snow.F90 index 93caa5efc..aedb6dfb1 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_snow.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_swe.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_swe.F90 index edfa39ac8..0b06bc477 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_swe.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_map_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qc_snowobs.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qc_snowobs.F90 index b1704d0c0..c44ed3fa0 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qc_snowobs.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qcsnow.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qcsnow.F90 index a8f8719ec..3eff05a25 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qcsnow.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_scale_snow.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_scale_snow.F90 index 0f3880714..01fd0b7ef 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_scale_snow.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_setsnowvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_setsnowvars.F90 index 83b9048b9..9403f39ea 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_setsnowvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_transform_snow.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_transform_snow.F90 index 38544c73c..75d7b5024 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_transform_snow.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_transform_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_updatesnowvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_updatesnowvars.F90 index 19a519435..561f49b44 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_updatesnowvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_wrtswe.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_wrtswe.F90 index 83d6919c1..02a256498 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_wrtswe.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snow/noah271_wrtswe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_descale_snwd.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_descale_snwd.F90 index 79bc26f9b..b9eeff97a 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_descale_snwd.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_descale_snwd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdpred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdpred.F90 index 68e3a9fc9..ce5194c0c 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdpred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdvars.F90 index 2f24f2628..4e3aa91dd 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_getsnwdvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_qcsnwd.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_qcsnwd.F90 index 1c31bacf6..f0adf458f 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_qcsnwd.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_qcsnwd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_scale_snwd.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_scale_snwd.F90 index f9581166f..4945eb78e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_scale_snwd.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_scale_snwd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_setsnwdvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_setsnwdvars.F90 index d0128115c..dd5c1e159 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_setsnwdvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_setsnwdvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_updatesnwdvars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_updatesnwdvars.F90 index 6b3e64a46..bc8a0bafe 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_updatesnwdvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_snwd/noah271_updatesnwdvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_descale_soilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_descale_soilm.F90 index fec11c4fc..173aa444a 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_descale_soilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsoilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsoilm.F90 index 8a1d1544c..4738218e3 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsoilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsynsmpred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsynsmpred.F90 index 71f79d3f7..d78f8442d 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsynsmpred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_getsynsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_map_sm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_map_sm.F90 index 63d2e0cf2..50f32378f 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_map_sm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_map_sm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qc_soilmobs.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qc_soilmobs.F90 index 53624a2dd..07428be9a 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qcsoilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qcsoilm.F90 index 5060a5bbe..a056173ce 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qcsoilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_scale_soilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_scale_soilm.F90 index b388a9540..7c2fe3f8d 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_scale_soilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_setsoilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_setsoilm.F90 index e439334c2..18c3feac0 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_setsoilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_transform_synsm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_transform_synsm.F90 index a9e904cef..9a27687b3 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_transform_synsm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_transform_synsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_updatesoilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_updatesoilm.F90 index 59da3e30e..9d23a6556 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_updatesoilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_write_soilm.F90 b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_write_soilm.F90 index 3008daa57..c140997ad 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_write_soilm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_soilm/noah271_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_descale_swe.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_descale_swe.F90 index 018aab468..092d9490e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_descale_swe.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_descale_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswepred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswepred.F90 index 4a54d0f12..1c7ac69e3 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswepred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswevars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswevars.F90 index cd78b5559..bcc40ba46 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswevars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_getswevars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_qcswe.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_qcswe.F90 index dda05264c..a26ba1002 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_qcswe.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_qcswe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_scale_swe.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_scale_swe.F90 index 94bd3f8ab..616c30e5f 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_scale_swe.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_scale_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_setswevars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_setswevars.F90 index 4e3f82a8e..ddfe3f79c 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_setswevars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_setswevars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_updateswevars.F90 b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_updateswevars.F90 index 8818728fa..2fd8b81d8 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_updateswevars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_swe/noah271_updateswevars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_descale_tskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_descale_tskin.F90 index 6cc910bf9..a85a27d66 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_descale_tskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_descale_tskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_getTskinPred.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_getTskinPred.F90 index e04e8ddd7..c529155fb 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_getTskinPred.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_getTskinPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_gettskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_gettskin.F90 index b548a53fb..725804257 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_gettskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_gettskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qc_tskinobs.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qc_tskinobs.F90 index 282006216..6439b47d5 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qc_tskinobs.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qc_tskinobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qctskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qctskin.F90 index 55e2fadc8..c1c7a6d4b 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qctskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_qctskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_scale_tskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_scale_tskin.F90 index f86fe9d6e..f6b33ea31 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_scale_tskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_scale_tskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_settskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_settskin.F90 index 6be76b453..cacba28fc 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_settskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_settskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_update_tskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_update_tskin.F90 index 76af36223..afaf4d7e0 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_update_tskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_update_tskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_wrttskin.F90 b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_wrttskin.F90 index f62809f7d..7481a705d 100644 --- a/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_wrttskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/da_tskin/noah271_wrttskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/module_sf_noah271lsm.F90 b/lis/surfacemodels/land/noah.2.7.1/module_sf_noah271lsm.F90 index d2b7ea35d..2cf6da2d0 100755 --- a/lis/surfacemodels/land/noah.2.7.1/module_sf_noah271lsm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/module_sf_noah271lsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_calc_tskin.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_calc_tskin.F90 index 5ca6a5328..de87f8a0f 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_calc_tskin.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_calc_tskin.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_coldstart.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_coldstart.F90 index bbef164dc..f449386b0 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_coldstart.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_dynsetup.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_dynsetup.F90 index 35b81ea45..ea66ac52b 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_dynsetup.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_f2t.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_f2t.F90 index 89bf5f6a3..b753b955d 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_f2t.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_finalize.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_finalize.F90 index a430b01f6..0d4b15be9 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_finalize.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_lsmMod.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_lsmMod.F90 index 46167a1b7..459bc7047 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_lsmMod.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_main.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_main.F90 index 2ff7650ba..24bd883e8 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_main.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_module.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_module.F90 index f44613890..a1b0fb1bb 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_module.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_readcrd.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_readcrd.F90 index 411f84cd2..8fd15724f 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_readcrd.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_readrst.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_readrst.F90 index 44b11833f..ea3ea18f2 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_readrst.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_setsoils.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_setsoils.F90 index 2318ad587..a756b4a95 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_setsoils.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_setsoils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_settbot.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_settbot.F90 index e7eb29f94..c4042c8ce 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_settbot.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_settbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_setup.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_setup.F90 index 351833282..57ca98901 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_setup.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_setvegparms.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_setvegparms.F90 index d1e4ad3e4..e4f937dad 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_setvegparms.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/noah271_writerst.F90 b/lis/surfacemodels/land/noah.2.7.1/noah271_writerst.F90 index 0ff7edd43..394cf9bc3 100644 --- a/lis/surfacemodels/land/noah.2.7.1/noah271_writerst.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/noah271_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_getpeobspred_wgPBMRsm.F90 b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_getpeobspred_wgPBMRsm.F90 index 7022bc8a3..bc14b11ef 100644 --- a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_getpeobspred_wgPBMRsm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_getpeobspred_wgPBMRsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_peMod.F90 b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_peMod.F90 index ed7bb9360..62c6365dd 100644 --- a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_peMod.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_set_pedecvars.F90 b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_set_pedecvars.F90 index 87e7f9c60..e74b0a30e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_set_pedecvars.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_setupobspred_wgPBMRsm.F90 b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_setupobspred_wgPBMRsm.F90 index 581caf806..620903a1e 100644 --- a/lis/surfacemodels/land/noah.2.7.1/pe/noah271_setupobspred_wgPBMRsm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/pe/noah271_setupobspred_wgPBMRsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs.F90 b/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs.F90 index 3bb2fac4b..62d3d5daa 100644 --- a/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs_mm.F90 b/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs_mm.F90 index 6867f6b6e..6d22259ab 100644 --- a/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/routing/noah271_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/sfc_cmem3/noah271_sfc2cmem3.F90 b/lis/surfacemodels/land/noah.2.7.1/sfc_cmem3/noah271_sfc2cmem3.F90 index abfd7269e..1b9d66442 100644 --- a/lis/surfacemodels/land/noah.2.7.1/sfc_cmem3/noah271_sfc2cmem3.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/sfc_cmem3/noah271_sfc2cmem3.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.2.7.1/sfc_crtm/noah271_sfc2crtm.F90 b/lis/surfacemodels/land/noah.2.7.1/sfc_crtm/noah271_sfc2crtm.F90 index 7ca0fee1b..70aec1462 100644 --- a/lis/surfacemodels/land/noah.2.7.1/sfc_crtm/noah271_sfc2crtm.F90 +++ b/lis/surfacemodels/land/noah.2.7.1/sfc_crtm/noah271_sfc2crtm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_setwrfexport.F90 b/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_setwrfexport.F90 index 5577c5492..acbad1187 100755 --- a/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_setwrfexport.F90 +++ b/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_wrf_f2t.F90 b/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_wrf_f2t.F90 index 79f4fb949..72b334e9d 100644 --- a/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_wrf_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.2/cpl_wrf_noesmf/noah32_wrf_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_getsnodepvars.F90 b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_getsnodepvars.F90 index 42122661c..38844fbd4 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_map_snodep.F90 b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_map_snodep.F90 index a2679e470..3f7eb006b 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_map_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_qcsnodep.F90 b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_qcsnodep.F90 index 23d3e7235..31a7e44c4 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_qcsnodep.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_setsnodepvars.F90 b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_setsnodepvars.F90 index e19361162..2c0cba57c 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_transform_snodep.F90 b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_transform_snodep.F90 index b670e8cf0..443f13b98 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_transform_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_updatesnodep.F90 b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_updatesnodep.F90 index 0862d11ee..ad902909a 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_updatesnodep.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snodep/noah32_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_dascf_Mod.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_dascf_Mod.F90 index 6682d65f4..5b94d760a 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_dascf_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_dascf_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_descale_snow.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_descale_snow.F90 index 42e23eef0..f5c50e3fa 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_descale_snow.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnowvars.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnowvars.F90 index 291a0fd07..61fc6d9f2 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnwdpred.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnwdpred.F90 index b22595a4b..31415805e 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnwdpred.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getswepred.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getswepred.F90 index cd3bc8ad4..744990298 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getswepred.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_snow.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_snow.F90 index 512d9afe7..4b3b06ffa 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_snow.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_swe.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_swe.F90 index 359a8bb4b..4cc6d678f 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_swe.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_map_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qc_snowobs.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qc_snowobs.F90 index 255e7e51f..4d85650e8 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qc_snowobs.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qcsnow.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qcsnow.F90 index 3fded8b9d..2e5f359b8 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qcsnow.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_scale_snow.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_scale_snow.F90 index 608f319a0..0b967834a 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_scale_snow.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_setsnowvars.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_setsnowvars.F90 index 93c3e2779..76f9e60cb 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_setsnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_transform_snow.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_transform_snow.F90 index a608c87e3..f232d242a 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_transform_snow.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_transform_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_updatesnowvars.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_updatesnowvars.F90 index 1407828e2..d5680fde5 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_updatesnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_wrtswe.F90 b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_wrtswe.F90 index cd37a2ea5..9c769f97e 100644 --- a/lis/surfacemodels/land/noah.3.2/da_snow/noah32_wrtswe.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_snow/noah32_wrtswe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_descale_soilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_descale_soilm.F90 index b4bddd5c2..199ce464c 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_descale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsmpred.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsmpred.F90 index 310faabff..0ebb7d0fe 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsmpred.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsoilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsoilm.F90 index bb2d3912f..59e08be37 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qc_soilmobs.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qc_soilmobs.F90 index 576b7bbd1..7767a024a 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qcsoilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qcsoilm.F90 index 2d038bb0b..2e010b825 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qcsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_scale_soilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_scale_soilm.F90 index 740494e31..97e1a7ea4 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_scale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_setsoilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_setsoilm.F90 index 82fe7e115..e807799bf 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_setsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_updatesoilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_updatesoilm.F90 index e4ee03749..99f238e13 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_updatesoilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_write_soilm.F90 b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_write_soilm.F90 index 457b582b5..e7ad361a8 100644 --- a/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_write_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.2/da_soilm/noah32_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/module_model_constants_32.F90 b/lis/surfacemodels/land/noah.3.2/module_model_constants_32.F90 index cd15e98ab..025f5dee6 100644 --- a/lis/surfacemodels/land/noah.3.2/module_model_constants_32.F90 +++ b/lis/surfacemodels/land/noah.3.2/module_model_constants_32.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/module_sf_noah32lsm.F90 b/lis/surfacemodels/land/noah.3.2/module_sf_noah32lsm.F90 index a1fb75ab6..53b66e6ec 100644 --- a/lis/surfacemodels/land/noah.3.2/module_sf_noah32lsm.F90 +++ b/lis/surfacemodels/land/noah.3.2/module_sf_noah32lsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/module_sfcdif_wrf_32.F90 b/lis/surfacemodels/land/noah.3.2/module_sfcdif_wrf_32.F90 index b56d34b8b..7d36a3a0d 100644 --- a/lis/surfacemodels/land/noah.3.2/module_sfcdif_wrf_32.F90 +++ b/lis/surfacemodels/land/noah.3.2/module_sfcdif_wrf_32.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_coldstart.F90 b/lis/surfacemodels/land/noah.3.2/noah32_coldstart.F90 index feb34469a..8364111fe 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_coldstart.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_dynsetup.F90 b/lis/surfacemodels/land/noah.3.2/noah32_dynsetup.F90 index 64ee1acf6..3892b5d3e 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_dynsetup.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_f2t.F90 b/lis/surfacemodels/land/noah.3.2/noah32_f2t.F90 index 73da96235..a14bdd85c 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_finalize.F90 b/lis/surfacemodels/land/noah.3.2/noah32_finalize.F90 index e7081d2ea..ec0cca886 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_finalize.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_lsmMod.F90 b/lis/surfacemodels/land/noah.3.2/noah32_lsmMod.F90 index edb8b7a73..0f3362934 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_lsmMod.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_main.F90 b/lis/surfacemodels/land/noah.3.2/noah32_main.F90 index 5af82542f..c74a83773 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_main.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_module.F90 b/lis/surfacemodels/land/noah.3.2/noah32_module.F90 index d1cf5deea..a52f40c37 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_module.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_readcrd.F90 b/lis/surfacemodels/land/noah.3.2/noah32_readcrd.F90 index 5fbb59685..0411bd169 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_readcrd.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_readrst.F90 b/lis/surfacemodels/land/noah.3.2/noah32_readrst.F90 index fc84ac76c..573659e13 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_readrst.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_setsoils.F90 b/lis/surfacemodels/land/noah.3.2/noah32_setsoils.F90 index c9ae402e4..ce0bdd6eb 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_setsoils.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_setsoils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_settbot.F90 b/lis/surfacemodels/land/noah.3.2/noah32_settbot.F90 index fd0a4e8fb..3902993c2 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_settbot.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_settbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_setup.F90 b/lis/surfacemodels/land/noah.3.2/noah32_setup.F90 index a60a8a445..f8e99133f 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_setup.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_setvegparms.F90 b/lis/surfacemodels/land/noah.3.2/noah32_setvegparms.F90 index 46b85a06a..a440fa902 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_setvegparms.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/noah32_writerst.F90 b/lis/surfacemodels/land/noah.3.2/noah32_writerst.F90 index 51aa89d78..a37a6d0e3 100644 --- a/lis/surfacemodels/land/noah.3.2/noah32_writerst.F90 +++ b/lis/surfacemodels/land/noah.3.2/noah32_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_ARMobs.F90 b/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_ARMobs.F90 index c862e638c..4f73128b5 100644 --- a/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_ARMobs.F90 +++ b/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_ARMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_template.F90 b/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_template.F90 index ba735acdb..b9abc569f 100644 --- a/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_template.F90 +++ b/lis/surfacemodels/land/noah.3.2/pe/noah32_getpeobspred_template.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/pe/noah32_peMod.F90 b/lis/surfacemodels/land/noah.3.2/pe/noah32_peMod.F90 index ef323ef09..422b6d1db 100644 --- a/lis/surfacemodels/land/noah.3.2/pe/noah32_peMod.F90 +++ b/lis/surfacemodels/land/noah.3.2/pe/noah32_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/pe/noah32_set_pedecvars.F90 b/lis/surfacemodels/land/noah.3.2/pe/noah32_set_pedecvars.F90 index 197c001af..f8cfa28b1 100644 --- a/lis/surfacemodels/land/noah.3.2/pe/noah32_set_pedecvars.F90 +++ b/lis/surfacemodels/land/noah.3.2/pe/noah32_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_ARMobs.F90 b/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_ARMobs.F90 index 92f06ef52..3f5e09524 100644 --- a/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_ARMobs.F90 +++ b/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_ARMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_template.F90 b/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_template.F90 index f7b8c929f..a2aeaf982 100644 --- a/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_template.F90 +++ b/lis/surfacemodels/land/noah.3.2/pe/noah32_setupobspred_template.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs.F90 b/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs.F90 index caaa24317..9007ed92c 100644 --- a/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs.F90 +++ b/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs_mm.F90 b/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs_mm.F90 index c36a49bb6..784bb85ad 100644 --- a/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noah.3.2/routing/noah32_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/sfc_cmem3/noah32_sfc2cmem3.F90 b/lis/surfacemodels/land/noah.3.2/sfc_cmem3/noah32_sfc2cmem3.F90 index 210d1ce5b..65c8b41e9 100644 --- a/lis/surfacemodels/land/noah.3.2/sfc_cmem3/noah32_sfc2cmem3.F90 +++ b/lis/surfacemodels/land/noah.3.2/sfc_cmem3/noah32_sfc2cmem3.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.2/sfc_crtm/noah32_sfc2crtm.F90 b/lis/surfacemodels/land/noah.3.2/sfc_crtm/noah32_sfc2crtm.F90 index 17dfda444..03a217b08 100644 --- a/lis/surfacemodels/land/noah.3.2/sfc_crtm/noah32_sfc2crtm.F90 +++ b/lis/surfacemodels/land/noah.3.2/sfc_crtm/noah32_sfc2crtm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_setwrfexport.F90 b/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_setwrfexport.F90 index ef8ac5ff6..147c02043 100644 --- a/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_setwrfexport.F90 +++ b/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_wrf_f2t.F90 b/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_wrf_f2t.F90 index 83019b375..69bdbebd3 100644 --- a/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_wrf_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.3/cpl_wrf_noesmf/noah33_wrf_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_descale_snodep.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_descale_snodep.F90 index 0ae6d6b8f..0c482f3f6 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_descale_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodeppred.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodeppred.F90 index 88a13fbcb..49ff0ca33 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodeppred.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodepvars.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodepvars.F90 index 85d67063a..4c6832d72 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_map_snodep.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_map_snodep.F90 index b0b04c06e..eef12d05a 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_map_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qc_snodepobs.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qc_snodepobs.F90 index af1907b31..f6f0d5b06 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qcsnodep.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qcsnodep.F90 index 5c316166d..b690ce7e1 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qcsnodep.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_scale_snodep.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_scale_snodep.F90 index 59801a660..09f85dd6e 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_scale_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_setsnodepvars.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_setsnodepvars.F90 index 06b379841..e325b829f 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_transform_snodep.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_transform_snodep.F90 index eae3fe08c..15153d60c 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_transform_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_updatesnodep.F90 b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_updatesnodep.F90 index 501ecf68c..5302045d0 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_updatesnodep.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snodep/noah33_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_dasnow_Mod.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_dasnow_Mod.F90 index 1be0601d5..9ff91f8ae 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_descale_snow.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_descale_snow.F90 index 7f62fbb35..9ccc3daad 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_descale_snow.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getscfpred.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getscfpred.F90 index a0c80618c..32d0f3bf4 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getscfpred.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getscfpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowpred_PMWsnow.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowpred_PMWsnow.F90 index c85362c25..2437633b7 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowpred_PMWsnow.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowpred_PMWsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowvars.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowvars.F90 index 8c4fe09a4..13d1e3410 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnwdpred.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnwdpred.F90 index 85a1d5fcd..0adcd1b9f 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnwdpred.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getswepred.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getswepred.F90 index 39eaade48..01ca35aaf 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getswepred.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow.F90 index 33935fb83..beee72529 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow_DI.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow_DI.F90 index 0335b0fa9..4430fd3fc 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow_DI.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_snow_DI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_swe.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_swe.F90 index 127d02635..5e548a0a4 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_swe.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_map_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_PMWsnowobs.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_PMWsnowobs.F90 index 3cbf50ef7..16c51c943 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_PMWsnowobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_PMWsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_scfobs.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_scfobs.F90 index 381a903a1..331a4e6ed 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_scfobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_scfobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_snowobs.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_snowobs.F90 index 0ae0f7307..04110c3c2 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_snowobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qcsnow.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qcsnow.F90 index 80a4f7735..380520853 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qcsnow.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_scale_snow.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_scale_snow.F90 index 742f6fa8a..61c0d02be 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_scale_snow.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_setsnowvars.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_setsnowvars.F90 index 260e673b3..d7c227d4f 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_setsnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_transform_snow.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_transform_snow.F90 index eee08f487..643a9e541 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_transform_snow.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_transform_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars.F90 index 2b2b2cefa..3d55fa30a 100644 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars_scfda.F90 b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars_scfda.F90 index 92e756886..1dfa48940 100755 --- a/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars_scfda.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_snow/noah33_updatesnowvars_scfda.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_dasoilm_Mod.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_dasoilm_Mod.F90 index 066e59af8..937c68beb 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_descale_soilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_descale_soilm.F90 index 898021991..4c327b1a1 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_descale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getLbandTbPred.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getLbandTbPred.F90 index 441d0e351..fc6a61f25 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsmpred.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsmpred.F90 index c0c819e45..4259f8930 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsmpred.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsoilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsoilm.F90 index e29e5fde6..ad3ced9ed 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qc_soilmobs.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qc_soilmobs.F90 index 811a280ab..8512fc087 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qcsoilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qcsoilm.F90 index 18cbe9e01..52749227d 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qcsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_scale_soilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_scale_soilm.F90 index 07e660d6c..d9499e076 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_scale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_setsoilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_setsoilm.F90 index 02950873a..d872b2aff 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_setsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_updatesoilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_updatesoilm.F90 index bf0f117e5..e960d0265 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_updatesoilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_write_soilm.F90 b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_write_soilm.F90 index 38327bfa5..b2d2c0e86 100644 --- a/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_write_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.3/da_soilm/noah33_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/irrigation/noah33_getirrigationstates.F90 b/lis/surfacemodels/land/noah.3.3/irrigation/noah33_getirrigationstates.F90 index 744d59c09..bf1b878ed 100644 --- a/lis/surfacemodels/land/noah.3.3/irrigation/noah33_getirrigationstates.F90 +++ b/lis/surfacemodels/land/noah.3.3/irrigation/noah33_getirrigationstates.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/module_model_constants_33.F90 b/lis/surfacemodels/land/noah.3.3/module_model_constants_33.F90 index 73d17636a..e618678b0 100644 --- a/lis/surfacemodels/land/noah.3.3/module_model_constants_33.F90 +++ b/lis/surfacemodels/land/noah.3.3/module_model_constants_33.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm.F90 b/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm.F90 index cdbf14ba8..5b6c652ae 100644 --- a/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm.F90 +++ b/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm_glacial.F90 b/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm_glacial.F90 index 8fa955dfc..2bd1c047d 100644 --- a/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm_glacial.F90 +++ b/lis/surfacemodels/land/noah.3.3/module_sf_noah33lsm_glacial.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/module_sfcdif_wrf_33.F90 b/lis/surfacemodels/land/noah.3.3/module_sfcdif_wrf_33.F90 index c7165c924..f46a9ce7e 100644 --- a/lis/surfacemodels/land/noah.3.3/module_sfcdif_wrf_33.F90 +++ b/lis/surfacemodels/land/noah.3.3/module_sfcdif_wrf_33.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_coldstart.F90 b/lis/surfacemodels/land/noah.3.3/noah33_coldstart.F90 index cf5b0bb50..af1c7c4d3 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_coldstart.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_dynsetup.F90 b/lis/surfacemodels/land/noah.3.3/noah33_dynsetup.F90 index d15b2633c..c26f47649 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_dynsetup.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_f2t.F90 b/lis/surfacemodels/land/noah.3.3/noah33_f2t.F90 index 8f9adfee4..c78776a65 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_finalize.F90 b/lis/surfacemodels/land/noah.3.3/noah33_finalize.F90 index 04bf6275a..29f52522c 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_finalize.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_lsmMod.F90 b/lis/surfacemodels/land/noah.3.3/noah33_lsmMod.F90 index a546401bd..3ca38fcbb 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_lsmMod.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_main.F90 b/lis/surfacemodels/land/noah.3.3/noah33_main.F90 index 0e7c4f25d..0e74fd451 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_main.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_module.F90 b/lis/surfacemodels/land/noah.3.3/noah33_module.F90 index f652b855d..22db934d3 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_module.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_readcrd.F90 b/lis/surfacemodels/land/noah.3.3/noah33_readcrd.F90 index 4e0fe3e0a..6327d6915 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_readcrd.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_readrst.F90 b/lis/surfacemodels/land/noah.3.3/noah33_readrst.F90 index db731ceb3..1c2494eb8 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_readrst.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_reset.F90 b/lis/surfacemodels/land/noah.3.3/noah33_reset.F90 index 0085e5ae7..3dbbb458d 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_reset.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_setsoils.F90 b/lis/surfacemodels/land/noah.3.3/noah33_setsoils.F90 index 6fc588c17..797453887 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_setsoils.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_setsoils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_settbot.F90 b/lis/surfacemodels/land/noah.3.3/noah33_settbot.F90 index 3f9f41a53..32c41e57a 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_settbot.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_settbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_setup.F90 b/lis/surfacemodels/land/noah.3.3/noah33_setup.F90 index 69734916d..c08cb8324 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_setup.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_setvegparms.F90 b/lis/surfacemodels/land/noah.3.3/noah33_setvegparms.F90 index 9c45e616f..2d3fab51f 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_setvegparms.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/noah33_writerst.F90 b/lis/surfacemodels/land/noah.3.3/noah33_writerst.F90 index 9133657cb..77a857f95 100644 --- a/lis/surfacemodels/land/noah.3.3/noah33_writerst.F90 +++ b/lis/surfacemodels/land/noah.3.3/noah33_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/noah33_peMod.F90 b/lis/surfacemodels/land/noah.3.3/pe/noah33_peMod.F90 index a83abb7b5..d79ec924a 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/noah33_peMod.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/noah33_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/noah33_set_pedecvars.F90 b/lis/surfacemodels/land/noah.3.3/pe/noah33_set_pedecvars.F90 index 56aa50d17..320299685 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/noah33_set_pedecvars.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/noah33_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_getpeobspred_ARMobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_getpeobspred_ARMobs.F90 index 30f452136..645ef3d56 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_getpeobspred_ARMobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_getpeobspred_ARMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_setupobspred_ARMobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_setupobspred_ARMobs.F90 index 6b6779091..b7971c4e8 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_setupobspred_ARMobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/ARM/noah33_setupobspred_ARMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_getpeobspred_FLUXNETobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_getpeobspred_FLUXNETobs.F90 index 564a2f593..ac7ccf80d 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_getpeobspred_FLUXNETobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_getpeobspred_FLUXNETobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_setupobspred_FLUXNETobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_setupobspred_FLUXNETobs.F90 index 5c49dfcd2..038003ed6 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_setupobspred_FLUXNETobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/FLUXNET/noah33_setupobspred_FLUXNETobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_getpeobspred_LPRMsmobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_getpeobspred_LPRMsmobs.F90 index 9eb4ef5c6..c17766151 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_getpeobspred_LPRMsmobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_getpeobspred_LPRMsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_setupobspred_LPRMsmobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_setupobspred_LPRMsmobs.F90 index d4f1b4d8f..b1d6a396b 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_setupobspred_LPRMsmobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/LPRM_AMSREsm/noah33_setupobspred_LPRMsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_getpeobspred_USDA_ARSsmobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_getpeobspred_USDA_ARSsmobs.F90 index 03c309622..63524d874 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_getpeobspred_USDA_ARSsmobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_getpeobspred_USDA_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_setupobspred_USDA_ARSsmobs.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_setupobspred_USDA_ARSsmobs.F90 index 27b7db10f..5d3aa91cc 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_setupobspred_USDA_ARSsmobs.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/USDA_ARSsm/noah33_setupobspred_USDA_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_getpeobspred_template.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_getpeobspred_template.F90 index 50d6160d6..74f6957e0 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_getpeobspred_template.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_getpeobspred_template.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_setupobspred_template.F90 b/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_setupobspred_template.F90 index bbdeef84b..84ffa1e85 100644 --- a/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_setupobspred_template.F90 +++ b/lis/surfacemodels/land/noah.3.3/pe/obspred/template/noah33_setupobspred_template.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs.F90 b/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs.F90 index 93bd07c63..baf3f27da 100644 --- a/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs.F90 +++ b/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_et.F90 b/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_et.F90 index aa0836f57..d5fb87404 100644 --- a/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_et.F90 +++ b/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_et.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_mm.F90 b/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_mm.F90 index 4e1014353..c36d8eee6 100644 --- a/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noah.3.3/routing/noah33_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/sfc_cmem3/noah33_sfc2cmem3.F90 b/lis/surfacemodels/land/noah.3.3/sfc_cmem3/noah33_sfc2cmem3.F90 index 17067fd8f..975f3b1f2 100644 --- a/lis/surfacemodels/land/noah.3.3/sfc_cmem3/noah33_sfc2cmem3.F90 +++ b/lis/surfacemodels/land/noah.3.3/sfc_cmem3/noah33_sfc2cmem3.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/sfc_crtm/noah33_sfc2crtm.F90 b/lis/surfacemodels/land/noah.3.3/sfc_crtm/noah33_sfc2crtm.F90 index 95c18ceb6..9ba0bd6ff 100644 --- a/lis/surfacemodels/land/noah.3.3/sfc_crtm/noah33_sfc2crtm.F90 +++ b/lis/surfacemodels/land/noah.3.3/sfc_crtm/noah33_sfc2crtm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.3/sfc_tauomega/noah33_sfc2tauomega.F90 b/lis/surfacemodels/land/noah.3.3/sfc_tauomega/noah33_sfc2tauomega.F90 index 89baeda14..a0d1fc39a 100644 --- a/lis/surfacemodels/land/noah.3.3/sfc_tauomega/noah33_sfc2tauomega.F90 +++ b/lis/surfacemodels/land/noah.3.3/sfc_tauomega/noah33_sfc2tauomega.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_setwrfexport.F90 b/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_setwrfexport.F90 index ddfac88d3..01138307a 100644 --- a/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_setwrfexport.F90 +++ b/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_wrf_f2t.F90 b/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_wrf_f2t.F90 index 7d2c08936..7025583f1 100644 --- a/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_wrf_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.6/cpl_wrf_noesmf/noah36_wrf_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_descale_snodep.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_descale_snodep.F90 index 6b2a62a74..663747d1f 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_descale_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodeppred.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodeppred.F90 index f02418c2d..5a8ca78ba 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodeppred.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodepvars.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodepvars.F90 index a57c05a00..86ce41a29 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_map_snodep.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_map_snodep.F90 index 3773d1315..0d383e195 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_map_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qc_snodepobs.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qc_snodepobs.F90 index fa7d2fdb4..2f5d96519 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qcsnodep.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qcsnodep.F90 index ff4384859..85b9d41ce 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qcsnodep.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_scale_snodep.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_scale_snodep.F90 index e7d662393..1bee6d1f2 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_scale_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_setsnodepvars.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_setsnodepvars.F90 index 40b13f2fa..4a4cb5a08 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_transform_snodep.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_transform_snodep.F90 index 57e135257..d2d4423e1 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_transform_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_updatesnodep.F90 b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_updatesnodep.F90 index 12a0d65c9..d5d26d143 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_updatesnodep.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snodep/noah36_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_dasnow_Mod.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_dasnow_Mod.F90 index edc67595d..1b93e0f0a 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_descale_snow.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_descale_snow.F90 index da514ae11..e7d41a89f 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_descale_snow.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getscfpred.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getscfpred.F90 index 864b917d0..5ff581c6c 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getscfpred.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getscfpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowpred_PMWsnow.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowpred_PMWsnow.F90 index d9d1fd571..e1516f656 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowpred_PMWsnow.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowpred_PMWsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowvars.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowvars.F90 index e54a800f0..d62aa6543 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnwdpred.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnwdpred.F90 index b0660b2c7..867354b96 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnwdpred.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getswepred.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getswepred.F90 index 0732f4584..69bed9c5c 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getswepred.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow.F90 index a831793e4..c3a0534f5 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow_DI.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow_DI.F90 index 3c147582d..d46db9d9b 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow_DI.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_snow_DI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_swe.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_swe.F90 index c7b4f1eae..f7f767816 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_swe.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_map_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_PMWsnowobs.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_PMWsnowobs.F90 index 9b2cfe6df..3ce9144e3 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_PMWsnowobs.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_PMWsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_scfobs.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_scfobs.F90 index e5a6fa8a5..23d50d020 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_scfobs.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_scfobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_snowobs.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_snowobs.F90 index ae3411cf6..e860905cb 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_snowobs.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qcsnow.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qcsnow.F90 index 3af77f5ba..15563af06 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qcsnow.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_scale_snow.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_scale_snow.F90 index 0f53c081b..bd1f2b97b 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_scale_snow.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_setsnowvars.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_setsnowvars.F90 index 641b79cf1..5b41322d1 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_setsnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_transform_snow.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_transform_snow.F90 index 573754e59..340a11343 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_transform_snow.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_transform_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars.F90 index 7633e78a2..829fe80e9 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars_scfda.F90 b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars_scfda.F90 index caa77d198..b9a65af5b 100644 --- a/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars_scfda.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_snow/noah36_updatesnowvars_scfda.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_dasoilm_Mod.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_dasoilm_Mod.F90 index ae494a658..5ac9d330d 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_descale_soilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_descale_soilm.F90 index 0c1a3cfdc..61fd178d4 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_descale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getLbandTbPred.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getLbandTbPred.F90 index 9ee961770..716e8aaef 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsmpred.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsmpred.F90 index f069c87c2..7e69b89df 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsmpred.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsoilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsoilm.F90 index d364dfe0e..d5a13259f 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qc_soilmobs.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qc_soilmobs.F90 index 878ec1443..c77bf2211 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qcsoilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qcsoilm.F90 index a722e6cdd..464b65d63 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qcsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_scale_soilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_scale_soilm.F90 index e2543099b..fd9156d55 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_scale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_setsoilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_setsoilm.F90 index b487dad67..339f7af2a 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_setsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_updatesoilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_updatesoilm.F90 index c9968b528..a27865ab6 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_updatesoilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_write_soilm.F90 b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_write_soilm.F90 index 08e27d4d8..5f8c6140a 100644 --- a/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_write_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.6/da_soilm/noah36_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/module_model_constants_36.F90 b/lis/surfacemodels/land/noah.3.6/module_model_constants_36.F90 index c943a926b..4fb4577b7 100644 --- a/lis/surfacemodels/land/noah.3.6/module_model_constants_36.F90 +++ b/lis/surfacemodels/land/noah.3.6/module_model_constants_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm.F90 b/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm.F90 index 0902ac272..3914c57f2 100644 --- a/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm.F90 +++ b/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm_glacial.F90 b/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm_glacial.F90 index 55df5e4cc..28de344fa 100644 --- a/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm_glacial.F90 +++ b/lis/surfacemodels/land/noah.3.6/module_sf_noah36lsm_glacial.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/module_sfcdif_wrf_36.F90 b/lis/surfacemodels/land/noah.3.6/module_sfcdif_wrf_36.F90 index 44f044950..b986c786a 100644 --- a/lis/surfacemodels/land/noah.3.6/module_sfcdif_wrf_36.F90 +++ b/lis/surfacemodels/land/noah.3.6/module_sfcdif_wrf_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_coldstart.F90 b/lis/surfacemodels/land/noah.3.6/noah36_coldstart.F90 index 32837f1c3..fa007aa3a 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_coldstart.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_dynsetup.F90 b/lis/surfacemodels/land/noah.3.6/noah36_dynsetup.F90 index 527a523af..e9f3a9a35 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_dynsetup.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_f2t.F90 b/lis/surfacemodels/land/noah.3.6/noah36_f2t.F90 index a641086f7..357b9e6ab 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_finalize.F90 b/lis/surfacemodels/land/noah.3.6/noah36_finalize.F90 index ddd4c740b..75c3da296 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_finalize.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_lsmMod.F90 b/lis/surfacemodels/land/noah.3.6/noah36_lsmMod.F90 index 8ea3db57c..efba0f78d 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_lsmMod.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -228,7 +228,7 @@ subroutine noah36_lsm_ini() !ag(05Jan2021) noah36_struc(n)%noah(i)%rivsto = 0.0 - noah36_struc(n)%noah(i)%fldfrc = 0.0 + noah36_struc(n)%noah(i)%fldsto = 0.0 noah36_struc(n)%noah(i)%fldfrc = 0.0 enddo diff --git a/lis/surfacemodels/land/noah.3.6/noah36_main.F90 b/lis/surfacemodels/land/noah.3.6/noah36_main.F90 index 7ead980e4..a25630ce5 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_main.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_module.F90 b/lis/surfacemodels/land/noah.3.6/noah36_module.F90 index 45ba960a7..2c1f5d463 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_module.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_readcrd.F90 b/lis/surfacemodels/land/noah.3.6/noah36_readcrd.F90 index a612cd683..8c430aeed 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_readcrd.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_readrst.F90 b/lis/surfacemodels/land/noah.3.6/noah36_readrst.F90 index 30139986c..5107213aa 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_readrst.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_reset.F90 b/lis/surfacemodels/land/noah.3.6/noah36_reset.F90 index 15269f5a5..c2de91950 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_reset.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_setsoils.F90 b/lis/surfacemodels/land/noah.3.6/noah36_setsoils.F90 index 9321f7080..663da5567 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_setsoils.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_setsoils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_settbot.F90 b/lis/surfacemodels/land/noah.3.6/noah36_settbot.F90 index 334644ea0..b264e956c 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_settbot.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_settbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_setup.F90 b/lis/surfacemodels/land/noah.3.6/noah36_setup.F90 index 4e252c60c..3c1b0b6da 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_setup.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_setvegparms.F90 b/lis/surfacemodels/land/noah.3.6/noah36_setvegparms.F90 index 8c01558a4..df10fcf6d 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_setvegparms.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/noah36_writerst.F90 b/lis/surfacemodels/land/noah.3.6/noah36_writerst.F90 index 57df5c9eb..88640e4eb 100644 --- a/lis/surfacemodels/land/noah.3.6/noah36_writerst.F90 +++ b/lis/surfacemodels/land/noah.3.6/noah36_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/pe/noah36_peMod.F90 b/lis/surfacemodels/land/noah.3.6/pe/noah36_peMod.F90 index 34f197f40..0f8140fb7 100644 --- a/lis/surfacemodels/land/noah.3.6/pe/noah36_peMod.F90 +++ b/lis/surfacemodels/land/noah.3.6/pe/noah36_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/pe/noah36_set_pedecvars.F90 b/lis/surfacemodels/land/noah.3.6/pe/noah36_set_pedecvars.F90 index ac3fafbd6..ca107d408 100644 --- a/lis/surfacemodels/land/noah.3.6/pe/noah36_set_pedecvars.F90 +++ b/lis/surfacemodels/land/noah.3.6/pe/noah36_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs.F90 b/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs.F90 index 78971cab6..804c2f2b8 100644 --- a/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs.F90 +++ b/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_hymap2.F90 b/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_hymap2.F90 index 6073405fd..2546ec004 100644 --- a/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_mm.F90 b/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_mm.F90 index 832bb6cd7..40959e120 100644 --- a/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noah.3.6/routing/noah36_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/routing/noah36_getsws_hymap2.F90 b/lis/surfacemodels/land/noah.3.6/routing/noah36_getsws_hymap2.F90 index 373ae8c99..9c7558a7d 100644 --- a/lis/surfacemodels/land/noah.3.6/routing/noah36_getsws_hymap2.F90 +++ b/lis/surfacemodels/land/noah.3.6/routing/noah36_getsws_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.6/sfc_cmem3/noah36_sfc2cmem3.F90 b/lis/surfacemodels/land/noah.3.6/sfc_cmem3/noah36_sfc2cmem3.F90 index e36ed4fe0..02bf9eebf 100644 --- a/lis/surfacemodels/land/noah.3.6/sfc_cmem3/noah36_sfc2cmem3.F90 +++ b/lis/surfacemodels/land/noah.3.6/sfc_cmem3/noah36_sfc2cmem3.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_getCROCUSexport.F90 b/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_getCROCUSexport.F90 index 195ef793b..4f9bd8b6d 100644 --- a/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_getCROCUSexport.F90 +++ b/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_getCROCUSexport.F90 @@ -1,7 +1,7 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! ! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. diff --git a/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_setCROCUSimport.F90 b/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_setCROCUSimport.F90 index 45ab46f76..984ccbafc 100755 --- a/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_setCROCUSimport.F90 +++ b/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_setCROCUSimport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_snow_update.F90 b/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_snow_update.F90 index c3a57e238..27aa535d2 100644 --- a/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_snow_update.F90 +++ b/lis/surfacemodels/land/noah.3.9/cplsubLSM/noah39_snow_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_descale_snodep.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_descale_snodep.F90 index 7741a48c4..140e4ffd2 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_descale_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodeppred.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodeppred.F90 index 1acc6e5c4..9a7980be2 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodeppred.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodepvars.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodepvars.F90 index 304923d17..53aa5cdc5 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_map_snodep.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_map_snodep.F90 index 85f4f608a..e85b6ec98 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_map_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qc_snodepobs.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qc_snodepobs.F90 index 8dbd0e092..05c7cea92 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qcsnodep.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qcsnodep.F90 index 8b7d93eca..98019bf75 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qcsnodep.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_scale_snodep.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_scale_snodep.F90 index 5e022fb86..031e2adeb 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_scale_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_setsnodepvars.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_setsnodepvars.F90 index 0a305c639..1779a84e4 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_transform_snodep.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_transform_snodep.F90 index ca936d2d6..4f1d42d12 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_transform_snodep.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_updatesnodep.F90 b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_updatesnodep.F90 index 6ce58b595..f28b11111 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_updatesnodep.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snodep/noah39_updatesnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_snow/noah39_dasnow_Mod.F90 b/lis/surfacemodels/land/noah.3.9/da_snow/noah39_dasnow_Mod.F90 index e4bc967af..118d9ba7b 100644 --- a/lis/surfacemodels/land/noah.3.9/da_snow/noah39_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_snow/noah39_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_dasoilm_Mod.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_dasoilm_Mod.F90 index 58ee58d43..41b105b2b 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_descale_soilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_descale_soilm.F90 index c4eeb60ba..7f48a0eb8 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_descale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getLbandTbPred.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getLbandTbPred.F90 index abfce1244..18e3dda8f 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsmpred.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsmpred.F90 index 08fe83746..606971b97 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsmpred.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsoilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsoilm.F90 index fc4346ca5..e41fce088 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qc_soilmobs.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qc_soilmobs.F90 index 1be06ca1a..4a566aa91 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qcsoilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qcsoilm.F90 index 06680ec5e..02245a69d 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qcsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_scale_soilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_scale_soilm.F90 index 5b33dfecd..14045cb72 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_scale_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_setsoilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_setsoilm.F90 index 7c04e0ee3..4d8c14732 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_setsoilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_updatesoilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_updatesoilm.F90 index a5ecc8cf0..db645d5d5 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_updatesoilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_write_soilm.F90 b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_write_soilm.F90 index 1a90131c7..0a755a7dc 100644 --- a/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_write_soilm.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_soilm/noah39_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_descale_usafsi.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_descale_usafsi.F90 index 6dac4d97c..fbfed3a22 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_descale_usafsi.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_descale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsipred.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsipred.F90 index 6667174c9..0e59efff5 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsipred.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsipred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsivars.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsivars.F90 index 3917d8cbd..2a9f381e0 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsivars.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_getusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_map_usafsi.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_map_usafsi.F90 index 945f4903c..d36353cf9 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_map_usafsi.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_map_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qc_usafsiobs.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qc_usafsiobs.F90 index adb595a58..5f6eb2544 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qc_usafsiobs.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qc_usafsiobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qcusafsi.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qcusafsi.F90 index b5b4e9605..183aebbd5 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qcusafsi.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_qcusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_scale_usafsi.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_scale_usafsi.F90 index 4795e61e2..44d81884f 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_scale_usafsi.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_scale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_setusafsivars.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_setusafsivars.F90 index 5d017c71c..ddc8a03be 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_setusafsivars.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_setusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_transform_usafsi.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_transform_usafsi.F90 index dac51c30e..598de6545 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_transform_usafsi.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_transform_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_updateusafsi.F90 b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_updateusafsi.F90 index 42bdca03d..71722d3b8 100644 --- a/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_updateusafsi.F90 +++ b/lis/surfacemodels/land/noah.3.9/da_usafsi/noah39_updateusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/module_sfcdif_wrf_39.F90 b/lis/surfacemodels/land/noah.3.9/module_sfcdif_wrf_39.F90 index 566490079..ffb689eea 100644 --- a/lis/surfacemodels/land/noah.3.9/module_sfcdif_wrf_39.F90 +++ b/lis/surfacemodels/land/noah.3.9/module_sfcdif_wrf_39.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_coldstart.F90 b/lis/surfacemodels/land/noah.3.9/noah39_coldstart.F90 index 8207c7d58..f8032bb95 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_coldstart.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_dynsetup.F90 b/lis/surfacemodels/land/noah.3.9/noah39_dynsetup.F90 index 4bd11c13b..5acb2c2e5 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_dynsetup.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_f2t.F90 b/lis/surfacemodels/land/noah.3.9/noah39_f2t.F90 index d71265406..e6101550d 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_f2t.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_finalize.F90 b/lis/surfacemodels/land/noah.3.9/noah39_finalize.F90 index 80b38a84f..dd92b1dee 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_finalize.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_lsmMod.F90 b/lis/surfacemodels/land/noah.3.9/noah39_lsmMod.F90 index b78c5c71d..b69b40765 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_lsmMod.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_main.F90 b/lis/surfacemodels/land/noah.3.9/noah39_main.F90 index c283b4697..7a8a5b9f8 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_main.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_module.F90 b/lis/surfacemodels/land/noah.3.9/noah39_module.F90 index 6a43ad0a6..58d6cf9ef 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_module.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_readcrd.F90 b/lis/surfacemodels/land/noah.3.9/noah39_readcrd.F90 index 2bde5d67a..9abfa764f 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_readcrd.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_readrst.F90 b/lis/surfacemodels/land/noah.3.9/noah39_readrst.F90 index d5c716aa1..bbd95b854 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_readrst.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -102,13 +102,13 @@ subroutine noah39_readrst() if(.not.file_exists) then write(LIS_logunit,*) '[ERR] Noah-3.9 restart file ', & - noah39_struc(n)%rfile,' does not exist ' + trim(noah39_struc(n)%rfile),' does not exist ' write(LIS_logunit,*) '[ERR] Program stopping ...' call LIS_endrun() endif write(LIS_logunit,*) & - '[INFO] Noah-3.9 restart file used: ',noah39_struc(n)%rfile + '[INFO] Noah-3.9 restart file used: ',trim(noah39_struc(n)%rfile) if(wformat.eq."binary") then ftn = LIS_getNextUnitNumber() diff --git a/lis/surfacemodels/land/noah.3.9/noah39_reset.F90 b/lis/surfacemodels/land/noah.3.9/noah39_reset.F90 index b3e0145da..da92e4e45 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_reset.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_setsoils.F90 b/lis/surfacemodels/land/noah.3.9/noah39_setsoils.F90 index 7e7691e82..2ec5f7b8d 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_setsoils.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_setsoils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_settbot.F90 b/lis/surfacemodels/land/noah.3.9/noah39_settbot.F90 index 9efe0efa0..8320b2fa3 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_settbot.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_settbot.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_setup.F90 b/lis/surfacemodels/land/noah.3.9/noah39_setup.F90 index a44a14d20..8dc2da04d 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_setup.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_setvegparms.F90 b/lis/surfacemodels/land/noah.3.9/noah39_setvegparms.F90 index 7f791cfb6..53fef6dfd 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_setvegparms.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_setvegparms.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/noah39_writerst.F90 b/lis/surfacemodels/land/noah.3.9/noah39_writerst.F90 index 880ba0904..bbc0b119a 100644 --- a/lis/surfacemodels/land/noah.3.9/noah39_writerst.F90 +++ b/lis/surfacemodels/land/noah.3.9/noah39_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/phys/module_sf_noah39lsm.F90 b/lis/surfacemodels/land/noah.3.9/phys/module_sf_noah39lsm.F90 index dda91bdd1..d42e8d8e0 100644 --- a/lis/surfacemodels/land/noah.3.9/phys/module_sf_noah39lsm.F90 +++ b/lis/surfacemodels/land/noah.3.9/phys/module_sf_noah39lsm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs.F90 b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs.F90 index 474e41773..b19851c16 100644 --- a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs.F90 +++ b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_hymap2.F90 b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_hymap2.F90 index 9c3343ee6..90cbdcc02 100644 --- a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_mm.F90 b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_mm.F90 index e8dfff558..5d355375a 100644 --- a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_rapid.F90 b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_rapid.F90 index d555a237d..3ff48a887 100644 --- a/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_rapid.F90 +++ b/lis/surfacemodels/land/noah.3.9/routing/noah39_getrunoffs_rapid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noah.3.9/routing/noah39_getsws_hymap2.F90 b/lis/surfacemodels/land/noah.3.9/routing/noah39_getsws_hymap2.F90 index 3c351cf1d..5913fec5c 100644 --- a/lis/surfacemodels/land/noah.3.9/routing/noah39_getsws_hymap2.F90 +++ b/lis/surfacemodels/land/noah.3.9/routing/noah39_getsws_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_coldstart.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_coldstart.F90 index 1ac3b2983..d4d17fe82 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_coldstart.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_dynsetup.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_dynsetup.F90 index 0165ca05e..85895a56e 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_dynsetup.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_f2t.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_f2t.F90 index 0fe18affa..e07a38624 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_f2t.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_finalize.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_finalize.F90 index 8cb39be23..fd35655ac 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_finalize.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_lsmMod.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_lsmMod.F90 index 1138e56e5..689946cce 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_lsmMod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_main.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_main.F90 index 185544938..0a16cfc84 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_main.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_module.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_module.F90 index c176d925b..78366844e 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_module.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readcrd.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readcrd.F90 index f2df681e2..9b1a1e524 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readcrd.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readrst.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readrst.F90 index eaf761cce..f759a4844 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readrst.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_reset.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_reset.F90 index b760ff162..6da19c7ac 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_reset.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_setup.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_setup.F90 index dc863a7cf..34a20872e 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_setup.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_writerst.F90 b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_writerst.F90 index 702767c37..781e4c5c3 100644 --- a/lis/surfacemodels/land/noahmp.3.6/NoahMP36_writerst.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/NoahMP36_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/SOIL_VEG_GEN_PARM_36.F90 b/lis/surfacemodels/land/noahmp.3.6/SOIL_VEG_GEN_PARM_36.F90 index 7dd4c9ad9..c2409728f 100644 --- a/lis/surfacemodels/land/noahmp.3.6/SOIL_VEG_GEN_PARM_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/SOIL_VEG_GEN_PARM_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/cpl_wrf_noesmf/noahMP36_setwrfexport.F90 b/lis/surfacemodels/land/noahmp.3.6/cpl_wrf_noesmf/noahMP36_setwrfexport.F90 index c167b3329..3971349c4 100755 --- a/lis/surfacemodels/land/noahmp.3.6/cpl_wrf_noesmf/noahMP36_setwrfexport.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/cpl_wrf_noesmf/noahMP36_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_daveg_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_daveg_Mod.F90 index d85e7a8a3..71f312e2f 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_daveg_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_daveg_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_descale_veg.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_descale_veg.F90 index 4125faf47..eee4fc4df 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_descale_veg.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_descale_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getLAIpred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getLAIpred.F90 index 443f3052d..7402c722c 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getLAIpred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getLAIpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getvegvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getvegvars.F90 index 9006075f2..b3ac05d68 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getvegvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_getvegvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_map_veg.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_map_veg.F90 index f0d652a89..dba99adfc 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_map_veg.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_map_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qc_LAIobs.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qc_LAIobs.F90 index 155485c94..e8bd797b2 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qc_LAIobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qc_LAIobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qcveg.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qcveg.F90 index 53b59306e..b46725949 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qcveg.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_qcveg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_scale_veg.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_scale_veg.F90 index 4b12aac56..8f840433d 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_scale_veg.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_scale_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_setvegvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_setvegvars.F90 index 7fe92d4af..faea83575 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_setvegvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_setvegvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_transform_veg.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_transform_veg.F90 index 5ed818ccc..bd82c03c7 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_transform_veg.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_transform_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_updatevegvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_updatevegvars.F90 index 6421716f8..0173ffa6a 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_updatevegvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_LAI/noahmp36_updatevegvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_daalbedo_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_daalbedo_Mod.F90 index 0c25cd08e..6a9b9be69 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_daalbedo_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_daalbedo_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_descale_albedo.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_descale_albedo.F90 index 1251c6a9c..eda92e49e 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_descale_albedo.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_descale_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedopred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedopred.F90 index 14c64075e..ba57f2632 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedopred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedopred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedovars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedovars.F90 index 4d5e23a08..4fbf158f2 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedovars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_getalbedovars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_map_albedo.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_map_albedo.F90 index eb8f5f650..a447a04e8 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_map_albedo.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_map_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qc_albedoobs.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qc_albedoobs.F90 index 162501f0d..321cd202a 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qc_albedoobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qc_albedoobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qcalbedo.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qcalbedo.F90 index 47f2d59bf..188ae1dfc 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qcalbedo.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_qcalbedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_scale_albedo.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_scale_albedo.F90 index 9bbea908e..d54019e22 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_scale_albedo.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_scale_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_setalbedovars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_setalbedovars.F90 index 73a9731ec..1871e81f9 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_setalbedovars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_setalbedovars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_transform_albedo.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_transform_albedo.F90 index 7d1803a43..8130554a3 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_transform_albedo.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_transform_albedo.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_updatealbedovars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_updatealbedovars.F90 index c6c1fc513..e73531b26 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_updatealbedovars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_albedo/noahmp36_updatealbedovars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_dasnodep_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_dasnodep_Mod.F90 index c90195e2c..0c4d88967 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_dasnodep_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_dasnodep_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_descale_snodep.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_descale_snodep.F90 index 42dddd924..3f701adbd 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_descale_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodeppred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodeppred.F90 index eff18139e..e83429727 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodeppred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodepvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodepvars.F90 index c31b1a0cd..c0bf63d94 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_map_snodep.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_map_snodep.F90 index 8d479899f..bccfeab85 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_map_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qc_snodepobs.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qc_snodepobs.F90 index f2b8ecf4f..6be930d63 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qcsnodep.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qcsnodep.F90 index 7fff820db..27ff043d7 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qcsnodep.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_scale_snodep.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_scale_snodep.F90 index 9b3586850..64cc4c0f0 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_scale_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_setsnodepvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_setsnodepvars.F90 index 58f941f54..4fa476d5b 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_snodep_update.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_snodep_update.F90 index 0fbf27188..780553245 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_snodep_update.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_snodep_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_transform_snodep.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_transform_snodep.F90 index aff680a25..bc2dc255c 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_transform_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_updatesnodepvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_updatesnodepvars.F90 index 93669b015..d024ff895 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_updatesnodepvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snodep/noahmp36_updatesnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_dasnow_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_dasnow_Mod.F90 index e8bf6cf2f..bb243a283 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_descale_snow.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_descale_snow.F90 index 9512ebfa3..ce578e3c8 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_descale_snow.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnowvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnowvars.F90 index 84ad38d1c..9a454b148 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnowvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnwdpred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnwdpred.F90 index 97f245395..c44cbfde2 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnwdpred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getswepred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getswepred.F90 index dfdba28fa..a7453c7ad 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getswepred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qc_snowobs.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qc_snowobs.F90 index afa5a16a4..045c67cdb 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qc_snowobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qcsnow.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qcsnow.F90 index dea58b51a..0e269e427 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qcsnow.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_scale_snow.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_scale_snow.F90 index e8c2e43f7..5ace73f06 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_scale_snow.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_setsnowvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_setsnowvars.F90 index e26444a11..48ce2a0bd 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_setsnowvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_snow_update.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_snow_update.F90 index f6adb1dcd..15afedb38 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_snow_update.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_snow_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_updatesnowvars.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_updatesnowvars.F90 index 1a0e15d38..da4128413 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_updatesnowvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snow/noahmp36_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/mwSVM_routines.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/mwSVM_routines.F90 index e767736ef..ba09cd9cf 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/mwSVM_routines.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/mwSVM_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_LIS_SVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_LIS_SVM.F90 index cebff4c4d..b7b642021 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_LIS_SVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_LIS_SVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_dasnowSVM_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_dasnowSVM_Mod.F90 index afd8fedd2..7e12bf199 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_dasnowSVM_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_dasnowSVM_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_descale_snowSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_descale_snowSVM.F90 index 8894bfeb9..25193c669 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_descale_snowSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_descale_snowSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnowvarsSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnowvarsSVM.F90 index 6ce841451..8e90876b8 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnowvarsSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnowvarsSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnwdpred_TB.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnwdpred_TB.F90 index 0f1b64206..6c26d1393 100755 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnwdpred_TB.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_getsnwdpred_TB.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qc_snowobsSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qc_snowobsSVM.F90 index d84070480..46fcd79f9 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qc_snowobsSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qc_snowobsSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qcsnowSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qcsnowSVM.F90 index d37f4de30..e6b818ed9 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qcsnowSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_qcsnowSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_scale_snowSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_scale_snowSVM.F90 index 28af6d5c5..da6b0bbb6 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_scale_snowSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_scale_snowSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_setsnowvarsSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_setsnowvarsSVM.F90 index cd5915bcf..19f77c750 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_setsnowvarsSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_setsnowvarsSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_updatesnowvarsSVM.F90 b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_updatesnowvarsSVM.F90 index c61e9425f..98b5a1409 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_updatesnowvarsSVM.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_snowSVM/noahmp36_updatesnowvarsSVM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_dasoilm_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_dasoilm_Mod.F90 index 14fd0fd20..2eb261054 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_descale_soilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_descale_soilm.F90 index 9ed5a9296..79382a8d6 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_descale_soilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsmpred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsmpred.F90 index 53a44483f..e2e9c0d15 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsmpred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsoilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsoilm.F90 index d8e0f0287..eb6fa795e 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsoilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qc_soilmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qc_soilmobs.F90 index a4e01b86b..af1b2a9cf 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qcsoilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qcsoilm.F90 index a2c83636b..f6ea257df 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qcsoilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_scale_soilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_scale_soilm.F90 index 3826306dc..cfa2d047d 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_scale_soilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_setsoilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_setsoilm.F90 index a46bdf90b..5679758a1 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_setsoilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_updatesoilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_updatesoilm.F90 index c279fef25..c2fd35f6b 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_updatesoilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_write_soilm.F90 b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_write_soilm.F90 index 2c1c0fa75..d2cd244c6 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_write_soilm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_soilm/noahmp36_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_datws_Mod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_datws_Mod.F90 index c817b55ae..d9a262851 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_datws_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_datws_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_descale_tws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_descale_tws.F90 index 4effc5676..10cdcc397 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_descale_tws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_descale_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettws.F90 index 04c87eed2..337c5fe5c 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettwspred.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettwspred.F90 index 11e3127b9..f3c061f7d 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettwspred.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_gettwspred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qc_twsobs.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qc_twsobs.F90 index 7979a3ffb..88a5364f3 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qc_twsobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qc_twsobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qctws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qctws.F90 index e6a9ef7d5..d7bb4ac59 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qctws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_qctws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_scale_tws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_scale_tws.F90 index f32748704..825d6eb7a 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_scale_tws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_scale_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_settws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_settws.F90 index 8a95801e1..0d21dd05f 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_settws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_settws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_tws_DAlogMod.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_tws_DAlogMod.F90 index f849c1193..6e34651c1 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_tws_DAlogMod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_tws_DAlogMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_updatetws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_updatetws.F90 index 0239a54be..0f19852a9 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_updatetws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_updatetws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_write_tws.F90 b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_write_tws.F90 index 1006b8302..862c6a4b5 100644 --- a/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_write_tws.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/da_tws/noahmp36_write_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/irrigation/noahmp36_getirrigationstates.F90 b/lis/surfacemodels/land/noahmp.3.6/irrigation/noahmp36_getirrigationstates.F90 index fa686995d..ac60788d4 100755 --- a/lis/surfacemodels/land/noahmp.3.6/irrigation/noahmp36_getirrigationstates.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/irrigation/noahmp36_getirrigationstates.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/kwm_date_utilities_36.F90 b/lis/surfacemodels/land/noahmp.3.6/kwm_date_utilities_36.F90 index 809ff57be..aa5d2bacf 100644 --- a/lis/surfacemodels/land/noahmp.3.6/kwm_date_utilities_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/kwm_date_utilities_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/module_model_constants_36.F90 b/lis/surfacemodels/land/noahmp.3.6/module_model_constants_36.F90 index 1bd48d618..4745622bf 100644 --- a/lis/surfacemodels/land/noahmp.3.6/module_model_constants_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/module_model_constants_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/module_sf_myjsfc_36.F90 b/lis/surfacemodels/land/noahmp.3.6/module_sf_myjsfc_36.F90 index 0966ce614..3adf8354c 100644 --- a/lis/surfacemodels/land/noahmp.3.6/module_sf_myjsfc_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/module_sf_myjsfc_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/module_sf_noahlsm_36.F90 b/lis/surfacemodels/land/noahmp.3.6/module_sf_noahlsm_36.F90 index 2c832a065..1655ff3b7 100644 --- a/lis/surfacemodels/land/noahmp.3.6/module_sf_noahlsm_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/module_sf_noahlsm_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/module_sf_noahmplsm_36.F90 b/lis/surfacemodels/land/noahmp.3.6/module_sf_noahmplsm_36.F90 index 8e073f35b..f4f4f5d94 100644 --- a/lis/surfacemodels/land/noahmp.3.6/module_sf_noahmplsm_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/module_sf_noahmplsm_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/module_sf_sfclay_36.F90 b/lis/surfacemodels/land/noahmp.3.6/module_sf_sfclay_36.F90 index 75893ef33..adf562237 100644 --- a/lis/surfacemodels/land/noahmp.3.6/module_sf_sfclay_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/module_sf_sfclay_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/noahmp36_wrf_routines.F90 b/lis/surfacemodels/land/noahmp.3.6/noahmp36_wrf_routines.F90 index 4d8040473..88f1e83e1 100644 --- a/lis/surfacemodels/land/noahmp.3.6/noahmp36_wrf_routines.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/noahmp36_wrf_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/noahmp_driver_36.F90 b/lis/surfacemodels/land/noahmp.3.6/noahmp_driver_36.F90 index 254cbef71..a0e1a8acc 100644 --- a/lis/surfacemodels/land/noahmp.3.6/noahmp_driver_36.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/noahmp_driver_36.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_peMod.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_peMod.F90 index 1e7d1bf1d..6d31d47c5 100755 --- a/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_peMod.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_set_pedecvars.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_set_pedecvars.F90 index 18231b358..249cf7c39 100755 --- a/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_set_pedecvars.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/NoahMP36_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_getpeobspred_ARSsmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_getpeobspred_ARSsmobs.F90 index 4867e2caf..56b819063 100755 --- a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_getpeobspred_ARSsmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_getpeobspred_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_setupobspred_ARSsmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_setupobspred_ARSsmobs.F90 index 0a4209544..7b4a12c0c 100755 --- a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_setupobspred_ARSsmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ARSsm/NoahMP36_setupobspred_ARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_getpeobspred_ISMNsmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_getpeobspred_ISMNsmobs.F90 index 0e4f7bf3f..fba497201 100755 --- a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_getpeobspred_ISMNsmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_getpeobspred_ISMNsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_setupobspred_ISMNsmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_setupobspred_ISMNsmobs.F90 index 39b26fdad..f661c33b3 100755 --- a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_setupobspred_ISMNsmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/ISMNsm/NoahMP36_setupobspred_ISMNsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_getpeobspred_SMAPsmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_getpeobspred_SMAPsmobs.F90 index 723c60029..5d62a7f8d 100644 --- a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_getpeobspred_SMAPsmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_getpeobspred_SMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_setupobspred_SMAPsmobs.F90 b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_setupobspred_SMAPsmobs.F90 index ab615fbb6..ed4f8596a 100644 --- a/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_setupobspred_SMAPsmobs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/pe/obspred/SMAPsm/NoahMP36_setupobspred_SMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs.F90 b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs.F90 index e0a0fcdd6..8dad79839 100644 --- a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_hymap2.F90 b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_hymap2.F90 index 4dc30b082..c5ac23eb4 100644 --- a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_mm.F90 b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_mm.F90 index 9919e77c6..ff40cf082 100644 --- a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_rapid.F90 b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_rapid.F90 index 49c87cf20..b535d2300 100644 --- a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_rapid.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getrunoffs_rapid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getsws_hymap2.F90 b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getsws_hymap2.F90 index ce1cdb1ee..24299fd50 100755 --- a/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getsws_hymap2.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/routing/noahmp36_getsws_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.3.6/sfc_cmem3/noahmp36_sfc2cmem3.F90 b/lis/surfacemodels/land/noahmp.3.6/sfc_cmem3/noahmp36_sfc2cmem3.F90 index 4b14b4fbe..093b647a1 100755 --- a/lis/surfacemodels/land/noahmp.3.6/sfc_cmem3/noahmp36_sfc2cmem3.F90 +++ b/lis/surfacemodels/land/noahmp.3.6/sfc_cmem3/noahmp36_sfc2cmem3.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_coldstart.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_coldstart.F90 index fbc18408d..e6c64a28f 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_coldstart.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_dynsetup.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_dynsetup.F90 index 4d6cc1917..833dea5b7 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_dynsetup.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_f2t.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_f2t.F90 index 07721e343..78d71e92f 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_f2t.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_finalize.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_finalize.F90 index 6c1d68277..9448f5068 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_finalize.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_lsmMod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_lsmMod.F90 index e1b94f570..d38c5c959 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_lsmMod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -304,18 +304,18 @@ subroutine NoahMP401_ini() call LIS_update_timestep(LIS_rc, n, NOAHMP401_struc(n)%ts) - call LIS_registerAlarm("NoahMP401 model alarm",& + write(fnest,'(i3.3)') n + call LIS_registerAlarm("NoahMP401 model alarm "//trim(fnest),& NOAHMP401_struc(n)%ts, & NOAHMP401_struc(n)%ts) - call LIS_registerAlarm("NoahMP401 restart alarm", & + call LIS_registerAlarm("NoahMP401 restart alarm "//trim(fnest), & NOAHMP401_struc(n)%ts,& NOAHMP401_struc(n)%rstInterval) ! EMK Add alarm to reset tair_agl_min for RHMin. This should ! match the output interval, since that is used for calculating ! Tair_F_min. - write(fnest,'(i3.3)') n call LIS_registerAlarm("NoahMP401 RHMin alarm "//trim(fnest),& NOAHMP401_struc(n)%ts,& LIS_sfmodel_struc(n)%outInterval) diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_main.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_main.F90 index 228575965..b87ee3c0b 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_main.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -242,9 +242,9 @@ subroutine NoahMP401_main(n) ! Code added by David Mocko 04/25/2019 real :: startsm, startswe, startint, startgw, endsm - real :: tmp_sfcheadrt ! extra input for WRF-HYDRO [m] - real :: tmp_infxs1rt ! extra output for WRF-HYDRO [m] - real :: tmp_soldrain1rt ! extra output for WRF-HYDRO [m] + real, dimension(1,1) :: tmp_sfcheadrt ! extra input for WRF-HYDRO [m] + real, dimension(1,1) :: tmp_infxs1rt ! extra output for WRF-HYDRO [m] + real, dimension(1,1) :: tmp_soldrain1rt ! extra output for WRF-HYDRO [m] !ag (05Jan2021) real :: tmp_rivsto @@ -272,7 +272,8 @@ subroutine NoahMP401_main(n) ! check NoahMP401 alarm. If alarm is ring, run model. - alarmCheck = LIS_isAlarmRinging(LIS_rc, "NoahMP401 model alarm") + write(fnest,'(i3.3)') n + alarmCheck = LIS_isAlarmRinging(LIS_rc, "NoahMP401 model alarm "//trim(fnest)) if (alarmCheck) Then do t = 1, LIS_rc%npatch(n, LIS_rc%lsm_index) @@ -866,8 +867,8 @@ subroutine NoahMP401_main(n) NOAHMP401_struc(n)%noahmp401(t)%chuc = tmp_chuc NOAHMP401_struc(n)%noahmp401(t)%chv2 = tmp_chv2 NOAHMP401_struc(n)%noahmp401(t)%chb2 = tmp_chb2 - NOAHMP401_struc(n)%noahmp401(t)%infxs1rt = tmp_infxs1rt - NOAHMP401_struc(n)%noahmp401(t)%soldrain1rt = tmp_soldrain1rt + NOAHMP401_struc(n)%noahmp401(t)%infxs1rt = tmp_infxs1rt(1,1) + NOAHMP401_struc(n)%noahmp401(t)%soldrain1rt = tmp_soldrain1rt(1,1) ! EMK Update RHMin for 557WW if (tmp_tair .lt. & @@ -1433,7 +1434,6 @@ subroutine NoahMP401_main(n) ! EMK...See if noahmp401_struc(n)%noahmp401(t)%tair_agl_min needs to be ! reset for calculating RHMin. - write(fnest,'(i3.3)') n alarmCheck = LIS_isAlarmRinging(LIS_rc, & "NoahMP401 RHMin alarm "//trim(fnest)) if (alarmCheck) then diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_module.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_module.F90 index 2c33d7195..1b47bd72d 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_module.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_read_OPT_parameters.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_read_OPT_parameters.F90 index ca8ca3da0..4d9b53d5b 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_read_OPT_parameters.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_read_OPT_parameters.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readcrd.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readcrd.F90 index 11ff367b7..17d28ff07 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readcrd.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -138,6 +138,9 @@ subroutine NoahMP401_readcrd() elseif (trim(landuse_scheme_name) .eq. "IGBPNCEP") then NOAHMP401_struc(n)%landuse_scheme_name = & "MODIFIED_IGBP_MODIS_NOAH" + elseif (trim(landuse_scheme_name) .eq. "NALCMS_SM_IGBPNCEP" ) then + NOAHMP401_struc(n)%landuse_scheme_name = & + "MODIFIED_IGBP_MODIS_NOAH" elseif (trim(landuse_scheme_name) .eq. "UMD") then NOAHMP401_struc(n)%landuse_scheme_name = "UMD" else diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readrst.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readrst.F90 index 606a12682..ca55e253e 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readrst.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_reset.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_reset.F90 index 8d041f4c5..48fd142ce 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_reset.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_setup.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_setup.F90 index 2491e4849..7799d9952 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_setup.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_writerst.F90 b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_writerst.F90 index 66dce6a26..eb44a25fc 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_writerst.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/NoahMP401_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -60,9 +60,11 @@ subroutine NoahMP401_writerst(n) logical :: alarmCheck integer :: ftn integer :: status + character*3 :: fnest ! set restart alarm - alarmCheck = LIS_isAlarmRinging(LIS_rc, "NoahMP401 restart alarm") + write(fnest,'(i3.3)') n + alarmCheck = LIS_isAlarmRinging(LIS_rc, "NoahMP401 restart alarm "//trim(fnest)) ! set restart file format (read from LIS configration file_ wformat = trim(NOAHMP401_struc(n)%rformat) diff --git a/lis/surfacemodels/land/noahmp.4.0.1/cpl_wrf_noesmf/noahMP401_setwrfexport.F90 b/lis/surfacemodels/land/noahmp.4.0.1/cpl_wrf_noesmf/noahMP401_setwrfexport.F90 index e81a4b346..9f66a7897 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/cpl_wrf_noesmf/noahMP401_setwrfexport.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/cpl_wrf_noesmf/noahMP401_setwrfexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getCROCUSexport.F90 b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getCROCUSexport.F90 index 1241fa81e..22602af4f 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getCROCUSexport.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getCROCUSexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getSnowModelexport.F90 b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getSnowModelexport.F90 new file mode 100644 index 000000000..1eb346e43 --- /dev/null +++ b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_getSnowModelexport.F90 @@ -0,0 +1,75 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: noahmp401_getSnowModelexport +! \label{noahmp401_getSnowModelexport} +! +! !REVISION HISTORY: +! 19 Sep 2020: Sujay Kumar; Initial Specification +! 17 Nov 2020: Mahdi Navari; In analogous to ISBA-Crocus %tgb replaced with %tslb +! 2 Dec 2020: Mahdi Navari; Edited to add soil volumetric liquid and frozen water content +! 12 Aug 2021: Kristi Arsenault; Added SnowModel connections +! +! !INTERFACE: +subroutine noahmp401_getSnowModelexport(n, LSM2SUBLSM_State) +! !USES: + use ESMF + use LIS_coreMod + use LIS_logMod + use noahmp401_lsmMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + type(ESMF_State) :: LSM2SUBLSM_State +! +! !DESCRIPTION: +! +! +!EOP + +#if 0 + type(ESMF_Field) :: gtField + type(ESMF_Field) :: XWGIField + type(ESMF_Field) :: XWGField + real, pointer :: gt(:) + real, pointer :: XWGI(:) + real, pointer :: XWG(:) + integer :: t + integer :: status + + call ESMF_StateGet(LSM2SUBLSM_State,"Ground temperature",gtField,rc=status) + call LIS_verify(status) + call ESMF_StateGet(LSM2SUBLSM_State,"soil volumetric liquid water content",XWGField,rc=status) + call LIS_verify(status) + call ESMF_StateGet(LSM2SUBLSM_State,"soil volumetric frozen water content",XWGIField,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(gtField,localDE=0,farrayPtr=gt,rc=status) + call LIS_verify(status) + call ESMF_FieldGet(XWGField,localDE=0,farrayPtr=XWG,rc=status) + call LIS_verify(status) + call ESMF_FieldGet(XWGIField,localDE=0,farrayPtr=XWGI,rc=status) + call LIS_verify(status) + + + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + gt(t) = NOAHMP401_struc(n)%noahmp401(t)%tslb(1) + !gt(t) = NOAHMP401_struc(n)%noahmp401(t)%tgb + XWGI(t) = NOAHMP401_struc(n)%noahmp401(t)%smc(1) - NOAHMP401_struc(n)%noahmp401(t)%sh2o(1) ! volumetric frozen soil moisture [m3/m3] + XWG(t) = NOAHMP401_struc(n)%noahmp401(t)%sh2o(1) ! volumetric liquid soil moisture [m3/m3] + enddo + +#endif + +end subroutine noahmp401_getSnowModelexport + + diff --git a/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setCROCUSimport.F90 b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setCROCUSimport.F90 index 6889274e6..de6790324 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setCROCUSimport.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setCROCUSimport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setSnowModelimport.F90 b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setSnowModelimport.F90 new file mode 100755 index 000000000..467c07f99 --- /dev/null +++ b/lis/surfacemodels/land/noahmp.4.0.1/cplsubLSM/noahmp401_setSnowModelimport.F90 @@ -0,0 +1,68 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: noahmp401_setSnowModelimport +! \label{noahmp401_setSnowModelimport} +! +! !REVISION HISTORY: +! 19 Sep 2020: Sujay Kumar; Initial Specification +! 12 Aug 2021: Kristi Arsenault; Added SnowModel +! +! !INTERFACE: +subroutine noahmp401_setSnowModelimport(n, SubLSM2LSM_State) +! !USES: + use ESMF + use LIS_coreMod + use LIS_logMod + use noahmp401_lsmMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + type(ESMF_State) :: SubLSM2LSM_State +! +! !DESCRIPTION: +! +! +!EOP + type(ESMF_Field) :: snwdField, sweField + real, pointer :: swe(:), snwd(:) + real :: dsneqv,dsnowh + integer :: t + integer :: status + + call ESMF_StateGet(SubLSM2LSM_State,"Total SWE",sweField,rc=status) + call LIS_verify(status,"noahmp401_setSnowModelimport: error in swe state get from SnowModel") + call ESMF_StateGet(SubLSM2LSM_State,"Total snowdepth",snwdField,rc=status) + call LIS_verify(status,"noahmp401_setSnowModelimport: error in snwd state get from SnowModel") + + call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) + call LIS_verify(status,"noahmp401_setSnowModelimport: error in swe data values") + call ESMF_FieldGet(snwdField,localDE=0,farrayPtr=snwd,rc=status) + call LIS_verify(status,"noahmp401_setSnowModelimport: error in snwd data values") + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + ! SnowModel has its SWE in meters -- conversion here to mm: + dsneqv = (swe(t)*1000.) - noahmp401_struc(n)%noahmp401(t)%sneqv !in mm + dsnowh = snwd(t) - noahmp401_struc(n)%noahmp401(t)%snowh !in m + +! if( dsneqv > 0. .or. dsnowh > 0. ) then +! write(501,*) t, swe(t), noahmp401_struc(n)%noahmp401(t)%sneqv, & +! snwd(t), noahmp401_struc(n)%noahmp401(t)%snowh +! endif + + ! Update NoahMP's Snow states: + call noahmp401_snow_update(n, t, dsneqv, dsnowh) + + enddo + +end subroutine noahmp401_setSnowModelimport + + diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_daveg_Mod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_daveg_Mod.F90 index 3630931d2..0e62ae676 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_daveg_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_daveg_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_descale_veg.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_descale_veg.F90 index bd317c20b..a51ecd488 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_descale_veg.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_descale_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getLAIpred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getLAIpred.F90 index d0fe9d6b1..2b75f1d36 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getLAIpred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getLAIpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getvegvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getvegvars.F90 index e7ce945f7..5611bd3a7 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getvegvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_getvegvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qc_LAIobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qc_LAIobs.F90 index cb6be1e72..63da30a45 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qc_LAIobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qc_LAIobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qcveg.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qcveg.F90 index 546655de7..b5eb9cade 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qcveg.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_qcveg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_scale_veg.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_scale_veg.F90 index d617f0f8e..745c67223 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_scale_veg.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_scale_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_setvegvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_setvegvars.F90 index 2ef4fc49d..68fa55de0 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_setvegvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_setvegvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_updatevegvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_updatevegvars.F90 index 38760e06d..43dfc8a3c 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_updatevegvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_updatevegvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_veg_DAlog.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_veg_DAlog.F90 index 5f9bcb19e..85a3eb471 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_veg_DAlog.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_veg_DAlog.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_write_veg.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_write_veg.F90 index 83ec93f15..804436f67 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_write_veg.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_LAI/noahmp401_write_veg.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_dasnodep_Mod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_dasnodep_Mod.F90 index 8db8ac65c..b625b20e7 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_dasnodep_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_dasnodep_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_descale_snodep.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_descale_snodep.F90 index 1776e2864..548719dd4 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_descale_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_descale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodeppred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodeppred.F90 index da3b4a3c0..dae311ec4 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodeppred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodeppred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodepvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodepvars.F90 index abdeea682..7bcae28f6 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodepvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_getsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_map_snodep.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_map_snodep.F90 index 7b08f8f1b..f2781e23d 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_map_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_map_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qc_snodepobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qc_snodepobs.F90 index a563d03e2..3d3688810 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qc_snodepobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qc_snodepobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qcsnodep.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qcsnodep.F90 index c63b36e0f..903811d6d 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qcsnodep.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_qcsnodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_scale_snodep.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_scale_snodep.F90 index f5e10c834..bb0049ca5 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_scale_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_scale_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_setsnodepvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_setsnodepvars.F90 index df7ce3975..2466de25b 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_setsnodepvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_setsnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_snodep_update.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_snodep_update.F90 index e8cff9847..ecca8a290 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_snodep_update.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_snodep_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_transform_snodep.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_transform_snodep.F90 index f7796c12f..29557f881 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_transform_snodep.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_transform_snodep.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_updatesnodepvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_updatesnodepvars.F90 index 3a41edc43..5bc167c03 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_updatesnodepvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snodep/noahmp401_updatesnodepvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_dasnow_Mod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_dasnow_Mod.F90 index 0c869bd91..2d6def21f 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_descale_snow.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_descale_snow.F90 index 9a363f08d..93d04ed68 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_descale_snow.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowpred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowpred.F90 index 6fa842c3c..48bdb9cff 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowpred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowvars.F90 index 50e2ca540..c21d02585 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getswepred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getswepred.F90 index 5ffb0c359..074953af3 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getswepred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qc_snowobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qc_snowobs.F90 index 4849d1b66..1cc06f089 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qc_snowobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qcsnow.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qcsnow.F90 index fe465f285..3c90c0915 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qcsnow.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_scale_snow.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_scale_snow.F90 index 2165f3a84..43da59153 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_scale_snow.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_setsnowvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_setsnowvars.F90 index b40e85c5b..f28accea9 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_setsnowvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_snow_update.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_snow_update.F90 index 93e105177..8df9ca2f1 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_snow_update.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_snow_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -16,6 +16,7 @@ ! 14 Dec 2018: Yeosang Yoon; Modified code for NoahMP 4.0.1 and SNODEP ! 15 May 2019: Yeosang Yoon; Modified for NoahMP 4.0.1 and LDTSI ! 13 Dec 2019: Eric Kemp; Replaced LDTSI with SNOW +! 05 Jun 2023: Justin Pflug; fixes for SnowModel-defined snow updates ! ! !INTERFACE @@ -59,6 +60,7 @@ subroutine noahmp401_snow_update(n, t, dsneqv, dsnowh) integer :: snl_idx,i,j,iz integer :: iloc, jloc ! needed, but not use real :: smp,sneqv,snowh + real :: snoden real :: sneqv1,snowh1 real :: ponding1,ponding2 integer :: newnode @@ -137,6 +139,22 @@ subroutine noahmp401_snow_update(n, t, dsneqv, dsnowh) stc(1:nsoil) = & noahmp401_struc(n)%noahmp401(t)%tslb(1:nsoil) + ! NMP snow density calculation + if(snowh.gt.0) then + snoden = sneqv/(snowh*1000) + else + snoden = 0.55 + endif + + ! allow snow update even in cases where changes opp. directions + ! alter snow depth change to be in direction of SWE change + if((dsneqv.gt.0.and.dsnowh.le.0).or.& + (dsneqv.lt.0.and.dsnowh.ge.0)) then + dsnowh = (dsneqv/snoden)/1000 + ! set snow depth change to zero in instance where no SWE change + elseif(dsneqv.eq.0.and.dsnowh.ne.0) then + dsnowh = 0. + endif ! from snowfall routine ! creating a new layer @@ -147,12 +165,12 @@ subroutine noahmp401_snow_update(n, t, dsneqv, dsnowh) newnode = 0 - if(isnow == 0 .and. snowh >= 0.025.and.& - (dsneqv.gt.0.and.dsnowh.gt.0)) then !mb: change limit - isnow = -1 - newnode = 1 + if(isnow.eq.0.and.dsneqv.gt.0.and.dsnowh.gt.0) then + if(snowh.ge.0.025) then + isnow = -1 + newnode = 1 + endif dzsnso(0)= snowh - snowh = 0. stc(0) = min(273.16, noahmp401_struc(n)%noahmp401(t)%sfctmp) snice(0) = sneqv snliq(0) = 0. @@ -168,23 +186,60 @@ subroutine noahmp401_snow_update(n, t, dsneqv, dsnowh) if(dsneqv.lt.0.and.dsnowh.lt.0) then snowh1 = snowh + dsnowh sneqv1 = sneqv + dsneqv +! if dsnowh adjusted since dsneqv and dsnowh in opp. directions +! can cause one or other snowh1 or sneqv1 to be negative + if(sneqv1.gt.0.and.snowh1.le.0) then + snowh = ((sneqv1/snoden)/1000)-dsnowh + snowh1 = snowh + dsnowh +! if SWE disappears, also make sure snow depth disappears + elseif(sneqv.le.0) then + sneqv = -dsneqv + sneqv1 = sneqv + dsneqv + snowh = -dsnowh + snowh1 = snowh + dsnowh + endif +! make sure snow layers currently exist in decrease case + if(dzsnso(0).eq.0) then + if(snowh.ge.0.025) then + isnow = -1 + else + isnow = 0 + endif + dzsnso(0)= snowh + stc(0) = min(273.16, noahmp401_struc(n)%noahmp401(t)%sfctmp) + snice(0) = sneqv + snliq(0) = 0. + endif if(snowh1.ge.0.and.sneqv1.ge.0) then snowh = snowh + dsnowh sneqv = sneqv + dsneqv -! update dzsnso -! how do you determine the thickness of a layer? +! snow can no longer fill layer 1 if(snowh.le.dzsnso(0)) then isnow = 0 dzsnso(-nsnow+1:(isnow-1)) = 0 dzsnso(isnow) = snowh + snice(-nsnow+1:(isnow-1)) = 0 + snice(isnow) = sneqv + snliq(-nsnow+1:isnow) = 0 +! snow can no longer fill layer 1 and 2 elseif(snowh.le.(dzsnso(0)+dzsnso(-1))) then - isnow = -1 - dzsnso(-nsnow+1:(isnow-1)) = 0 - dzsnso(isnow) = snowh -dzsnso(isnow+1) - elseif(snowh.le.(dzsnso(0)+dzsnso(-1)+dzsnso(-2))) then isnow = -2 - dzsnso(-nsnow+1:(isnow-2)) = 0 - dzsnso(isnow) = snowh -dzsnso(isnow+2) + dzsnso(-nsnow+1:isnow) = 0 + dzsnso(isnow+1) = snowh -dzsnso(0) + ! scale swe in layers by ratio of depth to pack + do snl_idx=-nsnow+1,0 + snice(snl_idx) = sneqv*(dzsnso(snl_idx)/snowh) + enddo + snliq(-nsnow+1:isnow) = 0 +! all other cases + elseif(snowh.le.(dzsnso(0)+dzsnso(-1)+dzsnso(-2))) then + isnow = -3 + dzsnso(isnow+1) = snowh -dzsnso(-1) -dzsnso(0) + ! scale swe in layers by ratio of depth to pack + do snl_idx=-nsnow+1,0 + snice(snl_idx) = sneqv*(dzsnso(snl_idx)/snowh) + enddo + snliq(-nsnow+1:isnow) = 0 endif endif endif diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_updatesnowvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_updatesnowvars.F90 index 35afc3c87..c5518d156 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_updatesnowvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_snow/noahmp401_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_dasoilm_Mod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_dasoilm_Mod.F90 index 38e7e3e84..cb7dddc5d 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_descale_soilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_descale_soilm.F90 index c0531e090..527e805fb 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_descale_soilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsmpred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsmpred.F90 index 3662eae99..f96424228 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsmpred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsoilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsoilm.F90 index d461f2091..ac6bcdd7e 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsoilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qc_soilmobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qc_soilmobs.F90 index 17bdef5dd..4c38990c9 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qcsoilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qcsoilm.F90 index 7e7a3b3ed..d77f93e1a 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qcsoilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_scale_soilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_scale_soilm.F90 index 0595e7553..3be9d1553 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_scale_soilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_setsoilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_setsoilm.F90 index 2f0007002..126607bbd 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_setsoilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_updatesoilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_updatesoilm.F90 index 7e0b0e198..319cd5c21 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_updatesoilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_write_soilm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_write_soilm.F90 index ecbb563dc..78a7356cc 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_write_soilm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_soilm/noahmp401_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_datws_Mod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_datws_Mod.F90 index 960ed91d5..aac1c6b56 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_datws_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_datws_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -15,12 +15,12 @@ module noahmp401_datws_Mod ! !MODULE: noahmp401_datws_Mod ! ! !DESCRIPTION: -! +! ! !REVISION HISTORY: ! ! 14 Mar 2017: Sujay Kumar; Initial Specification -! !USES: +! !USES: use ESMF use LIS_coreMod use LIS_dataAssimMod @@ -49,33 +49,31 @@ module noahmp401_datws_Mod integer :: scal end type dasm_dec - + type(dasm_dec), allocatable :: noahmp401_dasm_struc(:) contains !BOP -! +! ! !ROUTINE: noahmp401_datws_init ! \label{noahmp401_datws_init} -! +! ! !INTERFACE: subroutine noahmp401_datws_init(k) ! !USES: -! !DESCRIPTION: +! !DESCRIPTION: ! !EOP - - use LIS_constantsMod, only : LIS_CONST_PATH_LEN + implicit none integer :: k - integer :: n - character(len=LIS_CONST_PATH_LEN) :: modelcdffile(LIS_rc%nnest) + integer :: n integer :: status integer :: ngrid - if(.not.allocated(noahmp401_dasm_struc)) then + if(.not.allocated(noahmp401_dasm_struc)) then allocate(noahmp401_dasm_struc(LIS_rc%nnest)) endif - + end subroutine noahmp401_datws_init end module noahmp401_datws_Mod diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_descale_tws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_descale_tws.F90 index 49567ac11..09c499da6 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_descale_tws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_descale_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -20,160 +20,23 @@ subroutine noahmp401_descale_tws(n, LSM_State, LSM_Incr_State) ! !USES: use ESMF - use LIS_coreMod, only : LIS_rc - use LIS_logMod, only : LIS_verify - use noahmp401_lsmMod - use module_sf_noahmplsm_401 - use LIS_constantsMod, only : LIS_CONST_RHOFW ! Natt implicit none -! !ARGUMENTS: +! !ARGUMENTS: integer, intent(in) :: n type(ESMF_State) :: LSM_State type(ESMF_State) :: LSM_Incr_State ! ! !DESCRIPTION: ! -! Descales twsoisture related state prognostic variables for +! Descales tws related state prognostic variables for ! data assimilation -! -! The arguments are: +! +! The arguments are: ! \begin{description} ! \item[n] index of the nest \newline ! \item[LSM\_State] ESMF State container for LSM state variables \newline ! \end{description} !EOP -!Wanshu - - type(ESMF_Field) :: gwField - real, pointer :: gws(:) - type(ESMF_Field) :: gwIncrField - real, pointer :: gwsIncr(:) - integer :: t - integer :: status - -! Natt - type(ESMF_Field) :: sm1Field - type(ESMF_Field) :: sm2Field - type(ESMF_Field) :: sm3Field - type(ESMF_Field) :: sm4Field - type(ESMF_Field) :: sweField - type(ESMF_Field) :: snodField - type(ESMF_Field) :: sm1IncrField - type(ESMF_Field) :: sm2IncrField - type(ESMF_Field) :: sm3IncrField - type(ESMF_Field) :: sm4IncrField - type(ESMF_Field) :: sweIncrField - type(ESMF_Field) :: snodIncrField - real, pointer :: soilm1(:) - real, pointer :: soilm2(:) - real, pointer :: soilm3(:) - real, pointer :: soilm4(:) - real, pointer :: swe(:) - real, pointer :: snod(:) - real, pointer :: soilmIncr1(:) - real, pointer :: soilmIncr2(:) - real, pointer :: soilmIncr3(:) - real, pointer :: soilmIncr4(:) - real, pointer :: sweincr(:) - real, pointer :: snodincr(:) - integer :: SOILTYP ! soil type index [-] - real :: MAX_THRESHOLD , MIN_THRESHOLD - -#if 0 - ! Natt - ! Descale TWS states - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 1",sm1Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm1 in noahmp401_descale_tws') - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 2",sm2Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm2 in noahmp401_descale_tws') - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 3",sm3Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm3 in noahmp401_descale_tws') - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 4",sm4Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm4 in noahmp401_descale_tws') - call ESMF_StateGet(LSM_State,"SWE",sweField,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for SWE in noahmp401_descale_tws') - call ESMF_StateGet(LSM_State,"Snowdepth",snodField,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for Snowdepth in noahmp401_descale_tws') - - call ESMF_FieldGet(sm1Field,localDE=0,farrayPtr=soilm1,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm1 in noahmp401_descale_tws') - call ESMF_FieldGet(sm2Field,localDE=0,farrayPtr=soilm2,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm2 in noahmp401_descale_tws') - call ESMF_FieldGet(sm3Field,localDE=0,farrayPtr=soilm3,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm3 in noahmp401_descale_tws') - call ESMF_FieldGet(sm4Field,localDE=0,farrayPtr=soilm4,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm4 in noahmp401_descale_tws') - call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for SWE in noahmp401_descale_tws') - call ESMF_FieldGet(snodField,localDE=0,farrayPtr=snod,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for Snowdepth in noahmp401_descale_tws') - - ! Natt - ! Descale TWS state increment - call ESMF_StateGet(LSM_Incr_State,"Soil Moisture Layer 1",sm1IncrField,rc=status) - call LIS_verify(status,& - "ESMF_StateGet: Soil Moisture Layer 1 failed in noahmp401_descale_tws") - call ESMF_StateGet(LSM_Incr_State,"Soil Moisture Layer 2",sm2IncrField,rc=status) - call LIS_verify(status,& - "ESMF_StateGet: Soil Moisture Layer 2 failed in noahmp401_descale_tws") - call ESMF_StateGet(LSM_Incr_State,"Soil Moisture Layer 3",sm3IncrField,rc=status) - call LIS_verify(status,& - "ESMF_StateGet: Soil Moisture Layer 3 failed in noahmp401_descale_tws") - call ESMF_StateGet(LSM_Incr_State,"Soil Moisture Layer 4",sm4IncrField,rc=status) - call LIS_verify(status,& - "ESMF_StateGet: Soil Moisture Layer 4 failed in noahmp401_descale_tws") - call ESMF_StateGet(LSM_Incr_State,"SWE",sweIncrField,rc=status) - call LIS_verify(status) - call ESMF_StateGet(LSM_Incr_State,"Snowdepth",snodIncrField,rc=status) - call LIS_verify(status) - - call ESMF_FieldGet(sm1IncrField,localDE=0,farrayPtr=soilmIncr1,rc=status) - call LIS_verify(status,& - "ESMF_FieldGet: Soil Moisture Layer 1 failed in noahmp401_descale_tws") - call ESMF_FieldGet(sm2IncrField,localDE=0,farrayPtr=soilmIncr2,rc=status) - call LIS_verify(status,& - "ESMF_FieldGet: Soil Moisture Layer 2 failed in noahmp401_descale_tws") - call ESMF_FieldGet(sm3IncrField,localDE=0,farrayPtr=soilmIncr3,rc=status) - call LIS_verify(status,& - "ESMF_FieldGet: Soil Moisture Layer 3 failed in noahmp401_descale_tws") - call ESMF_FieldGet(sm4IncrField,localDE=0,farrayPtr=soilmIncr4,rc=status) - call LIS_verify(status,& - "ESMF_FieldGet: Soil Moisture Layer 4 failed in noahmp401_descale_tws") - call ESMF_FieldGet(sweIncrField,localDE=0,farrayPtr=sweincr,rc=status) - call LIS_verify(status) - call ESMF_FieldGet(snodIncrField,localDE=0,farrayPtr=snodincr,rc=status) - call LIS_verify(status) - - - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - !SOILTYP = NOAHMP401_struc(n)%noahmp401(t)%soiltype - !MAX_THRESHOLD = MAXSMC (SOILTYP) - !MIN_THRESHOLD = WLTSMC(SOILTYP) - soilm1(t) = soilm1(t) / (NOAHMP401_struc(n)%sldpth(1)*1000.0) ! mm -> m3m-3 - soilm2(t) = soilm2(t) / (NOAHMP401_struc(n)%sldpth(2)*1000.0) ! mm -> m3m-3 - soilm3(t) = soilm3(t) / (NOAHMP401_struc(n)%sldpth(3)*1000.0) ! mm -> m3m-3 - soilm4(t) = soilm4(t) / (NOAHMP401_struc(n)%sldpth(4)*1000.0) ! mm -> m3m-3 - !if (soilm1(t) .lt. MIN_THRESHOLD) soilm1(t) = MIN_THRESHOLD - !if (soilm2(t) .lt. MIN_THRESHOLD) soilm2(t) = MIN_THRESHOLD - !if (soilm3(t) .lt. MIN_THRESHOLD) soilm3(t) = MIN_THRESHOLD - !if (soilm4(t) .lt. MIN_THRESHOLD) soilm4(t) = MIN_THRESHOLD - !if (soilm1(t) .gt. MAX_THRESHOLD) soilm1(t) = MAX_THRESHOLD - !if (soilm2(t) .gt. MAX_THRESHOLD) soilm2(t) = MAX_THRESHOLD - !if (soilm3(t) .gt. MAX_THRESHOLD) soilm3(t) = MAX_THRESHOLD - !if (soilm4(t) .gt. MAX_THRESHOLD) soilm4(t) = MAX_THRESHOLD - swe(t) = swe(t) / 1000.0 ! mm -> m - snod(t) = snod(t) / 1000.0 ! mm -> m - - soilmIncr1(t) = soilmIncr1(t) / (NOAHMP401_struc(n)%sldpth(1)*1000.0) ! mm -> m3m-3 - soilmIncr2(t) = soilmIncr2(t) / (NOAHMP401_struc(n)%sldpth(2)*1000.0) ! mm -> m3m-3 - soilmIncr3(t) = soilmIncr3(t) / (NOAHMP401_struc(n)%sldpth(3)*1000.0) ! mm -> m3m-3 - soilmIncr4(t) = soilmIncr4(t) / (NOAHMP401_struc(n)%sldpth(4)*1000.0) ! mm -> m3m-3 - sweincr(t) = sweincr(t) / 1000.0 ! mm -> m - snodincr(t) = snodincr(t) / 1000.0 ! mm -> m - - enddo -#endif - end subroutine noahmp401_descale_tws diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettws.F90 index d78e2f4ae..7386fa95f 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -26,7 +26,7 @@ subroutine noahmp401_gettws(n, LSM_State) use noahmp401_lsmMod implicit none -! !ARGUMENTS: +! !ARGUMENTS: integer, intent(in) :: n type(ESMF_State) :: LSM_State ! @@ -34,8 +34,8 @@ subroutine noahmp401_gettws(n, LSM_State) ! ! Returns the soilmoisture and groundwater related state prognostic variables for ! data assimilation -! -! The arguments are: +! +! The arguments are: ! \begin{description} ! \item[n] index of the nest \newline ! \item[LSM\_State] ESMF State container for LSM state variables \newline @@ -71,8 +71,6 @@ subroutine noahmp401_gettws(n, LSM_State) call LIS_verify(status,'ESMF_StateGet failed for gw in noahmp401_gettws') call ESMF_StateGet(LSM_State,"SWE",sweField,rc=status) call LIS_verify(status,'ESMF_StateGet failed for SWE in noahmp401_gettws') - call ESMF_StateGet(LSM_State,"Snowdepth",snodField,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for Snowdepth in noahmp401_gettws') call ESMF_FieldGet(sm1Field,localDE=0,farrayPtr=soilm1,rc=status) call LIS_verify(status,'ESMF_FieldGet failed for sm1 in noahmp401_gettws') @@ -86,8 +84,6 @@ subroutine noahmp401_gettws(n, LSM_State) call LIS_verify(status,'ESMF_FieldGet failed for gw in noahmp401_gettws') call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) call LIS_verify(status,'ESMF_FieldGet failed for SWE in noahmp401_gettws') - call ESMF_FieldGet(snodField,localDE=0,farrayPtr=snod,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for Snowdepth in noahmp401_gettws') do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) !to mm @@ -97,7 +93,6 @@ subroutine noahmp401_gettws(n, LSM_State) soilm4(t) = NOAHMP401_struc(n)%noahmp401(t)%smc(4) gws(t) = NOAHMP401_struc(n)%noahmp401(t)%wa swe(t) = noahmp401_struc(n)%noahmp401(t)%sneqv - snod(t) = noahmp401_struc(n)%noahmp401(t)%snowh enddo end subroutine noahmp401_gettws diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettwspred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettwspred.F90 index 02a3f19e4..c523adc45 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettwspred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_gettwspred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qc_twsobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qc_twsobs.F90 index 82dd50ea4..b6e340314 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qc_twsobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qc_twsobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qctws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qctws.F90 index ab1d0be44..bc405ac28 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qctws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_qctws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -13,7 +13,7 @@ ! ! !REVISION HISTORY: ! 14 Mar 2017: Sujay Kumar; Initial Specification -! 29 May 2020: Bailing Li; Created for Noah-MP4.0.1 +! 29 May 2020: Bailing Li; Created for Noah-MP4.0.1 ! ! !INTERFACE: subroutine noahmp401_qctws(n, LSM_State) @@ -27,7 +27,7 @@ subroutine noahmp401_qctws(n, LSM_State) use NOAHMP_TABLES_401, ONLY : SMCMAX_TABLE,SMCWLT_TABLE implicit none -! !ARGUMENTS: +! !ARGUMENTS: integer, intent(in) :: n type(ESMF_State) :: LSM_State ! @@ -35,8 +35,8 @@ subroutine noahmp401_qctws(n, LSM_State) ! ! Returns the soilmoisture related state prognostic variables for ! data assimilation -! -! The arguments are: +! +! The arguments are: ! \begin{description} ! \item[n] index of the nest \newline ! \item[LSM\_State] ESMF State container for LSM state variables \newline @@ -50,7 +50,7 @@ subroutine noahmp401_qctws(n, LSM_State) real, pointer :: soilm4(:) real :: smmax real :: smmin - + type(ESMF_Field) :: sm1Field type(ESMF_Field) :: sm2Field type(ESMF_Field) :: sm3Field @@ -70,8 +70,8 @@ subroutine noahmp401_qctws(n, LSM_State) real :: swemin,snodmin real :: sndens - logical :: update_flag(LIS_rc%ngrid(n)) -!------- + logical :: update_flag(LIS_rc%ngrid(n)) +!------- call ESMF_StateGet(LSM_State,"Soil Moisture Layer 1",sm1Field,rc=status) call LIS_verify(status,& @@ -96,7 +96,7 @@ subroutine noahmp401_qctws(n, LSM_State) call ESMF_FieldGet(sm1Field,localDE=0,farrayPtr=soilm3,rc=status) call LIS_verify(status,& "ESMF_FieldGet for Soil Moisture Layer 3 failed in noahmp401_qctws") - + call ESMF_StateGet(LSM_State,"Soil Moisture Layer 4",sm4Field,rc=status) call LIS_verify(status,& "ESMF_StateGet for Soil Moisture Layer 4 failed in noahmp401_qctws") @@ -108,7 +108,7 @@ subroutine noahmp401_qctws(n, LSM_State) !Wanshu call ESMF_StateGet(LSM_State,"Groundwater Storage",gwField,rc=status) call LIS_verify(status,'ESMF_StateGet failed for gw in noahmp401_qctws') - + call ESMF_FieldGet(gwField,localDE=0,farrayPtr=gws,rc=status) call LIS_verify(status,'ESMF_FieldGet failed for gw in noahmp401_qctws') @@ -122,38 +122,31 @@ subroutine noahmp401_qctws(n, LSM_State) call ESMF_StateGet(LSM_State,"SWE",sweField,rc=status) call LIS_verify(status) - call ESMF_StateGet(LSM_State,"Snowdepth",snodField,rc=status) - call LIS_verify(status) call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) call LIS_verify(status) - call ESMF_FieldGet(snodField,localDE=0,farrayPtr=snod,rc=status) - call LIS_verify(status) + call ESMF_AttributeGet(sweField,"Max Value",swemax,rc=status) call LIS_verify(status) call ESMF_AttributeGet(sweField,"Min Value",swemin,rc=status) call LIS_verify(status) - call ESMF_AttributeGet(snodField,"Max Value",snodmax,rc=status) - call LIS_verify(status) - call ESMF_AttributeGet(snodField,"Min Value",snodmin,rc=status) - call LIS_verify(status) - + !------- do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) !Bailing Li: max min soil moisture should be retrieved based on soil type SOILTYP = NOAHMP401_struc(n)%noahmp401(t)%soiltype - MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) - MIN_THRESHOLD = SMCWLT_TABLE(SOILTYP) + MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) + MIN_THRESHOLD = SMCWLT_TABLE(SOILTYP) sm_threshold = MAX_THRESHOLD - 0.02 if(soilm1(t).gt.sm_threshold) then soilm1(t) = sm_threshold endif - + if(soilm1(t).lt.MIN_THRESHOLD) then soilm1(t) = MIN_THRESHOLD endif @@ -185,50 +178,11 @@ subroutine noahmp401_qctws(n, LSM_State) if(gws(t).lt.gwsmin) then gws(t) = gwsmin endif - !------ - enddo - - update_flag = .true. - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - - gid = LIS_domain(n)%gindex(& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) - - if((snod(t).lt.snodmin) .or. swe(t).lt.swemin) then - update_flag(gid) = .false. + if(swe(t).lt.swemin) then + swe(t) = swemin endif - + !------ enddo - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - gid = LIS_domain(n)%gindex(& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) - -!Use the model's snow density from the previous timestep - sndens = 0.0 - if(noahmp401_struc(n)%noahmp401(t)%snowh.gt.0) then - sndens = noahmp401_struc(n)%noahmp401(t)%sneqv/noahmp401_struc(n)%noahmp401(t)%snowh - endif - -!If the update is unphysical, do not update. - if(update_flag(gid)) then - snod(t) = snod(t) - swe(t) = snod(t)*sndens - else ! do not update - snod(t) = noahmp401_struc(n)%noahmp401(t)%snowh - swe(t) = noahmp401_struc(n)%noahmp401(t)%sneqv - end if - - if(swe(t).gt.swemax) then - swe(t) = swemax - endif - if(snod(t).gt.snodmax) then - snod(t) = snodmax - endif - - end do - end subroutine noahmp401_qctws diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_scale_tws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_scale_tws.F90 index 2dfed965a..1dbd7a96e 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_scale_tws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_scale_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -20,87 +20,22 @@ subroutine noahmp401_scale_tws(n, LSM_State) ! !USES: use ESMF - use LIS_coreMod, only : LIS_rc - use LIS_logMod, only : LIS_verify - use noahmp401_lsmMod - use LIS_constantsMod, only : LIS_CONST_RHOFW ! Natt implicit none -! !ARGUMENTS: +! !ARGUMENTS: integer, intent(in) :: n type(ESMF_State) :: LSM_State ! ! !DESCRIPTION: ! -! Scales twsoisture related state prognostic variables for +! Scales tws related state prognostic variables for ! data assimilation -! -! The arguments are: +! +! The arguments are: ! \begin{description} ! \item[n] index of the nest \newline ! \item[LSM\_State] ESMF State container for LSM state variables \newline ! \end{description} !EOP -!Wanshu - - type(ESMF_Field) :: gwField - real, pointer :: gws(:) - integer :: t - integer :: status - -! Natt - type(ESMF_Field) :: sm1Field - type(ESMF_Field) :: sm2Field - type(ESMF_Field) :: sm3Field - type(ESMF_Field) :: sm4Field - type(ESMF_Field) :: sweField - type(ESMF_Field) :: snodField - real, pointer :: soilm1(:) - real, pointer :: soilm2(:) - real, pointer :: soilm3(:) - real, pointer :: soilm4(:) - real, pointer :: swe(:) - real, pointer :: snod(:) - - -#if 0 - ! Natt - ! Scale TWS states to mm (Note, GWS is already in mm) - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 1",sm1Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm1 in noahmp401_scale_tws') - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 2",sm2Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm2 in noahmp401_scale_tws') - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 3",sm3Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm3 in noahmp401_scale_tws') - call ESMF_StateGet(LSM_State,"Soil Moisture Layer 4",sm4Field,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for sm4 in noahmp401_scale_tws') - call ESMF_StateGet(LSM_State,"SWE",sweField,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for SWE in noahmp401_scale_tws') - call ESMF_StateGet(LSM_State,"Snowdepth",snodField,rc=status) - call LIS_verify(status,'ESMF_StateGet failed for Snowdepth in noahmp401_scale_tws') - - call ESMF_FieldGet(sm1Field,localDE=0,farrayPtr=soilm1,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm1 in noahmp401_scale_tws') - call ESMF_FieldGet(sm2Field,localDE=0,farrayPtr=soilm2,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm2 in noahmp401_scale_tws') - call ESMF_FieldGet(sm3Field,localDE=0,farrayPtr=soilm3,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm3 in noahmp401_scale_tws') - call ESMF_FieldGet(sm4Field,localDE=0,farrayPtr=soilm4,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for sm4 in noahmp401_scale_tws') - call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for SWE in noahmp401_scale_tws') - call ESMF_FieldGet(snodField,localDE=0,farrayPtr=snod,rc=status) - call LIS_verify(status,'ESMF_FieldGet failed for Snowdepth in noahmp401_scale_tws') - - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - soilm1(t) = soilm1(t) * NOAHMP401_struc(n)%sldpth(1)*1000.0 ! m3m-3 -> mm - soilm2(t) = soilm2(t) * NOAHMP401_struc(n)%sldpth(2)*1000.0 ! m3m-3 -> mm - soilm3(t) = soilm3(t) * NOAHMP401_struc(n)%sldpth(3)*1000.0 ! m3m-3 -> mm - soilm4(t) = soilm4(t) * NOAHMP401_struc(n)%sldpth(4)*1000.0 ! m3m-3 -> mm - swe(t) = swe(t) * 1000.0 ! m -> mm - snod(t) = snod(t) * 1000.0 ! m -> mm - enddo -#endif - end subroutine noahmp401_scale_tws diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_settws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_settws.F90 index 629cdacd3..7a22d7b81 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_settws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_settws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -13,36 +13,38 @@ ! ! !REVISION HISTORY: ! 14 Mar 2017: Sujay Kumar; Initial Specification -! 29 May 2020: Bailing Li; created for Noah-MP4.0.1 +! 29 May 2020: Bailing Li; created for Noah-MP4.0.1 ! ! !INTERFACE: subroutine noahmp401_settws(n, LSM_State) ! !USES: use ESMF use LIS_coreMod + use LIS_constantsMod use LIS_logMod use noahMP401_lsmMod use NOAHMP_TABLES_401, ONLY : SMCMAX_TABLE,SMCWLT_TABLE implicit none -! !ARGUMENTS: +! !ARGUMENTS: integer, intent(in) :: n type(ESMF_State) :: LSM_State ! ! !DESCRIPTION: -! +! ! This routine assigns the soil moisture prognostic variables to noah's -! model space. -! +! model space. +! !EOP + real, parameter :: MIN_GWS_THRESHOLD = 0.00 real, parameter :: MAX_GWS_THRESHOLD = 7000.0 real, parameter :: MAX_WA = 7000.0 real, parameter :: ZSOIL = 2 !mm real, parameter :: ROUS = 0.2 ! specific yield !Bailing changed this to be WLTSMC -! real, parameter :: MIN_THRESHOLD = 0.02 - real :: MIN_THRESHOLD +! real, parameter :: MIN_THRESHOLD = 0.02 + real :: MIN_THRESHOLD real :: MAX_THRESHOLD real :: sm_threshold type(ESMF_Field) :: sm1Field @@ -65,14 +67,17 @@ subroutine noahmp401_settws(n, LSM_State) logical :: diffCheck(LIS_rc%ngrid(n)) logical :: ensCheck(LIS_rc%ngrid(n)) logical :: largeSM(LIS_rc%ngrid(n)) - integer :: i, c,r,t,m + real :: snodens(LIS_rc%npatch(n,LIS_rc%lsm_index)) + integer :: i, c,r,t,m,gid integer :: SOILTYP ! soil type index [-] - real :: sh2o_tmp, sh2o_rnd - real :: dsneqv,dsnowh,swe_old, snowh_old + real :: sh2o_tmp, sh2o_rnd + real :: dsneqv,dsnowh, snowh_new + real :: TWS1, TWS2, TWSd,delta1 integer :: status + logical :: update_flag(LIS_rc%ngrid(n)) logical :: rc1,rc2,rc3,rc4,rc5 - - + + call ESMF_StateGet(LSM_State,"Soil Moisture Layer 1",sm1Field,rc=status) call LIS_verify(status,& "ESMF_StateSet: Soil Moisture Layer 1 failed in noahmp401_settws") @@ -91,10 +96,6 @@ subroutine noahmp401_settws(n, LSM_State) call ESMF_StateGet(LSM_State,"SWE",sweField,rc=status) call LIS_verify(status,& "ESMF_StateSet: SWE failed in noahmp401_settws") - call ESMF_StateGet(LSM_State,"Snowdepth",snodField,rc=status) - call LIS_verify(status,& - "ESMF_StateSet: Snowdepth failed in noahmp401_settws") - call ESMF_FieldGet(sm1Field,localDE=0,farrayPtr=soilm1,rc=status) call LIS_verify(status,& @@ -114,60 +115,64 @@ subroutine noahmp401_settws(n, LSM_State) call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) call LIS_verify(status,& "ESMF_FieldGet: SWE failed in noahmp401_settws") - call ESMF_FieldGet(snodField,localDE=0,farrayPtr=snod,rc=status) - call LIS_verify(status,& - "ESMF_FieldGet: Snowdepth failed in noahmp401_settws") ensCheck = .true. diffCheck = .false. largeSM = .false. - + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - + c = LIS_domain(n)%tile(t)%col r = LIS_domain(n)%tile(t)%row i = LIS_domain(n)%gindex(c,r) - SOILTYP = NOAHMP401_struc(n)%noahmp401(t)%soiltype - MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) + SOILTYP = NOAHMP401_struc(n)%noahmp401(t)%soiltype + MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) !locations with large soil moisture values are ice points. !we turn off the increments in such locations. if(noahmp401_struc(n)%noahmp401(t)%smc(1).gt.MAX_THRESHOLD.or.& - noahmp401_struc(n)%noahmp401(t)%smc(1).gt.0.50) then + noahmp401_struc(n)%noahmp401(t)%smc(1).gt.0.50) then largeSM(i) = .true. endif + + if(noahmp401_struc(n)%noahmp401(t)%snowh.gt.0) then + snodens(t) = noahmp401_struc(n)%noahmp401(t)%sneqv/& + noahmp401_struc(n)%noahmp401(t)%snowh + else + snodens(t) = 0.0 + endif + enddo do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - + c = LIS_domain(n)%tile(t)%col r = LIS_domain(n)%tile(t)%row i = LIS_domain(n)%gindex(c,r) - if(largeSM(i)) then + if(largeSM(i)) then soilm1(t) = noahmp401_struc(n)%noahmp401(t)%smc(1) soilm2(t) = noahmp401_struc(n)%noahmp401(t)%smc(2) soilm3(t) = noahmp401_struc(n)%noahmp401(t)%smc(3) soilm4(t) = noahmp401_struc(n)%noahmp401(t)%smc(4) gws(t) = NOAHMP401_struc(n)%noahmp401(t)%wa - snod(t) = noahmp401_struc(n)%noahmp401(t)%snowh swe(t) = noahmp401_struc(n)%noahmp401(t)%sneqv endif enddo - - + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) c = LIS_domain(n)%tile(t)%col r = LIS_domain(n)%tile(t)%row i = LIS_domain(n)%gindex(c,r) - - SOILTYP = NOAHMP401_struc(n)%noahmp401(t)%soiltype - MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) + + SOILTYP = NOAHMP401_struc(n)%noahmp401(t)%soiltype + MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) MIN_THRESHOLD = 0.02 !SMCWLT_TABLE(SOILTYP) sm_threshold = MAX_THRESHOLD - 0.02 - + if((soilm1(t).lt.MIN_THRESHOLD.or.& soilm1(t).gt.MAX_THRESHOLD).or.& (soilm2(t).lt.MIN_THRESHOLD.or.& @@ -184,7 +189,7 @@ subroutine noahmp401_settws(n, LSM_State) (soilm2(t).ne.soilm2(i*LIS_rc%nensem(n))).and.& (soilm3(t).ne.soilm3(i*LIS_rc%nensem(n))).and.& (soilm4(t).ne.soilm4(i*LIS_rc%nensem(n))).and.& - (gws(t).ne.gws(i*LIS_rc%nensem(n)))) then + (gws(t).ne.gws(i*LIS_rc%nensem(n)))) then diffCheck(i) = .true. endif enddo @@ -194,7 +199,7 @@ subroutine noahmp401_settws(n, LSM_State) rc2 = .true. rc3 = .true. rc4 = .true. - rc5 = .true. + rc5 = .true. if(.not.ensCheck(i).and.diffCheck(i).and.(.not.largeSM(i))) then call noahmp401_tws_reorderEnsForOutliers(i,& LIS_rc%nensem(n),& @@ -230,116 +235,237 @@ subroutine noahmp401_settws(n, LSM_State) soilm3(t) = noahmp401_struc(n)%noahmp401(t)%smc(3) soilm4(t) = noahmp401_struc(n)%noahmp401(t)%smc(4) gws(t) = NOAHMP401_struc(n)%noahmp401(t)%wa - snod(t) = noahmp401_struc(n)%noahmp401(t)%snowh swe(t) = noahmp401_struc(n)%noahmp401(t)%sneqv enddo endif enddo - - + + + update_flag = .true. + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - delta = soilm1(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(1) - NOAHMP401_struc(n)%noahmp401(t)%smc(1) = soilm1(t) - NOAHMP401_struc(n)%noahmp401(t)%sh2o(1) = & - NOAHMP401_struc(n)%noahmp401(t)%sh2o(1) + delta - - delta = soilm2(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(2) - NOAHMP401_struc(n)%noahmp401(t)%smc(2) = soilm2(t) - NOAHMP401_struc(n)%noahmp401(t)%sh2o(2) = & - NOAHMP401_struc(n)%noahmp401(t)%sh2o(2) + delta - - delta = soilm3(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(3) - NOAHMP401_struc(n)%noahmp401(t)%smc(3) = soilm3(t) - NOAHMP401_struc(n)%noahmp401(t)%sh2o(3) = & - NOAHMP401_struc(n)%noahmp401(t)%sh2o(3) + delta - - delta = soilm4(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(4) - NOAHMP401_struc(n)%noahmp401(t)%smc(4) = soilm4(t) - NOAHMP401_struc(n)%noahmp401(t)%sh2o(4) = & - NOAHMP401_struc(n)%noahmp401(t)%sh2o(4) + delta - - NOAHMP401_struc(n)%noahmp401(t)%wa=gws(t) + + SOILTYP = noahmp401_struc(n)%noahmp401(t)%soiltype + MAX_THRESHOLD = SMCMAX_TABLE(SOILTYP) ! MAXSMC (SOILTYP) + sm_threshold = SMCMAX_TABLE(SOILTYP) - 0.02 ! MAXSMC (SOILTYP) - 0.02 + + gid = LIS_domain(n)%gindex(& + LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& + LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) + + delta1 = soilm1(t)-noahmp401_struc(n)%noahmp401(t)%smc(1) + + if(noahmp401_struc(n)%noahmp401(t)%sh2o(1)+delta1.gt.MIN_THRESHOLD .and.& + noahmp401_struc(n)%noahmp401(t)%sh2o(1)+delta1.lt.& + sm_threshold) then + update_flag(gid) = update_flag(gid).and.(.true.) + else + update_flag(gid) = update_flag(gid).and.(.false.) + endif + delta1 = soilm2(t)-noahmp401_struc(n)%noahmp401(t)%smc(2) + + if(noahmp401_struc(n)%noahmp401(t)%sh2o(2)+delta1.gt.MIN_THRESHOLD .and.& + noahmp401_struc(n)%noahmp401(t)%sh2o(2)+delta1.lt.& + sm_threshold) then + update_flag(gid) = update_flag(gid).and.(.true.) + else + update_flag(gid) = update_flag(gid).and.(.false.) + endif + + delta1 = soilm3(t)-noahmp401_struc(n)%noahmp401(t)%smc(3) + + if(noahmp401_struc(n)%noahmp401(t)%sh2o(3)+delta1.gt.MIN_THRESHOLD .and.& + noahmp401_struc(n)%noahmp401(t)%sh2o(3)+delta1.lt.& + sm_threshold) then + update_flag(gid) = update_flag(gid).and.(.true.) + else + update_flag(gid) = update_flag(gid).and.(.false.) + endif + + delta1 = soilm4(t)-noahmp401_struc(n)%noahmp401(t)%smc(4) + + if(noahmp401_struc(n)%noahmp401(t)%sh2o(4)+delta1.gt.MIN_THRESHOLD .and.& + noahmp401_struc(n)%noahmp401(t)%sh2o(4)+delta1.lt.& + sm_threshold) then + update_flag(gid) = update_flag(gid).and.(.true.) + else + update_flag(gid) = update_flag(gid).and.(.false.) + endif enddo - + +! if(LIS_localPet.eq.387) then +! gid = LIS_domain(n)%gindex(& +! LIS_surface(n,LIS_rc%lsm_index)%tile(16068)%col,& +! LIS_surface(n,LIS_rc%lsm_index)%tile(16068)%row) +! print*, 'tw1 ',NOAHMP401_struc(n)%noahmp401(16068)%smc,& +! NOAHMP401_struc(n)%noahmp401(16068)%sh2o,& +! NOAHMP401_struc(n)%noahmp401(16068)%sneqv,& +! update_flag(gid) +! endif + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - swe_old = noahmp401_struc(n)%noahmp401(t)%sneqv - snowh_old = noahmp401_struc(n)%noahmp401(t)%snowh - dsneqv = swe(t) - noahmp401_struc(n)%noahmp401(t)%sneqv !in mm - dsnowh = snod(t) - noahmp401_struc(n)%noahmp401(t)%snowh !in m + gid = LIS_domain(n)%gindex(& + LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& + LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) - !alternate option - call noahmp401_snow_update(n, t, dsneqv, dsnowh) + if(update_flag(gid)) then + delta = soilm1(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(1) + NOAHMP401_struc(n)%noahmp401(t)%smc(1) = soilm1(t) + NOAHMP401_struc(n)%noahmp401(t)%sh2o(1) = & + NOAHMP401_struc(n)%noahmp401(t)%sh2o(1) + delta + + delta = soilm2(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(2) + NOAHMP401_struc(n)%noahmp401(t)%smc(2) = soilm2(t) + NOAHMP401_struc(n)%noahmp401(t)%sh2o(2) = & + NOAHMP401_struc(n)%noahmp401(t)%sh2o(2) + delta + + delta = soilm3(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(3) + NOAHMP401_struc(n)%noahmp401(t)%smc(3) = soilm3(t) + NOAHMP401_struc(n)%noahmp401(t)%sh2o(3) = & + NOAHMP401_struc(n)%noahmp401(t)%sh2o(3) + delta + + delta = soilm4(t) - NOAHMP401_struc(n)%noahmp401(t)%smc(4) + NOAHMP401_struc(n)%noahmp401(t)%smc(4) = soilm4(t) + NOAHMP401_struc(n)%noahmp401(t)%sh2o(4) = & + NOAHMP401_struc(n)%noahmp401(t)%sh2o(4) + delta + + else + + TWS2 =(soilm1(t)*NOAHMP401_struc(n)%sldpth(1)*& + soilm2(t)*NOAHMP401_struc(n)%sldpth(2)*& + soilm3(t)*NOAHMP401_struc(n)%sldpth(3)*& + soilm4(t)*NOAHMP401_struc(n)%sldpth(4))*& + LIS_CONST_RHOFW + + + TWS1 =(Noahmp401_struc(n)%noahmp401(t)%smc(1)*& + NOAHMP401_struc(n)%sldpth(1)*& + noahmp401_struc(n)%noahmp401(t)%smc(2)*& + NOAHMP401_struc(n)%sldpth(2)*& + noahmp401_struc(n)%noahmp401(t)%smc(3)*& + NOAHMP401_struc(n)%sldpth(3)*& + noahmp401_struc(n)%noahmp401(t)%smc(4)*& + NOAHMP401_struc(n)%sldpth(4))*& + LIS_CONST_RHOFW + + TWSd = TWS1 - TWS2 + + if(NOAHMP401_struc(n)%noahmp401(t)%sneqv > 5.and.& + swe(t)+TWSd.gt.0) then +!only add snow if the increment is small + if(TWSd/NOAHMP401_struc(n)%noahmp401(t)%sneqv < 0.10) then + swe(t) = swe(t)+TWSd + endif + else + swe(t) = 0.0 + endif + +! if(LIS_localPet.eq.387.and.t.eq.16068) then +! print*, 'swe ',LIS_localPet, t, swe(t), TWSd +! !since soil moisture update is not accepted, add this to snow +! endif - if(noahmp401_struc(n)%noahmp401(t)%sneqv.eq.0.or.& - noahmp401_struc(n)%noahmp401(t)%snowh.eq.0) then - noahmp401_struc(n)%noahmp401(t)%sneqv = 0 - noahmp401_struc(n)%noahmp401(t)%snowh = 0 endif + + + NOAHMP401_struc(n)%noahmp401(t)%wa=gws(t) + enddo +! if(LIS_localPet.eq.387) then +! gid = LIS_domain(n)%gindex(& +! LIS_surface(n,LIS_rc%lsm_index)%tile(16068)%col,& +! LIS_surface(n,LIS_rc%lsm_index)%tile(16068)%row) +! print*, 'tw2 ',NOAHMP401_struc(n)%noahmp401(16068)%smc,& +! NOAHMP401_struc(n)%noahmp401(16068)%sh2o,& +! NOAHMP401_struc(n)%noahmp401(16068)%sneqv,& +! update_flag(gid) +! endif + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + if(snodens(t).eq.0) then + swe(t) = 0.0 + endif + dsneqv = swe(t) - NOAHMP401_struc(n)%noahmp401(t)%sneqv + + snowh_new = 0 + if(snodens(t).gt.0) then + snowh_new = swe(t)/snodens(t) + endif + + dsnowh = snowh_new - NOAHMP401_struc(n)%noahmp401(t)%sneqv + + call noahmp401_snow_update(n, t, dsneqv, dsnowh) + enddo + + + +! write(101,fmt='(I4.4, 1x, I2.2, 1x, I2.2, 1x, I2.2, 1x, I2.2,1x,10E14.6)') & +! LIS_rc%yr, LIS_rc%mo, LIS_rc%da, LIS_rc%hr,LIS_rc%mn,& +! NOAHMP401_struc(n)%noahmp401(991:1000)%sneqv end subroutine noahmp401_settws subroutine noahmp401_tws_reorderEnsForOutliers(i,nensem, statevec, & minvalue,maxvalue, status) - + use LIS_coreMod - + implicit none integer :: i integer :: nensem real :: statevec(nensem) real :: minvalue,maxvalue logical :: status - + real :: minvT, maxvT, minvG, maxvG integer :: k real :: spread_total, spread_good, spread_ratio - + !Ensemble spread (total and with 'good' ensemble members minvT = 1E10 maxvT = -1E10 minvG = 1E10 maxvG = -1E10 - status = .true. - + status = .true. + do k=1,nensem - if(statevec(k).lt.minvT) then + if(statevec(k).lt.minvT) then minvT = statevec(k) endif - if(statevec(k).gt.maxvT) then + if(statevec(k).gt.maxvT) then maxvT = statevec(k) endif - if(statevec(k).gt.minvalue.and.statevec(k).lt.maxvalue) then - if(statevec(k).lt.minvG) then + if(statevec(k).gt.minvalue.and.statevec(k).lt.maxvalue) then + if(statevec(k).lt.minvG) then minvG = statevec(k) endif - if(statevec(k).gt.maxvG) then + if(statevec(k).gt.maxvG) then maxvG = statevec(k) endif endif enddo - + if(minvG.eq.1E10.and.maxvG.eq.-1E10) then !all members are unphysical. statevec = minvalue status = .false. - + else spread_total = (maxvT - minvT) spread_good = (maxvG - minvG) - + spread_ratio = spread_good/spread_total - - !rescale the ensemble - + + !rescale the ensemble + do k=1,nensem-1 statevec(k) = statevec(nensem) + & - (statevec(k) - statevec(nensem))*spread_ratio + (statevec(k) - statevec(nensem))*spread_ratio enddo endif diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_tws_DAlogMod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_tws_DAlogMod.F90 index 31d6ebdd5..4def6005d 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_tws_DAlogMod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_tws_DAlogMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_updatetws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_updatetws.F90 index e0c031cc9..8b15211b6 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_updatetws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_updatetws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -13,7 +13,7 @@ ! ! !REVISION HISTORY: ! 14 Mar 2017: Sujay Kumar; Initial Specification -! 29 May 2020: Bailing Li; created for Noah-MP4.0.1 +! 29 May 2020: Bailing Li; created for Noah-MP4.0.1 ! ! !INTERFACE: subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) @@ -24,16 +24,16 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) use noahmp401_lsmMod implicit none -! !ARGUMENTS: +! !ARGUMENTS: integer, intent(in) :: n type(ESMF_State) :: LSM_State type(ESMF_State) :: LSM_Incr_State ! ! !DESCRIPTION: -! +! ! This routine assigns the soil moisture prognostic variables to noah's -! model space. -! +! model space. +! !EOP type(ESMF_Field) :: sm1Field @@ -51,7 +51,7 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) type(ESMF_Field) :: gwField type(ESMF_Field) :: gwIncrField real, pointer :: gws(:) - real, pointer :: gwsIncr(:) + real, pointer :: gwsIncr(:) real, pointer :: soilm1(:) real, pointer :: soilm2(:) @@ -71,7 +71,7 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) real :: snodmean(LIS_rc%ngrid(n)) integer :: nsnodmean(LIS_rc%ngrid(n)) - + call ESMF_StateGet(LSM_State,"Soil Moisture Layer 1",sm1Field,rc=status) call LIS_verify(status,& @@ -89,11 +89,10 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) call ESMF_StateGet(LSM_State,"Groundwater Storage",gwField,rc=status) call LIS_verify(status,& "ESMF_StateSet: Groundwater Storage failed in noahmp401_updatetws") - + call ESMF_StateGet(LSM_State,"SWE",sweField,rc=status) call LIS_verify(status) - call ESMF_StateGet(LSM_State,"Snowdepth",snodField,rc=status) - call LIS_verify(status) + call ESMF_StateGet(LSM_Incr_State,"Soil Moisture Layer 1",sm1IncrField,rc=status) @@ -114,8 +113,6 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) "ESMF_StateSet: Groundwater Storage failed in noahmp401_updatetws") call ESMF_StateGet(LSM_Incr_State,"SWE",sweIncrField,rc=status) call LIS_verify(status) - call ESMF_StateGet(LSM_Incr_State,"Snowdepth",snodIncrField,rc=status) - call LIS_verify(status) !------------------- @@ -136,8 +133,7 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) "ESMF_FieldGet: Groundwater Storage failed in noahmp401_updatetws") call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) call LIS_verify(status) - call ESMF_FieldGet(snodField,localDE=0,farrayPtr=snod,rc=status) - call LIS_verify(status) + call ESMF_FieldGet(sm1IncrField,localDE=0,farrayPtr=soilmIncr1,rc=status) @@ -157,105 +153,14 @@ subroutine noahmp401_updatetws(n, LSM_State, LSM_Incr_State) "ESMF_StateSet: Groundwater Storage failed in noahmp401_updatetws") call ESMF_FieldGet(sweIncrField,localDE=0,farrayPtr=sweincr,rc=status) call LIS_verify(status) - call ESMF_FieldGet(snodIncrField,localDE=0,farrayPtr=snodincr,rc=status) - call LIS_verify(status) do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - soilm1(t) = soilm1(t) + soilmIncr1(t) soilm2(t) = soilm2(t) + soilmIncr2(t) soilm3(t) = soilm3(t) + soilmIncr3(t) soilm4(t) = soilm4(t) + soilmIncr4(t) gws(t) = gws(t) + gwsIncr(t) + swe(t) = swe(t) + sweIncr(t) enddo - - - update_flag = .true. - perc_violation = 0.0 - snodmean = 0.0 - nsnodmean = 0 - - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - gid = LIS_domain(n)%gindex(& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) - - swetmp = swe(t) + sweincr(t) - snodtmp = snod(t) + snodincr(t) - - if((snodtmp.lt.0 .or. swetmp.lt.0)) then - update_flag(gid) = .false. - perc_violation(gid) = perc_violation(gid) +1 - endif - - enddo - - do gid=1,LIS_rc%ngrid(n) - perc_violation(gid) = perc_violation(gid) / real(LIS_rc%nensem(n)) - enddo - -! For ensembles that are unphysical, compute the ensemble average after excluding them. This -! is done only if the majority of the ensemble members are good (>80%) - - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - - gid = LIS_domain(n)%gindex(& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) - - if(.not.update_flag(gid)) then ! false - if(perc_violation(gid).lt.0.2) then - if(snod(t)+snodincr(t).ge.0) then - snodmean(gid) = snodmean(gid) + snod(t)+snodincr(t) - nsnodmean(gid) = nsnodmean(gid) + 1 - else - snodmean(gid) = 0.0 - endif - endif - endif - enddo - - do gid=1,LIS_rc%ngrid(n) - if(nsnodmean(gid).gt.0) then - snodmean(gid) = snodmean(gid) / real(nsnodmean(gid)) - endif - enddo - -! If the update is unphysical, simply set to the average of -! the good ensemble members. If all else fails, do not update. - - do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) - gid = LIS_domain(n)%gindex(& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col,& - LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row) - - - snodtmp = snod(t) + snodincr(t) - swetmp = swe(t) + sweincr(t) - -!Use the model's snow density from the previous timestep - sndens = 0.0 - if(noahmp401_struc(n)%noahmp401(t)%snowh.gt.0) then - sndens = noahmp401_struc(n)%noahmp401(t)%sneqv/noahmp401_struc(n)%noahmp401(t)%snowh - endif - - if(update_flag(gid)) then - snod(t) = snodtmp - swe(t) = swetmp - elseif(perc_violation(gid).lt.0.2) then - if(snodtmp.lt.0.0) then ! average of the good ensemble members - snod(t) = snodmean(gid) - swe(t) = snodmean(gid)*sndens - else - snod(t) = snodtmp - swe(t) = swetmp - endif - else ! do not update - snod(t) = noahmp401_struc(n)%noahmp401(t)%snowh - swe(t) = noahmp401_struc(n)%noahmp401(t)%sneqv - end if - - enddo - end subroutine noahmp401_updatetws diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_write_tws.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_write_tws.F90 index 8ae4e18df..7eb016ceb 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_write_tws.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_tws/noahmp401_write_tws.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_dausafsi_Mod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_dausafsi_Mod.F90 index 1831d9cff..ddc91ab4e 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_dausafsi_Mod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_dausafsi_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_descale_usafsi.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_descale_usafsi.F90 index 9bc4b914b..af300a581 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_descale_usafsi.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_descale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsipred.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsipred.F90 index 690b09f83..455d7e2c8 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsipred.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsipred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsivars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsivars.F90 index cbc48409e..34e560f27 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsivars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_getusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_map_usafsi.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_map_usafsi.F90 index 2d92a9ae4..5a340cc59 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_map_usafsi.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_map_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qc_usafsiobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qc_usafsiobs.F90 index 4e524a4ed..2a79be4c8 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qc_usafsiobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qc_usafsiobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qcusafsi.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qcusafsi.F90 index ed92c10cf..9ff1d1a4e 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qcusafsi.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_qcusafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_scale_usafsi.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_scale_usafsi.F90 index 033c003f5..47313927c 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_scale_usafsi.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_scale_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_setusafsivars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_setusafsivars.F90 index 7b13c3a20..a5ce79a9a 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_setusafsivars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_setusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_transform_usafsi.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_transform_usafsi.F90 index c380462c6..eaf312c24 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_transform_usafsi.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_transform_usafsi.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_updateusafsivars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_updateusafsivars.F90 index f039d344a..8d0887160 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_updateusafsivars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_updateusafsivars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_usafsi_update.F90 b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_usafsi_update.F90 index 57d09f12d..53d37d02e 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_usafsi_update.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/da_usafsi/noahmp401_usafsi_update.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/irrigation/noahmp401_getirrigationstates.F90 b/lis/surfacemodels/land/noahmp.4.0.1/irrigation/noahmp401_getirrigationstates.F90 index f155e79f3..f6a550e2d 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/irrigation/noahmp401_getirrigationstates.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/irrigation/noahmp401_getirrigationstates.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/kwm_date_utilities_401.F90 b/lis/surfacemodels/land/noahmp.4.0.1/kwm_date_utilities_401.F90 index e5d02bb70..f0150381c 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/kwm_date_utilities_401.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/kwm_date_utilities_401.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/noahmp_driver_401.F90 b/lis/surfacemodels/land/noahmp.4.0.1/noahmp_driver_401.F90 index 88c747a5f..715264d19 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/noahmp_driver_401.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/noahmp_driver_401.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_peMod.F90 b/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_peMod.F90 index c70c9d026..dab00a9d4 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_peMod.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_peMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_set_pedecvars.F90 b/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_set_pedecvars.F90 index 86af58f9a..fdc7fd790 100755 --- a/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_set_pedecvars.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/pe/NoahMP401_set_pedecvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_getpeobspred_UAsnowobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_getpeobspred_UAsnowobs.F90 index d0669daad..d4f04bc60 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_getpeobspred_UAsnowobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_getpeobspred_UAsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_setupobspred_UAsnowobs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_setupobspred_UAsnowobs.F90 index 5fda39680..25761d945 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_setupobspred_UAsnowobs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/pe/obspred/UAsnow/NoahMP401_setupobspred_UAsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmp_glacier_401.F90 b/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmp_glacier_401.F90 index cc0dba5ae..2a36e31e7 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmp_glacier_401.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmp_glacier_401.F90 @@ -1208,7 +1208,7 @@ SUBROUTINE SFCDIF1_GLACIER(ITER ,ZLVL ,ZPD ,Z0H ,Z0M , & !in REAL, INTENT(INOUT) :: FH2 !sen heat stability correction, weighted by prior iters ! outputs - REAL, INTENT(OUT) :: FV !friction velocity (m/s) + REAL, INTENT(INOUT) :: FV !friction velocity (m/s) REAL, INTENT(OUT) :: CM !drag coefficient for momentum REAL, INTENT(OUT) :: CH !drag coefficient for heat REAL, INTENT(OUT) :: CH2 !drag coefficient for heat diff --git a/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmplsm_401.F90 b/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmplsm_401.F90 index e84d3350c..001da5cc8 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmplsm_401.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/phys/module_sf_noahmplsm_401.F90 @@ -1101,7 +1101,12 @@ SUBROUTINE PHENOLOGY (parameters,VEGTYP ,croptype, SNOWH , TV , LAT , YEA IF(parameters%HVT> 0. .AND. parameters%HVT <= 1.0) THEN !MB: change to 1.0 and 0.2 to reflect SNOWHC = parameters%HVT*EXP(-SNOWH/0.2) ! changes to HVT in MPTABLE + IF(SNOWHC>1.E-06) THEN !Wanshu: avoid very small SNOWHC induced floating invalid FB = MIN(SNOWH,SNOWHC)/SNOWHC + ELSE + !print *,"small snowh in phenology=",snowh + FB = 1 + END IF ENDIF ELAI = LAI*(1.-FB) @@ -1821,10 +1826,15 @@ SUBROUTINE ENERGY (parameters,ICE ,VEGTYP ,IST ,NSNOW ,NSOIL , & !in ! ground snow cover fraction [Niu and Yang, 2007, JGR] FSNO = 0. - IF(SNOWH.GT.0.) THEN + IF(SNOWH.GT.0.) THEN BDSNO = SNEQV / SNOWH FMELT = (BDSNO/100.)**parameters%MFSNO + if (FMELT<0.000001) then !Bailing Li, added this for GRACE DA to catch smaller values + FSNO = 1 + !print *,"small FMELT due to snowh,fmelt,bdsno,para_mfsno",snowh,fmelt,bdsno,parameters%MFSNO + else FSNO = TANH( SNOWH /(2.5* Z0 * FMELT)) + end if ENDIF ! ground roughness length diff --git a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs.F90 b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs.F90 index 6678496d0..bc9c3134b 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_hymap2.F90 b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_hymap2.F90 index 50ba761c4..f119d6eb6 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_hymap2.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_mm.F90 b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_mm.F90 index 56e68d3d4..ae25aa2aa 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_rapid.F90 b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_rapid.F90 index 01d8769aa..69c4d2a97 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_rapid.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getrunoffs_rapid.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.3 +! Version 7.5 ! -! Copyright (c) 2020 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getsws_hymap2.F90 b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getsws_hymap2.F90 index 1c04b9186..cafdd895f 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getsws_hymap2.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/routing/noahmp401_getsws_hymap2.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/noahmp.4.0.1/wrf_debug.F90 b/lis/surfacemodels/land/noahmp.4.0.1/wrf_debug.F90 index 88e560de3..9477a6c39 100644 --- a/lis/surfacemodels/land/noahmp.4.0.1/wrf_debug.F90 +++ b/lis/surfacemodels/land/noahmp.4.0.1/wrf_debug.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356.lis.config b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356.lis.config index e8927d30b..d71673c92 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356.lis.config +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356.lis.config @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_coldstart.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_coldstart.F90 index 9950b6ec4..5afa6544e 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_coldstart.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_dynsetup.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_dynsetup.F90 index 0cf577ec7..cb64b76be 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_dynsetup.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_f2t.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_f2t.F90 index 209cd6c17..4e710edfe 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_f2t.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_finalize.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_finalize.F90 index ff68a7395..39b757aaf 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_finalize.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_lsmMod.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_lsmMod.F90 index bc796085a..31f6c78ae 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_lsmMod.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90 index 7fa70a33d..1a447d302 100644 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90.old b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90.old index 1fa766a46..64c412a66 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90.old +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_main.F90.old @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_module.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_module.F90 index 3df9c7c8f..aea5c8acb 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_module.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readcrd.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readcrd.F90 index 410fe9126..3ea47139e 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readcrd.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readrst.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readrst.F90 index f896ab331..d61313efe 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readrst.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_setup.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_setup.F90 index e57636814..603a571c8 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_setup.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_writerst.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_writerst.F90 index 89ebf9d34..ec4b1bb58 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_writerst.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM356_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/RDHM_356.F90 b/lis/surfacemodels/land/rdhm.3.5.6/RDHM_356.F90 index e928c918c..ece1b1329 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/RDHM_356.F90 +++ b/lis/surfacemodels/land/rdhm.3.5.6/RDHM_356.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/SOILPAR2.F b/lis/surfacemodels/land/rdhm.3.5.6/SOILPAR2.F index 812be7de8..5cdb3e3c4 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/SOILPAR2.F +++ b/lis/surfacemodels/land/rdhm.3.5.6/SOILPAR2.F @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/com_header.h b/lis/surfacemodels/land/rdhm.3.5.6/com_header.h index 77b50fb02..fb74f4a4f 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/com_header.h +++ b/lis/surfacemodels/land/rdhm.3.5.6/com_header.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/frz/gen_frzst.c b/lis/surfacemodels/land/rdhm.3.5.6/frz/gen_frzst.c index ca6f22a08..295d8ead3 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/frz/gen_frzst.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/frz/gen_frzst.c @@ -6,6 +6,10 @@ #include "linux.h" /* #include "models.h" */ +extern void fstfg1_(int *, int *, int *, int *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *); + +extern void frzind1_(float *, float *, float *, float *, int *, float *, float *, float *); + int gen_frzst(int npix, int *nsoil, int *nupl, float *sac_parx, float *frz_parx, float *frz_stx, float *sac_stx, float *sacst_prv, float *smc, float *sh2o, float dthr, diff --git a/lis/surfacemodels/land/rdhm.3.5.6/frz/scale_frzst.c b/lis/surfacemodels/land/rdhm.3.5.6/frz/scale_frzst.c index a3b7c3062..a15c23eb8 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/frz/scale_frzst.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/frz/scale_frzst.c @@ -4,6 +4,14 @@ #include "com_header.h" #include "linux.h" +extern void fstfg1_(int *, int *, int *, int *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *, float *); + +extern void soil_int1_(float *,int *,float *,float *,int *,float *); + +extern void scale_sh2o_(float *, float *, float *, int *, int *, float *, float *, float *, float *, float *, float *, float *); + +extern void frzind1_(float *, float *, float *, float *, int *, float *, float *, float *); + int scale_frzst(int npix, int *nsoil, int *nupl, float *sac_parx, float *frz_parx, float *frz_stx, float *sac_stx, float *sacst_prv, float *smc, float *sh2o, float dthr, diff --git a/lis/surfacemodels/land/rdhm.3.5.6/init_soil_moisture.f b/lis/surfacemodels/land/rdhm.3.5.6/init_soil_moisture.f index c36cc5a2d..0c1f89fcb 100644 --- a/lis/surfacemodels/land/rdhm.3.5.6/init_soil_moisture.f +++ b/lis/surfacemodels/land/rdhm.3.5.6/init_soil_moisture.f @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/linux.h b/lis/surfacemodels/land/rdhm.3.5.6/linux.h index 615669f79..16f496670 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/linux.h +++ b/lis/surfacemodels/land/rdhm.3.5.6/linux.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/logfromfortran.c b/lis/surfacemodels/land/rdhm.3.5.6/logfromfortran.c index 43f9620ce..de889c0d7 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/logfromfortran.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/logfromfortran.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/models.h b/lis/surfacemodels/land/rdhm.3.5.6/models.h index 27395381a..69448d1e9 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/models.h +++ b/lis/surfacemodels/land/rdhm.3.5.6/models.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/rdhm.3.5.6/rdhm_get_ped.c b/lis/surfacemodels/land/rdhm.3.5.6/rdhm_get_ped.c index b0a3358b1..6011922b8 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/rdhm_get_ped.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/rdhm_get_ped.c @@ -1,14 +1,17 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- /* wrapper for calling get_ped Shugong Wang 10/25/2013 */ + +extern void get_ped(int, int, int, int, int, float *, float *, float *); + void rdhm_get_ped_(int *year, /* */ int *month, /* */ int *day, /* */ diff --git a/lis/surfacemodels/land/rdhm.3.5.6/sac/days_of_month.c b/lis/surfacemodels/land/rdhm.3.5.6/sac/days_of_month.c index cef3f38c3..b109acf20 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/sac/days_of_month.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/sac/days_of_month.c @@ -13,6 +13,8 @@ #include "com_header.h" #include "models.h" +extern int is_leap_year(int); + int days_of_month(int m, int y) { int num_days[12]={31,28,31,30,31,30,31,31,30,31,30,31}; diff --git a/lis/surfacemodels/land/rdhm.3.5.6/sac/get_daily_pe.c b/lis/surfacemodels/land/rdhm.3.5.6/sac/get_daily_pe.c index e6f2aa2c1..d30f3a0fa 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/sac/get_daily_pe.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/sac/get_daily_pe.c @@ -15,6 +15,8 @@ #include "models.h" +extern int days_of_month(int, int); + void get_daily_pe(int yr, int mon, int day, int npix, float *pe, float *pe_adj, float *pe_day) { diff --git a/lis/surfacemodels/land/rdhm.3.5.6/sac/get_ped.c b/lis/surfacemodels/land/rdhm.3.5.6/sac/get_ped.c index 65dca8f2b..80af81203 100755 --- a/lis/surfacemodels/land/rdhm.3.5.6/sac/get_ped.c +++ b/lis/surfacemodels/land/rdhm.3.5.6/sac/get_ped.c @@ -16,6 +16,8 @@ #include "com_header.h" #include "models.h" +extern void get_daily_pe(int, int, int, int, float *, float *, float *); + void get_ped(int y, int m, int d, int npix, int dtm, float *pe, float *pe_adj, float *ped) { diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_coldstart.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_coldstart.F90 index 67cf16edb..52972c254 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_coldstart.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_dynsetup.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_dynsetup.F90 index 1d85100ac..1147998ba 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_dynsetup.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_f2t.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_f2t.F90 index 52baf9f5d..2fc2f767d 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_f2t.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_finalize.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_finalize.F90 index 4ed128521..3e370dcad 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_finalize.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_lsmMod.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_lsmMod.F90 index 48268126c..498fd2575 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_lsmMod.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_main.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_main.F90 index 2410bf037..0f3632ea4 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_main.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_module.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_module.F90 index 3929c73bb..0c4f4256f 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_module.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_readcrd.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_readcrd.F90 index fe18c98d8..ae492db35 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_readcrd.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_readrst.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_readrst.F90 index 0f3a1eebb..f3ba6d90a 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_readrst.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_setup.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_setup.F90 index 1496f134a..403a95bdb 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_setup.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/RUC37_writerst.F90 b/lis/surfacemodels/land/ruc.3.7/RUC37_writerst.F90 index 7271c4fe6..cc4bc4527 100644 --- a/lis/surfacemodels/land/ruc.3.7/RUC37_writerst.F90 +++ b/lis/surfacemodels/land/ruc.3.7/RUC37_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_dasnow_Mod.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_dasnow_Mod.F90 index ea3358d36..49fac63d8 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_dasnow_Mod.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_dasnow_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_descale_snow.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_descale_snow.F90 index e6fc0801f..d3dc59415 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_descale_snow.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_descale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getscfpred.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getscfpred.F90 index 4413d11f3..f15fc60fc 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getscfpred.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getscfpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowpred_PMWsnow.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowpred_PMWsnow.F90 index 387216d64..bd0d6824f 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowpred_PMWsnow.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowpred_PMWsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowvars.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowvars.F90 index b0a378d53..44f36752d 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowvars.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnwdpred.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnwdpred.F90 index daf913f74..f72e5722c 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnwdpred.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getsnwdpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getswepred.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getswepred.F90 index c56c6d310..21cf41379 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getswepred.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_getswepred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow.F90 index 5d6783e25..a5272de8c 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow_DI.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow_DI.F90 index 44e49939c..73c4523d0 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow_DI.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_snow_DI.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_swe.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_swe.F90 index c7b493099..52b97fe61 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_swe.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_map_swe.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_PMWsnowobs.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_PMWsnowobs.F90 index 6921eba30..79fbd9a20 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_PMWsnowobs.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_PMWsnowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_scfobs.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_scfobs.F90 index 711fbed67..11240bdf0 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_scfobs.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_scfobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_snowobs.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_snowobs.F90 index d0797314d..75c2c2abd 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_snowobs.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qc_snowobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qcsnow.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qcsnow.F90 index 8a6be9a50..a734f64aa 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qcsnow.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_qcsnow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_scale_snow.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_scale_snow.F90 index e9ea6dde0..7ae998374 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_scale_snow.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_scale_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_setsnowvars.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_setsnowvars.F90 index 7a53ea40c..9ab68a5fb 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_setsnowvars.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_setsnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_transform_snow.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_transform_snow.F90 index 3b4dc348a..6325defd8 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_transform_snow.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_transform_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars.F90 index 00616247b..b84e084f7 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars_scfda.F90 b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars_scfda.F90 index 088f61d8b..00ed11ee8 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars_scfda.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_snow/ruc37_updatesnowvars_scfda.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_dasoilm_Mod.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_dasoilm_Mod.F90 index 18e9cecb8..75e12acfe 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_dasoilm_Mod.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_dasoilm_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_descale_soilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_descale_soilm.F90 index f3a807df4..233bedbe0 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_descale_soilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_descale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getLbandTbPred.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getLbandTbPred.F90 index a7179dfce..5313c28f6 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getLbandTbPred.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getLbandTbPred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsmpred.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsmpred.F90 index ecbf22f5d..c68d6e6c9 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsmpred.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsoilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsoilm.F90 index 97406f1e8..bdc796b36 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsoilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsynsmpred.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsynsmpred.F90 index 610ca2f3f..be1d81605 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsynsmpred.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_getsynsmpred.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qc_soilmobs.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qc_soilmobs.F90 index 3a6e5291e..5e039bb48 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qc_soilmobs.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qc_soilmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qcsoilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qcsoilm.F90 index 92775c654..794e4edad 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qcsoilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_qcsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_scale_soilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_scale_soilm.F90 index e42fdb39e..aa3e98da3 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_scale_soilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_scale_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_setsoilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_setsoilm.F90 index f1cb99d0a..eed8b7d95 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_setsoilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_setsoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_updatesoilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_updatesoilm.F90 index 643694b52..0a76854ce 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_updatesoilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_updatesoilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_write_soilm.F90 b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_write_soilm.F90 index 4e6efb168..43c0ec07f 100644 --- a/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_write_soilm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/da_soilm/ruc37_write_soilm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/irrigation/ruc37_getirrigationstates.F90 b/lis/surfacemodels/land/ruc.3.7/irrigation/ruc37_getirrigationstates.F90 index c92c50ff6..d9eac1dce 100644 --- a/lis/surfacemodels/land/ruc.3.7/irrigation/ruc37_getirrigationstates.F90 +++ b/lis/surfacemodels/land/ruc.3.7/irrigation/ruc37_getirrigationstates.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs.F90 b/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs.F90 index 9ffc814d8..899aab113 100644 --- a/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs.F90 +++ b/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs_mm.F90 b/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs_mm.F90 index 2ff1d5ef0..ebdc856a3 100644 --- a/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs_mm.F90 +++ b/lis/surfacemodels/land/ruc.3.7/routing/ruc37_getrunoffs_mm.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_coldstart.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_coldstart.F90 index fa6ff31fb..a06729144 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_coldstart.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_coldstart.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_dynsetup.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_dynsetup.F90 index bc6df9bbb..e04e8aeaf 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_dynsetup.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_f2t.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_f2t.F90 index c26b0d196..0567528a3 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_f2t.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_finalize.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_finalize.F90 index 8fb138ec7..da79fe451 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_finalize.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_lsmMod.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_lsmMod.F90 index 44945ad45..7c0410ec5 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_lsmMod.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_main.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_main.F90 index 92223c88b..4c72cc48b 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_main.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_module.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_module.F90 index a5766b2f2..d7acce444 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_module.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readcrd.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readcrd.F90 index 3e4dfd1e3..2a129b0cd 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readcrd.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readrst.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readrst.F90 index 693f4ed77..2307d4f9f 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readrst.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_setup.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_setup.F90 index 09d923f1a..187d945d2 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_setup.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_writerst.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_writerst.F90 index 5bae79a67..3479e8639 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_writerst.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/Crocus81_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_getLSMexport.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_getLSMexport.F90 index d44e160dc..13ba2844e 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_getLSMexport.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_getLSMexport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_setLSMimport.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_setLSMimport.F90 index 386737416..79c6eed91 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_setLSMimport.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/cplLSM/Crocus81_setLSMimport.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/crocus_driver.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/crocus_driver.F90 index e55bac7ab..5cecf3fe2 100755 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/crocus_driver.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/crocus_driver.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/crocus.8.1/kwm_date_utilities_crocus81.F90 b/lis/surfacemodels/land/subLSM/crocus.8.1/kwm_date_utilities_crocus81.F90 index f7a5d4e2f..9a5b14836 100644 --- a/lis/surfacemodels/land/subLSM/crocus.8.1/kwm_date_utilities_crocus81.F90 +++ b/lis/surfacemodels/land/subLSM/crocus.8.1/kwm_date_utilities_crocus81.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/subLSM/snowmodel/cplLSM/Snowmodel_getLSMexport.F90 b/lis/surfacemodels/land/subLSM/snowmodel/cplLSM/Snowmodel_getLSMexport.F90 new file mode 100644 index 000000000..eac8acfd0 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/cplLSM/Snowmodel_getLSMexport.F90 @@ -0,0 +1,68 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: snowmodel_getLSMexport +! \label{snowmodel_getLSMexport} +! +! !REVISION HISTORY: +! 19 Sep 2020: Sujay Kumar; Initial Specification +! 9 Dec 2020: Mahdi Navari; edited to take into account the Crocus slope correction +! 2 Aug 2021: Kristi Arsenault; Edited to support SnowModel implementation +! +! !INTERFACE: +subroutine snowmodel_getLSMexport(n, SubLSM2LSM_State) +! !USES: + + use ESMF + use LIS_coreMod + use LIS_logMod + use snowmodel_lsmMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + type(ESMF_State) :: SubLSM2LSM_State +! +! !DESCRIPTION: +! +! +!EOP + type(ESMF_Field) :: snwdField, sweField + real, pointer :: swe(:), snwd(:) + integer :: t + integer :: status + real :: tmp_SLOPE + + call ESMF_StateGet(SubLSM2LSM_State,"Total SWE",sweField,rc=status) + call LIS_verify(status,'Snowmodel_getLSMexport: SM SWE state error get') + call ESMF_StateGet(SubLSM2LSM_State,"Total snowdepth",snwdField,rc=status) + call LIS_verify(status,'Snowmodel_getLSMexport: SM snowd state error get') + + call ESMF_FieldGet(sweField,localDE=0,farrayPtr=swe,rc=status) + call LIS_verify(status,'Snowmodel_getLSMexport: SM swe field error get') + call ESMF_FieldGet(snwdField,localDE=0,farrayPtr=snwd,rc=status) + call LIS_verify(status,'Snowmodel_getLSMexport: SM snwd field error get') + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + ! SnowModel states + swe(t) = snowmodel_struc(n)%sm(t)%swe_depth ! SWE: meters + snwd(t) = snowmodel_struc(n)%sm(t)%snow_depth ! Snow depth: meters + ! If values are very small -- set to 0. + if( swe(t) < 0.0001 ) then + swe(t) = 0. + endif + if( snwd(t) < 0.001 ) then + snwd(t) = 0. + endif + enddo + +end subroutine snowmodel_getLSMexport + + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/cplLSM/Snowmodel_setLSMimport.F90 b/lis/surfacemodels/land/subLSM/snowmodel/cplLSM/Snowmodel_setLSMimport.F90 new file mode 100644 index 000000000..61a2f9d3b --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/cplLSM/Snowmodel_setLSMimport.F90 @@ -0,0 +1,77 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: snowmodel_setLSMimport +! \label{snowmodel_setLSMimport} +! +! !REVISION HISTORY: +! 19 Sep 2020: Sujay Kumar; Initial Specification +! 2 Dec 2020: Mahdi Navari; Edited to add soil volumetric liquid and frozen water content +! 2 Aug 2021: Kristi Arsenault; Edited to support SnowModel implementation + +! !INTERFACE: +subroutine snowmodel_setLSMimport(n, LSM2SubLSM_State) +! !USES: + + use ESMF + use LIS_coreMod + use LIS_logMod + use snowmodel_lsmMod + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n + type(ESMF_State) :: LSM2SubLSM_State +! +! !DESCRIPTION: +! +! +!EOP + +#if 0 + type(ESMF_Field) :: gtField + real, pointer :: gt(:) + type(ESMF_Field) :: XWGIField + real, pointer :: XWGI(:) + type(ESMF_Field) :: XWGField + real, pointer :: XWG(:) + integer :: t + integer :: status + + call ESMF_StateGet(LSM2SubLSM_State,"Ground temperature",gtField,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(gtField,localDE=0,farrayPtr=gt,rc=status) + call LIS_verify(status) + + call ESMF_StateGet(LSM2SUBLSM_State,"soil volumetric frozen water content",XWGIField,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(XWGIField,localDE=0,farrayPtr=XWGI,rc=status) + call LIS_verify(status) + + call ESMF_StateGet(LSM2SUBLSM_State,"soil volumetric liquid water content",XWGField,rc=status) + call LIS_verify(status) + + call ESMF_FieldGet(XWGField,localDE=0,farrayPtr=XWG,rc=status) + call LIS_verify(status) + + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + snowmodel_struc(n)%crocus81(t)%TG = gt(t) + snowmodel_struc(n)%crocus81(t)%XWGI = XWGI(t) + snowmodel_struc(n)%crocus81(t)%XWG = XWG(t) + enddo + +#endif + +end subroutine snowmodel_setLSMimport + + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/docs/lis_snowmodel_howto.adoc b/lis/surfacemodels/land/subLSM/snowmodel/docs/lis_snowmodel_howto.adoc new file mode 100644 index 000000000..284e866e4 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/docs/lis_snowmodel_howto.adoc @@ -0,0 +1,169 @@ +[[sec_doctitle,Quick “How To” for Setting up and Running SnowModel in LIS]] +== Quick “How To” for Setting up and Running SnowModel in LIS + +March.10.2023 + +[[ssec_overview,Overview]] +=== Overview + +Glen Liston’s SnowModel (Liston and Elder, 2006a), a spatially +distributed snow modeling system with several submodels, including +MicroMet (Liston and Elder, 2006b), SnowPack and a 3-D wind-snow +transport scheme, SnowTran-3D (Liston and Sturm, 1998), is now +available in the latest Land Information System Framework (LISF; +Kumar et al., 2006), available from our GitHub page (under the +“master” branch): https://github.com/NASA-LIS/LISF + +The version of SnowModel that was implemented is based on the +NCAR/CSU GitHub “candidate-changes” branch, that is an early +Fortran-90 update of the model and based on Glen Liston’s code +from April-2021. SnowModel in the LISF can utilize the same input +files and model parameter files as used in the offline version, +with a few updates to note for running in this newer model driver +environment. + +LISF has three main components: the Land surface Data Toolkit (LDT; +Arsenault et al., 2018), Land Information System (LIS; Kumar et al., 2006), +and the Land Verification Toolkit (LVT, Kumar et al., 2012). To run +SnowModel in LISF, you will need LDT and LIS components to prepare +parameters and run the model, respectively. Please find below the +quick “How to” steps for setting up and running SnowModel in LISF. + +[[ssec_purpose,Purpose]] +=== Purpose + +Running the SnowModel model within the LIS Framework. + +[[ssec_prerequisites,Prerequisites]] +=== Prerequisites + +* SnowModel input files, including snowmodel.par, topo_vege file, GrADS descriptor files (“ctl_files”) and optional forcing input file. +* Compiled LDT and LIS executables. +* LDT and LIS config files, LDT output parameter file, and LIS input forcing and model output tables. + + +[[ssec_snowmodelsteps,A. Outline of SnowModel Steps]] +=== A. Outline of SnowModel Steps + +. Define and generate your model domain and native binary input parameter file (“topo_vege.gdat”) using Glen Liston’s SnowModel topo_vege tools and scripts. For access to these scripts, you can reach out to Dr. Glen Liston at CSU (glen.liston@colostate.edu). We recommend using Lambert conformal type grids when setting up your domain for running with LDT and LIS. LIS can handle also UTM and Mercator domains, but additional code updates would be needed to support these grids for SnowModel in LISF. + +. LIS is able to support running SnowModel with either its original native ASCII- or binary-formatted “station-based” meteorological forcing files (found in “met/[forcing_dataset]/7_mk_mm/”), or you can use any of the meteorological forcing data readers available in LIS (e.g., NLDAS2, GDAS, MERRA2), which allows the user to bypass all the main SnowModel preprocessing steps. For running with the SnowModel’s native ASCII-formatted files, for example, this option can allow the user to run with in situ station observations as before. + +. For large domains, we recommend also setting up the “extra_met” grid_lon.gdat and grid_lat.gdat files for handling of UTC time changes for the solar radiation calculations in SnowModel. + +. Next, you will want to set up your SnowModel parameter text-based input file: snowmodel.par, as you normally would to run the model. This input parameter file is read in by LIS and “loads” the variety of options available to run the SnowModel system. Note: With the LIS version, one new option was included in the snowmodel.par file, which an example is provided within this “docs” directory with this “How To”. The default option is: + +[subs="attributes+,-callouts"] +.... + metforce_opt = 0 +.... + +Finally, for the LIS-SnowModel model output, output fields and files are written in and follow the LIS output standards (e.g., ALMA standards). The native SnowModel output files are not currently supported in LIS (e.g., “outputs/wo_assim/snod.gdat”). + + +[[ssec_ldtsteps,B. Outline of LDT Steps: Generating the LIS-SnowModel input parameter file]] +=== B. Outline of LDT Steps: Generating the LIS-SnowModel input parameter file + +[NOTE] +==== +Check out the latest “master” branch from the LISF GitHub page. +==== + +. In the LDT directory, run the configure script and make sure to select the “little-endian” option (“1-little"), if running on a little-endian based operating system. Also note, the SnowModel parameter readers in LDT and LIS support parallel reads of the input topo_vege.gdat file, so you could also select “1-dmpar” for the “Parallelism” option. + +. Then run the compile script to generate the LDT executable file. + +. Set up your LDT input config file (e.g., ldt.config) to match the run domain of your SnowModel grid that you generated in step A1 (above). You will point the SnowModel-based parameter readers to your single SnowModel input file, e.g., topo_vege.gdat. + +The main points that are specific to SnowModel are: + +* Set the Land Surface Model to “SnowModel”; +* Set the landcover data source to "NALCMS_SM_IGBPNCEP" and point to your topo_vege.gdat file. Make sure all the landcover lat/lon/dimensions match the extent of your SnowModel domain. +* Set your landmask to "NALCMS_SM_IGBPNCEP"; +* Set all your elevation data to "NED_SM" and point to your topo_vege.gdat file (including the curvature data source). Make sure your topograph lat/lon/dimensions match the extent of your SnowModel domain. +* Point your SnowModel input map to your topo_vege.gdat file. + +For more information on all the options supported for SnowModel parameters in LDT, please see the full LDT instructions and documentation: + + https://github.com/NASA-LIS/LISF/blob/master/ldt/configs/ldt.config.adoc + +[start=4] +. Run your LDT executable with your ldt.config to generate the model parameter input file used in your LIS-SnowModel run. + + ./LDT ldt.config + Output file: lis_input.d01.nc (example filename) + + +[[ssec_lissteps,C. Outline of LIS Steps: Running LIS-SnowModel]] +=== C. Outline of LIS Steps: Running LIS-SnowModel + +. In the LIS directory, you will first go into “make” directory and you will do the following: + +a) Open the file: default.cfg (with an editor of choice) + +b) Go to the “SNOWMODEL” section and turn on the model with “True”: + + [SNOWMODEL] +enabled: True + +c) Save and close the file, and return to the main LIS directory. + +d) Run the LIS configure script. Here, you can select all the default options. + +e) Before compiling the LIS code, you will need to include the following Fortran compilation flag: + -mcmodel=medium + to the FFLAGS77 and FFLAGS in the make/configure.lis file. + +f) Once you add that flag, you are now ready to run the LIS compile script and generate the LIS executable file (“LIS”). + +[start=2] +. Set up your LIS input config file (e.g., lis.config) for the SnowModel setup, as a “subLSM” (and not as one of the LSMs). + Main things to pay attention to: ++ +* Land surface model should be set to "none" +* Number of subLSMs set to 1 +* subLSM model set to "SnowModel" +* Look at the options under the DOMAIN SPECIFICATION section. Most will be set to none, but make sure you do have these six options set to LDT, including curvature data source: ++ +[subs="attributes+,-callouts"] +.... +Landmask data source: LDT +Landcover data source: LDT +Elevation data source: LDT +Slope data source: LDT +Aspect data source: LDT +Curvature data source: LDT +.... ++ + +* Check out the SnowModel specific options under “LAND SURFACE MODELS” section header. This is where where you will specify your model timestep and point to your snowmodel.par file, for example. For further details and options, please check out: https://github.com/NASA-LIS/LISF/blob/master/lis/configs/lis.config.adoc + +* Since SnowModel is a subLSM in LIS, this setup has some model-specific variable names, where we added an “SM” prefix to SWE, SnowDepth, and other fields, as designated in the MODEL_OUTPUT.TBL. This setup was in support of being able to run semi-coupled with other LSMs in LIS, e.g., Noah or Noah-MP (Niu et al., 2011 and Yang et al., 2011), allowing the user to be able to look at both the LSM and this subLSM-based output fields in the LIS output files. Output field specifications for SnowModel can be found here: https://github.com/NASA-LIS/LISF/blob/master/lis/configs/MODEL_OUTPUT_LIST.TBL.adoc + +. Place your LDT and LIS executables along with your input config files within the same working directory, running LDT first to generate your LIS input parameter file. Then run LIS to generate your LIS-SnowModel based simulation and output. + +. For additional options, please check the lis.config.adoc file within the “configs” directory in your checked out repository or on the LISF GitHub page. You can see the options of running SnowModel coupled with an LSM (currently only setup to run with NoahMP4.0.1 version), or using different forcing and output options. + + +[[ssec_lissteps,References]] +=== References + +Arsenault, K.R., S.V. Kumar, J.V. Geiger, S. Wang, E. Kemp, D.M. Mocko, H.K. Beaudoing, A. Getirana, M. Navari, B. Li, J. Jacob, J. Wegiel, and C.D. Peters-Lidard (2018), The Land surface Data Toolkit (LDT v7.2) – a data fusion environment for land data assimilation systems. Geosci. Model Dev., 11, 3605-3621, doi:10.5194/gmd-11-3605-2018 + +Liston, G., & Sturm, M. (1998), A snow-transport model for complex terrain. Journal of Glaciology, 44(148), 498-516. doi:10.3189/S0022143000002021 + +Liston, G. E., & Elder, K. (2006a), A distributed snow-evolution modeling system (SnowModel). Journal of Hydrometeorology, 7(6): 1259-1276 + +Liston, G. E., & Elder, K. (2006b), A meteorological distribution system for high-resolution terrestrial modeling (MicroMet). Journal of Hydrometeorology, 7(2), 217-234 + +Liston, G., Haehnel, R., Sturm, M., Hiemstra, C., Berezovskaya, S., & Tabler, R. (2007), Simulating complex snow distributions in windy environments using SnowTran-3D. Journal of Glaciology, 53(181), 241-256. doi:10.3189/172756507782202865 + +Liston, G. E., Polashenski, C., Rösel, A., Itkin, P., King, J., Merkouriadi, I., & Haapala, J. (2018), A distributed snow-evolution model for sea-ice applications (SnowModel). https://doi.org/10.1002/2017JC013706 + +Kumar, S.V., C.D. Peters-Lidard, Y. Tian, P.R. Houser, J. Geiger, S. Olden, L. Lighty, J.L. Eastman, B. Doty, P. Dirmeyer, J. Adams, K. Mitchell, E. F. Wood, and J. Sheffield (2006), Land Information System - An Interoperable Framework for High Resolution Land Surface Modeling. Environ. Modelling & Software, 21, 1402-1415, doi:10.1016/j.envsoft.2005.07.004 + +Kumar, S.V., et al. (2012), Land surface Verification Toolkit (LVT) - a generalized framework for land surface model evaluation. Geosci. Model Dev., 5, 869-886, doi:10.5194/gmd-5-869-2012 + +Niu, G.-Y., et al. (2011), The community Noah land surface model with multiparameterization options (Noah-MP): 1. Model description and evaluation with local-scale measurements. J. Geophys. Res., 116, D12109, doi: 10.1029/2010JD015139 + +Yang, Z.-L., G.-Y. Niu, K. E. Mitchell, F. Chen, M. B. Ek, M. Barlage, K. Manning, D. Niyogi, M. Tewari, & Y. Xia (2011), The Community Noah Land Surface Model with Multi-Parameterization Options (Noah-MP): 2. Evaluation over Global River Basins. J. Geophys. Res., doi:10.1029/2010JD015140 diff --git a/lis/surfacemodels/land/subLSM/snowmodel/docs/snowmodel.par b/lis/surfacemodels/land/subLSM/snowmodel/docs/snowmodel.par new file mode 100644 index 000000000..be931a036 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/docs/snowmodel.par @@ -0,0 +1,1231 @@ +! snowmodel.par file. +! +! Define any required constants specific to this model run. +! +! The following must be true: +! +! All comment lines start with a ! in the first position. +! +! Blank lines are permitted. +! +! All parameter statements start with the parameter name, followed +! by a space, followed by an =, followed by a space, followed by +! the actual value, with nothing after that. These statements can +! have leading blanks, and must fit within 120 columns, and the +! parameter value cannot be longer than 80 characters (so, for +! example, your paths/file_names to the right of the "=" sign +! cannot be longer than 80 characters). +! +! Also note that all of the input numbers follow standard +! fortran_77 convention where anything starting with the letters +! "i" through "n" are integers, and all others are real numbers. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! GENERAL MODEL SETUP +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Number of x and y cells in the computational grid. +!!! (recommended default value: nx = user input required) +!!! (recommended default value: ny = user input required) + nx = 578 + ny = 541 + +! deltax = grid increment in x direction. Meters. +! deltay = grid increment in y direction. Meters. +!!! (recommended default value: deltax = user input required) +!!! (recommended default value: deltay = user input required) + deltax = 100.0 + deltay = 100.0 + +! Location (like UTM, in meters) value of lower-left grid point. +! xmn = value of x coordinate in center of lower left grid cell. +! Meters. +! ymn = value of y coordinate in center of lower left grid cell. +! Meters. +!!! (recommended default value: xmn = user input required) +!!! (recommended default value: ymn = user input required) + xmn = 251450.00 + ymn = 4176850.00 + +! Model time step, dt. Should be the same increment as in the input +! data file. In seconds. For what it is worth, I almost always +! run the model using 3-hour time steps or daily time steps. The +! 3-hour time step resolves the diurnal cycle, and the daily time +! step is 8 times faster. While other time steps can be used, +! there would need to be a good reason to (for example, it has +! been years since I have run the model on a daily time step; +! with no apparent loss in quality). +!!! (recommended default value: dt = user input required) +! One day. +! dt = 86400.0 +! Three hours. +! dt = 10800.0 +! One hour. + dt = 3600.0 + +! Start year of input data file. Four digit year. Integer. +!!! (recommended default value: iyear_init = user input required) + iyear_init = 2009 + +! Start month of input data file. One or two digit month. Integer. +!!! (recommended default value: imonth_init = user input required) + imonth_init = 9 + +! Start day of input data file. One or two digit day. Integer. +!!! (recommended default value: iday_init = user input required) + iday_init = 1 + +! Start hour of input data file. Local time, like in solar time. +! Decimal hour. Each day the clock runs from 0.00 through 23.99. +! Real. +!!! (recommended default value: xhour_init = user input required) + xhour_init = 1.0 +! xhour_init = 3.0 +! xhour_init = 12.0 + +! Number of model iterations defines how many times to process. +!!! (recommended default value: max_iter = user input required) +! max_iter = 1 +! max_iter = 365 +! max_iter = 2920 + max_iter = 8760 + +! MicroMet requires a met input file that has data in a specific +! format (see the MicroMet documentation). For the case of +! inputs from more than a single station, the input met file +! requires an initial number indicating the number of valid +! stations at a given time step. For the case of a single +! station, this number can be dropped (it doesn't have to be +! though). Identify whether to process as a single station +! without the valid station count (isingle_stn_flag = 1), or +! or to process with the count included (for multi stations +! and single stations with the number of stations included; +! isingle_stn_flag = 0). +!!! (recommended default value: isingle_stn_flag = user input +!!! required) + isingle_stn_flag = 0 + +! For the case of isingle_stn_flag = 1, the input file can be a GrADS +! binary file. Identify whether that is the case (= 1, else = 0). +!!! (recommended default value: igrads_metfile = 0) + igrads_metfile = 0 + +! (New) Meteorological forcing option to help specify whether +! forcing fields will be read in from the options selected in +! this snowmodel.par input file (including the forcing file +! read and station or gridcell interpolation), OR that 2-D +! meteorological fields are passed on the Snowmodel model +! grid space into MicroMet and utilize just the topographic +! downscaling operations and routines. +!!! (recommended default value: metforce_opt = 0 ) +!!! (0 = Read in SnowModel forcing specific file and perform +!!! interplation in MicroMet routines) +!!! (1 = Pass in 2D meteorological forcing fields, already +!!! interpolated to the model space grid, to MicroMet) + metforce_opt = 0 + + +! Define the meteorologial input file name. Note that this input +! file has very specific input format requirements (see the +! MicroMet preprocessor). The required met variables are: +! Tair (deg C or K), rh (%), wind speed (m/s), wind direction +! (0-360 True N), and precipitation (mm/time_step). +!!! (recommended default value: met_input_fname = user input required) + met_input_fname = SnowModel_Inputs/uppertuo_100m/mm_3hrly_wys2010-2020.dat + +! The number used as an undefined value for both inputs and outputs. +!!! (recommended default value: undef = -9999.0) + undef = -9999.0 + +! Define whether the topography and vegetation input files will +! be ARC/INFO ascii text (grid) files, or a GrADS binary file +! (ascii = 1.0, GrADS = 0.0). +!!! (recommended default value: ascii_topoveg = 1.0) + ascii_topoveg = 0.0 + +! Define the GrADS topography and vegetation input file name +! (record 1 = topo, record 2 = veg). Note that if you are using +! ascii files, you still cannot comment this line out (it is okay +! for it to point to something that doesn't exist) or you will +! an error message. +!!! (recommended default value: topoveg_fname = xxxxxx) + topoveg_fname = SnowModel_Inputs/topo_vege/topo_vege.gdat + +! For the case of using ascii text topography and vegetation files, +! provide the file names. Note that if you are using a grads +! file, you still cannot comment these two lines out (it is okay +! for it to point to something that doesn't exist) or you will +! an error message. +!!! (recommended default value: topo_ascii_fname = user input required) +!!! (recommended default value: veg_ascii_fname = user input required) + topo_ascii_fname = xxxxxx + veg_ascii_fname = xxxxxx + +! The vegetation types are assumed to range from 1 through 30. The +! last 6 types are available to be user-defined vegetation types +! and vegetation snow-holding depths. The first 24 vegetation +! types, and the associated vegetation snow-holding depths +! (meters), are hard-coded to be: +! +! code description veg_shd example class +! +! 1 coniferous forest 15.00 spruce-fir/taiga/lodgepole forest +! 2 deciduous forest 12.00 aspen forest forest +! 3 mixed forest 14.00 aspen/spruce-fir/low taiga forest +! 4 scattered short-conifer 8.00 pinyon-juniper forest +! 5 clearcut conifer 4.00 stumps and regenerating forest +! +! 6 mesic upland shrub 0.50 deeper soils, less rocky shrub +! 7 xeric upland shrub 0.25 rocky, windblown soils shrub +! 8 playa shrubland 1.00 greasewood, saltbush shrub +! 9 shrub wetland/riparian 1.75 willow along streams shrub +! 10 erect shrub tundra 0.65 arctic shrubland shrub +! 11 low shrub tundra 0.30 low to medium arctic shrubs shrub +! +! 12 grassland rangeland 0.15 graminoids and forbs grass +! 13 subalpine meadow 0.25 meadows below treeline grass +! 14 tundra (non-tussock) 0.15 alpine, high arctic grass +! 15 tundra (tussock) 0.20 graminoid and dwarf shrubs grass +! 16 prostrate shrub tundra 0.10 graminoid dominated grass +! 17 arctic gram. wetland 0.20 grassy wetlands, wet tundra grass +! +! 18 bare 0.01 bare +! +! 19 water/possibly frozen 0.01 water +! 20 permanent snow/glacier 0.01 water +! +! 21 residential/urban 0.01 human +! 22 tall crops 0.40 e.g., corn stubble human +! 23 short crops 0.25 e.g., wheat stubble human +! 24 ocean 0.01 water +! +! 25 user defined (see below) +! 26 user defined (see below) +! 27 user defined (see below) +! 28 user defined (see below) +! 29 user defined (see below) +! 30 user defined (see below) +! +! Define the vegetation snow-holding depths (in meters) for each +! of the user-defined vegetation types. The numbers in the +! list below correspond to the vegetation-type numbers in the +! vegetation-type data array (veg type 25.0 -> veg_shd_25). Note +! that even if these are not used, they cannot be commented out +! or you will get an error message. +!!! (recommended default value: veg_shd_25 = 0.10) +!!! (recommended default value: veg_shd_26 = 0.10) +!!! (recommended default value: veg_shd_27 = 0.10) +!!! (recommended default value: veg_shd_28 = 0.10) +!!! (recommended default value: veg_shd_29 = 0.10) +!!! (recommended default value: veg_shd_30 = 0.10) + veg_shd_25 = 0.10 + veg_shd_26 = 0.10 + veg_shd_27 = 0.10 + veg_shd_28 = 0.10 + veg_shd_29 = 0.10 + veg_shd_30 = 0.10 + +! Define whether the vegetation will be constant or defined by the +! topography/vegetation input file name (0.0 means use the file, +! 1.0 or greater means use a constant vegetation type equal to +! the number that is used). This will define the associated +! veg_shd that will be used. The reason you might use a constant +! vegetation type is to avoid generating a veg-distribution file. +!!! (recommended default value: const_veg_flag = 0.0) +! const_veg_flag = 12.0 + const_veg_flag = 0.0 + +! For the case where you have vegetation height data, and want to +! use that instead of the tables above, you must also provide a +! file that defines the vegetation height (m) of each grid cell. +! iveg_ht_flag = 0 means the file is not provided and the required +! array will be generated by filling it with the values listed in +! the above vegetation summary. iveg_ht_flag = -1 means the data +! file is a grads binary file with the name veg_ht.gdat. +! iveg_ht_flag = 1 means the data file is an ascii text file with +! the same format that ascii topo and veg files would have and +! with a name of veg_ht.asc. Note that this .asc file is +! y-reversed (see ascii topo/veg notes), and the .gdat file is +! not. It is assumed that the file, if provided, is located in +! the same directory as the topo and vege files listed above (in +! topoveg_fname or topo_ascii_fname and veg_ascii_fname). Note +! that this height information is primarily used as the vegetation +! snow-holding depth, thus the model is expecting average +! vegetation heights for each grid cell, not maximum heights. +!!! (recommended default value: iveg_ht_flag = 0) + iveg_ht_flag = 0 + +! The latitude of domain center (decimal degrees). This only needs +! to be approximate, since it is used to define some of the solar +! radiation calculations. +!!! (recommended default value: xlat = user input required) + xlat = 40.0 + +! For the case where your domain spans enough latitude that there +! is significant variation in solar radiation from the top to +! the bottom of the domain, you must also provide a file that +! defines the latitude (in decimal degrees) of the center of +! each grid cell. lat_solar_flag = 0 means the file is not +! provided and the required array will be generated by filling +! it with the constant xlat value listed above. lat_solar_flag +! = -1 means the data file is a grads binary file with the name +! grid_lat.gdat. lat_solar_flag = 1 means the data file is an +! ascii text file with the same format that ascii topo and veg +! files would have and with a name of grid_lat.asc. Note that +! the .gdat and .asc files are y-reversed (see ascii topo/veg +! notes). It is assumed that the file, if provided, is located +! in an 'extra_met/' directory off of the main model directory. +!!! (recommended default value: lat_solar_flag = 0) + lat_solar_flag = 0 + +! For the case where your domain spans enough longitude that there +! is significant variation in solar radiation from the side to +! the side of the domain, you must also provide a file that +! defines the lonitude (in decimal degrees) of the center of +! each grid cell. In this case it also no longer makes sense +! to be running the model in local time, and UTC (or GMT) time +! is required. UTC_flag = 0.0 means the the model will be run +! in local time. UTC_flag = -1.0 means the longitude data file +! is a grads binary file with the name grid_lon.gdat. UTC_flag +! = 1 means the longitude data file is an ascii text file with +! the same format that ascii topo and veg files would have and +! with a name of grid_lon.asc. Note that the .gdat and .asc +! files are y-reversed from each other (see ascii topo/veg +! notes). It is assumed that the file, if provided, is located +! in an 'extra_met/' directory off of the main model directory. +! Note that if UTC_flag is non-zero, lat_solar_flag should +! probably also be non-zero. +!!! (recommended default value: UTC_flag = 0.0) + UTC_flag = 0.0 + +! Define which models that are going to run. A value of 1.0 means +! that you want to run the model (0.0 means don't run it). +! Currently the model is only configured to run the following +! combinations (micromet), (micromet, enbal), (micromet, enbal, +! snowpack), (micromet, snowtran), or (micromet, enbal, snowpack, +! snowtran). +!!! (recommended default value: run_micromet = user input required) +!!! (recommended default value: run_enbal = user input required) +!!! (recommended default value: run_snowpack = user input required) +!!! (recommended default value: run_snowtran = user input required) + run_micromet = 1.0 + run_enbal = 1.0 + run_snowpack = 1.0 + run_snowtran = 1.0 + +! Define whether you are doing a standard model simulation, or a +! DATA ASSIMILATION RUN where you are going to assimilate +! observed snow water equivalent observations as part of the +! model integration. A data assimilation run can be used to +! correct precipitation inputs and/or melt rates to force the +! model towards your observed swe distributions. For a standard +! simulation, use irun_data_assim = 0, for a data assimilation +! run, use irun_data_assim = 1. Note that irun_data_assim = 1 +! requires swe data and some extra input files. See the +! dataassim_user.f subroutine for details (read the comments in +! that subroutine to learn how to set up a data assimilation +! run). If you are using this feature, you will also need to +! run the model with "print_user = 1.0" defined below in this +! .par file; there are three output files/variables that you +! must turn on (as noted below) to do a data assimilation run. +! Data assimilation works for single-layer runs and multi-layer +! runs (multilayer_snowpack = 1). The snow water equivalent +! assimilation input file must be placed in this directory and +! be called: /sm/swe_assim/swe_obs.dat. +!!! (recommended default value: irun_data_assim = user input +!!! required) + irun_data_assim = 0 +! irun_data_assim = 1 + +! In addition to the SWE data assimilation described above, +! you can also assimilate snow density observations as a +! post-processing step at the end of the model run. See the +! /post_process/density_assim/ directory for additional +! details. Assimilating both SWE and density will help +! reproduce the observed SWE, depth, and density (all three, +! not just one of them). + +! Define whether want to implement the history restart option. +! This creates periodic output files that allow you to restart +! the simulation from somewhere other than the beginning. All +! of the required data arrays are saved to a grads file that is +! read back in when the simulation is restarted. The new +! simulation starts at the history restart iteration, with the +! initial conditions defined by the saved data arrays. The +! new simulation starts in the micromet file where the original +! simulation ended. This is also true of the output files, +! if the run has been set up to write continuously to a given +! output file. This option also assumes that you have not made +! any changes to the model setup; it does no error checking. +! ihrestart_flag = -2 turns this option off, ihrestart_flag = -1 +! does the restart saves, and ihrestart_flag >= 0 runs a history +! restart where the number defines the restart iteration (e.g., +! ihrestart = 720 will set iteration 720 as the intitial +! condition for the start of the new simulation. For the case +! where ihrestart_flag = 0, and i_dataassim_loop <= -1, the +! run will start at the begining of the second data assimilation +! loop. NOTE: HISTORY RESTARTS NO LONGER WORK; THIS WILL BE +! CORRECTED IN THE COMING MONTHS. +!!! (recommended default value: ihrestart_flag = -2) + ihrestart_flag = -2 +! ihrestart_flag = -1 +! ihrestart_flag = 3444 +! ihrestart_flag = 0 + +! For the case where you are running a history restart, define +! whether you want to restart the run during a standard run or +! the first loop of a data assimilation model run +! (i_dataassim_loop = 1) or during the second loop of a data +! assimilation run (i_dataassim_loop < 0). The value of this +! negative number is used to define how many obervation dates +! you have in your data assimilation run (e.g., -3 would mean +! you have 3 observation dates and nobs_dates = 3 in +! dataassim_user.f). Also note that to correctly run the history +! restart function for the case of a data assimilation run, you +! need to first set i_corr_factor = 0 and save a history restart +! at the end of that run before going on to the second half of +! the assimilation run. +!!! (recommended default value: i_dataassim_loop = 1) + i_dataassim_loop = 1 +! i_dataassim_loop = -1 + +! If ihrestart_flag = -1, then define how often the restart +! files are generated. This is in iteration units (e.g., every +! 30 days for the model running at hourly time steps would be +! ihrestart_inc = 720). The history restart files will be +! placed in an 'hrestart/' directory off of the main model +! directory. In addition to this time increment, if the +! ihrestart_flag = -1, the last model iteration is always saved +! (so if you just want to save the last iteration, just set +! ihrestart_inc to a number bigger than your maximum iteration). +! Note that if you want to do history restarts with data +! assimilation this increment must be evenly divisible into +! the maximum interation; in other words, the simulation must +! at least do a write at the end of the first data assimilation +! loop. +!!! (recommended default value: ihrestart_inc = 0) + ihrestart_inc = 0 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! MICROMET MODEL SETUP +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Define which fields you want to process/distribute. 1 = do it, +! 0 = don't do it. As an example, if you are running SnowTran-3D +! with no melting, you don't need solar radiation. Also, MicroMet +! provides the ability to to read in an alternate wind dataset +! that has been previously generated with another program, like +! winds from NUATMOS. To do that set the flag to -1. See +! i_wind_flag = -1 in the code for an example of how to do this. +!!! (recommended default value: i_tair_flag = 1) +!!! (recommended default value: i_rh_flag = 1) +!!! (recommended default value: i_wind_flag = 1) +!!! (recommended default value: i_solar_flag = 1) +!!! (recommended default value: i_longwave_flag = 1) +!!! (recommended default value: i_prec_flag = 1) + i_tair_flag = 1 + i_rh_flag = 1 + i_wind_flag = 1 + i_solar_flag = 1 + i_longwave_flag = 1 + i_prec_flag = 1 + +! Force the model to determine a value for every grid cell (= 1), or +! just define values for some specified "radius of influence" (= 0). +!!! (recommended default value: ifill = 1) + ifill = 1 + +! Let the model determine an appropriate "radius of influence" (= 0), +! or define the "radius of influence" you want the model to use (= 1). +! 1 = use obs interval below, 0 = use model generated interval. +!!! (recommended default value: iobsint = 0) + iobsint = 0 + +! The "radius of influence" or "observation interval" you want the +! model to use for the interpolation. In units of deltax, deltay. +!!! (recommended default value: dn = 1.0) + dn = 1.0 + +! The barnes station interpolation can be done two different ways: +! First, barnes_oi does the interpolation by processing all of +! the available station data for each model grid cell. +! Second, barnes_oi_ij does the interpolation by processing only +! the "n_stns_used" number of stations for each model grid cell. +! For small domains, with relatively few met stations (100's), +! the first way is best. For large domains (like the +! United States, Globe, Pan-Arctic, North America, Greenland) +! and many met stations (like 1000's), the second approach is the +! most efficient. But, the second approach carries the following +! restrictions: 1) there can be no missing data for the fields of +! interest; 2) there can be no missing stations (all stations +! must exist throughout the simulation period); and 3) the +! station met file must list the stations in the same order for +! all time steps. This second method works well for regridding +! atmospheric analyses/model datasets. Also, the MicroMet +! preprocessor can be used to fill in missing data segments. +! The second option now has the option to calculate the nearest +! "stations" at every time step. This is useful if you have +! stations (instead of just reanalyis grid points) in your model +! domain. It works with either line (snowmodel_line_flag = 1.0) +! or rectangular domain (snowmodel_line_flag = 0.0) configurations +! (see below). Use barnes_lg_domain = 0.0 for the first method, +! barnes_lg_domain = 1.0 for the second method with all of the +! restrictions listed above, and barnes_lg_domain = 2.0 for the +! second method with stations that come and go with valid data +! during the model simulation. +!!! (recommended default value: barnes_lg_domain = 0.0) + barnes_lg_domain = 1.0 + +! For the case where barnes_lg_domain = 1.0, define the number +! of nearest stations to be used in the interpolation (9 or +! less). If barnes_lg_domain = 0.0, n_stns_used is not used, but +! n_stns_used still needs to have some value. Note that these +! station interpolations are very costly, and thus, very +! sensitive to the value of n_stns_used. So, it needs to be +! big enough to create smooth fields, but not so big as to +! waste CPU time (the CPU cost is something like nstns^2). Using +! a test run as an example, 4 stns = 33 mins, 5 stns = 40 mins, +! 6 stns = 49 mins, and 9 stns = 84 mins. In general, a value +! of 4 stns seems to be adequate, but if you see interpolation +! artifacts in our spatial fields, you may want to use a higher +! value. +!!! (recommended default value: n_stns_used = 4) + n_stns_used = 4 + +! The code has also been configured to run the model with all of +! grid cells of interest concatenated into a single line of grid +! cells. This is useful when large parts of a rectangular domain +! are not of interest in your simulation, for example, when you +! want to simulate snow processes over all of the glaciers in +! the Northern Hemisphere or all of the ice-free grid cells in +! Greenland. Because the grid cells in this configuration are +! not realistically connected on the x-y grid anymore, the blowing +! snow model (SnowTran-3D) cannot be used in this configuration. +! Also, the implementation assumes that you are running with +! barnes_lg_domain = 1.0 (see the notes above). To define the +! relationship between this line of grid cells and the original +! rectangular x-y domain, an indexing file is required. This +! is assumed to be called snowmodel_line_pts.dat, and to be +! located in the /extra_met/ directory. This data file has five +! columns: 1) a grid cell counter, 2) and 3) the i and j +! locations within the rectangular grid, and 4) and 5) the x and +! y SnowModel coordinates within the rectangular version of the +! domain. The number of rows in this file equals the number of +! grid cells in the line of grid cells. In addition to the +! requirements listed above, several preprocessing steps are +! required to generate the appropriate indexing for this +! implementation. These steps are highlighted in the +! /readme_docs/readme_snowmodel_line.txt file. 1.0 = run with a +! line domain, 0.0 = run with a standard rectangular domain. +!!! (recommended default value: snowmodel_line_flag = 0.0) + snowmodel_line_flag = 0.0 + +! Define whether you want to check the met input file to make sure +! it contains (some) valid data for every time step. While this +! is generally a good idea to do, if you are running, for example, +! the model with 30 years of reanalysis data, it can take a very +! long time and may not be necessary. 1.0 = do the check, 0.0 = +! skip the check. +!!! (recommended default value: check_met_data = 1.0) + check_met_data = 1.0 + +! The curvature is used as part of the wind model. Define a length +! scale that the curvature calculation will be performed on. This +! has units of meters, and should be approximately one-half the +! wavelength of the topographic features within the domain. +!!! (recommended default value: curve_len_scale = 500.0) + curve_len_scale = 300.0 + +! The curvature and wind_slope values range between -0.5 and +0.5. +! Valid slopewt and curvewt values are between 0 and 1, with +! values of 0.5 giving approximately equal weight to slope and +! curvature. I suggest that slopewt and curvewt be set such +! that slopewt + curvewt = 1.0. This will limit the total +! wind weight to between 0.5 and 1.5 (but this is not required). +!!! (recommended default value: slopewt = 0.58) +!!! (recommended default value: curvewt = 0.42) + slopewt = 0.58 + curvewt = 0.42 +! slopewt = 0.25 +! curvewt = 0.75 + +! Impose a second, larger length scale, curvature affect on the +! snow distribution. Turning this flag on (= 1.0) will reduce the +! Utau_t threshold in regions of positive curvature in big +! mountains. The net effect of this is to increase the wind- +! related snow erosion on high, steep, mountain slopes. If = 1.0 +! then the model will look in an 'extra_met/' directory off of +! the main model directory for a .gdat file of the weighing +! distribution (that has been created in preparation for the +! model run using the external program called make_lg_curve_wt.f). +! Turning this flag off (= 0.0) produces the default model and +! snow resistance to wind shear. +!!! (recommended default value: curve_lg_scale_flag = 0.0) + curve_lg_scale_flag = 0.0 + +! Avoid problems of zero (low) winds (for example, turbulence +! theory, log wind profile, etc., says that we must have some +! wind. Thus, some equations blow up when the wind speed gets +! very small). This number defines the value that any wind speed +! below this gets set to. +!!! (recommended default value: windspd_min = 0.1) + windspd_min = 0.1 + +! Define whether the model is to use the default monthly lapse +! rates (= 0) or user supplied monthly lapse rates (= 1). To use +! user supplied lapse rates, you have to edit the user lapse rate +! data array in micromet_code.f (subroutine get_lapse_rates). +! Note that this implementation currently only defines +! average-monthly lapse rates. +!!! (recommended default value: lapse_rate_user_flag = 0) + lapse_rate_user_flag = 0 + +! Define whether the precipitation adjustment factor, with units of +! km^-1 (kind of a precipitation lapse rate, used to adjust the +! precipitation for locations above and below the precipitation +! observing station(s)), is to use the default monthly lapse +! rates (= 0) or user supplied monthly lapse rates (= 1). To use +! user supplied lapse rates, you have to edit the user lapse rate +! data array in micromet_code.f (subroutine get_lapse_rates). +!!! (recommended default value: iprecip_lapse_rate_user_flag = 0) + iprecip_lapse_rate_user_flag = 0 + +! There are two different precipitation-increase-with-elevation +! schemes implemented in MicroMet. The first is described in +! Liston and Elder 2006; the original MicroMet paper. The +! second is described in the van Pelt et al. (2006) Svalbard +! paper. I used the original in everything except Svalbard +! simulations, but it is an option to expore. The parameter +! above, iprecip_lapse_rate_user_flag, only affects the original +! scheme. iprecip_scheme = 1 is the original scheme, and = 2 +! is the van Pelt scheme. +!!! (recommended default value: iprecip_scheme = 1) + iprecip_scheme = 1 + +! Define how the rain-snow fraction of the water-equivalent +! precipitation forcing is calculated. snowfall_frac = 1.0 +! uses Auer (1974) where rain occurs at air temperatures above +! +2 C and snow occurs below that threshold; snowfall_frac = +! 2.0 uses Dai (2008); and snowfall_frac = 3.0 uses Liston's +! linear fit to Dai's curve. Note that what options 2.0 and 3.0 +! are doing is causing a mix of rain and snow to occur during +! the time step when air temperatures are around freezing. +!!! (recommended default value: snowfall_frac = 3.0) +! snowfall_frac = 1.0 + snowfall_frac = 3.0 + +! The model can also impose a wind speed increase with elevation, +! called here the "wind_lapse_rate". If wind_lapse_rate = 0.0, +! then nothing is done. Or you can define a wind_lapse_rate to +! equal the wind multiplier per km. So, for example, a rate = 1.5 +! would give wind speeds at 1-km elevation above the wind speed +! observations that are 1.5 times those observations. Where this +! is useful is when you have all of your met stations in the +! valley bottoms, but you want higher wind speeds on the tops of +! the higher ridges. The elevation correction formulation follows +! that of precipitation (although there is no seasonal variation +! implemented). So this will have the effect of also making the +! wind speeds at lower elevations than the met stations less than +! the met station values. +!!! (recommended default value: wind_lapse_rate = 0.0) + wind_lapse_rate = 0.0 + +! Define whether you want the model to calculate, use, and output +! sub-forest-canopy windspeed, incoming solar and longwave +! radiation (= 1.0), or above canopy values (= 0.0). +!!! (recommended default value: calc_subcanopy_met = 1.0) + calc_subcanopy_met = 1.0 + +! Define the canopy gap fraction (0-1). This parameter accounts +! for solar radiation reaching the snow surface below the canopy, +! beyond that defined by the canopy transmissivity calculation. +! In effect, it allows additional solar radiation to penetrate +! the canopy (e.g., through gaps in the forest), thus inceasing +! melt rates, etc. A gap_frac = 0.0 produces the sub-canopy +! solar radiation using the default transmissivity calculation, +! a gap_frac = 1.0 (all gaps) produces sub_canopy radiation equal +! to the top-of-canopy radiation. If you want the snow in the +! forest to melt faster, increasing this value will do it. +!!! (recommended default value: gap_frac = 0.2) + gap_frac = 0.2 + +! To handle the case, for example, of a met station located in +! an inversion layer recording high relative humidity, and the +! model producing anomolously high cloud-cover fractions, the +! cloud_frac_factor can be used to decrease the simulated cloud +! fraction. This number is multiplied by the calculated cloud +! fraction. For example, a cloud_frac_factor = 1.0 produces the +! simulated cloud fraction, a cloud_frac_factor = 0.5 produces +! the half the simulated cloud fraction, and a cloud_frac_factor +! = 0.0 forces the simulated cloud fraction to be zero. +!!! (recommended default value: cloud_frac_factor = 1.0) + cloud_frac_factor = 1.0 + +! Define whether the simulation will assimilate shortwave radiation +! observations (no = 0.0, yes = 1.0). If yes, the model assumes +! there is a shortwave radation station data file, called +! shortwave.dat, in an 'extra_met/' directory off of the main +! model directory. See the micromet code for file format details. +!!! (recommended default value: use_shortwave_obs = 0.0) + use_shortwave_obs = 0.0 + +! Define whether the simulation will assimilate longwave radiation +! observations (no = 0.0, yes = 1.0). If yes, the model assumes +! there is a longwave radation station data file, called +! longwave.dat, in an 'extra_met/' directory off of the main model +! directory. See the micromet code for file format details. +!!! (recommended default value: use_longwave_obs = 0.0) + use_longwave_obs = 0.0 + +! Define whether the simulation will assimilate surface pressure +! observations (no = 0.0, yes = 1.0). If yes, the model assumes +! there is a surface pressure station data file, called +! sfc_pressure.dat, in an 'extra_met/' directory off of the main +! model directory. See the micromet code for file format details. +!!! (recommended default value: use_sfc_pressure_obs = 0.0) + use_sfc_pressure_obs = 0.0 + +! Define whether you want to use a user-defined precipitation +! correction factor. This can be either a 2-D grads file (=1.0), +! an ascii text file (=2.0), or a scalar (=3.0). Or it can be +! turned off by setting cf_precip_flag = 0.0. The file that +! contains the cf data must be in the /snowmodel/precip_cf/ +! directory, and they are assumed to be called: cf_precip.gdat, +! cf_precip.asc, and cf_precip.dat, for 1.0, 2.0, and 3.0, +! respectively. +!!! (recommended default value: cf_precip_flag = 0.0) + cf_precip_flag = 0.0 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! SNOWTRAN-3D MODEL SETUP +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Define whether the threshold surface shear velocity will be +! constant during the simulation (Utau_t_flag = 0.0), or whether +! it will evolve as a funtion of air temperature and wind speed +! (Utau_t_flag = 1.0). +!!! (recommended default value: Utau_t_flag = 0.0) + Utau_t_flag = 0.0 +! Utau_t_flag = 1.0 + +! For the case of Utau_t_flag = 0.0, define what the threshold +! surface shear velocity (m/s) will be during the simulation. +!!! (recommended default value: Utau_t_const = 0.25) + Utau_t_const = 0.25 + +! Define whether you want to apply the Tabler subgrid algorithm. +! Flag = 0.0 is the original model (no subgrid redistribution, as +! in the original model), flag = 1.0 uses Tabler (1975) to define +! equilibrium profiles for topographic drift catchments. Note +! that the model has not been tested for grid increments less than +! 1.0 m deltax and deltay. Also note that this subgrid algorithm +! is not really appropriate for grid increments greater than +! 30.0 m. There is also a computational penalty for running with +! this turned on: the simulations can take as much as 35% longer +! when subgrid_flag = 1.0 (but it does produce more realistic +! drift profiles at the higher resolutions). Note that as of June +! 2018 this version of subgrid_flag = 1.0 is different than that in +! previous years/versions. The old version has been replaced and +! is no longer supported. If subgrid_flag = 1.0, you need to set +! topoflag = 1.0. +!!! (recommended default value: subgrid_flag = 0.0 for resolutions +! >= 30 m, subgrid_flag = 1.0 for resolutions < 30 m) + subgrid_flag = 0.0 +! subgrid_flag = 1.0 + +! For subgrid_flag = 1.0, you can either define the dominant wind +! direction (one of the 8 primary wind directions) you want +! Tabler surfaces and drifts to be generated for. In this case, +! the blowing snow transport direction is constant during the +! entire simulation. Or you can let the code calculate the +! direction of the dominant blowing snow flux, and use that. In +! this case, the direction may be different at each time step, +! depending on the wind directions and transport fluxes. This +! second option is obtained by setting the tabler_dir = to a +! non-zero, negative wind direction (the number can't be -0.0). +! The second approach appears to be the best option for most +! simulations. Also note that the resulting direction is +! constant over the entire simulation domain; another code +! change will be required to relax this assumption. +!!! (recommended default value: user input required, or -270.0) + tabler_dir = -270.0 +! tabler_dir = 0.0 +! tabler_dir = 45.0 +! tabler_dir = 90.0 +! tabler_dir = 135.0 +! tabler_dir = 180.0 +! tabler_dir = 225.0 +! tabler_dir = 270.0 +! tabler_dir = 315.0 + +! You can make adjustments to the slopes of the Tabler surfaces +! using the 'slope_adjust' parameter. This factor is multiplied by +! the calculated Tabler equilibrium drift surface slope to get the +! simulated slope. So, for example, if you want the simulated +! slope to be 50% of what Tabler calculated, use a value of 0.5; a +! value of 1.5 would give half again steeper than Tabler's original +! model. +!!! (recommended default value: slope_adjust = 1.0) + slope_adjust = 1.0 + +! Define whether you want two-layer accounting for soft (movable) +! and hard (unmovable) layers (flag = 0.0 = off, flag = 1.0 = on). +!!! (recommended default value: twolayer_flag = 1.0) +! twolayer_flag = 0.0 + twolayer_flag = 1.0 + +! Define whether you want the upwind boundaries to have zero +! incoming transport flux, or the equilibrium transport flux. +! bc_flag = 0.0 corresponds to a zero flux, and bc_flag = 1.0 +! corresponds to the equilibrium flux. +!!! (recommended default value: bc_flag = 0.0) + bc_flag = 0.0 + +! Input the height of the wind and rh observations. The model does +! not need an air temperature height and is not very sensitive to +! the relative humidity observation height. +!!! (recommended default value: ht_windobs = user input required) +!!! (recommended default value: ht_rhobs = user input required) + ht_windobs = 10.0 + ht_rhobs = 10.0 + +! Snow density used in SnowTran-3D if you are running SnowTran-3D +! without SnowPack. This is required because without SnowPack, +! SnowTran-3D does not know what the snow density is. It should +! be defined to be a typical snow density for your simulation +! domain. This is also used to initialize the SWE if you have +! set snow_d_init_const (see below) to be non-zero. +!!! (recommended default value: ro_snow = 300.0) + ro_snow = 300.0 + +! Define the initial snow-depth distributions. +!!! (recommended default value: snow_d_init_const = 0.0) + snow_d_init_const = 0.0 + +! Define whether the simulation will use a surface topography +! equal to ground topography (topoflag = 0.0), or equal to the +! snow surface (topoflag = 1.0). +!!! (recommended default value: topoflag = 1.0) + topoflag = 1.0 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! ENBAL-2D MODEL SETUP +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Identify whether the surface energy balance calculation for +! this simulation will include a non-zero conduction term +! (icond_flag = 0 = no conduction, 1 = conduction). Note that +! icond_flag = 1 requires running the multi-layer snowpack model +! with at least 2 snow layers. +!!! (recommended default value: icond_flag = 0) + icond_flag = 0 +! icond_flag = 1 + +! Define the albedo for a melting snowcover under the forest +! canopy. This allows the user to control, to some degree, the +! melt rates in the forests. Note that adjusting the gap-frac +! parameter is also an effective way to do this. The non-melting +! snow albedo is set to 0.8 in the code. +!!! (recommended default value: albedo_snow_forest = 0.45) + albedo_snow_forest = 0.45 + +! Define the albedo for a melting snowcover in non-forested areas. +! This allows the user to control, to some degree, the melt +! rates in non-forested areas. The non-melting snow albedo is +! set to 0.8 in the code. +!!! (recommended default value: albedo_snow_clearing = 0.60) + albedo_snow_clearing = 0.60 + +! Define the albedo for a glacier surface (dry and melting). +!!! (recommended default value: albedo_glacier = 0.40) + albedo_glacier = 0.40 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! SNOWPACK MODEL SETUP +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Define whether static-surface (non-blowing snow) sublimation will +! be included in the model calculations (sfc_sublim_flag = 1.0). +! To turn this off, set sfc_sublim_flag = 0.0. If sfc_sublim_flag +! is turned on, the latent heat flux (Qe) calculated in ENBAL is +! used to add/remove snow from the snowpack. +!!! (recommended default value: sfc_sublim_flag = 1.0) + sfc_sublim_flag = 1.0 + +! Define whether this is going to be a multi-layer snowpack run +! (multilayer_snowpack = 1, else 0). This option does not work +! with the history restart or data assimilation functions. +!!! (recommended default value: multilayer_snowpack = 0) +! multilayer_snowpack = 1 + multilayer_snowpack = 0 + +! Define the time since last snowfall threshold, in hours. This +! sets how long you have to go without snow precipitation to +! start a new snow layer in the multi-layer snowpack model. +! Periods with zero snowfall at time gaps less than this threshold +! do not create a new snow layer. To force a single layer using +! this parameter, set tsls_threshold >= the number of hours in +! the simulation. Note the equation below can be used to +! calculate this number. +! tsls_threshold = dt * real(max_iter) / 3600.0 +!!! (recommended default value: tsls_threshold = 24.0) +! tsls_threshold = 1.0 + tsls_threshold = 24.0 +! tsls_threshold = 12.0 +! tsls_threshold = 144.0 +! tsls_threshold = 8000.0 + +! Define the maximum number of snow layers you want to allow in +! the multi-layer snowpack model. Note that nz_max in the +! snowmodel.inc file must be at least 1 greater than max_layers. +! So, if you want to run the multi-layer snowpack model with a +! single snow layer, set nz_max = 2. If you want to run the +! original single-layer snowpack model, you can set nz_max = 1 in +! snowmodel.inc. +!!! (recommended default value: max_layers = 6) +! max_layers = 12 +! max_layers = 6 + max_layers = 1 + +! Define the minimum snow layer thickness (m) for the multi-layer +! snowpack model. 0.001 is an appropriate number. It is also +! okay to set this to be 0.0 which will allow the tracking of +! thin layers in the simulation. +!!! (recommended default value: dz_snow_min = 0.001) + dz_snow_min = 0.001 +! dz_snow_min = 0.01 +! dz_snow_min = 0.0 + +! For multi-year simulations, sometimes it is desirable to zero +! out the snow cover arrays on a certain summer date. For +! example, to prevent glaciers from forming. Input that date +! here, in the form: mmddhh. I recommend setting this to be the +! last time step of the year in a multi-year simulation. For a +! simulation that starts on YYYY 09 01, with a 3-hour time step, +! 090100 is the last time step of the year (the first one is +! 090103). For the same simulation with a 1-day time step, +! 083112 is the last time step of the year (the first one is +! 090112). Set this to 999999 if you would like to disable this +! feature. +!!! (recommended default value: izero_snow_date = 090100 or 083112, +!!! depending on the model configuration details) +! izero_snow_date = 999999 + izero_snow_date = 090100 +! izero_snow_date = 083112 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! SEAICE MODEL SETUP +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Define whether you want to simulate snow on sea ice. A land-only +! run (seaice_run = 0.0) means any snow on ocean grid cells +! (vegtype.eq.24.0) will be set to zero. A sea-ice-only run +! (seaice_run = 1.0) means any snow on land grid cells +! (vegtype.ne.24.0) will be set to zero. For a combined land +! and sea-ice run, seaice_run = 2.0. For a sea-ice-only run +! with incremental remapping to handle the ice motion, seaice_run +! = 3.0; this option is no longer supported (see the notes in: +! /sm/misc_programs/Eulerian_seaice_incremental_remapper/ if you +! want to reimplement and run this option). seaice_run = 4.0 is +! a Lagrangian parcel-tracking sea-ice only simulation (no land) +! where the following is required: barnes_lg_domain = 1.0, +! n_stns_used = 1, and snowmodel_line_flag = 1.0. +!!! (recommended default value: seaice_run = 0.0) +! seaice_run = 4.0 + seaice_run = 0.0 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! PRINTING OUTPUT FILES +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! There are two kinds of GrADS .gdat output data files that the +! model is set up to automatically write out as part of the model +! simulation (see descriptions [1] and [2] below). GrADS +! control (.ctl), or data description, files are automatically +! created for any of the output files you elect to create. These +! .ctl files describe what is in the .gdat files and allow you to +! plot the outputs with GrADS (see: http://cola.gmu.edu/grads/). +! All of the .ctl files are written to the "ctl_files" directory, +! and they point to the .gdat file locations you define below. +! Note that any paths or directories that you list here must +! exist on your workstation (you have to make those directories +! before you start the model run). + +! The output file options are: + +![1] Individual data files for each sub-model (MicroMet, EnBal, +! SnowPack, SnowTran-3D, etc.). These typically have several +! output variables in them, so the files can be huge. In +! addition, these can only be written out at every model time +! step (e.g., you cannot write out daily data when you are +! running the model on hourly or 3-hourly time steps; to do +! that requires you to use the second output option described +! below). Also note that if you are saving with this option +! and running the data assimilation routines, during the +! second assimilation loop the code will write over the data +! that where written out in the first loop (so the first loop's +! data will be lost). I only use this output option for model +! development applications where I want to look at many +! interrelated variables and where I am typically +! troubleshooting problems with my model runs. I really do +! not recommend this output option except for special +! situations; maybe the multi-layer output file is an +! exception to this general rule, because output option 2) +! described below is not set up to handle multi-layer output +! variables. + +! For these files you have to define whether you want the data +! written out (print_name = 1.0) or if you do not want these +! files written out (print_name = 0.0), and the name of the +! output file. + +! MicroMet output file. +!!! (recommended default value: print_micromet = 0.0) +!!! (recommended default value: micromet_output_fname = +!!! outputs/micromet.gdat) + print_micromet = 0.0 + micromet_output_fname = outputs/micromet.gdat + +! SnowTran-3D output file. +!!! (recommended default value: print_snowtran = 0.0) +!!! (recommended default value: snowtran_output_fname = +!!! outputs/snowtran.gdat) + print_snowtran = 0.0 + snowtran_output_fname = outputs/snowtran.gdat + +! SnowTran-3D TABLER-SURFACE output files. There are two +! additional Tabler surface output files that can be output. + +! The first one is Tabler equilibrium surface distributions for +! each of the 8 Tabler directions (0, 45, 90, etc.), for the +! snow-free topographic distribution. These data distributions +! are saved with Tabler_1_flag = 1.0, and they are not saved +! with Tabler_1_flag = 0.0. You also have to define the path +! or directory you want this file saved in. +!!! (recommended default value: Tabler_1_flag = user input +!!! required) +!!! (recommended default value: tabler_sfc_path_name = outputs/) + Tabler_1_flag = 0.0 + tabler_sfc_path_name = outputs/ + +! The second one saves the Tabler equilibrium surface that was +! used at each time step. The file will be located according +! to "output_path_wo_assim" and "output_path_wi_assim" defined +! below, and the file name will be "tabler_sfcs_iter.gdat". So +! all that is required here is to define whether you want the +! data saved or not. Tabler_1_flag = 0.0 means don't save the +! data, and Tabler_1_flag = 1.0 means the data will be saved. +!!! (recommended default value: Tabler_1_flag = user input +!!! required) + Tabler_2_flag = 0.0 + +! EnBal output file. +!!! (recommended default value: print_enbal = 0.0) +!!! (recommended default value: enbal_output_fname = +!!! outputs/enbal.gdat) + print_enbal = 0.0 + enbal_output_fname = outputs/enbal.gdat + +! SnowPack output file. +!!! (recommended default value: print_snowpack = 0.0) +!!! (recommended default value: snowpack_output_fname = +!!! outputs/snowpack.gdat) + print_snowpack = 0.0 + snowpack_output_fname = outputs/snowpack.gdat + +! MultiLayer output file (s). print_multilayer = 1.0 +! prints a suite of multilayer variables to a single +! file called multilayer.gdat to the directory defined +! in 'multilayer_output_fname'. print_multilayer = 2.0 +! prints each of these variables to their own file +! located in the directories called 'output_path_wo_assim' +! and 'output_path_wi_assim' defined below. See +! snowmodel_main.f for a listing of the output variables. +!!! (recommended default value: print_multilayer = 0.0) +!!! (recommended default value: multilayer_output_fname = +!!! outputs/multilayer.gdat) + print_multilayer = 0.0 + multilayer_output_fname = outputs/multilayer.gdat + +![2] Individual data files for individual variables. These data +! outputs are controlled in the outputs_user.f subroutine. +! In the lines below you can define which of the most common +! variables you want to write out, and you can define the +! write interval in time-step units (e.g., for a 3-hour dt, +! a write interval of 8 time steps (print_inc = 8.0) will +! give you a data write at the end of each day). Note that +! this code will write the average, sum, or the instantanious +! value, depending on the variable of interest (see below). +! You have to define whether you want these kinds of data +! files to be written (print_user = 1.0) or not (print_user +! = 0.0). And you have to define the directory they will be +! written to. Two directories are required: one is for non- +! data assimilation outputs, and one is for data assimilation +! outputs. + +! Define whether you want to write individual files for each +! variable. +!!! (recommended default value: print_user = 1.0) + print_user = 1.0 + +! Define the print increment, in time-step units. +!!! (recommended default value: print_inc = 1.0 or 8.0) + print_inc = 1.0 +! print_inc = 8.0 + +! Define the directory (the path) where the data will be stored. +! This requires a path for "without" assimilation, and a path +! "with" assimilation. +!!! (recommended default value: +!!! output_path_wo_assim = user input required) +!!! output_path_wi_assim = user input required) + output_path_wo_assim = outputs/wo_assim/ + output_path_wi_assim = outputs/wi_assim/ + +! Individual data files can be output for each variable of +! interest. The code is set up to output 21 variables that +! are commonly used in SnowModel simulations. There are 9 +! empty variable names assigned for the user to add new +! variables of interest for their application. Listed below +! are the variable names as they are defined and used in the +! code, and the corresponding 4-character name that is used in +! the output file for that variable. + +! Define which variables you want to save by using a yes = y or +! no = n. + +! These data outputs are configured to mask out ocean points +! (vegtype.eq.24.0) if this is a land run (seaice_run = 0.0); +! mask out all land points (vegtype.ne.24.0) if this is an +! ocean/sea ice run (seaice_run = 1.0 or 3.0); and to not mask +! out anything if this is a combined land and sea ice run +! (seaice_run = 2.0). + +! If you want to do something different than this general output +! file setup, you can make changes to the outputs_user.f file. + +! VALUES AVERAGED OVER THE PERIOD. + +! air temperature (degrees C) +! 01 = tair(i,j) = Tair_grid(i,j) - 273.16 + print_var_01 = y + +! relative humidity (%) +! 02 = relh(i,j) = rh_grid(i,j) + print_var_02 = n + +! wind speed (m/s) +! 03 = wspd(i,j) = windspd_grid(i,j) + print_var_03 = n + +! incoming solar radiation reaching the surface (W/m2) +! 04 = qsin(i,j) = Qsi_grid(i,j) + print_var_04 = n + +! incoming longwave radiation reaching the surface (W/m2) +! 05 = qlin(i,j) = Qli_grid(i,j) + print_var_05 = n + +! emitted longwave radiation (W/m2) +! 06 = qlem(i,j) = Qle(i,j) + print_var_06 = n + +! albedo (0-1) +! 07 = albd(i,j) = albedo(i,j) + print_var_07 = n + +! wind direction (0-360, true N) +! 08 = wdir(i,j) = from uwind_grid(i,j) and vwind_grid(i,j) + print_var_08 = n + +! VALUES SUMMED OVER THE PERIOD. + +! water-equivalent precipitation (m/time_step) +! 09 = prec(i,j) = prec_grid(i,j) + print_var_09 = y + +! liquid precipitation (m/time_step) +! 10 = rpre(i,j) = rain(i,j) + print_var_10 = y + +! solid precipitation (m/time_step) +! 11 = spre(i,j) = sprec(i,j) + print_var_11 = y + +! snow-water-equivalent melt (m) +! 12 = smlt(i,j) = swemelt(i,j) + print_var_12 = n + +! static-surface sublimation (m) +! 13 = ssub(i,j) = swesublim(i,j) + print_var_13 = n + +! runoff from base of snowpack (m/time_step) +! 14 = roff(i,j) = runoff(i,j) + print_var_14 = n + +! snow-water-equivalent melt from glacier ice (m) +! 15 = glmt(i,j) = glacier_melt(i,j) + print_var_15 = n + +! VALUES SAVED AT THE END OF THE PERIOD. + +! snow depth (m) +! 16 = snod(i,j) = snow_depth(i,j) + print_var_16 = y + +! snow density (kg/m3) (if snod is zero, sden is undef) +! 17 = sden(i,j) = xro_snow(i,j) + print_var_17 = y + +! snow-water-equivalent depth (m) +! This is required if you are doing swe assimilation. +! 18 = swed(i,j) = swe_depth(i,j) + print_var_18 = y + +! summed snow precipitation during simulation year (m) +! This is required if you are doing swe assimilation. +! 19 = sspr(i,j) = sum_sprec(i,j) + print_var_19 = n + +! summed snow-water-equivalent melt during simulation year (m) +! This is required if you are doing swe assimilation. +! 20 = ssmt(i,j) = sum_swemelt(i,j) + print_var_20 = n + +! NEW VARIABLES ADDED TO THE OUTPUT DATA FILE OPTIONS. + +! cloud fraction (0-1) (averaged over the write period) +! 21 = cldf(i,j) = cloud_fraction_grid(i,j) + print_var_21 = n + +! These are extra variables that the user can add as needed. +! You have to modify the code in outputs_user.f to do the +! processing you want for these variables. + print_var_22 = n + print_var_23 = n + print_var_24 = n + print_var_25 = n + print_var_26 = n + print_var_27 = n + print_var_28 = n + print_var_29 = n + print_var_30 = n + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/micromet_module.F90 b/lis/surfacemodels/land/subLSM/snowmodel/micromet_module.F90 new file mode 100644 index 000000000..fb48073f2 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/micromet_module.F90 @@ -0,0 +1,430 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +module micromet_module +!BOP +! +! !MODULE: micromet_module +! +! !DESCRIPTION: +! This module contains the key MicroMet routines for each +! of the different meteorological forcing fields (e.g., +! temperature, etc.). +! +! The routines in this module include: +! +! \begin{description} +! \item[micromet_relhum] +! micromet_relhum ... +! \end{description} +! +! !REVISION HISTORY: +! 01 Mar 2006: G. Liston and K. Elder; MicroMet routine authors +! 16 Feb 2021: K. Arsenault; Added MicroMet routines to LIS +! 03 Feb 2022: K. Arsenault; Added MicroMet's solar routines +! +!EOP + implicit none + +contains + +!BOP +! +! !ROUTINE: micromet_relhum +! \label{micromet_relhum} +! +! !DESCRIPTION: +! This routine calculates relative humidity (rh; %) for given +! specific humidity (sphm; kg/kg) and pressure (pres; Pa) +! +! !INTERFACE: + subroutine micromet_relhum(nx, ny, tair, sphm, pres, rh) + + implicit none + + integer, intent(in) :: nx + integer, intent(in) :: ny + real, intent(in) :: tair(nx,ny) + real, intent(in) :: sphm(nx,ny) + real, intent(in) :: pres(nx,ny) + real, intent(out) :: rh(nx,ny) + + integer :: i, j + real :: Tf ! Temperature at freezing point + real :: e ! vapor pressure + real :: es ! saturation vapor pressure + real :: A, B, C ! Coeffs for sat vapor pressure over water + +! ______________________________________________________________ + + Tf = 273.16 + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. +! Over water. + A = 6.1121 * 100.0 + B = 17.502 + C = 240.97 +! Over ice. +! A = 6.1115 * 100.0 +! B = 22.452 +! C = 272.55 + + do j = 1, ny + do i = 1, nx + +! Compute the saturation water vapor pressure for given air temperature. +! CALL SATVAPOR(es,tair,Tf) + es = A * exp((B * (Tair(i,j) - Tf))/(C + (Tair(i,j) - Tf))) + +! Compute the water vapor pressure from the specific humidity (kg/kg) +! and pressure (Pa). + e = sphm(i,j) * pres(i,j) / (0.622 + 0.378 * sphm(i,j)) + +! Relative humidity (%). + rh(i,j) = 100.0 * (e / es) + rh(i,j) = min(100.0,rh(i,j)) + rh(i,j) = max(0.0,rh(i,j)) + + enddo + enddo + + end subroutine micromet_relhum + +!BOP +! +! !ROUTINE: micromet_snowfall +! \label{micromet_snowfall} +! +! !DESCRIPTION: +! This routine discriminates the amount of snowfall +! based on total precipitation, 2m air temperature +! and the snow fraction method based on the option +! selected in snowmodel.par +! +! !INTERFACE: + subroutine micromet_snowfall(nx, ny, snowfall_frac, prec, tair, sprec) + + implicit none + + integer, intent(in) :: nx + integer, intent(in) :: ny + real, intent(in) :: snowfall_frac ! Snowfall method option + real, intent(in) :: prec(nx,ny) ! Total precip + real, intent(in) :: tair(nx,ny) ! 2m Air temp + real, intent(out) :: sprec(nx,ny) ! Snowfall + + real :: Tair_C(nx,ny) ! Temperature in Celsius + real :: Tf ! Temperature at freezing point + + integer :: i,j + real :: snowfall_frac_1, snowfall_frac_2, snowfall_frac_3 + real :: Tair_C_center + real :: slope, b +! ______________________________________________________________ + + Tf = 273.15 + + do j = 1, ny + do i = 1, nx + + Tair_C(i,j) = Tair(i,j) - Tf + +! Option 1: Auer (1974); a rain-snow threshold at +2.0 C. + if (snowfall_frac.eq.1.0) then + + if (Tair_C(i,j).lt.2.0) then + snowfall_frac_1 = 1.0 + else + snowfall_frac_1 = 0.0 + endif + sprec(i,j) = snowfall_frac_1 * prec(i,j) + +! Option 2: Dai, A. (2008): Temperature and pressure dependenxe of the +! rain-snow phase transition over land and ocean, Geophys. +! Res. Lett., 35, L12802, doi:10.1029/2008GL033295. +! In this implementation, G. Liston clipped Dai's values to +! 0 and 1. + elseif (snowfall_frac.eq.2.0) then + snowfall_frac_2 = - 0.482292 * & + (tanh(0.7205 * (Tair_C(i,j) - 1.1662)) - 1.0223) + if (Tair_C(i,j).lt.-4.0) then + snowfall_frac_2 = 1.0 + elseif (Tair_C(i,j).gt.6.0) then + snowfall_frac_2 = 0.0 + endif + sprec(i,j) = snowfall_frac_2 * prec(i,j) + +! Option 3: Glen's linear approximation to Dai (2008). This plots right +! over the top of Dai, between frac = 0.1 and 0.9. + elseif (snowfall_frac.eq.3.0) then + +! Define where you want the center temperature to be when frac = 0.5. + Tair_C_center = 1.1 +! Define the slope of the line. + slope = -0.30 +! Calculate the intercept (the 0.5 is the frac for Tair_C_center). + b = 0.5 - slope * Tair_C_center + +! Solve the equation in the form y = m*x + b + snowfall_frac_3 = slope * Tair_C(i,j) + b + snowfall_frac_3 = max(0.0,snowfall_frac_3) + snowfall_frac_3 = min(1.0,snowfall_frac_3) + sprec(i,j) = snowfall_frac_3 * prec(i,j) + + endif + + enddo + enddo + + end subroutine micromet_snowfall + + +!BOP +! +! !ROUTINE: micromet_wind +! \label{micromet_wind} +! +! !DESCRIPTION: +! This routine calculates the wind distribution, for both +! U- and V-wind gridded fields, and the gridded wind speed +! and wind direction fields. +! Options selected in snowmodel.par +! +! !INTERFACE: + subroutine micromet_wind( nx, ny, deltax, deltay, & + uwind_grid,vwind_grid,slopewt,curvewt,& + curvature,slope_az,terrain_slope,windspd_grid,& + winddir_grid,windspd_flag,winddir_flag,windspd_min,& + vegtype,forest_LAI,calc_subcanopy_met,vegsnowd_xy,& + topo,wind_lapse_rate,curve_len_scale) + + use LIS_mpiMod + use snowmodel_lsmMod, only : snowmodel_struc + + implicit none + + integer, intent(in) :: nx + integer, intent(in) :: ny + real, intent(in) :: deltax ! grid increment in x + real, intent(in) :: deltay ! grid increment in y + + ! Output wind fields + real, intent(inout) :: uwind_grid(nx,ny) ! output U-wind values + real, intent(inout) :: vwind_grid(nx,ny) ! output V-wind values + real, intent(inout) :: winddir_grid(nx,ny) ! output wind direction + real, intent(inout) :: windspd_grid(nx,ny) ! output wind speed + real, intent(inout) :: windspd_flag + real, intent(inout) :: winddir_flag + + ! Input parameters + real, intent(in) :: curvature(nx,ny) + real, intent(in) :: slope_az(nx,ny) + real, intent(in) :: terrain_slope(nx,ny) + real, intent(in) :: vegtype(nx,ny) + real, intent(in) :: vegsnowd_xy(nx,ny) + real, intent(in) :: topo(nx,ny) + + ! User-specified inputs: + real, intent(in) :: slopewt ! wind model slope weight + real, intent(in) :: curvewt ! wind model curvature weight + real, intent(in) :: windspd_min ! Min wind speed threshold (set by user) + real, intent(in) :: curve_len_scale ! length scale for curvature calculation + real, intent(in) :: wind_lapse_rate + real, intent(in) :: calc_subcanopy_met + real, intent(in) :: forest_LAI(5) + + integer :: i, j + integer :: ierr + integer :: loops_windwt_smoother + real :: topo_ref_grid(nx,ny) + real :: delta_topo,alfa1,alfa2 + real :: u_sum, v_sum + real :: pi,deg2rad,rad2deg + +! Initialize any local fields: + topo_ref_grid = 0.0 + +! Define the required constants. + pi = 2.0 * acos(0.0) + deg2rad = pi / 180.0 + rad2deg = 180.0 / pi + +! If desired, impose a wind speed increase with elevation. Here +! the wind_lapse_rate = the wind speed increase per 1-km elevation +! gain. The adjustment is patterned after the precipitation- +! elevation adjustment. +! Note: topo_ref_grid here comes from the precipitation adjustment. + if (wind_lapse_rate.ne.0.0) then + alfa1 = (wind_lapse_rate - 1.0) / (1.0 + wind_lapse_rate) + ! Convert to m-1. + alfa1 = alfa1 / 1000.0 + do j=1,ny + do i=1,nx + delta_topo = topo(i,j) - topo_ref_grid(i,j) + ! Impose some limits to the adjustment. + delta_topo = min(delta_topo,1800.0) + alfa2 = alfa1 * delta_topo + uwind_grid(i,j) = uwind_grid(i,j) * (1.0 + alfa2)/(1.0 - alfa2) + vwind_grid(i,j) = vwind_grid(i,j) * (1.0 + alfa2)/(1.0 - alfa2) + enddo + enddo + endif + +! Convert these u and v components to speed and directions. + do j=1,ny + do i=1,nx +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(uwind_grid(i,j)).lt.1e-10) then + uwind_grid(i,j) = 1e-10 + endif + winddir_grid(i,j) = rad2deg * atan2(uwind_grid(i,j),vwind_grid(i,j)) + if (winddir_grid(i,j).ge.180.0) then + winddir_grid(i,j) = winddir_grid(i,j) - 180.0 + else + winddir_grid(i,j) = winddir_grid(i,j) + 180.0 + endif + + windspd_grid(i,j) = sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) + enddo + enddo + +! Modify the wind speed and direction according to simple +! wind-topography relationships. + call topo_mod_winds(nx,ny,winddir_grid,slopewt,curvewt,& + & windspd_grid,uwind_grid,vwind_grid,curvature,slope_az,& + & terrain_slope,vegtype,forest_LAI,calc_subcanopy_met,& + & vegsnowd_xy,curve_len_scale,deltax,deltay) + +! Avoid problems of zero (low) winds (for example, turbulence +! theory, log wind profile, etc., says that we must have some +! wind. Thus, some equations blow up when the wind speed gets +! very small). + do j=1,ny + do i=1,nx + if (windspd_grid(i,j).lt.windspd_min) then + windspd_grid(i,j) = windspd_min + uwind_grid(i,j) = (- windspd_grid(i,j)) * & + & sin(deg2rad*winddir_grid(i,j)) + vwind_grid(i,j) = (- windspd_grid(i,j)) * & + & cos(deg2rad*winddir_grid(i,j)) + endif + enddo + enddo + +! Find the maximum wind speed in the domain, and the +! domain-averaged wind direction. + windspd_flag = 0.0 + u_sum = 0.0 + v_sum = 0.0 + do j=1,ny + do i=1,nx + windspd_flag = max(windspd_flag,windspd_grid(i,j)) + u_sum = u_sum + uwind_grid(i,j) + v_sum = v_sum + vwind_grid(i,j) + enddo + enddo + +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(u_sum, snowmodel_struc(1)%usum_glb, 1,& + MPI_REAL, MPI_SUM,& + LIS_mpi_comm, ierr) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(v_sum, snowmodel_struc(1)%vsum_glb, 1,& + MPI_REAL, MPI_SUM,& + LIS_mpi_comm, ierr) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(windspd_flag, snowmodel_struc(1)%windspdflg_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + + u_sum = snowmodel_struc(1)%usum_glb + v_sum = snowmodel_struc(1)%vsum_glb + windspd_flag = snowmodel_struc(1)%windspdflg_glb +#endif + +! NOTE: winddir_flag never gets used in any subsequent +! SnowModel submodels, like snowtran3d + u_sum = u_sum / real(nx*ny) + v_sum = v_sum / real(nx*ny) + +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(u_sum).lt.1e-10) then + u_sum = 1e-10 + endif + winddir_flag = rad2deg * atan2(u_sum,v_sum) + if (winddir_flag.ge.180.0) then + winddir_flag = winddir_flag - 180.0 + else + winddir_flag = winddir_flag + 180.0 + endif + + end subroutine micromet_wind + + +!BOP +! +! !ROUTINE: micromet_solar +! \label{micromet_solar} +! +! !DESCRIPTION: +! Calculate solar radiation and estiamte a cloud cover +! for SWdown inputs to SnowModel. +! +! Options selected in snowmodel.par +! +! !INTERFACE: +! subroutine micromet_solar( nx,ny,xhour,J_day,topo,rh_grid,Tair_grid,& +! xlat_grid,Qsi_grid,slope_az,terrain_slope,dt,vegtype,& +! forest_LAI,T_lapse_rate,Td_lapse_rate,& +! calc_subcanopy_met,gap_frac,cloud_frac_factor,UTC_flag,& +! xlon_grid,cloud_frac_grid) + +! use LIS_mpiMod +! use snowmodel_lsmMod, only : snowmodel_struc + +! implicit none + +! integer, intent(in) :: nx +! integer, intent(in) :: ny +! real, intent(in) :: xhour ! model decimal hour +! integer, intent(in) :: J_day ! model day of year + + ! Input parameters and fields +! real, intent(in) :: rh_grid(nx,ny) +! real, intent(in) :: Tair_grid(nx,ny) +! real, intent(in) :: xlat_grid(nx,ny) +! real, intent(in) :: xlon_grid(nx,ny) +! real, intent(in) :: topo(nx,ny) +! real, intent(in) :: slope_az(nx,ny) +! real, intent(in) :: terrain_slope(nx,ny) +! real, intent(in) :: vegtype(nx,ny) +! real, intent(in) :: cloud_frac_grid(nx,ny) +! real, intent(in) :: dt +! real, intent(in) :: forest_LAI +! real, intent(in) :: T_lapse_rate +! real, intent(in) :: Td_lapse_rate +! real, intent(in) :: calc_subcanopy_met +! real, intent(in) :: gap_frac +! real, intent(in) :: cloud_frac_factor +! real, intent(in) :: UTC_flag + + ! Output SWdown fields +! real, intent(inout) :: Qsi_grid(nx,ny) ! output SWdown values + +! end subroutine micromet_solar + +end module micromet_module + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/dataassim_user.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/dataassim_user.f90 new file mode 100755 index 000000000..d5e20a102 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/dataassim_user.f90 @@ -0,0 +1,1958 @@ +! dataassim_user.f90 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! subroutine DATAASSIM_USER does the SWE assimilation. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine DATAASSIM_USER(nx,ny,icorr_factor_index,& + & corr_factor,max_iter,deltax,deltay,xmn,ymn,nobs_dates,& + & print_inc,iday_init,imonth_init,iyear_init,dt,& + & output_path_wo_assim,xhour_init) + +! Perform the required correction (precipitation and melt) factor +! calculations. To run the data assimilation routines requires +! additional model inputs to be added here (inputs in addition +! to those in the snowmodel.par file). Then you must recompile +! the code before running it. + +! This program works when you have data at one or many points +! (many individual grid cells), for one or more times. And for +! data (e.g., average swe) over areas of grid cells; there can be +! many of these areas, at many different times. + +! The input (swe) data file is assumed to be in the directory: +! /snowmodel/swe_assim/. See below for the details of how this +! file is to be configured. + +! The data assimilation produces a couple of extra files the user +! can look at to study what the model did with the input data +! file (fname_sweobs) that was provided. First, there is a text +! file written to /snowmodel/swe_assim/ that provides a summary +! of the calculations that were done (see unit=77 in the code +! below for what is written to this file). Second, there is a +! copy of the precipitation correction surfaces that were +! generated. This is also placed in /snowmodel/swe_assim/, the +! file is a GrADS file (called corr_factor.gdat), and there is +! also a corr_factor.ctl there that can be modified to fit the +! current simulation. The data layers in corr_factor.gdat arec +! structured as follows: +! The number of layers equals the total number of observation +! times that were assimilated, plus the number of years in the +! assimilation. The order is: the correction surface (cf) for +! the time between the start of the simulation and observation +! time 1 in year 1, the cf for the time between obs time 1 in +! year 1 and obs time 2 in year 1, etc., then a cf==1.0 for the +! time between the last obs time and the end of year 1 (or the +! end of the simulation for a 1-year run). Then this order +! repeats for the rest of the years of the simulation. In the +! GrADS control file (corr_factor.ctl) these layers are assumed +! to correspond to different times in the data file (although +! the actual time increment defined in the .ctl file is not +! really relevant: for example, t=1 corresponds to the cf for +! obs 1, t=2 is for obs 2, t=3 is for the time between the last +! obs time and the end of year 1, t=4 is for the obs 1 in year +! 2, etc.). + + use snowmodel_inc + implicit none + + real deltax,deltay,beta,areas_flag,print_inc,dt,xhour_init + real sprec_ratio(max_obs_dates),smelt_ratio(max_obs_dates) + real corr_factor(nx_max,ny_max,max_obs_dates) + real areas_mask(nx_max,ny_max) + + double precision xmn,ymn + double precision xstn(nx_max*ny_max),ystn(nx_max*ny_max) + + integer icorr_factor_index(max_time_steps) + integer iobs_rec(max_obs_dates) + integer nobs_dates,nx,ny,max_iter,local_assim_flag,iday_init,& + & imonth_init,iyear_init,nyear,nyears,nobs_total,nobs_total_cfi + + character*89 fname_swed,fname_sspr,fname_ssmt + character*80 fname_sweobs + character*80 fname_sweobs_barnes_mask + + character*80 output_path_wo_assim + integer trailing_blanks,i_len_wo + integer i,j + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! BEGIN USER EDIT SECTION. +! BEGIN USER EDIT SECTION. + +! Define how many years there are in this simulation. Note that +! these are SnowModel simulation years. So, for example, year +! 1 might be 1 Sep 2007 - 31 Aug 2008, and year 2 might be +! 1 Sep 2008 - 31 Aug 2009, etc. +! NOTE: this is now put in the first line of the swe assimilation +! input file (in 'fname_sweobs' below). +! nyears = 20 +! nyears = 1 + +! A single data file describes the observation information that +! will be used in the data assimilation. This file contains the +! following information in the following format. The id can be +! any number, x and y are easting and northing in m, and swe is +! in m). + +! total_number_of_observation_dates_for_this_year +! iyr imo idy (for this observation date) +! number_of_stations_for_this_observation_date +! id x y swe +! id x y swe +! id x y swe +! iyr imo idy (for this observation date) +! number_of_stations_for_this_observation_date +! id x y swe +! id x y swe + +! For example: + +! 2 +! 2014 3 15 +! 3 +! 101 3456.7 23677.4 0.42 +! 102 3556.3 25079.3 0.52 +! 103 3106.2 29089.3 0.59 +! 2014 4 1 +! 2 +! 101 3456.7 23677.4 0.48 +! 103 3106.2 29089.3 0.62 + +! Then this repeats for each year of the assimilation (the input +! file looks like the above for a single-year run, and for +! multi-year runs the data for each following year is just +! stacked on top of the previous year). The example below is +! for a two-year assimilation run. +! NOTE: the first '2=nyears' is because this is two-year run (if +! this were a 1-year run, this would be a 1, etc.). + +! 2 +! 2 +! 2014 3 15 +! 3 +! 101 3456.7 23677.4 0.42 +! 102 3556.3 25079.3 0.52 +! 103 3106.2 29089.3 0.59 +! 2014 4 1 +! 2 +! 101 3456.7 23677.4 0.48 +! 103 3106.2 29089.3 0.62 +! 1 +! 2015 3 25 +! 2 +! 101 3456.7 23677.4 0.23 +! 102 3556.3 25079.3 0.32 + +! For the run where you have years with no data to assimilate, +! and some years with data to assimilate, the code still +! requires a "total_number_of_observation_dates_for_this_year" +! line for each year. So, if you have a year with no data, this +! must be set to be 0 (zero). If this is 0, the code sets the +! correction factor to equal 1.0 for that simulation year, and +! no adjustments are made to the precipitation for that year. +! For example, if the first two, and fourth, years of a five- +! year run have no data to assimilate, your input file would +! look like: + +! 5 +! 0 +! 0 +! 1 +! 2014 3 15 +! 3 +! 101 3456.7 23677.4 0.42 +! 102 3556.3 25079.3 0.52 +! 103 3106.2 29089.3 0.59 +! 0 +! 1 +! 2015 3 25 +! 2 +! 101 3456.7 23677.4 0.23 +! 102 3556.3 25079.3 0.32 + +! Provide the name of the data file that contains the observed swe +! information (as described above). This can no longer be +! changed (defining it this way allows the error checking to be +! done). + fname_sweobs = 'swe_assim/swe_obs.dat' + +! Define the file names of the swe depth (swed), annual summed snow +! precipitation (sspr), and annual summed snowmelt (ssmt) outputs +! from the first iteration of the data assimilation run. In this +! implementation of the data assimilation code, I have assumed +! that the output files are those created by outputs_user.f, +! where there is an individual file for each variable. +! NOTE: in the latest code version these paths have already been +! defined in the snowmodel.par file. +! fname_swed = 'outputs/wo_assim/swed.gdat' +! fname_sspr = 'outputs/wo_assim/sspr.gdat' +! fname_ssmt = 'outputs/wo_assim/ssmt.gdat' + i_len_wo = 80 - trailing_blanks(output_path_wo_assim) + fname_swed = output_path_wo_assim(1:i_len_wo)//'swed.gdat' + fname_sspr = output_path_wo_assim(1:i_len_wo)//'sspr.gdat' + fname_ssmt = output_path_wo_assim(1:i_len_wo)//'ssmt.gdat' + +! THE PARAMETERS BELOW ARE RARELY CHANGED, UNLESS YOU ARE DOING AN +! AREAS ASSIMILATION (INSTEAD OF ASSIMILATING POINT DATA). + +! Beta controls the interpolation distance weights. Beta = 1.0 +! will give you a very smooth field, and correction factor +! distributions that may not produce swe's that exactly match +! the observations. Beta << 1.0 will give you correction factor +! fields that go right through the data. If you just have one +! data point/area, beta is not used. + beta = 1.0 +! beta = 0.1 +! beta = 0.5 + +! Define whether this simulation will be processing areas (data +! within groups of grid cells: areas_flag = 1.0), or points +! (single grid cells: areas_flag = 0.0). Note that if you have +! a combination of areas and points, you have to use the areas +! option and treat each point like a single-grid-cell (small) +! area. + areas_flag = 0.0 +! areas_flag = 1.0 + +! If this is an areas simulation, open and read in the areas mask +! data. Note that here I assume that the area mask is a nx by ny +! file with undef values everywhere except at the area 'stations'. +! And that each 'station' area is given a 1.0, 2.0, etc. that +! corresponds to the order of the station listing in the 'station' +! data input file (the first 'station' listed has mask value = 1.0, +! the second listed has mask value = 2.0, etc. + if (areas_flag.eq.1.0) then +! open(63,file= +! & '../1_topo_vege/8_mk_glac_front_mask/seals_fjord_mask.gdat', +! & form='unformatted',access='direct',recl=4*nx*ny) +! read(63,rec=1) ((areas_mask(i,j),i=1,nx),j=1,ny) +! If you have two masks for two different observation dates, then +! do something like the following. +! open(63,file='swe_assim/zack_obs_mask.gdat', +! & form='unformatted',access='direct',recl=4*nx*ny) +! read(63,rec=1) ((areas_mask(i,j,1),i=1,nx),j=1,ny) +! read(63,rec=2) ((areas_mask(i,j,2),i=1,nx),j=1,ny) + endif + +! Define whether this simulation is going to restrict the +! assimilation influence to some local area surrounding each +! data point that is assimilated. This was implemented for +! ANWR simulations where we only had observations in a corner +! of the simulation domain and I didn't want the corrections +! to extend too far outside that local observation area. So, +! this is an example of what can be done, and it is not written +! for general application. If you want to do something similar, +! the associated subroutine can be edited for your specific +! simulation of interest. For yes, local_assim_flag = 1, for +! no, local_assim_flag = 0. + local_assim_flag = 0 + +! Identify the file that contains the local data assimilation +! mask. This is only used if local_assim_flag = 1. + fname_sweobs_barnes_mask = & + & '../swe_obs/2014/barnes/obs.gridded.gdat' + +! END USER EDIT SECTION. +! END USER EDIT SECTION. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Open the swe input file. + open (unit=61,file=fname_sweobs) + +! Read in the number of years this assimilation will process. + read(61,*) nyears + +! LOOP THROUGH THE YEARS IN THE SIMULATION. + do nyear=1,nyears + +! Run the data assimilation routines. + call data_assimilation(nx,ny,deltax,deltay,beta,& + & areas_flag,sprec_ratio,smelt_ratio,corr_factor,& + & areas_mask,xmn,ymn,xstn,ystn,nobs_dates,iobs_rec,& + & local_assim_flag,fname_swed,fname_sspr,fname_ssmt,& + & fname_sweobs,fname_sweobs_barnes_mask,iday_init,& + & imonth_init,iyear_init,nyear,nobs_total,print_inc,& + & nyears,dt,max_iter,xhour_init) + +! Build an array indicating the appropriate correction factor to +! use at any given time during the simulation. What this does +! is define an index array that contains the record number that +! gets used at every model time step during the second model run +! loop. This record number corresponds to the record (krec) of +! the corr_factor(i,j,krec) array that was generated and saved +! in the subroutine above. + call corr_factor_index(nobs_dates,icorr_factor_index,& + & iobs_rec,max_iter,sprec_ratio,smelt_ratio,print_inc,& + & iday_init,imonth_init,iyear_init,nyear,nobs_total_cfi,& + & nyears) + + enddo + + return + end SUBROUTINE DATAASSIM_USER +! end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine data_assimilation(nx,ny,deltax,deltay,beta,& + & areas_flag,sprec_ratio,smelt_ratio,corr_factor,& + & areas_mask,xmn,ymn,xstn,ystn,nobs_dates,iobs_rec,& + & local_assim_flag,fname_swed,fname_sspr,fname_ssmt,& + & fname_sweobs,fname_sweobs_barnes_mask,iday_init,& + & imonth_init,iyear_init,nyear,nobs_total,print_inc,& + & nyears,dt,max_iter,xhour_init) + + use snowmodel_inc + implicit none + + real deltax,deltay,undef,dn,beta,areas_flag,swe_count,cf_min,& + & print_inc,dt,xhour_init + real sprec_ratio(max_obs_dates),smelt_ratio(max_obs_dates) + real corr_factor(nx_max,ny_max,max_obs_dates) + real swe_tmp(nx_max,ny_max),sum_sprec_tmp1(nx_max,ny_max),& + & sum_sprec_tmp2(nx_max,ny_max),grid(nx_max,ny_max),& + & areas_mask(nx_max,ny_max),sum_smelt_tmp1(nx_max,ny_max),& + & sum_smelt_tmp2(nx_max,ny_max) + real corr_factor_tmp(nx_max*ny_max),swe_obs(nx_max*ny_max),& + & swe_model(nx_max*ny_max),sumsprec_model(nx_max*ny_max),& + & delta_old(nx_max*ny_max),obsid(nx_max*ny_max),& + & sumsmelt_model(nx_max*ny_max),obsid_old(nx_max*ny_max),& + & delta_old_tmp(nx_max*ny_max) +! real corr_offset(nx_max*ny_max) + + double precision xmn,ymn + double precision xstn(nx_max*ny_max),ystn(nx_max*ny_max) + + integer iobs_rec(max_obs_dates) + integer ii(nx_max*ny_max),jj(nx_max*ny_max) + integer iobs_num,irec1,irec2,nobs_dates,nx,ny,i,j,ifill,& + & iobsint,k,nstns,nstns_old,kk,local_assim_flag,iiyr,iimo,& + & iidy,iobs_rec_tmp,iday_init,imonth_init,iyear_init,nyear,& + & krec,nobs_total,nyears,max_iter + + character*89 fname_swed,fname_sspr,fname_ssmt + character*80 fname_sweobs + character*80 fname_sweobs_barnes_mask + +! Perform some initialization steps. + if (nyear.eq.1) then + +! Define some of the constants and parameters used in the data +! assimilation. ifill should be = 1; in that case undef is not +! really used (so it does not have to be the same as defined +! in the .par file). + undef = -9999.0 + ifill = 1 + iobsint = 0 + +! Open a file to write some basic correction factor information. +! This just saves information that the user might want to look +! at. + open (unit=77,file='swe_assim/corr_factor.txt') + +! Open an output file for the correction factor array. + open(62,file='swe_assim/corr_factor.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + +! Initialize the number-of-observations counter. + nobs_total = 0 + + endif + +! Read the number of observation dates for this year. + read(61,*) nobs_dates + +! If you have observations for this year, generate the correction +! factors. For the case of no observations for this year, set +! the correction factor equal to 1.0. + if (nobs_dates.gt.0) then + +! Loop through the observation dates. + do iobs_num=1,nobs_dates + +! Increment the number-of-observations counter. + nobs_total = nobs_total + 1 + +! Read the date corresponding to this observation. + read(61,*) iiyr,iimo,iidy + +! Convert this date to the corresponding record number in the +! original SnowModel output files. Note that this has assumed +! that daily data files were written out since the start of +! the simulation. + call get_obs_record(iday_init,imonth_init,iyear_init,& + & iidy,iimo,iiyr,iobs_rec_tmp,print_inc,dt) + iobs_rec(iobs_num) = iobs_rec_tmp + +! For this observation date, read in the data describing the +! location and swe values for each observation. For areas +! simulations, xstn, and ystn correspond to the center of the +! area domain and they are not really used. + read(61,*) nstns + do k=1,nstns + read(61,*) obsid(k),xstn(k),ystn(k),swe_obs(k) + enddo + +! Convert the x and y locations to (ii,jj) locations. + do k=1,nstns + ii(k) = 1 + nint((xstn(k) - xmn) / deltax) + jj(k) = 1 + nint((ystn(k) - ymn) / deltay) + enddo + +! If you do a data assimilation run from start to finish, it is +! not required to close and reopen these files. But if you are +! doing a history restart then these files are no longer open +! so you must do this. What I do below works for both cases. + close (238) + close (239) + close (240) + +! Open the required inputs from the initial assimilation loop. +! Open swe depth (swe_depth). +! /outputs/wo_assim/swed.gdat is unit 238 in outputs_user.f +! Open sum snow precip (sum_sprec). +! /outputs/wo_assim/sspr.gdat is unit 239 in outputs_user.f +! Open sum snow melt (sum_smelt). +! /outputs/wo_assim/ssmt.gdat is unit 240 in outputs_user.f + open (238,file=fname_swed,& + & form='unformatted',access='direct',recl=4*1*nx*ny) + open (239,file=fname_sspr,& + & form='unformatted',access='direct',recl=4*1*nx*ny) + open (240,file=fname_ssmt,& + & form='unformatted',access='direct',recl=4*1*nx*ny) + +! Read the model output for the first observation time. + if (iobs_num.eq.1) then + irec1 = iobs_rec(iobs_num) + read(238,rec=irec1) ((swe_tmp(i,j),i=1,nx),j=1,ny) + read(239,rec=irec1) ((sum_sprec_tmp1(i,j),i=1,nx),j=1,ny) + read(240,rec=irec1) ((sum_smelt_tmp1(i,j),i=1,nx),j=1,ny) + +! For points, just pull the data at the appropriate grid cell. +! For areas, average the data over the masked out area for each +! 'station'. + do k=1,nstns + if (areas_flag.eq.0.0) then + swe_model(k) = swe_tmp(ii(k),jj(k)) + sumsprec_model(k) = sum_sprec_tmp1(ii(k),jj(k)) + sumsmelt_model(k) = sum_smelt_tmp1(ii(k),jj(k)) + elseif (areas_flag.eq.1.0) then + swe_model(k) = 0.0 + sumsprec_model(k) = 0.0 + sumsmelt_model(k) = 0.0 + swe_count = 0.0 + do j=1,ny + do i=1,nx + if (areas_mask(i,j).eq.obsid(k)) then +! The following is used if the mask changes with observation time. +! if (areas_mask(i,j,iobs_num).eq.obsid(k)) then + swe_count = swe_count + 1.0 + swe_model(k) = swe_model(k) + swe_tmp(i,j) + sumsprec_model(k) = sumsprec_model(k) +& + & sum_sprec_tmp1(i,j) + sumsmelt_model(k) = sumsmelt_model(k) +& + & sum_smelt_tmp1(i,j) + endif + enddo + enddo + swe_model(k) = swe_model(k) / swe_count + sumsprec_model(k) = sumsprec_model(k) / swe_count + sumsmelt_model(k) = sumsmelt_model(k) / swe_count + endif + enddo + endif + +! Read the model output for any additional observation times (irec1 +! = current obs time, irec2 = previous obs time). + if (iobs_num.gt.1) then + irec1 = iobs_rec(iobs_num) + irec2 = iobs_rec(iobs_num-1) + read(238,rec=irec1) ((swe_tmp(i,j),i=1,nx),j=1,ny) + read(239,rec=irec1) ((sum_sprec_tmp1(i,j),i=1,nx),j=1,ny) + read(239,rec=irec2) ((sum_sprec_tmp2(i,j),i=1,nx),j=1,ny) + read(240,rec=irec1) ((sum_smelt_tmp1(i,j),i=1,nx),j=1,ny) + read(240,rec=irec2) ((sum_smelt_tmp2(i,j),i=1,nx),j=1,ny) + +! For points, just pull the data at the appropriate grid cell. +! For areas, average the data over the masked out area for each +! 'station'. + do k=1,nstns + if (areas_flag.eq.0.0) then + swe_model(k) = swe_tmp(ii(k),jj(k)) + sumsprec_model(k) = sum_sprec_tmp1(ii(k),jj(k)) -& + & sum_sprec_tmp2(ii(k),jj(k)) + sumsmelt_model(k) = sum_smelt_tmp1(ii(k),jj(k)) -& + & sum_smelt_tmp2(ii(k),jj(k)) + elseif (areas_flag.eq.1.0) then + swe_model(k) = 0.0 + sumsprec_model(k) = 0.0 + sumsmelt_model(k) = 0.0 + swe_count = 0.0 + do j=1,ny + do i=1,nx + if (areas_mask(i,j).eq.obsid(k)) then +! The following is used if the mask changes with observation time. +! if (areas_mask(i,j,iobs_num).eq.obsid(k)) then + swe_count = swe_count + 1.0 + swe_model(k) = swe_model(k) + swe_tmp(i,j) + sumsprec_model(k) = sumsprec_model(k) + & + & sum_sprec_tmp1(i,j) - sum_sprec_tmp2(i,j) + sumsmelt_model(k) = sumsmelt_model(k) + & + & sum_smelt_tmp1(i,j) - sum_smelt_tmp2(i,j) + endif + enddo + enddo + swe_model(k) = swe_model(k) / swe_count + sumsprec_model(k) = sumsprec_model(k) / swe_count + sumsmelt_model(k) = sumsmelt_model(k) / swe_count + endif + enddo + endif + +! To avoid a divide by zero later on, make sure sumsprec_model and +! sumsmelt_model are not both zero. + do k=1,nstns + sumsprec_model(k) = sumsprec_model(k) + 1.0e-6 + enddo + +! Determine whether we will adjust the precipitation or melt. To +! do this, calculate the relative contributions of precipitation +! and melt inputs for this correction period. This can be +! different for each observation interval. Calculate the average +! over all of the stations/areas in the domain. + sprec_ratio(iobs_num) = 0.0 + smelt_ratio(iobs_num) = 0.0 + do k=1,nstns + sprec_ratio(iobs_num) = sprec_ratio(iobs_num) + & + & sumsprec_model(k) / (sumsprec_model(k)+sumsmelt_model(k)) + smelt_ratio(iobs_num) = smelt_ratio(iobs_num) + & + & sumsmelt_model(k) / (sumsprec_model(k)+sumsmelt_model(k)) + enddo + sprec_ratio(iobs_num) = sprec_ratio(iobs_num) / real(nstns) + smelt_ratio(iobs_num) = smelt_ratio(iobs_num) / real(nstns) + +! Initialize the delta swe variable. + if (iobs_num.eq.1) then + do k=1,nstns + delta_old(k) = 0.0 + enddo + else + do k=1,nstns + delta_old(k) = 0.0 + enddo + do k=1,nstns + do kk=1,nstns_old + if(obsid(k).eq.obsid_old(kk)) & + & delta_old(k) = delta_old_tmp(kk) + enddo + enddo +! write (77,*) +! do k=1,nstns +! write (77,*) 'k, delta_old(k)',k,100.*delta_old(k) +! enddo +! write (77,*) + endif + +! Calculate the correction factor to be used in the next model +! iteration. Let the correction factor equal 1.0 during +! periods where we have no swe observations. Also, note that the +! reason for the delta_old variable is to account for the fact +! that that delta will be fixed with the previous date correction +! time period. This is one of the things that allows the +! correction to be done in two model iterations. +! If sumsprec_model or sumsmelt_model are too small to be used in +! the assimilation (like less than 1 mm), set corr_factor_tmp = 1.0 +! so no adjustments are performed for this observation interval. + cf_min = 0.1 + do k=1,nstns + if (sprec_ratio(iobs_num).ge.smelt_ratio(iobs_num)) then + if (sumsprec_model(k).lt.1.0e-3) then + corr_factor_tmp(k) = 1.0 + else + corr_factor_tmp(k) = 1.0 + & + & (swe_obs(k) - swe_model(k) - delta_old(k)) / & + & sumsprec_model(k) + corr_factor_tmp(k) = max(cf_min,corr_factor_tmp(k)) + endif + else + if (sumsmelt_model(k).lt.1.0e-3) then + corr_factor_tmp(k) = 1.0 + else + corr_factor_tmp(k) = 1.0 + & + & (swe_model(k) - swe_obs(k) + delta_old(k)) / & + & sumsmelt_model(k) + corr_factor_tmp(k) = max(cf_min,corr_factor_tmp(k)) + endif + endif +! Save some information about the model calculations. +! write (77,*) '---' +! write (77,*) k,swe_obs(k) +! write (77,*) k,swe_model(k) +! write (77,*) k,delta_old(k) +! write (77,*) k,swe_obs(k)-swe_model(k)-delta_old(k) +! write (77,*) k,sumsprec_model(k) +! write (77,*) k,sumsmelt_model(k) +! write (77,*) k,corr_factor_tmp(k) +! write (77,*) '---' + +! Save some data from this observation time for use at the next +! observation time. + nstns_old = nstns + obsid_old(k) = obsid(k) + delta_old_tmp(k) = swe_obs(k) - swe_model(k) + enddo + +! Now that I have the correction factors calculated at each +! observation point, interpolate those over the simulation domain. + +! Use the barnes oi scheme to create the distribution. If there is +! only a single station, distribute those data uniformly over +! the domain. + if (nstns.ge.2) then + call get_dn(nx,ny,deltax,deltay,nstns,dn,iobsint) + +! Modify the size of dn. + dn = beta * dn + + call barnes_oi(nx,ny,deltax,deltay,xmn,ymn, & + & nstns,xstn,ystn,corr_factor_tmp,dn,grid,undef,ifill) + elseif (nstns.eq.1) then + call single_stn(nx,ny,nstns,corr_factor_tmp,grid) + endif + +! The following calculations are done if you want to implement the +! special case where you limit the data assimilation corrections +! to a certain area of your simulation domain. Edits to this +! subroutine will certainly be required to make it work for your +! specific application. This subroutine generates correction +! factors with 1.0's in places outside the local obs influences. + if (local_assim_flag.eq.1) then + call mk_local_cfs(nx,ny,undef,xmn,ymn,deltax,deltay,& + & fname_sweobs,fname_sweobs_barnes_mask,nobs_dates,& + & corr_factor_tmp,beta,iobsint,ifill,grid) + endif + +! Define the correction surface record that corresponds to this +! year and observation. + krec = nobs_total + (nyear - 1) + if (krec.gt.max_obs_dates) then + print *, 'max_obs_dates must be increased in snowmodel.inc' + print *, 'krec = ',krec,' max_obs_dates = ',max_obs_dates + stop + endif + +! Use the gridded output file to build the corr_factor array. + do j=1,ny + do i=1,nx + corr_factor(i,j,krec) = grid(i,j) + corr_factor(i,j,krec) = & + & max(cf_min,corr_factor(i,j,krec)) + enddo + enddo + +! Note that the interpolation scheme may have produced correction +! factors that do not produce exact matches with the +! observations (like happens with the case of having a single +! data point). If you are interested, calculate the difference +! between the exact value and the actual calculated value, and +! then write it out as done below. +! do k=1,nstns +! if (sprec_ratio(iobs_num).ge.smelt_ratio(iobs_num)) then +! corr_offset(k) = sumsprec_model(k) * +! & (corr_factor(ii(k),jj(k),iobs_num) - corr_factor_tmp(k)) +! else +! corr_offset(k) = sumsmelt_model(k) * +! & (corr_factor(ii(k),jj(k),iobs_num) - corr_factor_tmp(k)) +! endif +! enddo + +! Write some information to the text file. + write (77,*) & + & '**************************************************************' + +! write (77,*) ' sprec_ratio =',sprec_ratio(iobs_num), +! & ' smelt_ratio =',smelt_ratio(iobs_num) +! write (77,*) + + write (77,*) iiyr,iimo,iidy + write (77,*) ' sprec_ratio =',sprec_ratio(iobs_num) + write (77,*) ' smelt_ratio =',smelt_ratio(iobs_num) + write (77,*) + + do k=1,nstns +! write (77,*) k,' swe diff =', +! & 100.0*abs(swe_obs(k)-swe_model(k)),' SWE OBS =', +! & 100.0*swe_obs(k) +! write (77,*) 'sumsprec =',sumsprec_model(k)*100., +! & ' SWE MODEL =',swe_model(k)*100. +! write (77,*) 'iobs_num =',iobs_num, +! & ' CORR_FACTOR =',corr_factor_tmp(k) + + write (77,*) ' SWE OBS (cm) =',100.0*swe_obs(k) + write (77,*) ' SWE MODEL (cm) =',100.0*swe_model(k) + write (77,*) ' CORR_FACTOR =',corr_factor_tmp(k) + +!c write (77,*) 'corr_offset =',100.*corr_offset(k), +!c & ' ij',ii(k),jj(k) +!c write (77,*) ' delta_old =',100.*delta_old(k), +!c & ' corr fact used =',corr_factor(ii(k),jj(k),iobs_num) +! write (77,*) +! write (77,*) k,' sumsprec_model(k) =',sumsprec_model(k) +! write (77,*) k,' sumsmelt_model(k) =',sumsmelt_model(k) +! write (77,*) + enddo + + write (77,*) & + & '**************************************************************' + +! Write the output data to a grads file. + write(62,rec=krec) ((corr_factor(i,j,krec),i=1,nx),j=1,ny) + + enddo + +! Fill corr_factor with 1.0 for the period following the last obs +! date in the current year. This is also required for the history +! restart to work correctly. Without the history restart this was +! already done as part of the model initialization. + if (krec+1.gt.max_obs_dates) then + print *, 'max_obs_dates must be increased in snowmodel.inc' + print *, 'krec+1 = ',krec+1,' max_obs_dates = ',max_obs_dates + stop + endif + do j=1,ny + do i=1,nx + corr_factor(i,j,krec+1) = 1.0 + enddo + enddo + + write(62,rec=krec+1) ((corr_factor(i,j,krec+1),i=1,nx),j=1,ny) + +! The met, topo, and veg files must be closed for the next model +! iteration. + close (20) + close (37) + close (38) + + close (238) + close (239) + close (240) + + else + +! For the case of no observations for this year, set the correction +! factor equal to 1.0. + krec = nobs_total + nyear + if (krec.gt.max_obs_dates) then + print *, 'max_obs_dates must be increased in snowmodel.inc' + print *, 'krec = ',krec,' max_obs_dates = ',max_obs_dates + stop + endif + + do j=1,ny + do i=1,nx + corr_factor(i,j,krec) = 1.0 + enddo + enddo + + write(62,rec=krec) ((corr_factor(i,j,krec),i=1,nx),j=1,ny) + + endif + +! Create the GrADS .ctl (control) file to go with the GrADS +! .gdat corr_factor file that was generated by this model run. + call mk_cf_prec_ctl(nx,ny,deltax,deltay,xmn,ymn,dt, & + & iyear_init,imonth_init,iday_init,xhour_init,max_iter, & + & nobs_total,nyears) + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine corr_factor_index(nobs_dates,icorr_factor_index, & + & iobs_rec,max_iter,sprec_ratio,smelt_ratio,print_inc, & + & iday_init,imonth_init,iyear_init,nyear,nobs_total_cfi, & + & nyears) + + use snowmodel_inc + implicit none + + integer icorr_factor_index(max_time_steps) + + integer kk,istart,iend,nobs_dates,iter,max_iter,krec,nyear,& + & nobs_total_cfi,ioptn,julian_start,iiyr,julian_end,iday_init,& + & imonth_init,iyear_init,nyears + integer iobs_rec(max_obs_dates) + real sprec_ratio(max_obs_dates),smelt_ratio(max_obs_dates) + real print_inc + +! Initialize the number-of-observations counter. + if (nyear.eq.1) nobs_total_cfi = 0 + +! Build an array indicating the appropriate correction factor to +! use at each time step during the simulation. + if (nobs_dates.gt.0) then + +! Loop through the observation dates. + do kk=1,nobs_dates+1 + +! Increment the number-of-observations counter. + if (kk.le.nobs_dates) nobs_total_cfi = nobs_total_cfi + 1 + +! FIRST, FROM THE SIMULATION START UNTIL THE FIRST OBSERVATION, FOR +! EACH YEAR. + if (kk.eq.1) then + +! Here istart equals the first model time step of each year. + ioptn = 3 + call calndr (ioptn,iday_init,imonth_init,iyear_init,& + & julian_start) + +! Find the Julian day for this data record. + iiyr = iyear_init + (nyear - 1) + call calndr (ioptn,iday_init,imonth_init,iiyr,julian_end) + +! Calculate istart. + istart = 1 + (julian_end - julian_start) * nint(print_inc) + +! Here iend equals the model time step corresponding to the end of +! the first observation day. Take advantage of the data-file +! record that was calculated before. Convert from daily data +! output records to model time steps using print_inc. + iend = iobs_rec(kk) * nint(print_inc) + +! Define the corr_factor data array record. + krec = nobs_total_cfi + (nyear - 1) + +! Fill the index for each model time step. + do iter=istart,iend + if (sprec_ratio(kk).ge.smelt_ratio(kk)) then + icorr_factor_index(iter) = krec + else + icorr_factor_index(iter) = -krec + endif + enddo + +! SECOND, BETWEEN THE LAST OBSERVATION AND THE END OF THE SIMULATION. + elseif (kk.eq.nobs_dates+1) then + istart = iobs_rec(kk-1) * nint(print_inc) + 1 + +! Here iend equals the last time step in the year of interest. +! Find the Julian day for this data record. + iiyr = iyear_init + nyear + call calndr (ioptn,iday_init,imonth_init,iiyr,julian_end) + +! Calculate iend for this year. + iend = (julian_end - julian_start) * nint(print_inc) + iend = min(iend,max_iter) + +! Define the corr_factor data array record. + krec = nobs_total_cfi + nyear + +! Fill the index for each model time step. + do iter=istart,iend + icorr_factor_index(iter) = krec + enddo + +! THIRD, ANY PERIODS BETWEEN OBSERVATIONS. + else + istart = iobs_rec(kk-1) * nint(print_inc) + 1 + iend = iobs_rec(kk) * nint(print_inc) + +! Define the corr_factor data array record. + krec = nobs_total_cfi + (nyear - 1) + +! Fill the index for each model time step. + do iter=istart,iend + if (sprec_ratio(kk).ge.smelt_ratio(kk)) then + icorr_factor_index(iter) = krec + else + icorr_factor_index(iter) = -krec + endif + enddo + endif + enddo + + else + +! Create an array indes for the case of no observations for this +! year. Here istart equals the first model time step of each year. + ioptn = 3 + call calndr (ioptn,iday_init,imonth_init,iyear_init,& + & julian_start) + +! Find the Julian day for this data record. + iiyr = iyear_init + (nyear - 1) + call calndr (ioptn,iday_init,imonth_init,iiyr,julian_end) + +! Calculate istart. + istart = 1 + (julian_end - julian_start) * nint(print_inc) + +! Calculate iend for this year. + iiyr = iyear_init + nyear + call calndr (ioptn,iday_init,imonth_init,iiyr,julian_end) + iend = (julian_end - julian_start) * nint(print_inc) + iend = min(iend,max_iter) + +! Define the corr_factor data array record. + krec = nobs_total_cfi + nyear + +! Fill the index for each model time step. + do iter=istart,iend + icorr_factor_index(iter) = krec + enddo + + endif + +! SAVE A VERSION OF THE INDEX THAT THE USER CAN EASILY LOOK AT. + if (nyear.eq.nyears) then + print * + do iter=1,max_iter + write (77,*) iter,icorr_factor_index(iter) + enddo + print * + endif + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_local_cfs(nx,ny,undef,xmn,ymn,deltax,deltay,& + & fname_sweobs,fname_sweobs_barnes_mask,nobs_dates,& + & corr_factor_tmp,beta,iobsint,ifill,grid) + + use snowmodel_inc + implicit none + + integer nstns,k,nx,ny,i,j,ntstations,icount,nobs_dates,ifill, & + & iobsint,nstns2 + + real dummy,stnid,undef,deltax,deltay,beta,dn + real xmask(nx_max,ny_max),grid(nx_max,ny_max) + real corr_factor_tmp(nx_max*ny_max),cf_tmp2(nx_max*ny_max),& + & obsid(nx_max*ny_max) + + real var(nstns_max) + + double precision xmn,ymn + double precision yg(nx_max,ny_max),xg(nx_max,ny_max) + double precision xstn(nstns_max),ystn(nstns_max) + + character*80 fname_sweobs + character*80 fname_sweobs_barnes_mask + + print * + print *,'You are doing local assimilation, this requires' + print *,'an observation mask to have been generated before' + print *,'the model run and saved in the file called:' + print *,'fname_sweobs_barnes_mask' + print * + print *,'This was also not tested after some big changes to' + print *,'the data assimilation code. So I strongly suggest' + print *,'you make sure this is doing what you want when you' + print *,'first start using it.' + print * + stop + if (nobs_dates.gt.1) then + print *,'THIS HAS NOT BEEN MADE TO WORK WITH MORE THAN' + print *,'ONE OBS TIME.' + stop + endif + print * + +! Save the correction factors for the local-influence assimilation +! scheme. + open (unit=78,file='swe_assim/cf.txt') + do k=1,nstns + write (78,*) corr_factor_tmp(k) + enddo + close (78) + +! These are the obs and correction factors calculated from the +! first loop in SnowModel. + open (721,file=fname_sweobs) + open (731,file='swe_assim/cf.txt') + + read (721,*) nstns + do k=1,nstns + read (721,*) stnid,xstn(k),ystn(k),dummy + read (731,*) var(k) +! if (var(k).gt.1.5) then +! print *, 'cf > 1.5 found; setting to 1.5',k,var(k) +! var(k) = 1.5 +! endif +! if (var(k).lt.0.5) then +! print *, 'cf < 0.5 found; setting to 0.5',k,var(k) +! var(k) = 0.5 +! endif +! var(k) = min(1.5,var(k)) +! var(k) = max(0.5,var(k)) + enddo + close (721) + close (731) + +! Create a collection of 'stations' with correction factors of +! 1.0 in areas outside of our traverse regions. + open(741,file=fname_sweobs_barnes_mask,& + & form='unformatted',access='direct',recl=4*nx*ny) + read (741,rec=1) ((xmask(i,j),i=1,nx),j=1,ny) + close (741) + +! Create an array of e, n coordinates for this domain. + do j=1,ny + do i=1,nx + xg(i,j) = xmn + deltax * (real(i) - 1.0) + yg(i,j) = ymn + deltay * (real(j) - 1.0) + enddo + enddo + + do j=1,ny + do i=1,nx + if (xmask(i,j).ne.undef) then + xg(i,j) = undef + yg(i,j) = undef + endif + enddo + enddo + +! Count how many cf=1.0 'stations' you are going to end up with. + icount = 0 + do j=1,ny,100 + do i=1,nx,100 + if (xg(i,j).ne.undef) then + icount = icount + 1 + endif + enddo + enddo + +! Write out the original stations. + open (761,file='swe_assim/cf_with_mask.txt') + ntstations = nstns + icount + write (761,88) ntstations + do k=1,nstns + write (761,89) k,xstn(k),ystn(k),var(k) + enddo + +! Write out the cf=1.0 stations. + icount = 0 + do j=1,ny,100 + do i=1,nx,100 + if (xg(i,j).ne.undef) then + icount = icount + 1 + write (761,89) icount+1000,xg(i,j),yg(i,j),1.0 + endif + enddo + enddo + close (761) + +! Read in the new local cf data. + open (79,file='swe_assim/cf_with_mask.txt') + read (79,*) nstns2 + do k=1,nstns2 + read (79,*) obsid(k),xstn(k),ystn(k),cf_tmp2(k) + enddo + close (79) + + call get_dn(nx,ny,deltax,deltay,nstns2,dn,iobsint) + + dn = beta * dn + + call barnes_oi(nx,ny,deltax,deltay,xmn,ymn,& + & nstns2,xstn,ystn,cf_tmp2,dn,grid,undef,ifill) + +! Write the output data to a grads file. + open(511,file='swe_assim/corr_factor_w-mask.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + write(511,rec=1) ((grid(i,j),i=1,nx),j=1,ny) + close (511) + + 88 format (i10) + 89 format (i10,2f15.1,f10.4) + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_obs_record(iday_init,imonth_init,iyear_init,& + & iidy,iimo,iiyr,iobs_rec_tmp,print_inc,dt) + + implicit none + + integer ioptn,iday_init,imonth_init,iyear_init,julian_start,& + & iidy,iimo,iiyr,julian_end,iobs_rec_tmp,n_writes_per_day + + real print_inc,dt + +! Find the Julian day at the start of the model run. + ioptn = 3 + call calndr (ioptn,iday_init,imonth_init,iyear_init,julian_start) + +! Find the Julian day for this data record. + call calndr (ioptn,iidy,iimo,iiyr,julian_end) + +! Calculate the day of simulation for this data record. This is the +! same as the output file data record. + iobs_rec_tmp = julian_end - julian_start + 1 + +! Correct this for the case where sub-daily data writes were made. + n_writes_per_day = nint((86400.0 / dt) / print_inc) + iobs_rec_tmp = n_writes_per_day * iobs_rec_tmp + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_cf_prec_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & nobs_total,nyears) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,nobs_total,nyears + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_desc,trailing_blanks + + character*95 output_fname + character*80 filename,description + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + data description /& + & 'cf 0 0 precip correction factor (above and below 1.0)'/ + + undef = -9999.0 + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert the write interval from seconds to hours or a day. + igrads_dt = 1 + cdt = 'dy' + + filename = 'swe_assim/corr_factor.ctl' + output_fname = 'corr_factor.gdat' + + len_desc = 80 - trailing_blanks(description) + + open (71,file=filename) + + write (71,51) output_fname + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) nobs_total+nyears,nint(xhour_init),& + & iday_init,cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) description(1:len_desc) + write (71,60) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 51 format ('DSET ^',a) + 52 format ('TITLE SnowModel data assimilation precip corr factor') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 59 format (a) + 60 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! file = calendar.f version 1.0 +! +! Note from Glen: This is the version that should be used as +! part of my computer programs!!!!!!!!!!!!!!!!!!!!!!!!!! +! +! This program performs various date conversion calculations +! using subroutine calndr(). +! On a 32-bit computer, it can handle any date between roughly +! 5 million BC and 5 million AD. This limitation is due to +! the range of integers that can be expressed with 32 bits. +! The algorithm has no limitation. +! +! Using function idaywk(), the day of the week is computed +! along with the answer to the user's calendar calculation. +! +! External routines called: +! calndr calendar conversions +! idaywk day of the week determination +! +! Portability +! This routine is coded to Fortran 77 standards except that +! lower case is used. +! +! Copyright (C) 1999 Jon Ahlquist. +! Issued under the second GNU General Public License. +! See www.gnu.org for details. +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! If you find any errors, please notify: +! Jon Ahlquist +! Dept of Meteorology +! Florida State University +! Tallahassee, FL 32306-4520 +! 15 March 1999. +! +!---------- +! +! Declare variables. +! implicit none +! integer day, daynum, ioptn, julian, month, year +! character*9 daynam(0:6) +! +! Declare the integer function used to compute the day of the week. +! integer idaywk +! +! Define the day names. +! data daynam /'Sunday', 'Monday', 'Tuesday', 'Wednesday', +! & 'Thursday', 'Friday', 'Saturday'/ +! +! Variables and their meanings +! day day of the month. +! daynam array of day names. (daynam(0)='Sunday', daynam(1)='Monday', +! ..., daynam(6)='Saturday') +! daynum day number during the year. (1 for 1 January, 2 for +! 2 January, 32 for 1 February, etc.) +! idaywk integer function that returns an integer counter indicating +! the day of the week, where 0 refers to Sunday, 1 to Monday, +! up to 6 for Saturday. +! ioptn option indicator where 0 < abs(ioptn) < 6. +! See below and especially subroutine calndr for details. +! julian Julian Day number. +! month month counter (1=January, 2=February, ..., 12=December) +! year year expressed with ALL digits. DO NOT abbreviate years +! by using only the last two digits. +! +!---------- +! + subroutine calndr (ioptn, iday, month, iyear, idayct) +! +!---------- +! +! CALNDR = CALeNDaR conversions, version 1.0 +! +! Input variable specifying the desired calendar conversion option. + integer ioptn +! +! Input/Output variables (sometimes input, sometimes output, +! depending on the value of the desired option, ioptn.) + integer iday, month, iyear, idayct +! +!---------- +! +! Subroutine calndr() performs calendar calculations using either +! the standard Gregorian calendar or the old Julian calendar. +! This subroutine extends the definitions of these calendar systems +! to any arbitrary year. The algorithms in this subroutine +! will work with any date in the past or future, +! but overflows will occur if the numbers are sufficiently large. +! For a computer using a 32-bit integer, this routine can handle +! any date between roughly 5.8 million BC and 5.8 million AD +! without experiencing overflow during calculations. +! +! No external functions or subroutines are called. +! +!---------- +! +! INPUT/OUTPUT ARGUMENTS FOR SUBROUTINE CALNDR() +! +! "ioptn" is the desired calendar conversion option explained below. +! Positive option values use the standard modern Gregorian calendar. +! Negative option values use the old Julian calendar which was the +! standard in Europe from its institution by Julius Caesar in 45 BC +! until at least 4 October 1582. The Gregorian and Julian calendars +! are explained further below. +! +! (iday,month,iyear) is a calendar date where "iday" is the day of +! the month, "month" is 1 for January, 2 for February, etc., +! and "iyear" is the year. If the year is 1968 AD, enter iyear=1968, +! since iyear=68 would refer to 68 AD. +! For BC years, iyear should be negative, so 45 BC would be iyear=-45. +! By convention, there is no year 0 under the BC/AD year numbering +! scheme. That is, years proceed as 2 BC, 1 BC, 1 AD, 2 AD, etc., +! without including 0. Subroutine calndr() will print an error message +! and stop if you specify iyear=0. +! +! "idayct" is a day count. It is either the day number during the +! specified year or the Julian Day number, depending on the value +! of ioptn. By day number during the specified year, we mean +! idayct=1 on 1 January, idayct=32 on 1 February, etc., to idayct=365 +! or 366 on 31 December, depending on whether the specified year +! is a leap year. +! +! The values of input variables are not changed by this subroutine. +! +! +! ALLOWABLE VALUES FOR "IOPTN" and the conversions they invoke. +! Positive option values ( 1 to 5) use the standard Gregorian calendar. +! Negative option values (-1 to -5) use the old Julian calendar. +! +! Absolute +! value +! of ioptn Input variable(s) Output variable(s) +! +! 1 iday,month,iyear idayct +! Given a calendar date (iday,month,iyear), compute the day number +! (idayct) during the year, where 1 January is day number 1 and +! 31 December is day number 365 or 366, depending on whether it is +! a leap year. +! +! 2 idayct,iyear iday,month +! Given the day number of the year (idayct) and the year (iyear), +! compute the day of the month (iday) and the month (month). +! +! 3 iday,month,iyear idayct +! Given a calendar date (iday,month,iyear), compute the Julian Day +! number (idayct) that starts at noon of the calendar date specified. +! +! 4 idayct iday,month,iyear +! Given the Julian Day number (idayct) that starts at noon, +! compute the corresponding calendar date (iday,month,iyear). +! +! 5 idayct iday,month,iyear +! Given the Julian Day number (idayct) that starts at noon, +! compute the corresponding day number for the year (iday) +! and year (iyear). On return from calndr(), "month" will always +! be set equal to 1 when ioptn=5. +! +! No inverse function is needed for ioptn=5 because it is +! available through option 3. One simply calls calndr() with: +! ioptn = 3, +! iday = day number of the year instead of day of the month, +! month = 1, and +! iyear = whatever the desired year is. +! +!---------- +! +! EXAMPLES +! The first 6 examples are for the standard Gregorian calendar. +! All the examples deal with 15 October 1582, which was the first day +! of the Gregorian calendar. 15 October is the 288-th day of the year. +! Julian Day number 2299161 began at noon on 15 October 1582. +! +! Find the day number during the year on 15 October 1582 +! ioptn = 1 +! call calndr (ioptn, 15, 10, 1582, idayct) +! calndr() should return idayct=288 +! +! Find the day of the month and month for day 288 in year 1582. +! ioptn = 2 +! call calndr (ioptn, iday, month, 1582, 288) +! calndr() should return iday=15 and month=10. +! +! Find the Julian Day number for 15 October 1582. +! ioptn = 3 +! call calndr (ioptn, 15, 10, 1582, julian) +! calndr() should return julian=2299161 +! +! Find the Julian Day number for day 288 during 1582 AD. +! When the input is day number of the year, one should specify month=1 +! ioptn = 3 +! call calndr (ioptn, 288, 1, 1582, julian) +! calndr() should return dayct=2299161 +! +! Find the date for Julian Day number 2299161. +! ioptn = 4 +! call calndr (ioptn, iday, month, iyear, 2299161) +! calndr() should return iday=15, month=10, and iyear=1582 +! +! Find the day number during the year (iday) and year +! for Julian Day number 2299161. +! ioptn = 5 +! call calndr (ioptn, iday, month, iyear, 2299161) +! calndr() should return iday=288, month=1, iyear=1582 +! +! Given 15 October 1582 under the Gregorian calendar, +! find the date (idayJ,imonthJ,iyearJ) under the Julian calendar. +! To do this, we call calndr() twice, using the Julian Day number +! as the intermediate value. +! call calndr ( 3, 15, 10, 1582, julian) +! call calndr (-4, idayJ, monthJ, iyearJ, julian) +! The first call to calndr() should return julian=2299161, and +! the second should return idayJ=5, monthJ=10, iyearJ=1582 +! +!---------- +! +! BASIC CALENDAR INFORMATION +! +! The Julian calendar was instituted by Julius Caesar in 45 BC. +! Every fourth year is a leap year in which February has 29 days. +! That is, the Julian calendar assumes that the year is exactly +! 365.25 days long. Actually, the year is not quite this long. +! The modern Gregorian calendar remedies this by omitting leap years +! in years divisible by 100 except when the year is divisible by 400. +! Thus, 1700, 1800, and 1900 are leap years under the Julian calendar +! but not under the Gregorian calendar. The years 1600 and 2000 are +! leap years under both the Julian and the Gregorian calendars. +! Other years divisible by 4 are leap years under both calendars, +! such as 1992, 1996, 2004, 2008, 2012, etc. For BC years, we recall +! that year 0 was omitted, so 1 BC, 5 BC, 9 BC, 13 BC, etc., and 401 BC, +! 801 BC, 1201 BC, etc., are leap years under both calendars, while +! 101 BC, 201 BC, 301 BC, 501 BC, 601 BC, 701 BC, 901 BC, 1001 BC, +! 1101 BC, etc., are leap years under the Julian calendar but not +! the Gregorian calendar. +! +! The Gregorian calendar is named after Pope Gregory XIII. He declared +! that the last day of the old Julian calendar would be Thursday, +! 4 October 1582 and that the following day, Friday, would be reckoned +! under the new calendar as 15 October 1582. The jump of 10 days was +! included to make 21 March closer to the spring equinox. +! +! Only a few Catholic countries (Italy, Poland, Portugal, and Spain) +! switched to the Gregorian calendar on the day after 4 October 1582. +! It took other countries months to centuries to change to the +! Gregorian calendar. For example, England's first day under the +! Gregorian calendar was 14 September 1752. The same date applied to +! the entire British empire, including America. Japan, Russia, and many +! eastern European countries did not change to the Gregorian calendar +! until the 20th century. The last country to change was Turkey, +! which began using the Gregorian calendar on 1 January 1927. +! +! Therefore, between the years 1582 and 1926 AD, you must know +! the country in which an event was dated to interpret the date +! correctly. In Sweden, there was even a year (1712) when February +! had 30 days. Consult a book on calendars for more details +! about when various countries changed their calendars. +! +! DAY NUMBER DURING THE YEAR +! The day number during the year is simply a counter equal to 1 on +! 1 January, 32 on 1 February, etc., thorugh 365 or 366 on 31 December, +! depending on whether the year is a leap year. Sometimes this is +! called the Julian Day, but that term is better reserved for the +! day counter explained below. +! +! JULIAN DAY NUMBER +! The Julian Day numbering system was designed by Joseph Scaliger +! in 1582 to remove ambiguity caused by varying calendar systems. +! The name "Julian Day" was chosen to honor Scaliger's father, +! Julius Caesar Scaliger (1484-1558), an Italian scholar and physician +! who lived in France. Because Julian Day numbering was especially +! designed for astronomers, Julian Days begin at noon so that the day +! counter does not change in the middle of an astronmer's observing +! period. Julian Day 0 began at noon on 1 January 4713 BC under the +! Julian calendar. A modern reference point is that 23 May 1968 +! (Gregorian calendar) was Julian Day 2,440,000. +! +! JULIAN DAY NUMBER EXAMPLES +! +! The table below shows a few Julian Day numbers and their corresponding +! dates, depending on which calendar is used. A negative 'iyear' refers +! to BC (Before Christ). +! +! Julian Day under calendar: +! iday month iyear Gregorian Julian +! 24 11 -4714 0 -38 +! 1 1 -4713 38 0 +! 1 1 1 1721426 1721424 +! 4 10 1582 2299150 2299160 +! 15 10 1582 2299161 2299171 +! 1 3 1600 2305508 2305518 +! 23 5 1968 2440000 2440013 +! 5 7 1998 2451000 2451013 +! 1 3 2000 2451605 2451618 +! 1 1 2001 2451911 2451924 +! +! From this table, we can see that the 10 day difference between the +! two calendars in 1582 grew to 13 days by 1 March 1900, since 1900 was +! a leap year under the Julian calendar but not under the Gregorian +! calendar. The gap will widen to 14 days after 1 March 2100 for the +! same reason. +! +!---------- +! +! PORTABILITY +! +! This subroutine is written in standard FORTRAN 77. +! It calls no external functions or subroutines and should run +! without problem on any computer having a 32-bit word or longer. +! +!---------- +! +! ALGORITHM +! +! The goal in coding calndr() was clear, clean code, not efficiency. +! Calendar calculations usually take a trivial fraction of the time +! in any program in which dates conversions are involved. +! Data analysis usually takes the most time. +! +! Standard algorithms are followed in this subroutine. Internal to +! this subroutine, we use a year counter "jyear" such that +! jyear=iyear when iyear is positive +! =iyear+1 when iyear is negative. +! Thus, jyear does not experience a 1 year jump like iyear does +! when going from BC to AD. Specifically, jyear=0 when iyear=-1, +! i.e., when the year is 1 BC. +! +! For simplicity in dealing with February, inside this subroutine, +! we let the year begin on 1 March so that the adjustable month, +! February is the last month of the year. +! It is clear that the calendar used to work this way because the +! months September, October, November, and December refer to +! 7, 8, 9, and 10. For consistency, jyear is incremented on 1 March +! rather than on 1 January. Of course, everything is adjusted back to +! standard practice of years beginning on 1 January before answers +! are returned to the routine that calls calndr(). +! +! Lastly, we use a trick to calculate the number of days from 1 March +! until the end of the month that precedes the specified month. +! That number of days is int(30.6001*(month+1))-122, +! where 30.6001 is used to avoid the possibility of round-off and +! truncation error. For example, if 30.6 were used instead, +! 30.6*5 should be 153, but round-off error could make it 152.99999, +! which would then truncated to 152, causing an error of 1 day. +! +! Algorithm reference: +! Dershowitz, Nachum and Edward M. Reingold, 1990: Calendrical +! Calculations. Software-Practice and Experience, vol. 20, number 9 +! (September 1990), pp. 899-928. +! +! Copyright (C) 1999 Jon Ahlquist. +! Issued under the second GNU General Public License. +! See www.gnu.org for details. +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! If you find any errors, please notify: +! Jon Ahlquist +! Dept of Meteorology +! Florida State University +! Tallahassee, FL 32306-4520 +! 15 March 1999. +! +!----- +! Declare internal variables. + integer jdref, jmonth, jyear, leap,& + & n1yr, n4yr, n100yr, n400yr,& + & ndays, ndy400, ndy100, nyrs,& + & yr400, yrref +! +! Explanation of all internal variables. +! jdref Julian Day on which 1 March begins in the reference year. +! jmonth Month counter which equals month+1 if month .gt. 2 +! or month+13 if month .le. 2. +! jyear Year index, jyear=iyear if iyear .gt. 0, jyear=iyear+1 +! if iyear .lt. 0. Thus, jyear does not skip year 0 +! like iyear does between BC and AD years. +! leap =1 if the year is a leap year, =0 if not. +! n1yr Number of complete individual years between iyear and +! the reference year after all 4, 100, +! and 400 year periods have been removed. +! n4yr Number of complete 4 year cycles between iyear and +! the reference year after all 100 and 400 year periods +! have been removed. +! n100yr Number of complete 100 year periods between iyear and +! the reference year after all 400 year periods +! have been removed. +! n400yr Number of complete 400 year periods between iyear and +! the reference year. +! ndays Number of days since 1 March during iyear. (In intermediate +! steps, it holds other day counts as well.) +! ndy400 Number of days in 400 years. Under the Gregorian calendar, +! this is 400*365 + 100 - 3 = 146097. Under the Julian +! calendar, this is 400*365 + 100 = 146100. +! ndy100 Number of days in 100 years, Under the Gregorian calendar, +! this is 100*365 + 24 = 36524. Under the Julian calendar, +! this is 100*365 + 25 = 36525. +! nyrs Number of years from the beginning of yr400 +! to the beginning of jyear. (Used for option +/-3). +! yr400 The largest multiple of 400 years that is .le. jyear. +! +! +!---------------------------------------------------------------- +! Do preparation work. +! +! Look for out-of-range option values. + if ((ioptn .eq. 0) .or. (abs(ioptn) .ge. 6)) then + write(*,*)'For calndr(), you specified ioptn = ', ioptn + write(*,*) & + & 'Allowable values are 1 to 5 for the Gregorian calendar' + write(*,*) & + & 'and -1 to -5 for the Julian calendar.' + stop + endif +! +! Options 1-3 have "iyear" as an input value. +! Internally, we use variable "jyear" that does not have a jump +! from -1 (for 1 BC) to +1 (for 1 AD). + if (abs(ioptn) .le. 3) then + if (iyear .gt. 0) then + jyear = iyear + elseif (iyear .eq. 0) then + write(*,*) & + & 'For calndr(), you specified the nonexistent year 0' + stop + else + jyear = iyear + 1 + endif +! +! Set "leap" equal to 0 if "jyear" is not a leap year +! and equal to 1 if it is a leap year. + leap = 0 + if ((jyear/4)*4 .eq. jyear) then + leap = 1 + endif + if ((ioptn .gt. 0) .and. & + & ((jyear/100)*100 .eq. jyear) .and. & + & ((jyear/400)*400 .ne. jyear) ) then + leap = 0 + endif + endif +! +! Options 3-5 involve Julian Day numbers, which need a reference year +! and the Julian Days that began at noon on 1 March of the reference +! year under the Gregorian and Julian calendars. Any year for which +! "jyear" is divisible by 400 can be used as a reference year. +! We chose 1600 AD as the reference year because it is the closest +! multiple of 400 to the institution of the Gregorian calendar, making +! it relatively easy to compute the Julian Day for 1 March 1600 +! given that, on 15 October 1582 under the Gregorian calendar, +! the Julian Day was 2299161. Similarly, we need to do the same +! calculation for the Julian calendar. We can compute this Julian +! Day knwoing that on 4 October 1582 under the Julian calendar, +! the Julian Day number was 2299160. The details of these calculations +! is next. +! From 15 October until 1 March, the number of days is the remainder +! of October plus the days in November, December, January, and February: +! 17+30+31+31+28 = 137, so 1 March 1583 under the Gregorian calendar +! was Julian Day 2,299,298. Because of the 10 day jump ahead at the +! switch from the Julian calendar to the Gregorian calendar, 1 March +! 1583 under the Julian calendar was Julian Day 2,299,308. Making use +! of the rules for the two calendar systems, 1 March 1600 was Julian +! Day 2,299,298 + (1600-1583)*365 + 5 (due to leap years) = +! 2,305,508 under the Gregorian calendar and day 2,305,518 under the +! Julian calendar. +! We also set the number of days in 400 years and 100 years. +! For reference, 400 years is 146097 days under the Gregorian calendar +! and 146100 days under the Julian calendar. 100 years is 36524 days +! under the Gregorian calendar and 36525 days under the Julian calendar. + if (abs(ioptn) .ge. 3) then +! +! Julian calendar values. + yrref = 1600 + jdref = 2305518 +! = Julian Day reference value for the day that begins +! at noon on 1 March of the reference year "yrref". + ndy400 = 400*365 + 100 + ndy100 = 100*365 + 25 +! +! Adjust for Gregorian calendar values. + if (ioptn .gt. 0) then + jdref = jdref - 10 + ndy400 = ndy400 - 3 + ndy100 = ndy100 - 1 + endif + endif +! +!---------------------------------------------------------------- +! OPTIONS -1 and +1: +! Given a calendar date (iday,month,iyear), compute the day number +! of the year (idayct), where 1 January is day number 1 and 31 December +! is day number 365 or 366, depending on whether it is a leap year. + if (abs(ioptn) .eq. 1) then +! +! Compute the day number during the year. + if (month .le. 2) then + idayct = iday + (month-1)*31 + else + idayct = iday + int(30.6001 * (month+1)) - 63 + leap + endif +! +!---------------------------------------------------------------- +! OPTIONS -2 and +2: +! Given the day number of the year (idayct) and the year (iyear), +! compute the day of the month (iday) and the month (month). + elseif (abs(ioptn) .eq. 2) then +! + if (idayct .lt. 60+leap) then + month = (idayct-1)/31 + iday = idayct - month*31 + month = month + 1 + else + ndays = idayct - (60+leap) +! = number of days past 1 March of the current year. + jmonth = (10*(ndays+31))/306 + 3 +! = month counter, =4 for March, =5 for April, etc. + iday = (ndays+123) - int(30.6001*jmonth) + month = jmonth - 1 + endif +! +!---------------------------------------------------------------- +! OPTIONS -3 and +3: +! Given a calendar date (iday,month,iyear), compute the Julian Day +! number (idayct) that starts at noon. + elseif (abs(ioptn) .eq. 3) then +! +! Shift to a system where the year starts on 1 March, so January +! and February belong to the preceding year. +! Define jmonth=4 for March, =5 for April, ..., =15 for February. + if (month .le. 2) then + jyear = jyear - 1 + jmonth = month + 13 + else + jmonth = month + 1 + endif +! +! Find the closest multiple of 400 years that is .le. jyear. + yr400 = (jyear/400)*400 +! = multiple of 400 years at or less than jyear. + if (jyear .lt. yr400) then + yr400 = yr400 - 400 + endif +! + n400yr = (yr400 - yrref)/400 +! = number of 400-year periods from yrref to yr400. + nyrs = jyear - yr400 +! = number of years from the beginning of yr400 +! to the beginning of jyear. +! +! Compute the Julian Day number. + idayct = iday + int(30.6001*jmonth) - 123 + 365*nyrs + nyrs/4 & + & + jdref + n400yr*ndy400 +! +! If we are using the Gregorian calendar, we must not count +! every 100-th year as a leap year. nyrs is less than 400 years, +! so we do not need to consider the leap year that would occur if +! nyrs were divisible by 400, i.e., we do not add nyrs/400. + if (ioptn .gt. 0) then + idayct = idayct - nyrs/100 + endif +! +!---------------------------------------------------------------- +! OPTIONS -5, -4, +4, and +5: +! Given the Julian Day number (idayct) that starts at noon, +! compute the corresponding calendar date (iday,month,iyear) +! (abs(ioptn)=4) or day number during the year (abs(ioptn)=5). + else +! +! Create a new reference date which begins on the nearest +! 400-year cycle less than or equal to the Julian Day for 1 March +! in the year in which the given Julian Day number (idayct) occurs. + ndays = idayct - jdref + n400yr = ndays / ndy400 +! = integral number of 400-year periods separating +! idayct and the reference date, jdref. + jdref = jdref + n400yr*ndy400 + if (jdref .gt. idayct) then + n400yr = n400yr - 1 + jdref = jdref - ndy400 + endif +! + ndays = idayct - jdref +! = number from the reference date to idayct. +! + n100yr = min(ndays/ndy100, 3) +! = number of complete 100-year periods +! from the reference year to the current year. +! The min() function is necessary to avoid n100yr=4 +! on 29 February of the last year in the 400-year cycle. +! + ndays = ndays - n100yr*ndy100 +! = remainder after removing an integral number of +! 100-year periods. +! + n4yr = ndays / 1461 +! = number of complete 4-year periods in the current century. +! 4 years consists of 4*365 + 1 = 1461 days. +! + ndays = ndays - n4yr*1461 +! = remainder after removing an integral number +! of 4-year periods. +! + n1yr = min(ndays/365, 3) +! = number of complete years since the last leap year. +! The min() function is necessary to avoid n1yr=4 +! when the date is 29 February on a leap year, +! in which case ndays=1460, and 1460/365 = 4. +! + ndays = ndays - 365*n1yr +! = number of days so far in the current year, +! where ndays=0 on 1 March. +! + iyear = n1yr + 4*n4yr + 100*n100yr + 400*n400yr + yrref +! = year, as counted in the standard way, +! but relative to 1 March. +! +! At this point, we need to separate ioptn=abs(4), which seeks a +! calendar date, and ioptn=abs(5), which seeks the day number during +! the year. First compute the calendar date if desired (abs(ioptn)=4). + if (abs(ioptn) .eq. 4) then + jmonth = (10*(ndays+31))/306 + 3 +! = offset month counter. jmonth=4 for March, =13 for +! December, =14 for January, =15 for February. + iday = (ndays+123) - int(30.6001*jmonth) +! = day of the month, starting with 1 on the first day +! of the month. +! +! Now adjust for the fact that the year actually begins +! on 1 January. + if (jmonth .le. 13) then + month = jmonth - 1 + else + month = jmonth - 13 + iyear = iyear + 1 + endif +! +! This code handles abs(ioptn)=5, finding the day number during the year. + else +! ioptn=5 always returns month=1, which we set now. + month = 1 +! +! We need to determine whether this is a leap year. + leap = 0 + if ((jyear/4)*4 .eq. jyear) then + leap = 1 + endif + if ((ioptn .gt. 0) .and. & + & ((jyear/100)*100 .eq. jyear) .and. & + & ((jyear/400)*400 .ne. jyear) ) then + leap = 0 + endif +! +! Now find the day number "iday". +! ndays is the number of days since the most recent 1 March, +! so ndays=0 on 1 March. + if (ndays .le.305) then + iday = ndays + 60 + leap + else + iday = ndays - 305 + iyear = iyear + 1 + endif + endif +! +! Adjust the year if it is .le. 0, and hence BC (Before Christ). + if (iyear .le. 0) then + iyear = iyear - 1 + endif +! +! End the code for the last option, ioptn. + endif +! + return + end + + + integer function idaywk(jdayno) +! +! IDAYWK = compute the DAY of the WeeK given the Julian Day number, +! version 1.0. +! +! Input variable + integer jdayno +! jdayno = Julian Day number starting at noon of the day in question. +! +! Output variable: +! idaywk = day of the week, where 0=Sunday, 1=Monday, ..., 6=Saturday. +! +!---------- +! Compute the day of the week given the Julian Day number. +! You can find the Julian Day number given (day,month,year) +! using subroutine calndr.f. +! Example: For the first day of the Gregorian calendar, +! 15 October 1582, compute the Julian day number (option 3 of +! subroutine calndr) and compute the day of the week. +! call calndr (3, 15, 10, 1582, jdayno) +! write(*,*) jdayno, idaywk(jdayno) +! The numbers printed should be 2299161 and 5, +! where 6 refers to Friday. +! +! Copyright (C) 1999 Jon Ahlquist. +! Issued under the second GNU General Public License. +! See www.gnu.org for details. +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! If you find any errors, please notify: +! Jon Ahlquist +! Dept of Meteorology +! Florida State University +! Tallahassee, FL 32306-4520 +! 15 March 1999. +! +!----- +! Declare internal variable. +! jdSun is the Julian Day number starting at noon on any Sunday. +! I arbitrarily chose the first Sunday after Julian Day 1, +! which is Julian Day 6. + integer jdSun + data jdSun /6/ + idaywk = mod(jdayno-jdSun,7) +! If jdayno-jdSun < 0, then we are taking the modulus of a negative +! number. Fortran's built-in mod function returns a negative value +! when the argument is negative. In that case, we adjust the result +! to a positive value. + if (idaywk .lt. 0) idaywk = idaywk + 7 + return + + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/enbal_code.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/enbal_code.f90 new file mode 100755 index 000000000..8c948637e --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/enbal_code.f90 @@ -0,0 +1,808 @@ +! enbal_code.f + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE ENBAL_CODE(nx,ny,Tair_grid,uwind_grid,sfc_pressure,& + & vwind_grid,rh_grid,Tsfc,Qsi_grid,Qli_grid,Qle,Qh,Qe,& + & Qc,Qm,e_balance,Qf,snow_d,ht_windobs,icond_flag,& + & albedo,snow_z0,veg_z0,vegtype,undef,albedo_snow_forest,& + & albedo_snow_clearing,albedo_glacier,snod_layer,T_old,& + & gamma,KK) + + use snowmodel_inc + implicit none + + real Tair_grid(nx,ny) + real rh_grid(nx,ny) + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + real Qsi_grid(nx,ny) + real Qli_grid(nx,ny) + real albedo(nx,ny) + real vegtype(nx,ny) + real veg_z0(nx,ny) + + real,dimension(nx,ny) :: Tsfc,Qle,& + & Qh,Qe,Qc,& + & Qm,e_balance,Qf,& + & snow_d,sfc_pressure + + real snow_z0,veg_z0_tmp,windspd,ht_windobs,undef,& + & albedo_snow_forest,albedo_snow_clearing,albedo_glacier,& + & count_Tsfc_not_converged + + integer i,j,nx,ny,icond_flag,k + + integer KK(nx,ny) + real snod_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real gamma(nx,ny,nz_max) + real snod_layer_z(2) + real T_old_z(2) + real gamma_z(2) + +! print *,' solving the energy balance' + + count_Tsfc_not_converged = 0.0 + + do j=1,ny + do i=1,nx + + windspd = sqrt(uwind_grid(i,j)**2+vwind_grid(i,j)**2) + +! Prevent the problem of low wind speeds in the logarithmic wind +! profile calculations. + windspd = max(1.0,windspd) + + veg_z0_tmp = veg_z0(i,j) + +! Extract the vertical column for this i,j point, and send it +! to the subroutine. *** Note that I should use f95, then I would +! not have to do this (I could pass in subsections of the arrays). + if (icond_flag.eq.1) then + do k=1,2 + snod_layer_z(k) = snod_layer(i,j,k) + T_old_z(k) = T_old(i,j,k) + gamma_z(k) = gamma(i,j,k) + enddo + endif + + CALL ENBAL_CORE(Tair_grid(i,j),windspd,rh_grid(i,j),& + & Tsfc(i,j),Qsi_grid(i,j),Qli_grid(i,j),Qle(i,j),Qh(i,j),& + & Qe(i,j),Qc(i,j),Qm(i,j),e_balance(i,j),Qf(i,j),undef,& + & sfc_pressure(i,j),snow_d(i,j),ht_windobs,& + & icond_flag,albedo(i,j),snow_z0,veg_z0_tmp,vegtype(i,j),& + & albedo_snow_forest,albedo_snow_clearing,albedo_glacier,& + & snod_layer_z,T_old_z,gamma_z,KK(i,j),& + & count_Tsfc_not_converged) + enddo + enddo + +! Calculate the % of the grid cells that did not converge during +! this time step. + count_Tsfc_not_converged = 100.0* count_Tsfc_not_converged / & + & real(nx*ny) + +! Set the not-converged threshold to be 1% of the grid cells. + if (count_Tsfc_not_converged.gt.1.0) then + print *,'Over 1% of the grid cells failed to converge' + print *,' in the Tsfc energy balance calculation. This' + print *,' usually means there in a problem with the' + print *,' atmopheric forcing inputs, or that windspd_min' + print *,' in snowmodel.par is set too low; like less than' + print *,' 1 m/s.' + print * + print *,'% Tsfc not converged = ',count_Tsfc_not_converged + endif + + return + end SUBROUTINE ENBAL_CODE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE ENBAL_CORE(Tair,windspd,rh,& + & Tsfc,Qsi,Qli,Qle,Qh,& + & Qe,Qc,Qm,e_balance,Qf,undef,& + & sfc_pressure,snow_d,ht_windobs,& + & icond_flag,albedo,snow_z0,veg_z0_tmp,vegtype,& + & albedo_snow_forest,albedo_snow_clearing,albedo_glacier,& + & snod_layer_z,T_old_z,gamma_z,KK,& + & count_Tsfc_not_converged) + +! This is the FORTRAN code which implements the surface energy +! balance model used in: +! +! (1) "Local Advection of Momentum, Heat, and Moisture during the +! Melt of Patchy Snow Covers", G. E. Liston, J. Applied +! Meteorology, 34, 1705-1715, 1995. +! +! (2) "An Energy-Balance Model of Lake-Ice Evolution", G. E. +! Liston, D. K. Hall, J. of Glaciology, (41), 373-382, 1995. +! +! (3) "Sensitivity of Lake Freeze-Up and Break-Up to Climate +! Change: A Physically Based Modeling Study", G. E. Liston, +! D. K. Hall, Annals of Glaciology, (21), 387-393, 1995. +! +! (4) "Below-Surface Ice Melt on the Coastal Antarctic Ice +! Sheet", G. E. Liston, and 4 others, J. of Glaciology, (45), +! 273-285, 1999. +! +! This version runs at sub-hourly to daily time steps. +! +! In addition, this version includes the influence of direct and +! diffuse solar radiation, and the influence of topographic +! slope and aspect on incoming solar radiation. + + implicit none + + real Tair,windspd,rh,Tsfc,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,e_balance,& + & Qf,sfc_pressure,snow_d,ht_windobs,albedo,snow_z0,& + & veg_z0_tmp,vegtype,emiss_sfc,Stef_Boltz,ro_air,Cp,gravity,& + & xls,xkappa,xLf,Tf,ro_water,Cp_water,ro_ice,z_0,ea,de_h,& + & stability,es0,undef,albedo_snow_forest,albedo_snow_clearing,& + & albedo_glacier,count_Tsfc_not_converged + + integer icond_flag,KK + + real snod_layer_z(2) + real T_old_z(2) + real gamma_z(2) + +! Define the constants used in the computations. + CALL CONSTS_ENBAL(emiss_sfc,Stef_Boltz,ro_air,Cp,gravity,& + & xls,xkappa,xLf,Tf,ro_water,Cp_water,ro_ice) + +! Define the surface characteristics based on the snow conditions. + CALL GET_SFC(snow_d,albedo,z_0,Tf,Tair,snow_z0,veg_z0_tmp,& + & vegtype,albedo_snow_forest,albedo_snow_clearing,& + & albedo_glacier) + +! Atmospheric vapor pressure from relative humidity data. + CALL VAPPRESS(ea,rh,Tair,Tf) + +! Compute the turbulent exchange coefficients. + CALL EXCOEFS(De_h,z_0,ht_windobs,windspd,xkappa) + +! Compute the flux contribution due to conduction. + CALL CONDUCT(icond_flag,Qc,snod_layer_z,T_old_z,gamma_z,& + & KK) + +! Solve the energy balance for the surface temperature. + CALL SFCTEMP(Tsfc,Tair,Qsi,Qli,ea,albedo,De_h,& + & sfc_pressure,ht_windobs,windspd,ro_air,Cp,emiss_sfc,& + & Stef_Boltz,gravity,xLs,xkappa,z_0,Tf,Qc,& + & count_Tsfc_not_converged) + +! Make sure the snow surface temperature is <= 0 C. + CALL MELTTEMP(Tsfc,Tf,snow_d,vegtype) + +! Compute the stability function. + CALL STABLEFN(stability,Tair,Tsfc,windspd,ht_windobs,& + & gravity,xkappa,z_0) + +! Compute the water vapor pressure at the surface. + CALL VAPOR(es0,Tsfc,Tf) + +! Compute the latent heat flux. + CALL LATENT(Qe,De_h,stability,ea,es0,ro_air,xLs,& + & sfc_pressure,undef,snow_d,vegtype) + +! Compute the sensible heat flux. + CALL SENSIBLE(Qh,De_h,stability,Tair,Tsfc,ro_air,Cp,& + & undef,snow_d,vegtype) + +! Compute the longwave flux emitted by the surface. + CALL LONGOUT(Qle,Tsfc,emiss_sfc,Stef_Boltz) + +! Compute the energy flux available for melting or freezing. + CALL MFENERGY(albedo,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,Qf,Tsfc,& + & Tf,Tair,windspd,ht_windobs,gravity,De_h,ea,ro_air,xLs,& + & sfc_pressure,Cp,emiss_sfc,Stef_Boltz,snow_d,xkappa,z_0,& + & vegtype,icond_flag,undef,snod_layer_z,T_old_z,gamma_z,KK) + +! Perform an energy balance check. + CALL ENBAL(e_balance,albedo,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,& + & undef,snow_d,vegtype) + + return + end SUBROUTINE ENBAL_CORE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE VAPPRESS(ea,rh,Tair,Tf) + + implicit none + + real A,B,C,ea,rh,Tair,Tf + +! Also see the VAPOR subroutine. + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. + +! Because I am interested in sublimation over snow during the +! winter, do these calculations over ice. + +! Over water. +! A = 6.1121 * 100.0 +! B = 17.502 +! C = 240.97 +! Over ice. + A = 6.1115 * 100.0 + B = 22.452 + C = 272.55 + +! Atmospheric vapor pressure from relative humidity data. + ea = rh / 100.0 * A * exp((B * (Tair - Tf))/(C + (Tair - Tf))) + + return + end SUBROUTINE VAPPRESS + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE MFENERGY(albedo,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,Qf,Tsfc,& + & Tf,Tair,windspd,ht_windobs,gravity,De_h,ea,ro_air,xLs,& + & sfc_pressure,Cp,emiss_sfc,Stef_Boltz,snow_d,xkappa,z_0,& + & vegtype,icond_flag,undef,snod_layer_z,T_old_z,gamma_z,KK) + + implicit none + + real albedo,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,Qf,Tsfc,Tf,Tair,windspd,& + & ht_windobs,gravity,De_h,ea,ro_air,xLs,sfc_pressure,Cp,& + & emiss_sfc,Stef_Boltz,snow_d,xkappa,z_0,vegtype,xTsfc,& + & xstability,xes0,xQe,xqh,xQle,xQc,undef + + integer icond_flag,KK + + real snod_layer_z(2) + real T_old_z(2) + real gamma_z(2) + +! If Qm is > 0, then this is the energy available for melting. +! If Qm is < 0, then this is the energy available for freezing +! liquid water in the snowpack. + if (snow_d.gt.0.0 .and. Tsfc.eq.Tf) then + Qm = (1.0-albedo) * Qsi + Qli + Qle + Qh + Qe + Qc + elseif (vegtype.eq.20.0 .and. Tsfc.eq.Tf) then + Qm = (1.0-albedo) * Qsi + Qli + Qle + Qh + Qe + Qc + else + Qm = 0.0 + endif + + if (Tsfc.lt.Tf) then + xTsfc = Tf + CALL STABLEFN(xstability,Tair,xTsfc,windspd,ht_windobs,& + & gravity,xkappa,z_0) + CALL VAPOR(xes0,xTsfc,Tf) + CALL LATENT(xQe,De_h,xstability,ea,xes0,ro_air,xLs,& + & sfc_pressure,undef,snow_d,vegtype) + CALL SENSIBLE(xQh,De_h,xstability,Tair,xTsfc,ro_air,Cp,& + & undef,snow_d,vegtype) + CALL LONGOUT(xQle,xTsfc,emiss_sfc,Stef_Boltz) + CALL CONDUCT(icond_flag,xQc,snod_layer_z,T_old_z,gamma_z,& + & KK) + Qf = (1.0-albedo) * Qsi + Qli + xQle + xQh + xQe + xQc + else + Qf = 0.0 + endif + + return + end SUBROUTINE MFENERGY + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE MELTTEMP(Tsfc,Tf,snow_d,vegtype) + + implicit none + + real Tsfc,snow_d,vegtype,Tf + + if (snow_d.gt.0.0 .or. vegtype.eq.20.0) then + if (Tsfc.gt.Tf) Tsfc = Tf + endif + + return + end SUBROUTINE MELTTEMP + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE CONDUCT(icond_flag,Qc,snod_layer_z,T_old_z,gamma_z,& + & KK) + + implicit none + + integer icond_flag,KK + + real Qc + real snod_layer_z(2) + real T_old_z(2) + real gamma_z(2) + + if (icond_flag.eq.0) then + Qc = 0.0 + else + if (KK.le.1) then + Qc = 0.0 + else + Qc = - (gamma_z(1) + gamma_z(2))/2.0 * & + & (T_old_z(1) - T_old_z(2)) / & + & (snod_layer_z(1) + snod_layer_z(2))/2.0 + endif + endif + + return + end SUBROUTINE CONDUCT + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE CONSTS_ENBAL(emiss_sfc,Stef_Boltz,ro_air,Cp,gravity,& + & xLs,xkappa,xLf,Tf,ro_water,Cp_water,ro_ice) + + implicit none + + real emiss_sfc,Stef_Boltz,ro_air,Cp,gravity,xLs,xkappa,xLf,& + & Tf,ro_water,Cp_water,ro_ice + + emiss_sfc = 0.98 + Stef_Boltz = 5.6696e-8 + ro_air = 1.275 + Cp = 1004. + gravity = 9.81 + xLs = 2.500e6 + xkappa = 0.4 + xLf = 3.34e5 + Tf = 273.15 + ro_water = 1000.0 + Cp_water = 4180.0 + ro_ice = 917.0 + + return + end SUBROUTINE CONSTS_ENBAL + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE ENBAL(e_balance,albedo,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,& + & undef,snow_d,vegtype) + + implicit none + + real e_balance,albedo,Qsi,Qli,Qle,Qh,Qe,Qc,Qm,undef,snow_d,& + & vegtype + + if (snow_d.gt.0.0 .or. vegtype.eq.20.0) then + e_balance = (1.0-albedo)*Qsi + Qli + Qle + Qh + Qe + Qc - Qm + else + e_balance = undef + endif + + return + end SUBROUTINE ENBAL + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE STABLEFN(stability,Tair,Tsfc,windspd,ht_windobs,& + & gravity,xkappa,z_0) + + implicit none + + real C1,C2,B1,B2,stability,Tair,Tsfc,windspd,ht_windobs,& + & gravity,xkappa,z_0,B8,B3,z_0_tmp + + z_0_tmp = min(0.25*ht_windobs,z_0) + C1 = 5.3 * 9.4 * (xkappa/(log(ht_windobs/z_0_tmp)))**2 * & + & sqrt(ht_windobs/z_0_tmp) + C2 = gravity * ht_windobs / (Tair * windspd**2) + B1 = 9.4 * C2 + B2 = C1 * sqrt(C2) + + if (Tsfc.gt.Tair) then +! Unstable case. + B3 = 1.0 + B2 * sqrt(Tsfc - Tair) + stability = 1.0 + B1 * (Tsfc - Tair) / B3 + elseif (Tsfc.lt.Tair) then +! Stable case. + B8 = B1 / 2.0 + stability = 1.0 / ((1.0 + B8 * (Tair - Tsfc))**2) + else +! Neutrally stable case. + stability = 1.0 + endif + + return + end SUBROUTINE STABLEFN + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE LONGOUT(Qle,Tsfc,emiss_sfc,Stef_Boltz) + + implicit none + + real Qle,emiss_sfc,Stef_Boltz,Tsfc + + Qle = (- emiss_sfc) * Stef_Boltz * Tsfc**4 + + return + end SUBROUTINE LONGOUT + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SENSIBLE(Qh,De_h,stability,Tair,Tsfc,ro_air,Cp,& + & undef,snow_d,vegtype) + + implicit none + + real Qh,De_h,stability,Tair,Tsfc,ro_air,Cp,undef,snow_d,vegtype + + if (snow_d.gt.0.0 .or. vegtype.eq.20.0) then + Qh = ro_air * Cp * De_h * stability * (Tair - Tsfc) + else + Qh = undef +! To do this, see the laps snow-shrub parameterization runs. +! Qh = ro_air * Cp * De_h * stability * (Tair - Tsfc) + endif + + return + end SUBROUTINE SENSIBLE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SFCTEMP(Tsfc,Tair,Qsi,Qli,ea,albedo,De_h,& + & sfc_pressure,ht_windobs,windspd,ro_air,Cp,emiss_sfc,& + & Stef_Boltz,gravity,xLs,xkappa,z_0,Tf,Qc,& + & count_Tsfc_not_converged) + + implicit none + + real Tsfc,Tair,Qsi,Qli,ea,albedo,De_h,sfc_pressure,ht_windobs,& + & windspd,ro_air,Cp,emiss_sfc,Stef_Boltz,gravity,xLs,xkappa,& + & z_0,Tf,Qc,AAA,CCC,DDD,EEE,FFF,C1,C2,B1,B2,z_0_tmp,& + & count_Tsfc_not_converged + + AAA = ro_air * Cp * De_h + CCC = 0.622 / sfc_pressure + DDD = emiss_sfc * Stef_Boltz + EEE = (1.0-albedo) * Qsi + Qli + Qc + FFF = ro_air * xLs * De_h + +! Compute the constants used in the stability coefficient +! computations. + z_0_tmp = min(0.25*ht_windobs,z_0) + C1 = 5.3 * 9.4 * (xkappa/(log(ht_windobs/z_0_tmp)))**2 * & + & sqrt(ht_windobs/z_0_tmp) + C2 = gravity * ht_windobs / (Tair * windspd**2) + B1 = 9.4 * C2 + B2 = C1 * sqrt(C2) + + CALL SOLVE(Tsfc,Tair,ea,AAA,CCC,DDD,EEE,FFF,B1,B2,Tf,& + & count_Tsfc_not_converged) + + return + end SUBROUTINE SFCTEMP + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SOLVE(xnew,Tair,ea,AAA,CCC,DDD,EEE,FFF,B1,B2,Tf,& + & count_Tsfc_not_converged) + + implicit none + + integer maxiter,i + + real tol,old,A,B,C,other1,other2,es0,dother1,dother2,xnew,& + & Tair,ea,AAA,CCC,DDD,EEE,FFF,B1,B2,Tf,B3,stability,& + & dstability,fprime1,fprime2,fprime3,fprime4,B8,funct,& + & fprime,count_Tsfc_not_converged,relax + + tol = 1.0e-2 + maxiter = 20 + old = Tair + relax = 0.8 ! New term added (Apr-2021) + +! Because I am interested in sublimation over snow during the +! winter, do these calculations over ice. + +! Over water. +! A = 6.1121 * 100.0 +! B = 17.502 +! C = 240.97 +! Over ice. + A = 6.1115 * 100.0 + B = 22.452 + C = 272.55 + + do i=1,maxiter + +! This section accounts for an increase in turbulent fluxes +! under unstable conditions. + other1 = AAA * (Tair - old) + es0 = A * exp((B * (old - Tf))/(C + (old - Tf))) + other2 = FFF*CCC*(ea-es0) + + dother1 = - AAA + dother2 = (- FFF)*CCC*es0*B*C/((C + (old - Tf))**2) + + if (old.gt.Tair) then +! Unstable case. + B3 = 1.0 + B2 * sqrt(old - Tair) + stability = 1.0 + B1 * (old - Tair) / B3 + dstability = B1/B3 - (B1*B2*(old-Tair))/ & + & (2.0*B3*B3*sqrt(old-Tair)) + fprime1 = (- 4.0)*DDD*old**3 + fprime2 = stability * dother1 + other1 * dstability + fprime3 = stability * dother2 + other2 * dstability + fprime4 = - 0.0 + + elseif (old.lt.Tair) then +! Stable case. + B8 = B1 / 2.0 + stability = 1.0 / ((1.0 + B8 * (Tair - old))**2) + dstability = 2.0 * B8 / ((1.0 + B8 * (Tair - old))**3) + fprime1 = (- 4.0)*DDD*old**3 + fprime2 = stability * dother1 + other1 * dstability + fprime3 = stability * dother2 + other2 * dstability + fprime4 = - 0.0 + + else +! Neutrally stable case. + stability = 1.0 + fprime1 = (- 4.0)*DDD*old**3 + fprime2 = dother1 + fprime3 = dother2 + fprime4 = - 0.0 + endif + + funct = EEE - DDD*old**4 + AAA*(Tair-old)*stability + & + & FFF*CCC*(ea-es0)*stability + & + & 0.0 + fprime = fprime1 + fprime2 + fprime3 + fprime4 + +! Original code: +! xnew = old - funct/fprime +! G. Liston code update: Apr, 2021 + xnew = old - relax * funct/fprime + + if (abs(xnew - old).lt.tol) return + old = xnew + + enddo + +! If the maximum iterations are exceeded, send a message and set +! the surface temperature to the air temperature. +! write (*,102) +! 102 format('max iteration exceeded when solving for Tsfc') + +! Count the number of times the model did not converge for this +! time step. + count_Tsfc_not_converged = count_Tsfc_not_converged + 1.0 + + xnew = Tair + + return + end SUBROUTINE SOLVE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE LATENT(Qe,De_h,stability,ea,es0,ro_air,xLs,& + & sfc_pressure,undef,snow_d,vegtype) + + implicit none + + real Qe,De_h,stability,ea,es0,ro_air,xLs,sfc_pressure,undef,& + & snow_d,vegtype + + if (snow_d.gt.0.0 .or. vegtype.eq.20.0) then + Qe = ro_air * xLs * De_h * stability * & + & (0.622/sfc_pressure * (ea - es0)) + else + Qe = undef +! To do this, see the laps snow-shrub parameterization runs. +! Qe = ro_air * xLs * De_h * stability * +! & (0.622/sfc_pressure * (ea - es0)) + endif + + return + end SUBROUTINE LATENT + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE EXCOEFS(De_h,z_0,ht_windobs,windspd,xkappa) + + implicit none + + real De_h,z_0,ht_windobs,windspd,xkappa,z_0_tmp + + z_0_tmp = min(0.25*ht_windobs,z_0) + De_h = (xkappa**2) * windspd / ((log(ht_windobs/z_0_tmp))**2) + + return + end SUBROUTINE EXCOEFS + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE VAPOR(es0,Tsfc,Tf) + + implicit none + + real es0,Tsfc,Tf,A,B,C + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. + +! Because I am interested in sublimation over snow during the +! winter, do these calculations over ice. + +! Over water. +! A = 6.1121 * 100.0 +! B = 17.502 +! C = 240.97 +! Over ice. + A = 6.1115 * 100.0 + B = 22.452 + C = 272.55 + +! Compute the water vapor pressure at the surface. + es0 = A * exp((B * (Tsfc - Tf))/(C + (Tsfc - Tf))) + + return + end SUBROUTINE VAPOR + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GET_SFC(snow_d,albedo,z_0,Tf,Tair,snow_z0,veg_z0_tmp,& + & vegtype,albedo_snow_forest,albedo_snow_clearing,& + & albedo_glacier) + + implicit none + + real snow_d,albedo,z_0,Tf,Tair,snow_z0,veg_z0_tmp,vegtype,& + & albedo_veg,albedo_snow_forest,albedo_snow_clearing,& + & albedo_glacier +! real scf + +! Note that this is very crude for many reasons, and should be +! improved. See below for an alternative solution. + + albedo_veg = 0.15 + +! Define the albedo and roughness length. + if (snow_d.gt.0.0) then +! Snow. + z_0 = snow_z0 + if (Tair.gt.Tf) then + if (vegtype.le.5.0) then +! Melting. Assume, because of leaf litter, etc., that the snow +! albedo under a forest canopy is different than in a clearing. + albedo = albedo_snow_forest + else + albedo = albedo_snow_clearing + endif +! For thin melting snowcovers (less than 15 cm), reduce the albedo +! to account for the observed enhanced melting processes. +! scf = min(1.0,snow_d/0.15) +! albedo = scf * albedo + (1.0 - scf) * albedo_veg + else +! Dry. + albedo = 0.8 + endif + +! No snow. + else + if (vegtype.eq.20.0) then +! Glacier or permanant snow. + z_0 = snow_z0 + albedo = albedo_glacier + else +! Land. + z_0 = veg_z0_tmp + if (vegtype.le.5.0) then + z_0 = 0.2 + elseif (vegtype.le.11.0) then + z_0 = 0.04 + else + z_0 = 0.02 + endif + albedo = albedo_veg + endif + endif + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! The code below simulates the TIME-EVOLUTION OF SNOW ALBEDO in +! response to precipitation and melt. + +! The general model equations are described in the paper: +! Modeling Snow Depth for Improved Simulation of +! Snow-Vegetion-Atmosphere Interactions. +! Strack, J. E., G. E. Liston, and R. A. Pielke, Sr., 2004, +! Journal of Hydrometeorology, 5, 723-734. + +! implicit none +! real albedo +! real Tair +! real prec +! real al_gr_cold +! real al_gr_melt +! real al_min +! real al_max +! real dt,tau_1 + +! Model time step. +! dt = 3600. +! dt = 86400. + +! Maximum albedo, minimum albedo, gradient cold snow albedo +! gradient melting snow albedo +! al_max = 0.8 +! al_min = 0.5 +! al_gr_cold = 0.008 +! al_gr_melt = 0.24 +! tau_1 = 86400. + +! Define the initial condition. +! albedo = al_max + +! do iter=1,maxiter + +! In the presence of precipitation, re-initialize the albedo. +! if (prec.gt.0.003) albedo = al_max + +! Evolve the snow albedo. +! CALL SNOW_ALBEDO(Tair,albedo,al_gr_cold,al_min, +! & al_gr_melt,dt,tau_1) + +! enddo + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! SUBROUTINE SNOW_ALBEDO(Tair,albedo,al_gr_cold,al_min, +! & al_gr_melt,dt,tau_1) + +! implicit none +! real Tair +! real albedo +! real al_gr_cold +! real al_min +! real al_gr_melt +! real dt,tau_1 + +! if (Tair.le.0.0) then +! albedo = albedo - (al_gr_cold * dt / tau_1) +! albedo = max(albedo,al_min) +! else +! albedo = (albedo - al_min) * exp(-al_gr_melt * dt / tau_1) + +! & al_min +! endif + +! return +! end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + return + end SUBROUTINE GET_SFC + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/micromet_code.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/micromet_code.f90 new file mode 100755 index 000000000..cefce05cf --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/micromet_code.f90 @@ -0,0 +1,3553 @@ +! micromet_code.f + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +#include "LIS_misc.h" + + subroutine MICROMET_CODE(nx,ny,xmn,ymn,deltax,deltay,& + & iyear_init,imonth_init,iday_init,xhour_init,dt,undef,& + & ifill,iobsint,dn,iter,curve_len_scale,slopewt,curvewt,& + & topo,curvature,terrain_slope,slope_az,Tair_grid,& + & rh_grid,uwind_grid,vwind_grid,Qsi_grid,prec_grid,& + & i_tair_flag,i_rh_flag,i_wind_flag,i_solar_flag,& + & i_prec_flag,isingle_stn_flag,igrads_metfile,& + & windspd_grid,winddir_grid,windspd_flag,winddir_flag,& + & sprec,windspd_min,Qli_grid,i_longwave_flag,vegtype,& + & forest_LAI,iyear,imonth,iday,xhour,corr_factor,& + & icorr_factor_index,lapse_rate_user_flag,& + & iprecip_lapse_rate_user_flag,use_shortwave_obs,& + & use_longwave_obs,use_sfc_pressure_obs,sfc_pressure,& + & run_enbal,run_snowpack,calc_subcanopy_met,vegsnowd_xy,& + & gap_frac,cloud_frac_factor,barnes_lg_domain,n_stns_used,& + & k_stn,xlat_grid,xlon_grid,UTC_flag,icorr_factor_loop,& + & snowmodel_line_flag,xg_line,yg_line,irun_data_assim,& + & wind_lapse_rate,iprecip_scheme,cf_precip_flag,cf_precip,& + & cloud_frac_grid,snowfall_frac,seaice_run,metforce_opt) + + use snowmodel_inc +!KRA + use LIS_logMod, only : LIS_logunit + use LIS_coreMod +!KRA + + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + integer nstns_orig ! number of input values + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real Tair_orig(nstns_max) ! input values + real rh_orig(nstns_max) ! input values + real winddir_orig(nstns_max) ! input values + real windspd_orig(nstns_max) ! input values + real prec_orig(nstns_max) ! input values + real elev_orig(nstns_max) ! station elevation + real dn ! average observation spacing + real topo(nx,ny) ! grid topography + real xlat_grid(nx,ny) ! lat (dec deg) of cell centers + real xlon_grid(nx,ny) ! lon (dec deg) of cell centers + + real Tair_grid(nx,ny) ! output values + real rh_grid(nx,ny) ! output values + real uwind_grid(nx,ny) ! output, E-W wind component + real vwind_grid(nx,ny) ! output, N-S wind component + real windspd_grid(nx,ny) + real winddir_grid(nx,ny) + real Qsi_grid(nx,ny) ! output + real Qli_grid(nx,ny) ! output + real prec_grid(nx,ny) ! output + real sprec(nx,ny) ! output + real sfc_pressure(nx,ny) + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + real dt ! model time step, in seconds + integer iter ! model iteration + integer iyear_init ! model start year + integer imonth_init ! model start month + integer iday_init ! model start day + real xhour_init ! model start hour + integer J_day ! model Julian day, actually day-of-year + + real undef ! undefined value + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + real curvature(nx,ny) ! topographic curvature + real slope_az(nx,ny) ! azimuth of topographic slope + real terrain_slope(nx,ny) ! terrain slope + real vegtype(nx,ny) + real vegsnowd_xy(nx,ny) + real, save, allocatable :: topo_ref_grid(:,:)! reference surface + + real curve_len_scale ! length scale for curvature calculation + real slopewt ! wind model slope weight + real curvewt ! wind model curvature weight + + integer i_tair_flag,i_rh_flag,i_wind_flag,i_solar_flag,& + & i_prec_flag,i_longwave_flag,isingle_stn_flag,igrads_metfile,& + & lapse_rate_user_flag,iprecip_lapse_rate_user_flag,n_stns_used,& + & icorr_factor_loop,irun_data_assim,iprecip_scheme,metforce_opt + + real windspd_flag,winddir_flag,windspd_min,calc_subcanopy_met,& + & T_lapse_rate,Td_lapse_rate,precip_lapse_rate,& + & use_shortwave_obs,use_longwave_obs,use_sfc_pressure_obs,& + & run_enbal,run_snowpack,gap_frac,cloud_frac_factor,& + & barnes_lg_domain,UTC_flag,wind_lapse_rate + + integer, parameter :: nftypes = 5 + real forest_LAI(nftypes) + + real corr_factor(nx_max,ny_max,max_obs_dates+1) + integer icorr_factor_index(max_time_steps) + integer k_stn(nx,ny,9) + + real cf_precip(nx,ny) + real cf_precip_flag + + real cloud_frac_grid(nx,ny) + real snowfall_frac + + real seaice_run + integer i,j,irec,irec_day + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + if(.not.allocated(topo_ref_grid)) then + allocate(topo_ref_grid(nx,ny)) + topo_ref_grid = 0.0 + end if + +! Calculate what the current simulation date should be. + call get_model_time(iyear_init,imonth_init,iday_init,& + & xhour_init,iter,dt,iyear,imonth,iday,xhour,J_day) + + if (irun_data_assim.eq.1) then + write (*,150) icorr_factor_loop,iyear,imonth,iday,xhour + 150 format('In Assim Loop #',i1,'; WORKING ON MODEL TIME =', & + & i5,2i4,f6.1) + else + write (*,151) iyear,imonth,iday,xhour + 151 format(' WORKING ON MODEL TIME =',& + & i5,2i4,f6.1) + endif + +! Read in the observations for this time step, and build an array of +! valid observations to be interpolated. + call get_obs_data(nstns_orig,Tair_orig,rh_orig,xstn_orig,& + & ystn_orig,elev_orig,iyear,imonth,iday,xhour,undef,& + & windspd_orig,winddir_orig,prec_orig,isingle_stn_flag,& + & igrads_metfile,iter) + +! Make the topographic calculations required by the wind and solar +! radiation models. These calculations are not fixed in time +! because as the snow depth evolves it modifies the "topography". + call topo_data(nx,ny,deltax,deltay,topo,& + & curvature,terrain_slope,slope_az,curve_len_scale) + +! Calculate the temperature and dew-point lapse rates to be used in +! the interpolations. + call get_lapse_rates(imonth,iday,T_lapse_rate,& + & Td_lapse_rate,xlat_grid(1,1),lapse_rate_user_flag,& + & precip_lapse_rate,iprecip_lapse_rate_user_flag) + +! Calculate the forest lai for each of the five forest types, and +! for this day of the simulation (the lai varies seasonally for +! the case of deciduous trees). + call get_lai(J_day,forest_LAI) + +! If this is a Lagrangian sea ice parcel trajectory simulation, +! extract the lat-lon of the parcels at this time step. Note +! that these files have daily data in them, so the record has +! to be adjusted to account for this. + if (seaice_run.eq.4.0) then + + if (iter.eq.1) then + open (91,file='extra_met/grid_lat_time.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + open (92,file='extra_met/grid_lon_time.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + endif + + if (dt.eq.86400.0) then + irec = iter + elseif (dt.eq.10800.0) then + call get_daily_irec (iter,dt,irec_day) + irec = irec_day + else + print *,'This has not been set up to work on dt' + print *,' values other than 1 day and 3-hours.' + print *,' dt =',dt + stop + endif + + read (91,rec=irec) ((xlat_grid(i,j),i=1,nx),j=1,ny) + read (92,rec=irec) ((xlon_grid(i,j),i=1,nx),j=1,ny) + + endif + +! TEMPERATURE. + if (i_tair_flag.eq.1) then +! print *,' solving for temperature' + call temperature(nx,ny,deltax,deltay,xmn,ymn,& + & nstns_orig,xstn_orig,ystn_orig,Tair_orig,dn,Tair_grid,& + & undef,ifill,iobsint,iyear,imonth,iday,xhour,elev_orig,& + & topo,T_lapse_rate,barnes_lg_domain,n_stns_used,k_stn,& + & snowmodel_line_flag,xg_line,yg_line,seaice_run) + endif + +! RELATIVE HUMIDITY. + if (i_rh_flag.eq.1) then +! print *,' solving for relative humidity' + call relative_humidity(nx,ny,deltax,deltay,xmn,ymn,& + & nstns_orig,xstn_orig,ystn_orig,rh_orig,dn,rh_grid,undef,& + & ifill,iobsint,iyear,imonth,iday,xhour,elev_orig,topo,& + & Tair_orig,Tair_grid,Td_lapse_rate,barnes_lg_domain,& + & n_stns_used,k_stn,snowmodel_line_flag,xg_line,yg_line,& + & seaice_run) + endif + +! WIND SPEED AND DIRECTION. + if (i_wind_flag.eq.1) then +! print *,' solving for wind speed and direction' + call wind(nx,ny,deltax,deltay,xmn,ymn,windspd_orig,& + & nstns_orig,xstn_orig,ystn_orig,dn,undef,ifill,& + & iobsint,iyear,imonth,iday,xhour,elev_orig,& + & winddir_orig,uwind_grid,vwind_grid,slopewt,curvewt,& + & curvature,slope_az,terrain_slope,windspd_grid,& + & winddir_grid,windspd_flag,winddir_flag,windspd_min,& + & vegtype,forest_LAI,calc_subcanopy_met,vegsnowd_xy,& + & barnes_lg_domain,n_stns_used,k_stn,snowmodel_line_flag,& + & xg_line,yg_line,topo_ref_grid,topo,wind_lapse_rate,& + & curve_len_scale,seaice_run) + +! Provide the ability to read in an alternate wind dataset that +! has been previously generated with another program, like +! NUATMOS. The following assumes you are reading in a single +! file with u and v values. The file name is hardcoded here. + elseif (i_wind_flag.eq.-1) then + call read_wind_file(nx,ny,iter,uwind_grid,vwind_grid,& + & windspd_grid,winddir_grid,windspd_flag,winddir_flag,& + & windspd_min) + endif + +! SOLAR RADIATION. + if (i_solar_flag.eq.1) then +! print *,' solving for solar radiation' + call solar(nx,ny,xhour,J_day,topo,rh_grid,Tair_grid,& + & xlat_grid,Qsi_grid,slope_az,terrain_slope,dt,vegtype,& + & forest_LAI,T_lapse_rate,Td_lapse_rate,& + & calc_subcanopy_met,gap_frac,cloud_frac_factor,UTC_flag,& + & xlon_grid,cloud_frac_grid) + +! If requested, modify the model output to account for shortwave +! radiation observations. + if (use_shortwave_obs.eq.1.0) then + if (barnes_lg_domain.eq.1.0) then + print *,'The model is not configured to assimilate' + print *,' solar data with barnes_lg_domain = 1.0.' + stop + endif + call shortwave_data(nx,ny,deltax,deltay,xmn,ymn,& + & iyear,imonth,iday,xhour,undef,Qsi_grid,iter) + endif + endif + +! INCOMING LONGWAVE RADIATION. + if (i_longwave_flag.eq.1) then +! print *,' solving for incoming longwave radiation' + call longwave(nx,ny,rh_grid,Tair_grid,Qli_grid,topo,& + & vegtype,forest_LAI,T_lapse_rate,Td_lapse_rate,& + & calc_subcanopy_met,cloud_frac_factor) + +! If requested, modify the model output to account for longwave +! radiation observations. + if (use_longwave_obs.eq.1.0) then + if (barnes_lg_domain.eq.1.0) then + print *,'The model is not configured to assimilate' + print *,' longwave data with barnes_lg_domain = 1.0.' + stop + endif + call longwave_data(nx,ny,deltax,deltay,xmn,ymn,& + & iyear,imonth,iday,xhour,undef,Qli_grid,iter) + endif + endif + +! PRECIPITATION. + if (i_prec_flag.eq.1) then +! print *,' solving for precipitation' + call precipitation(nx,ny,deltax,deltay,xmn,ymn,& + & nstns_orig,xstn_orig,ystn_orig,prec_orig,dn,prec_grid,& + & undef,ifill,iobsint,iyear,imonth,iday,xhour,elev_orig,& + & topo,Tair_grid,sprec,corr_factor,icorr_factor_index,iter,& + & precip_lapse_rate,barnes_lg_domain,n_stns_used,k_stn,& + & snowmodel_line_flag,xg_line,yg_line,topo_ref_grid,& + & iprecip_scheme,cf_precip_flag,cf_precip,snowfall_frac,& + & seaice_run) + endif + +! SURFACE PRESSURE. +! Surface pressure is used in EnBal and SnowMass. If needed for +! this SnowModel simulation, calculate the distribution here. + if (run_enbal.eq.1.0 .or. run_snowpack.eq.1.0) then + call pressure(nx,ny,topo,sfc_pressure) + +! If requested, modify the model output to account for surface +! pressure observations. + if (use_sfc_pressure_obs.eq.1.0) then + if (barnes_lg_domain.eq.1.0) then + print *,'The model is not configured to assimilate' + print *,' pressure data with barnes_lg_domain = 1.0.' + stop + endif + call sfc_pressure_data(nx,ny,deltax,deltay,xmn,ymn,& + & iyear,imonth,iday,xhour,undef,sfc_pressure,iter) + endif + endif + + return + end subroutine MICROMET_CODE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine precipitation(nx,ny,deltax,deltay,xmn,ymn,& + & nstns_orig,xstn_orig,ystn_orig,prec_orig,dn,prec_grid,& + & undef,ifill,iobsint,iyear,imonth,iday,xhour,elev_orig,& + & topo,Tair_grid,sprec,corr_factor,icorr_factor_index,iter,& + & precip_lapse_rate,barnes_lg_domain,n_stns_used,k_stn,& + & snowmodel_line_flag,xg_line,yg_line,topo_ref_grid,& + & iprecip_scheme,cf_precip_flag,cf_precip,snowfall_frac,& + & seaice_run) + +! Interpolate the observed precipitation values to the grid. Also +! interpolate the station elevations to a reference surface. Use +! a precipitation "lapse rate", or adjustment factor to define +! the precipitation on the actual elevation grid. The reason the +! interpolated station elevations are used as the topographic +! reference surface (instead of something like sea level), is +! because the precipitation adjustment factor is a non-linear +! function of elevation difference. + +! The adjustment factor that is used comes from: Thornton, P. E., +! S. W. Running, and M. A. White, 1997: Generating surfaces of +! daily meteorological variables over large regions of complex +! terrain. J. Hydrology, 190, 214-251. + + use snowmodel_inc + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + integer nstns ! number of input values, all good + integer nstns_orig ! number of input values + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real prec(nstns_max) ! input values + real elev(nstns_max) ! station elevation + real undef ! undefined value + + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real elev_orig(nstns_max) ! station elevation + real prec_orig(nstns_max) ! input values + + real dn ! average observation spacing + real topo(nx,ny) ! grid topography + real prec_grid(nx,ny) ! output values + real Tair_grid(nx,ny) ! input values + real sprec(nx,ny) ! output values + real topo_ref_grid(nx,ny) ! reference surface + + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + + real delta_topo,alfa,Tf,precip_lapse_rate_m,precip_lapse_rate,& + & barnes_lg_domain + integer i,j,iter,n_stns_used + integer k_stn(nx,ny,9) + + real corr_factor(nx_max,ny_max,max_obs_dates+1) + integer icorr_factor_index(max_time_steps) + integer iprecip_scheme + + real cf_precip(nx,ny) + real cf_precip_flag + + real Tair_C,Tair_C_center,slope,b,snowfall_frac + real snowfall_frac_1,snowfall_frac_2,snowfall_frac_3 + + real seaice_run + +! Filter through the original input data, and eliminate any +! missing values. + call get_good_values1(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,prec_orig,prec) + +! Use the barnes oi scheme to interpolate the station elevation data +! to the grid, so that it can be used as a topographic reference +! surface. + call interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,elev,dn,topo_ref_grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! Use the barnes oi scheme to interpolate the station data to +! the grid. + call interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,prec,dn,prec_grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! Convert the precipitation "lapse rate" (km-1) to m-1. + precip_lapse_rate_m = precip_lapse_rate / 1000.0 + +! Choose between Glen's original precipitation increase with +! elevation scheme, and Ward van Pelt's scheme used in our +! Svalbard simulations (see van Pelt et al. 2016). + +! This is Glen's original MicroMet precipitation adjustment +! scheme. + if (iprecip_scheme.eq.1) then + + do j=1,ny + do i=1,nx + +! Convert the gridded station data to the SnowModel-grid elevations. + delta_topo = topo(i,j) - topo_ref_grid(i,j) + +! Don't let the elevation difference be greater than some number +! (like 1800 meters gives a factor of 4.4). If it is too large +! you get huge precipitation adjustment, a divide by zero, or +! even negative adjustments for high elevations). + delta_topo = min(delta_topo,1800.0) + alfa = precip_lapse_rate_m * delta_topo + prec_grid(i,j) = prec_grid(i,j) * (1.0 + alfa)/(1.0 - alfa) + + enddo + enddo + +! This is van Pelt's precipitation adjustment scheme. + elseif (iprecip_scheme.eq.2) then + + do j=1,ny + do i=1,nx + +! Don't correct precipitation above 1000 m a.s.l.. + if (topo_ref_grid(i,j).le.1000.0) then + if (topo(i,j).gt.1000.0) then + delta_topo = 1000.0 - topo_ref_grid(i,j) + else + delta_topo = topo(i,j) - topo_ref_grid(i,j) + endif + endif + if (topo_ref_grid(i,j).gt.1000.0) then + if (topo(i,j).gt.1000.0) then + delta_topo = 0.0 + else + delta_topo = topo(i,j) - 1000.0 + endif + endif + +! Don't let the elevation difference be greater than some number +! (like 1800 meters gives a factor of 4.4). If it is too large +! you get huge precipitation adjustment, a divide by zero, or +! even negative adjustments for high elevations). + delta_topo = min(delta_topo,1800.0) + alfa = 1.75 * delta_topo / 1000.0 + prec_grid(i,j) = prec_grid(i,j) * max(1.0+alfa,0.1) + + enddo + enddo + + endif + +! Convert the precipitation values from mm to m swe. Also, make +! sure the interpolation has not created any negetive +! precipitation values. + do j=1,ny + do i=1,nx + prec_grid(i,j) = prec_grid(i,j) / 1000.0 + prec_grid(i,j) = max(0.0,prec_grid(i,j)) + enddo + enddo + +! This is my original code: +! Use the temperature distribution to define whether this +! precipitation is falling as rain or snow (generate a +! snow-precipitation array following the air temperature +! threshold defined by Auer (1974) = 2.0 C). Note here that, +! if you ever want it, rain_prec = prec_grid - sprec. This +! snow precipitation (sprec) is assumed to be in meters +! snow-water-equivalent per time step. +! Tf = 273.15 +! do j=1,ny +! do i=1,nx +! if (Tair_grid(i,j).lt.2.0+Tf) then +! if (icorr_factor_index(iter).gt.0) then +! prec_grid(i,j) = +! & corr_factor(i,j,icorr_factor_index(iter)) * +! & prec_grid(i,j) +! else +! prec_grid(i,j) = prec_grid(i,j) +! endif +! sprec(i,j) = prec_grid(i,j) +! else +! sprec(i,j) = 0.0 +! endif +! enddo +! enddo + +! First apply any precipitation correction factors calculated as +! part of any data assimilation. + do j=1,ny + do i=1,nx + if (icorr_factor_index(iter).gt.0) then + prec_grid(i,j) = & + & corr_factor(i,j,icorr_factor_index(iter)) * & + & prec_grid(i,j) + endif + enddo + enddo + +! Apply the user-defined precipitation correction factor, if one +! exists. + if (cf_precip_flag.ne.0.0) then + do j=1,ny + do i=1,nx + prec_grid(i,j) = cf_precip(i,j) * prec_grid(i,j) + enddo + enddo + endif + +! Now calculate whether the precipiation is falling as rain or +! snow, and how much of each. + Tf = 273.15 + +! Auer (1974); a rain-snow threshold at +2.0 C. + if (snowfall_frac.eq.1.0) then + + do j=1,ny + do i=1,nx + Tair_C = Tair_grid(i,j) - Tf + if (Tair_C.lt.2.0) then + snowfall_frac_1 = 1.0 + else + snowfall_frac_1 = 0.0 + endif + sprec(i,j) = snowfall_frac_1 * prec_grid(i,j) + enddo + enddo + +! Dai, A. (2008): Temperature and pressure dependence of the +! rain-snow phase transition over land and ocean, Geophys. +! Res. Lett., 35, L12802, doi:10.1029/2008GL033295. +! In this implementation I have clipped Dai's values to 0 +! and 1. + elseif (snowfall_frac.eq.2.0) then + + do j=1,ny + do i=1,nx + Tair_C = Tair_grid(i,j) - Tf + snowfall_frac_2 = - 0.482292 * & + & (tanh(0.7205 * (Tair_C - 1.1662)) - 1.0223) + if (Tair_C.lt.-4.0) then + snowfall_frac_2 = 1.0 + elseif (Tair_C.gt.6.0) then + snowfall_frac_2 = 0.0 + endif + sprec(i,j) = snowfall_frac_2 * prec_grid(i,j) + enddo + enddo + +! Glen's linear approximation to Dai (2008). This plots right +! over the top of Dai, between frac = 0.1 and 0.9. + elseif (snowfall_frac.eq.3.0) then + +! Define where you want the center temperature to be when frac = 0.5. + Tair_C_center = 1.1 +! Define the slope of the line. + slope = -0.30 +! Calculate the intercept (the 0.5 is the frac for Tair_C_center). + b = 0.5 - slope * Tair_C_center + + do j=1,ny + do i=1,nx + Tair_C = Tair_grid(i,j) - Tf + +! Solve the equation in the form y = m*x + b + snowfall_frac_3 = slope * Tair_C + b + snowfall_frac_3 = max(0.0,snowfall_frac_3) + snowfall_frac_3 = min(1.0,snowfall_frac_3) + + sprec(i,j) = snowfall_frac_3 * prec_grid(i,j) + enddo + enddo + + endif + + return + end subroutine precipitation + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine longwave(nx,ny,rh_grid,Tair_grid,Qli_grid,topo,& + & vegtype,forest_LAI,T_lapse_rate,Td_lapse_rate,& + & calc_subcanopy_met,cloud_frac_factor) + + use snowmodel_inc + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + + real Tair_grid(nx,ny) + real rh_grid(nx,ny) + real Qli_grid(nx,ny) + real topo(nx,ny) + real vegtype(nx,ny) + + real T_lapse_rate,Td_lapse_rate,es,e,emiss_cloud,& + & A,B,C,Tf,Stef_Boltz,cloud_frac,E1,X1,Y1,Z1,E2,X2,Y2,Z2,& + & Xs,Ys,Zs,forest_frac,E3,X3,Y3,Z3,alfa,calc_subcanopy_met,& + & cloud_frac_factor + + integer, parameter :: nftypes = 5 + + real forest_LAI(nftypes) + + integer i,j,nveg + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. + A = 6.1121 * 100.0 + B = 17.502 + C = 240.97 + +! Over ice. +! A = 6.1115 * 100.0 +! B = 22.452 +! C = 272.55 + +! Define the freezing temperature to be used to convert from C to K. + Tf = 273.15 + +! Define the Stefan Boltzmann constant. + Stef_Boltz = 5.6696e-8 + +! Constants required for Iziomon et al. (2003). + E1 = 200.0 + X1 = 0.35 + Y1 = 0.100 + Z1 = 0.224 + + E2 = 1500.0 + X2 = 0.43 + Y2 = 0.115 + Z2 = 0.320 + +! Assume the X and Y coefficients increase linearly to 3000 m, +! and adjust Z to create a best fit to the CLPX data. + E3 = 3000.0 + X3 = 0.51 + Y3 = 0.130 + Z3 = 1.100 + + do j=1,ny + do i=1,nx + +! Compute the cloud fraction. + call get_cloudfrac(Tair_grid(i,j),rh_grid(i,j),topo(i,j),& + & cloud_frac,T_lapse_rate,Td_lapse_rate,cloud_frac_factor) + +! Calculate the vapor pressure. + es = A * exp((B * (Tair_grid(i,j) - Tf))/ & + & (C + (Tair_grid(i,j) - Tf))) + e = es * rh_grid(i,j) / 100.0 + +! Compute Qli following Iziomon et al. (2003). + if (topo(i,j).lt.E1) then + Xs = X1 + Ys = Y1 + Zs = Z1 + elseif (topo(i,j).gt.E2) then + Xs = X3 + Ys = Y3 + Zs = Z3 + else + Xs = X1 + (topo(i,j) - E1) * (X3 - X1)/(E3 - E1) + Ys = Y1 + (topo(i,j) - E1) * (Y3 - Y1)/(E3 - E1) + Zs = Z1 + (topo(i,j) - E1) * (Z3 - Z1)/(E3 - E1) + endif + + alfa = 1.083 + emiss_cloud = alfa * & + & (1.0 - Xs * exp((- Ys) * e/Tair_grid(i,j))) * & + & (1.0 + Zs * cloud_frac**2) + emiss_cloud = min(1.0,emiss_cloud) + + Qli_grid(i,j) = emiss_cloud * Stef_Boltz * Tair_grid(i,j)**4 + +! Modify the incoming longwave radiation for the forest canopy. + if (vegtype(i,j).le.5.0) then + if (calc_subcanopy_met.eq.1.0) then + +! Define the forest-canopy parameters. + nveg = nint(vegtype(i,j)) + if (forest_LAI(nveg).lt.0.2) then + forest_frac = 0.5 * forest_LAI(nveg) + else + forest_frac = & + & min(1.0,0.55 + 0.29 * log(forest_LAI(nveg))) + endif + Qli_grid(i,j) = Qli_grid(i,j) * (1.0 - forest_frac) + & + & (Stef_Boltz * Tair_grid(i,j)**4) * forest_frac + endif + endif + + enddo + enddo + + return + end subroutine longwave + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine solar(nx,ny,xhour,J_day,topo,rh_grid,Tair_grid,& + & xlat_grid,Qsi_grid,slope_az,terrain_slope,dt,vegtype,& + & forest_LAI,T_lapse_rate,Td_lapse_rate,& + & calc_subcanopy_met,gap_frac,cloud_frac_factor,UTC_flag,& + & xlon_grid,cloud_frac_grid) + +! First take the surface gridded fields of Tair and RH, and +! calculate Td for the topographic surface. Then use Tair and +! Td, and the associated lapse rates, and calculate Tair and Td +! for the 700 mb level. Use these surfaces to calculate RH at +! 700 mb, and convert these values to cloud fraction following +! Walcek, C. J., 1994: Cloud cover and its relationship to +! relative humidity during a spring midlatitude cyclone. Mon. +! Wea. Rev., 122, 1021-1035. + + use snowmodel_inc + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + + real topo(nx,ny) + real Tair_grid(nx,ny) + real rh_grid(nx,ny) + real Qsi_grid(nx,ny) + real slope_az(nx,ny) + real terrain_slope(nx,ny) + real vegtype(nx,ny) + real xlat_grid(nx,ny) + real xlon_grid(nx,ny) + real cloud_frac_grid(nx,ny) + + real xhour ! model decimal hour + real xxhour + integer J_day ! model day of year + integer i,j,ihrs_day,ihour,nveg + real dt,cloud_frac,Qsi_tmp,Qsi_sum,trans_veg,& + & T_lapse_rate,Td_lapse_rate,calc_subcanopy_met,gap_frac,& + & cloud_frac_factor,UTC_flag + + integer, parameter :: nftypes = 5 + real forest_LAI(nftypes) + + ihrs_day = 24 + + do j=1,ny + do i=1,nx + +! Compute the cloud fraction. + call get_cloudfrac(Tair_grid(i,j),rh_grid(i,j),topo(i,j),& + & cloud_frac,T_lapse_rate,Td_lapse_rate,cloud_frac_factor) + +! Save a copy of the cloud fraction distribution. + cloud_frac_grid(i,j) = cloud_frac + +! Compute the incoming solar radiation. The solar_rad subroutine +! calculates the instantaneous incoming solar radiation, so +! if the time step is very long, account for this by calculating +! the incoming solar radiation every 3 hours and then taking the +! average. + if (dt.le.10800.0) then + call solar_rad(Qsi_grid(i,j),J_day,xlat_grid(i,j),& + & cloud_frac,xhour,slope_az(i,j),terrain_slope(i,j),& + & UTC_flag,xlon_grid(i,j)) + elseif (dt.eq.86400.0) then + Qsi_sum = 0.0 + do ihour=3,ihrs_day,3 + xxhour = real(ihour) + call solar_rad(Qsi_tmp,J_day,xlat_grid(i,j),& + & cloud_frac,xxhour,slope_az(i,j),terrain_slope(i,j),& + & UTC_flag,xlon_grid(i,j)) + Qsi_sum = Qsi_sum + Qsi_tmp + enddo + Qsi_grid(i,j) = Qsi_sum / (real(ihrs_day)/3.0) + else + print *,'The model may not do what you want with this dt' + stop + endif + +! Modify the incoming solar radiation for the forest canopy. + if (vegtype(i,j).le.5.0) then + if (calc_subcanopy_met.eq.1.0) then + +! Define the forest-canopy transmissivity. 0.71 provided a +! best-fit to the observations, when averaged over the two years +! of hourly data. + nveg = nint(vegtype(i,j)) + trans_veg = exp((- 0.71) * forest_LAI(nveg)) + +! Account for any gaps in the forest canopy that will allow +! direct incoming solar radiation to reach the snow surface. + trans_veg = gap_frac * (1.0 - trans_veg) + trans_veg + + Qsi_grid(i,j) = trans_veg * Qsi_grid(i,j) + + endif + endif + + enddo + enddo + + return + end subroutine solar + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_cloudfrac(Tair_grid,rh_grid,topo,& + & cloud_frac,T_lapse_rate,Td_lapse_rate,cloud_frac_factor) + + implicit none + + real Td_lapse_rate,topo_ref,delta_topo,A,B,C,e,es,dx,& + & T_lapse_rate,press_ratio,f_max,one_minus_RHe,f_1,& + & Td_700,Tair_700,rh_700,cloud_frac,Tair_grid,rh_grid,& + & topo,Td_grid,Tf,cloud_frac_factor + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. + A = 6.1121 * 100.0 + B = 17.502 + C = 240.97 + +! Over ice. +! A = 6.1115 * 100.0 +! B = 22.452 +! C = 272.55 + +! Define the freezing temperature to be used to convert from C to K. + Tf = 273.15 + +! Assume that 700 mb is equivalent to 3000 m in a standard +! atmosphere. + topo_ref = 3000.0 + +! Define the ratio of 700 mb level pressure to the surface pressure +! (~1000 mb). + press_ratio = 0.7 + +! Assume dx = 80.0 km, for Walcek (1994). + dx = 80.0 + +! Walcek coefficients. + f_max = 78.0 + 80.0/15.5 + one_minus_RHe = 0.196 + (0.76-80.0/2834.0) * (1.0 - press_ratio) + f_1 = f_max * (press_ratio - 0.1) / 0.6 / 100.0 + +! Convert the gridded topo-surface RH to Td. + es = A * exp((B * (Tair_grid - Tf))/(C + (Tair_grid - Tf))) + e = es * max(10.0,rh_grid) / 100.0 + Td_grid = C * log(e/A) / (B - log(e/A)) + Tf + +! Convert the topo-surface temperature values to 700 mb values. +! delta_topo = topo - topo_ref + delta_topo = topo_ref - topo + Td_700 = Td_grid + Td_lapse_rate * delta_topo + Tair_700 = Tair_grid + T_lapse_rate * delta_topo + +! Convert each Td to a gridded relative humidity (0-1). + e = A * exp((B * (Td_700 - Tf))/(C + (Td_700 - Tf))) + es = A * exp((B * (Tair_700 - Tf))/(C + (Tair_700 - Tf))) + rh_700 = e/es + rh_700 = min(1.0,rh_700) + rh_700 = max(0.0,rh_700) + +! Use this RH at 700 mb to define the cloud fraction (0-1). + cloud_frac = f_1 * exp((rh_700 - 1.0)/one_minus_RHe) + +! If the user wants to, reduce the calculate cloud fraction by the +! cloud_frac_factor. + cloud_frac = cloud_frac_factor * cloud_frac + + return + end subroutine get_cloudfrac + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine solar_rad(Qsi,J_day,xlat,& + & cloud_frac,xxhour,slope_az,terrain_slope,& + & UTC_flag,xlon) + + implicit none + + integer J_day + + real solar_const,days_yr,Trop_Can,solstice,pi,deg2rad,& + & Qsi_direct,Qsi_diffuse,cos_i,cos_Z,Qsi,xlat,sin_z,xxhour,& + & cloud_frac,slope_az,terrain_slope,sol_dec,hr_angl,& + & trans_direct,trans_diffuse,Qsi_trans_dir,Qsi_trans_dif,& + & sun_azimuth,slope_az_S0,xxxhour,UTC_flag,xlon + +! Required constants. + solar_const = 1370. + days_yr = 365.25 + Trop_Can = 0.41 + solstice = 173. + pi = 2.0 * acos(0.0) + deg2rad = pi / 180.0 + +! COMPUTE THE BASIC SOLAR RADIATION PARAMETERS. + +! Compute the solar declination angle (radians). + sol_dec = Trop_Can * & + & cos(2.*pi * (real(J_day) - solstice)/days_yr) + +! For the case of running UTC time and a latitudinal variation +! in solar radiation, adjust the time to correspond to the +! local time at this longitude position. + if (UTC_flag.ne.0.0) then + xxxhour = xxhour + xlon / 15.0 + if (xxxhour.ge.24.0) xxxhour = xxxhour - 24.0 + if (xxxhour.lt.0.0) xxxhour = xxxhour + 24.0 + else + xxxhour = xxhour + endif + +! Compute the sun's hour angle (radians). + hr_angl = (xxxhour * 15.0 - 180.0) * deg2rad + +! Compute cos_Z. Note that the sin of the solar elevation angle, +! sin_alfa, is equal to the cosine of the solar zenith angle, +! cos_Z. + cos_Z = sin(sol_dec) * sin(xlat * deg2rad) + & + & cos(sol_dec) * cos(xlat * deg2rad) * cos(hr_angl) + cos_Z = max(0.0,cos_Z) + +! Account for clouds, water vapor, pollution, etc. + trans_direct = (0.6 + 0.2 * cos_Z) * (1.0 - cloud_frac) + trans_diffuse = (0.3 + 0.1 * cos_Z) * cloud_frac + +! Compute the solar radiation transmitted through the atmosphere. + Qsi_trans_dir = solar_const * trans_direct + Qsi_trans_dif = solar_const * trans_diffuse + +! COMPUTE THE CORRECTIONS TO ALLOW FOR TOPOGRAPHIC SLOPE AND ASPECT. + +! The sine of the solar zenith angle. + sin_Z = sqrt(1.0 - cos_Z*cos_Z) + +! Azimuth of the sun, with south having zero azimuth for the +! northern hemisphere. + sun_azimuth = & + & asin(max(-1.0,min(1.0,cos(sol_dec)*sin(hr_angl)/sin_Z))) + if (xlat.lt.0.0) then + sun_azimuth = - sun_azimuth + endif + +! Make the corrections so that the angles below the local horizon +! are still measured from the normal to the slope. + if (xlat.ge.0.0) then + if (hr_angl.lt.0.0) then + if (hr_angl.lt.sun_azimuth) sun_azimuth = - pi - sun_azimuth + elseif (hr_angl.gt.0.0) then + if (hr_angl.gt.sun_azimuth) sun_azimuth = pi - sun_azimuth + endif + else +! if (hr_angl.lt.0.0) then +! if (hr_angl.lt.sun_azimuth) sun_azimuth = - pi - sun_azimuth +! elseif (hr_angl.gt.0.0) then +! if (hr_angl.gt.sun_azimuth) sun_azimuth = pi - sun_azimuth +! endif + endif + +! Build, from the variable with north having zero azimuth, a +! slope_azimuth value with south having zero azimuth. Also +! make north have zero azimuth if in the southern hemsisphere. + if (xlat.ge.0.0) then + if (slope_az.ge.180.0) then + slope_az_S0 = slope_az - 180.0 + else + slope_az_S0 = slope_az + 180.0 + endif + else + slope_az_S0 = slope_az + endif + +! Compute the angle between the normal to the slope and the angle +! at which the direct solar radiation impinges on the sloping +! terrain (radians). + cos_i = cos(terrain_slope * deg2rad) * cos_Z + & + & sin(terrain_slope * deg2rad) * sin_Z * & + & cos(sun_azimuth - slope_az_S0 * deg2rad) + +! Adjust the topographic correction due to local slope so that +! the correction is zero if the sun is below the local horizon +! (i.e., the slope is in the shade) or if the sun is below the +! global horizon. + if (cos_i.lt.0.0) cos_i = 0.0 + if (cos_Z.le.0.0) cos_i = 0.0 + +! Adjust the solar radiation for slope, etc. + Qsi_direct = cos_i * Qsi_trans_dir + Qsi_diffuse = cos_Z * Qsi_trans_dif + +! Combine the direct and diffuse solar components. + Qsi = Qsi_direct + Qsi_diffuse + + return + end subroutine solar_rad + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine wind(nx,ny,deltax,deltay,xmn,ymn,windspd_orig,& + & nstns_orig,xstn_orig,ystn_orig,dn,undef,ifill,& + & iobsint,iyear,imonth,iday,xhour,elev_orig,& + & winddir_orig,uwind_grid,vwind_grid,slopewt,curvewt,& + & curvature,slope_az,terrain_slope,windspd_grid,& + & winddir_grid,windspd_flag,winddir_flag,windspd_min,& + & vegtype,forest_LAI,calc_subcanopy_met,vegsnowd_xy,& + & barnes_lg_domain,n_stns_used,k_stn,snowmodel_line_flag,& + & xg_line,yg_line,topo_ref_grid,topo,wind_lapse_rate,& + & curve_len_scale,seaice_run) + +! This program takes the station wind speed and direction, converts +! them to u and v components, interpolates u and v to a grid, +! converts the gridded values to speed and direction, and then +! runs a simple wind model that adjusts those speeds and +! directions according to topographic slope and curvature +! relationships. The resulting speeds and directions are +! converted to u and v components and passed back to the main +! program to be written to a file. (All of the conversion +! between u-v and speed-dir is done because of the problems +! with interpolating over the 360/0 direction line.) + + use snowmodel_inc + ! KRA + use LIS_coreMod + use LIS_mpiMod + use snowmodel_lsmMod, only : snowmodel_struc + ! KRA + implicit none + + integer :: ierr ! KRA + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + integer nstns ! number of input values, all good + integer nstns_orig ! number of input values + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real elev(nstns_max) ! station elevation + real undef ! undefined value + + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real elev_orig(nstns_max) ! station elevation + + real windspd_orig(nstns_max) ! input values + real winddir_orig(nstns_max) ! input values + + real speed(nstns_max) ! input values + real dir(nstns_max) ! input values + real u(nstns_max) ! u component of wind + real v(nstns_max) ! v component of wind + + real dn ! average observation spacing + real uwind_grid(nx,ny) ! output values + real vwind_grid(nx,ny) ! output values + real u_grid(nx,ny) ! temporary u wind component + real v_grid(nx,ny) ! temporary v wind component + real winddir_grid(nx,ny) ! temporary wind direction + real windspd_grid(nx,ny) ! temporary wind speed + + real curvature(nx,ny) ! topographic curvature + real slope_az(nx,ny) ! azimuth of topographic slope + real terrain_slope(nx,ny) ! terrain slope + real vegtype(nx,ny) + real vegsnowd_xy(nx,ny) + real topo_ref_grid(nx,ny) ! reference surface + real topo(nx,ny) + + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + + real pi,deg2rad,rad2deg,slopewt,curvewt,curve_len_scale + integer i,j,k,n_stns_used + integer k_stn(nx,ny,9) + real windspd_flag,winddir_flag,u_sum,v_sum,windspd_min,& + & calc_subcanopy_met,barnes_lg_domain,wind_lapse_rate,& + & delta_topo,alfa1,alfa2 + + integer, parameter :: nftypes = 5 + real forest_LAI(nftypes) + real seaice_run + +! Define the required constants. + pi = 2.0 * acos(0.0) + deg2rad = pi / 180.0 + rad2deg = 180.0 / pi + +! Filter through the original input data, and eliminate any +! missing values (i.e., make sure each wind direction is paired +! up with a wind speed. + call get_good_values2(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,windspd_orig,winddir_orig,& + & speed,dir) + +! Convert these station data to u and v wind components. + do k=1,nstns + speed(k) = max(windspd_min,speed(k)) + u(k) = (- speed(k)) * sin(deg2rad * dir(k)) + v(k) = (- speed(k)) * cos(deg2rad * dir(k)) + enddo + +! Use the barnes oi scheme to interpolate the station data to +! the grid. +! U component. + call interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,u,dn,u_grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! V component. + call interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,v,dn,v_grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! If desired, impose a wind speed increase with elevation. Here +! the wind_lapse_rate = the wind speed increase per 1-km elevation +! gain. The adjustment is patterned after the precipitation- +! elevation adjustment. topo_ref_grid here comes from the +! precipitation adjustment. + if (wind_lapse_rate.ne.0.0) then + alfa1 = (wind_lapse_rate - 1.0) / (1.0 + wind_lapse_rate) +! Convert to m-1. + alfa1 = alfa1 / 1000.0 + do j=1,ny + do i=1,nx + delta_topo = topo(i,j) - topo_ref_grid(i,j) +! Impose some limits to the adjustment. + delta_topo = min(delta_topo,1800.0) + alfa2 = alfa1 * delta_topo + u_grid(i,j) = u_grid(i,j) * (1.0 + alfa2)/(1.0 - alfa2) + v_grid(i,j) = v_grid(i,j) * (1.0 + alfa2)/(1.0 - alfa2) + enddo + enddo + endif + +! Convert these u and v components to speed and directions. + do j=1,ny + do i=1,nx + +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(u_grid(i,j)).lt.1e-10) u_grid(i,j) = 1e-10 + + winddir_grid(i,j) = rad2deg * atan2(u_grid(i,j),v_grid(i,j)) + if (winddir_grid(i,j).ge.180.0) then + winddir_grid(i,j) = winddir_grid(i,j) - 180.0 + else + winddir_grid(i,j) = winddir_grid(i,j) + 180.0 + endif + +! winddir_grid(i,j) = 270.0 - +! & rad2deg*atan2(v_grid(i,j),u_grid(i,j)) +! if (winddir_grid(i,j).ge.360.0) +! & winddir_grid(i,j) = winddir_grid(i,j)-360.0 + + windspd_grid(i,j) = sqrt(u_grid(i,j)**2 + v_grid(i,j)**2) + enddo + enddo + +! Modify the wind speed and direction according to simple +! wind-topography relationships. + call topo_mod_winds(nx,ny,winddir_grid,slopewt,curvewt,& + & windspd_grid,uwind_grid,vwind_grid,curvature,slope_az,& + & terrain_slope,vegtype,forest_LAI,calc_subcanopy_met,& + & vegsnowd_xy,curve_len_scale,deltax,deltay) + +! Avoid problems of zero (low) winds (for example, turbulence +! theory, log wind profile, etc., says that we must have some +! wind. Thus, some equations blow up when the wind speed gets +! very small). + do j=1,ny + do i=1,nx + if (windspd_grid(i,j).lt.windspd_min) then + windspd_grid(i,j) = windspd_min + uwind_grid(i,j) = (- windspd_grid(i,j)) * & + & sin(deg2rad*winddir_grid(i,j)) + vwind_grid(i,j) = (- windspd_grid(i,j)) * & + & cos(deg2rad*winddir_grid(i,j)) + endif + enddo + enddo + +! Find the maximum wind speed in the domain, and the +! domain-averaged wind direction. + windspd_flag = 0.0 + u_sum = 0.0 + v_sum = 0.0 + do j=1,ny + do i=1,nx + windspd_flag = max(windspd_flag,windspd_grid(i,j)) + u_sum = u_sum + uwind_grid(i,j) + v_sum = v_sum + vwind_grid(i,j) + enddo + enddo + +! KRA +#if (defined SPMD) +! CAF calls for locating totals ... (Alessandro) +! call co_sum(u_sum) +! call co_sum(v_sum) +! call co_max(windspd_flag) + +! print *, "wind: ",LIS_localPet+1, u_sum, v_sum, windspd_flag + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(u_sum, snowmodel_struc(1)%usum_glb, 1,& + MPI_REAL, MPI_SUM,& + LIS_mpi_comm, ierr) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(v_sum, snowmodel_struc(1)%vsum_glb, 1,& + MPI_REAL, MPI_SUM,& + LIS_mpi_comm, ierr) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(windspd_flag, snowmodel_struc(1)%windspdflg_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + + u_sum = snowmodel_struc(1)%usum_glb + v_sum = snowmodel_struc(1)%vsum_glb + windspd_flag = snowmodel_struc(1)%windspdflg_glb + +! print *, " final u_sum: ",u_sum +! print *, " final v_sum: ",v_sum +! print *, " final wspdflag: ",windspd_flag + +#endif +! KRA + + u_sum = u_sum / real(nx*ny) + v_sum = v_sum / real(nx*ny) + +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(u_sum).lt.1e-10) u_sum = 1e-10 + + winddir_flag = rad2deg * atan2(u_sum,v_sum) + if (winddir_flag.ge.180.0) then + winddir_flag = winddir_flag - 180.0 + else + winddir_flag = winddir_flag + 180.0 + endif + +! winddir_flag = 270.0 - rad2deg*atan2(v_sum,u_sum) +! if (winddir_flag.ge.360.0) winddir_flag = winddir_flag-360.0 + + return + end subroutine wind + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine relative_humidity(nx,ny,deltax,deltay,xmn,ymn,& + & nstns_orig,xstn_orig,ystn_orig,rh_orig,dn,rh_grid,undef,& + & ifill,iobsint,iyear,imonth,iday,xhour,elev_orig,topo,& + & Tair_orig,Tair_grid,Td_lapse_rate,barnes_lg_domain,& + & n_stns_used,k_stn,snowmodel_line_flag,xg_line,yg_line,& + & seaice_run) + +! This procedure follows: Kunkel, K. E., 1989: Simple procedures for +! extrapolation of humidity variables in the mountainous Western +! United States. J. Climate, 2, 656-669. + +! First convert stn relative humidity to dew-point temperature. Use +! the Td lapse rate to take the stn Td to sea level. Interpolate +! the stn Td to the grid. Use the Td lapse rate to take the sea +! level grid to the actual elevations. Convert each Td to +! relative humidity. + + use snowmodel_inc + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + integer nstns ! number of input values, all good + integer nstns_orig ! number of input values + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real elev(nstns_max) ! station elevation + real undef ! undefined value + + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real elev_orig(nstns_max) ! station elevation + + real Tair_orig(nstns_max) ! input values + real rh_orig(nstns_max) ! input values + + real Tair(nstns_max) ! input values + real Td(nstns_max) ! input values + real rh(nstns_max) ! input values + + real dn ! average observation spacing + real topo(nx,ny) ! grid topography + real Tair_grid(nx,ny) ! output values + real Td_grid(nx,ny) ! output values + real rh_grid(nx,ny) ! output values + + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + + real Td_lapse_rate,topo_ref,delta_topo,A,B,C,e,es,Tf,& + & barnes_lg_domain + integer i,j,k,n_stns_used + integer k_stn(nx,ny,9) + real seaice_run + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C. + A = 6.1121 * 100.0 + B = 17.502 + C = 240.97 + +! Over ice. +! A = 6.1115 * 100.0 +! B = 22.452 +! C = 272.55 + +! Define the freezing temperature to be used to convert from C to K. + Tf = 273.15 + +! Filter through the original input data, and eliminate any +! missing values. + call get_good_values2(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,Tair_orig,rh_orig,& + & Tair,rh) + +! Convert the stn relative humidity to Td. + do k=1,nstns + +! Saturation vapor pressure at temperature, T. + es = A * exp((B * (Tair(k) - Tf))/(C + (Tair(k) - Tf))) + +! Dew point temperature for a given temperature and relative humidity. + e = es * max(10.0,rh(k)) / 100.0 + Td(k) = C * log(e/A) / (B - log(e/A)) + Tf + + enddo + +! Define the topographic reference surface. + topo_ref = 0.0 + +! Convert the station data to sea level values. + do k=1,nstns + delta_topo = topo_ref - elev(k) + Td(k) = Td(k) + Td_lapse_rate * delta_topo + enddo + +! Use the barnes oi scheme to interpolate the station data to +! the grid. + call interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,Td,dn,Td_grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! Convert these grid values back to the actual gridded elevations. + do j=1,ny + do i=1,nx + delta_topo = topo(i,j) - topo_ref + Td_grid(i,j) = Td_grid(i,j) + Td_lapse_rate * delta_topo + enddo + enddo + +! Convert each Td to a gridded relative humidity. + do j=1,ny + do i=1,nx + e = A * exp((B * (Td_grid(i,j) - Tf)) / & + & (C + (Td_grid(i,j) - Tf))) + es = A * exp((B * (Tair_grid(i,j) - Tf)) /& + & (C + (Tair_grid(i,j) - Tf))) + rh_grid(i,j) = 100.0 * e/es + +! Make sure the interpolation processes has not created any values +! above 100 and below 0. + rh_grid(i,j) = min(100.0,rh_grid(i,j)) + rh_grid(i,j) = max(0.0,rh_grid(i,j)) + enddo + enddo + + return + end subroutine relative_humidity + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine temperature(nx,ny,deltax,deltay,xmn,ymn,& + & nstns_orig,xstn_orig,ystn_orig,Tair_orig,dn,Tair_grid,& + & undef,ifill,iobsint,iyear,imonth,iday,xhour,elev_orig,& + & topo,T_lapse_rate,barnes_lg_domain,n_stns_used,k_stn,& + & snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! The lapse rate used depends on the month of the year, and is +! defined by: Kunkel, K. E., 1989: Simple procedures for +! extrapolation of humidity variables in the mountainous Western +! United States. J. Climate, 2, 656-669. + +! First adjust the stn temperatures to a common level (sea level), +! assuming this lapse rate. Then interpolate the temperatures +! to the model grid. Then use the topography data and lapse +! rate to adjust the gridded temperatures values back to the +! actual elevation. + +! Contact Glen if you are interested in the temperature inversion +! code presented in: Mernild, S. H., and G. E. Liston, 2010: +! The influence of air temperature inversions on snowmelt and +! glacier mass-balance simulations, Ammassalik Island, SE +! Greenland. J. Applied Meteorology and Climatology, 49, 47-67. + + use snowmodel_inc + use LIS_coreMod ! KRA + + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + integer nstns ! number of input values, all good + integer nstns_orig ! number of input values + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real Tair(nstns_max) ! input values + real elev(nstns_max) ! station elevation + real undef ! undefined value + + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real elev_orig(nstns_max) ! station elevation + real Tair_orig(nstns_max) ! input values + + real dn ! average observation spacing + real topo(nx,ny) ! grid topography + real Tair_grid(nx,ny) ! output values + + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + + real T_lapse_rate,topo_ref,delta_topo,barnes_lg_domain + integer i,j,k,n_stns_used + integer k_stn(nx,ny,9) + real seaice_run + +! Filter through the original input data, and eliminate any +! missing values. + call get_good_values1(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,Tair_orig,Tair) + +! Define the topographic reference surface. + topo_ref = 0.0 + +! Convert the station data to sea level values. + do k=1,nstns + delta_topo = topo_ref - elev(k) + Tair(k) = Tair(k) + T_lapse_rate * delta_topo + enddo + +! Use the barnes oi scheme to interpolate the station data to +! the grid. + call interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,Tair,dn,Tair_grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + +! Convert these grid values back to the actual gridded elevations. + do j=1,ny + do i=1,nx + delta_topo = topo(i,j) - topo_ref + Tair_grid(i,j) = Tair_grid(i,j) + T_lapse_rate * delta_topo + enddo + enddo + + return + end subroutine temperature + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine topo_mod_winds(nx,ny,winddir_grid,slopewt,curvewt,& + & windspd_grid,uwind_grid,vwind_grid,curvature,slope_az,& + & terrain_slope,vegtype,forest_LAI,calc_subcanopy_met,& + & vegsnowd_xy,curve_len_scale,deltax,deltay) + + use snowmodel_inc +! KRA + use LIS_coreMod + use LIS_mpiMod + use snowmodel_lsmMod, only : snowmodel_struc +! KRA + implicit none + + integer :: ierr ! KRA + + integer i,j,nx,ny,nveg,k + + real pi,deg2rad,rad2deg,slopewt,curvewt,dirdiff,curve_len_scale,& + & wslope_max,beta,veg_ht,a,canopy_windwt,calc_subcanopy_met,& + & deltax,deltay,xmult + integer, parameter :: nftypes = 5 + integer :: loops_windwt_smoother + + real forest_LAI(nftypes) + + real curvature(nx,ny) + real windspd_grid(nx,ny) + real winddir_grid(nx,ny) + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + real wind_slope(nx,ny) + real slope_az(nx,ny) + real terrain_slope(nx,ny) + real vegtype(nx,ny) + real vegsnowd_xy(nx,ny) + real windwt(nx,ny) + +! Compute the wind modification factor which is a function of +! topography and wind direction following Liston and Sturm (1998). + +! Define the required constants. + pi = 2.0 * acos(0.0) + deg2rad = pi / 180.0 + rad2deg = 180.0 / pi + +! Compute the slope in the direction of the wind. + do i=1,nx + do j=1,ny + wind_slope(i,j) = deg2rad * terrain_slope(i,j) * & + & cos(deg2rad * (winddir_grid(i,j) - slope_az(i,j))) + enddo + enddo + +! Scale the wind slope such that the max abs(wind slope) has a value +! of abs(0.5). Include a 1 mm slope in slope_max to prevent +! divisions by zero in flat terrain where the slope is zero. + wslope_max = 0.0 + 0.001 + do j=1,ny + do i=1,nx + wslope_max = max(wslope_max,abs(wind_slope(i,j))) + enddo + enddo + +! KRA +#if (defined SPMD) +! call co_max(wslope_max) +! print *, "wslope_max: ",LIS_localPet+1, wslope_max + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(wslope_max, snowmodel_struc(1)%wslopemax_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + wslope_max = snowmodel_struc(1)%wslopemax_glb +! print *, "final wslope_max: ",wslope_max +#endif +! KRA + + do j=1,ny + do i=1,nx + wind_slope(i,j) = wind_slope(i,j) / (2.0 * wslope_max) + enddo + enddo + +! Calculate the wind speed and direction adjustments. The +! curvature and wind_slope values range between -0.5 and +0.5. +! Valid slopewt and curvewt values are between 0 and 1, with +! values of 0.5 giving approximately equal weight to slope and +! curvature. I suggest that slopewt and curvewt be set such +! that slopewt + curvewt = 1.0. This will limit the total +! wind weight to between 0.5 and 1.5 (but this is not required). + +! Compute the wind weighting factor. + do i=1,nx + do j=1,ny + windwt(i,j) = 1.0 + slopewt * wind_slope(i,j) + & + & curvewt * curvature(i,j) + enddo + enddo + +! Smooth the wind weighting factor to eliminate any sharp speed +! increases resulting from the merging of the curve wt and the +! slope wt. Define the number of times this is done to be a +! function of the curvature length scale and the grid increment. +! The first 0.5 here just means that half of the caclulated +! number appears to be about right (additional loops with this +! smoother does not change the results much). If there are +! unwanted wave features in the snow distribution, this 0.5 +! factor can be increased to 1.0 or more, to get rid of these +! waves. Also see "loops_snowd_smoother" in snowtran_code.f. +! xmult = 0.5 + xmult = 1.0 +! xmult = 1.5 + loops_windwt_smoother = nint(xmult * curve_len_scale / & + & (0.5 * (deltax + deltay))) + +! print * +! print *, 'loops_windwt_smoother ',loops_windwt_smoother +! print * + +! Don't do this smoothing if the domain is arbitrarily small. + if (nx.gt.100 .and. ny.gt.100) then + do k=1,loops_windwt_smoother + call smoother9(nx,ny,windwt) + enddo + endif + +! Continue with the wind calculations. + do i=1,nx + do j=1,ny + +! Generate the terrain-modified wind speed. + windspd_grid(i,j) = windwt(i,j) * windspd_grid(i,j) + +! Further modify the wind speed to account for forest canopies. + if (vegtype(i,j).le.5.0) then + if (calc_subcanopy_met.eq.1.0) then + nveg = nint(vegtype(i,j)) + +! Define the canopy wind-weighting factor. Assume z=0.6*canopy_ht, +! and the canopy_ht equals the vegetation snow-holding depth. + beta = 0.9 + veg_ht = vegsnowd_xy(i,j) + a = beta * forest_LAI(nveg) + canopy_windwt = exp((- a)*(1.0 - (0.6*veg_ht)/veg_ht)) + windspd_grid(i,j) = canopy_windwt * windspd_grid(i,j) + + endif + endif + +! Modify the wind direction according to Ryan (1977). Note that it +! is critical that "dirdiff" handles the cases where the slope +! azimuth and the wind direction are on different sides of the +! 360-0 line. + if (slope_az(i,j).gt.270.0.and. & + & winddir_grid(i,j).lt.90.0) then + dirdiff = slope_az(i,j) - winddir_grid(i,j) - 360.0 + elseif (slope_az(i,j).lt.90.0.and. & + & winddir_grid(i,j).gt.270.0) then + dirdiff = slope_az(i,j) - winddir_grid(i,j) + 360.0 + else + dirdiff = slope_az(i,j) - winddir_grid(i,j) + endif + if (abs(dirdiff).le.90.0) then + winddir_grid(i,j) = winddir_grid(i,j) - 0.5 * & + & min(wind_slope(i,j)*rad2deg,45.0) * & + & sin(deg2rad * (2.0 * dirdiff)) + if (winddir_grid(i,j).gt.360.0) then + winddir_grid(i,j) = winddir_grid(i,j) - 360.0 + elseif (winddir_grid(i,j).lt.0.0) then + winddir_grid(i,j) = winddir_grid(i,j) + 360.0 + endif + endif + +! Extract the u and v wind components. + uwind_grid(i,j) = (- windspd_grid(i,j)) * & + & sin(deg2rad*winddir_grid(i,j)) + vwind_grid(i,j) = (- windspd_grid(i,j)) * & + & cos(deg2rad*winddir_grid(i,j)) + enddo + enddo + + return + end subroutine topo_mod_winds + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine topo_data(nx,ny,deltax,deltay,topo,& + & curvature,terrain_slope,slope_az,curve_len_scale) + + use snowmodel_inc +! KRA + use LIS_coreMod + use LIS_mpiMod + use snowmodel_lsmMod, only : snowmodel_struc +! KRA + implicit none + + integer :: ierr ! KRA + + integer i,j,nx,ny,inc + + real pi,rad2deg,deltax,deltay,deltaxy,curve_len_scale,curve_max + + real topo(nx,ny) + real dzdx(nx,ny) + real dzdy(nx,ny) + real curvature(nx,ny) + real slope_az(nx,ny) + real terrain_slope(nx,ny) + +! Compute the topographic information required to run the wind +! model. + +! Deal with the model running at a point, or along single or double +! lines. + if (nx.le.2 .or. ny.le.2) then + do i=1,nx + do j=1,ny + curvature(i,j) = 0.0 + terrain_slope(i,j) = 0.0 + slope_az(i,j) = 0.0 + enddo + enddo + else + +! Define the required constants. + pi = 2.0 * acos(0.0) + rad2deg = 180.0 / pi + +! CURVATURE CALCULATIONS. + +! Compute the average grid increment. + deltaxy = 0.5 * (deltax + deltay) + +! Convert the length scale to an appropriate grid increment. + inc = max(1,nint(curve_len_scale/deltaxy)) + +! Compute the curvature. + do i=1,nx + do j=1,ny + curvature(i,j) = (4.0 * topo(i,j) - & + & topo(max(1,i-inc),max(1,j-inc)) - & + & topo(min(nx,i+inc),min(ny,j+inc)) - & + & topo(min(nx,i+inc),max(1,j-inc)) - & + & topo(max(1,i-inc),min(ny,j+inc))) / & + & (sqrt(2.0) * 16.0 * real(inc) * deltaxy) + & + & (4.0 * topo(i,j) - & + & topo(min(nx,i+inc),j) - topo(max(1,i-inc),j) - & + & topo(i,min(ny,j+inc)) - topo(i,max(1,j-inc))) / & + & (16.0 * real(inc) * deltaxy) + enddo + enddo + +! Scale the curvature such that the max abs(curvature) has a value +! of abs(0.5). Include a 1 mm curvature in curve_max to prevent +! divisions by zero in flat terrain where the curvature is zero. + curve_max = 0.0 + 0.001 + do j=1,ny + do i=1,nx + curve_max = max(curve_max,abs(curvature(i,j))) + enddo + enddo +! KRA +#if (defined SPMD) +! call co_max(curve_max) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(curve_max, snowmodel_struc(1)%curvemax_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + curve_max = snowmodel_struc(1)%curvemax_glb +#endif +! KRA + do j=1,ny + do i=1,nx + curvature(i,j) = curvature(i,j) / (2.0 * curve_max) + enddo + enddo + +! SLOPE CALCULATIONS. + +! Find dzdx. + do j=1,ny + dzdx(1,j) = (topo(2,j) - topo(1,j)) / deltax + do i=2,nx-1 + dzdx(i,j) = (topo(i+1,j) - topo(i-1,j)) / (2.0 * deltax) + enddo + dzdx(nx,j) = (topo(nx,j) - topo(nx-1,j)) / deltax + enddo + +! Find dzdy. + do i=1,nx + dzdy(i,1) = (topo(i,2) - topo(i,1)) / deltay + do j=2,ny-1 + dzdy(i,j) = (topo(i,j+1) - topo(i,j-1)) / (2.0 * deltay) + enddo + dzdy(i,ny) = (topo(i,ny) - topo(i,ny-1)) / deltay + enddo + +! Calculate the terrain slope and azimuth. + do i=1,nx + do j=1,ny + +! Some compilers will not allow dzdx and dzdy to both be 0.0 in +! the atan2 computation. +! if (abs(dzdx(i,j)).lt.1e-10) dzdx(i,j) = 1e-10 + if (abs(dzdy(i,j)).lt.1e-10) dzdy(i,j) = 1e-10 + +! Compute the slope azimuth, making sure that north has zero +! azimuth. Also note that for the Ryan wind rotation, the +! azimuth values must range from 0 to 360. + slope_az(i,j) = rad2deg * & + & (3.0 / 2.0 * pi - atan2(dzdy(i,j),dzdx(i,j))) + if (slope_az(i,j).ge.360.0) slope_az(i,j) = & + & slope_az(i,j) - 360.0 + +! Compute the slope of the terrain. + terrain_slope(i,j) = rad2deg * & + & atan(sqrt(dzdx(i,j)*dzdx(i,j) + dzdy(i,j)*dzdy(i,j))) + + enddo + enddo + + endif + + return + end subroutine topo_data + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine interpolate(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,var,dn,grid,undef,ifill,iobsint,& + & iyear,imonth,iday,xhour,barnes_lg_domain,n_stns_used,& + & k_stn,snowmodel_line_flag,xg_line,yg_line,seaice_run) + + use snowmodel_inc + use LIS_coreMod ! KRA + + implicit none + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real var(nstns_max) ! input values + + double precision xstn_tmp(nstns_max) ! input stn x coords + double precision ystn_tmp(nstns_max) ! input stn y coords + real var_tmp(nstns_max) ! input values + + integer nstns ! number of input values, all good + real undef ! undefined value + real dn ! average observation spacing + real grid(nx,ny) ! output values + + integer i,j ! col, row counters + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + + integer k_stn(nx,ny,9) + integer k,n_stns_used + real barnes_lg_domain,seaice_run + +! Use the barnes oi scheme to grid the station data. If there is +! only a single station, distribute those data uniformly over +! the grid. In the event that there are no valid observations, +! send an error message and stop (although this should have been +! caught as part of a preprocessor step). + +! The interpolation can be done two different ways: +! First, barnes_oi does the interpolation by processing all of +! the available station data for each model grid cell. +! Second, barnes_oi_ij does the interpolation by processing only +! the "n_stns_used" number of stations for each model grid cell. +! For small domains, with relatively few met stations (100's), +! the first way is best. For large domains (like the +! United States, Globe, Pan-Arctic, North America, Greenland) +! and many met stations (like 1000's), the second approach is the +! most efficient. But, the second approach carries the following +! restrictions: 1) there can be no missing data for the fields of +! interest; 2) there can be no missing stations (all stations +! must exist throughout the simulation period); and 3) the +! station met file must list the stations in the same order for +! all time steps. In addition, the code limits the number of +! nearest stations used to be 5 or less. + +! In this first case you are doing a Lagrangian sea ice parcel +! simulation. + if (seaice_run.eq.4.0) then + do j=1,ny + do i=1,nx + grid(i,j) = var(i) + enddo + enddo + else + if (nstns.ge.2) then + +! call get_dn(nx,ny,deltax,deltay,nstns,dn,iobsint) !KRA + call get_dn(LIS_rc%gnc(1),LIS_rc%gnr(1),& + deltax,deltay,nstns,dn,iobsint) !KRA + + if (barnes_lg_domain.eq.1.0 .or. barnes_lg_domain.eq.2.0) then + + if (barnes_lg_domain.eq.2.0) then + call get_nearest_stns_2(nx,ny,xmn,ymn,deltax,deltay,& + & n_stns_used,k_stn,nstns,xstn,ystn,xg_line,yg_line,& + & snowmodel_line_flag) + endif + + do j=1,ny + do i=1,nx + +! Use that nearest station list to extract the station information +! to be used in the interpolation. + do k=1,n_stns_used + xstn_tmp(k) = xstn(k_stn(i,j,k)) + ystn_tmp(k) = ystn(k_stn(i,j,k)) + var_tmp(k) = var(k_stn(i,j,k)) + enddo + +! Do the interpolation for this model grid cell. + call barnes_oi_ij(nx,ny,deltax,deltay,xmn,ymn,& + & n_stns_used,xstn_tmp,ystn_tmp,var_tmp,dn,grid,& + & undef,ifill,i,j,snowmodel_line_flag,xg_line,yg_line) + + enddo + enddo + + else + + call barnes_oi(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,var,dn,grid,undef,ifill) + + endif + + elseif (nstns.eq.1) then + + call single_stn(nx,ny,nstns,var,grid) + + else + + print *,'found no valid obs data at this time step' + print *,' model time =', iyear,imonth,iday,xhour + stop + + endif + + endif + + return + end subroutine interpolate + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_nearest_stns_2(nx,ny,xmn,ymn,deltax,deltay,& + & n_stns_used,k_stn,nstns,xstn,ystn,xg_line,yg_line,& + & snowmodel_line_flag) + + use snowmodel_inc + implicit none + + double precision xstn(nstns_max) + double precision ystn(nstns_max) + double precision dsq(nstns_max) + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + double precision xg,yg,xmn,ymn,dist_min + real deltax,deltay + + integer i,j,k,kk,nstns,n_stns_used,nx,ny + integer k_stn(nx,ny,9) + + do j=1,ny + do i=1,nx + +! xcoords of grid nodes at index i,j +! ycoords of grid nodes at index i,j + if (snowmodel_line_flag.eq.1.0) then + xg = xg_line(i,j) + yg = yg_line(i,j) + elseif (snowmodel_line_flag.eq.0.0) then + print *, 'This can be very slow. I suggest you study' + print *, 'and implement some version of the code below' + print *, 'this subroutine before continuing along this' + print *, 'simulation approach.' + stop + xg = xmn + deltax * (real(i) - 1.0) + yg = ymn + deltay * (real(j) - 1.0) + endif + +! Loop through all of the stations, calculating the distance +! between the current grid point and each of the stations. + do k=1,nstns + dsq(k) = (xg - xstn(k))**2 + (yg - ystn(k))**2 + enddo + +! Loop through each of the station distances and find the +! stations closest to the grid point in question. + do kk=1,n_stns_used + dist_min = 1.0e30 + do k=1,nstns + if (dsq(k).le.dist_min) then + k_stn(i,j,kk) = k + dist_min = dsq(k) + endif + enddo + +! Eliminate the last found minimum from the next search by making +! its distance a big number. + dsq(k_stn(i,j,kk)) = 1.0e30 + enddo + + enddo + enddo + + return + end subroutine get_nearest_stns_2 + +! get_nearest.f + +! Find the ii,jj locations of the nearest observation grid +! point (veg grid) closest to each of the output grid cells +! (the topo grid). + +! I'm starting out with original veg data on a UTM grid, and +! interpolating to the UTM coords of the topo data grid. + +! nnx, nny is the original veg data grid. +! nx, ny is the topo data grid. + +!! implicit none + +!! integer nx,ny,nstns,nnx,nny,n,icount + +!! parameter (nx=23401,ny=27502,nnx=14288,nny=16176) +!! parameter (nstns=1) + +!! real dsq(nnx,nny) +!! real xk_min(nx,ny,nstns) + +!! real del_x,del_y,gx_ll,gy_ll +!! real xmn,ymn,deltax,deltay,xg,yg,xs,ys,dist_min +!! integer i,j,k,kk,ii,jj,iii,iiii,jjj,jjjj,inc + +!! real gx_stn(nnx,nny) +!! real gy_stn(nnx,nny) + +!! print *,'preforming the station indexing calculations' + +! Grid increment for the veg grid, in m. +!! del_x = 30.0 +!! del_y = 30.0 + +! Coordinates of center of lower left grid cell of veg (input) grid, +! and grid increments. +!! gx_ll = 398580.0 + del_x/2.0 +!! gy_ll = 8495405.0 + del_y/2.0 + +! UTM coordinates of the 'stations' or input grid-cell centers. +!! do j=1,nny +!! do i=1,nnx +!! gx_stn(i,j) = gx_ll + del_x * (real(i) - 1.0) +!! gy_stn(i,j) = gy_ll + del_y * (real(j) - 1.0) +!! enddo +!! enddo + +! Grid increment for the topo grid, in m. +!! deltax = 20.0 +!! deltay = 20.0 + +! Coordinates of center of lower left grid cell of topo (output) grid, +! and grid increments. +!! xmn = 381990.0 + deltax/2.0 +!! ymn = 8449790.0 + deltay/2.0 + +! Search for the stations nearest to the grid point of interest. +!! icount = 0 +!! do j=1,ny +!! if (mod(j,100).eq.0.0) print *, 'j = ',j +!! do i=1,nx + +! xcoords of topo grid nodes at index i,j +! ycoords of topo grid nodes at index i,j +!! xg = xmn + deltax * (real(i) - 1.0) +!! yg = ymn + deltay * (real(j) - 1.0) + +! Find the corresponding veg grid cell coordinate to this grid cell. +!! iii = nint((xg - gx_ll)/del_x + 1.0) +!! jjj = nint((yg - gy_ll)/del_y + 1.0) + +! Don't let things go outside the array bounds. +!! inc = 5 +!! if (iii.le.inc) iii = 1 + inc +!! if (iii.ge.nnx-inc+1) iii = nnx - inc +!! if (jjj.le.inc) jjj = 1 + inc +!! if (jjj.ge.nny-inc+1) jjj = nny - inc + +! Loop through all of the stations, calculating the distance +! between the current grid point and each of the stations. +!! do jj=jjj-inc,jjj+inc +!! do ii=iii-inc,iii+inc +!! xs = gx_stn(ii,jj) +!! ys = gy_stn(ii,jj) +!! dsq(ii,jj) = (xg - xs)**2 + (yg - ys)**2 +!! enddo +!! enddo + +! Loop through each of the station distances and find the +! stations closest to the grid point in question. +!! do kk=1,nstns +!! dist_min = 1.0e30 +!! do jj=jjj-inc,jjj+inc +!! do ii=iii-inc,iii+inc +!! if (dsq(ii,jj).le.dist_min) then +!! k = ii + (jj - 1) * nnx +!! xk_min(i,j,kk) = real(k) +!! dist_min = dsq(ii,jj) +!! iiii = ii +!! jjjj = jj +!! endif +!! enddo +!! enddo + +! Eliminate the last found minimum from the next search by making +! its distance a big number. +!! dsq(iiii,jjjj) = 1.0e30 +!! enddo + +!! enddo +!! enddo + +! Save xk_min. +!! print *,'--------------------------------------' +!! print *,'--------------------------------------' +!! print *, 'saving data' + +!! open (unit=41,file='nearest_stns_1.gdat', +!! & form='unformatted',access='direct',recl=4*nx) + +!! print *, '1' +!! do j=1,ny +!! write(41,rec=j) (xk_min(i,j,1),i=1,nx) +!! enddo + +!! end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_good_values1(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,var_orig,var) + + use snowmodel_inc + implicit none + + integer nstns ! number of input values, all good + integer nstns_orig ! number of input values + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real elev(nstns_max) ! input stn elevation + real var(nstns_max) ! input values + real undef ! undefined value + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real elev_orig(nstns_max) ! input stn elevation + real var_orig(nstns_max) ! input values + + integer k + +! Before performing the interpolation, sort through the data and +! toss out any undefined values. + nstns = 0 + do k=1,nstns_orig + if (var_orig(k).ne.undef) then + nstns = nstns + 1 + xstn(nstns) = xstn_orig(k) + ystn(nstns) = ystn_orig(k) + var(nstns) = var_orig(k) + elev(nstns) = elev_orig(k) + endif + enddo + + return + end subroutine get_good_values1 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_good_values2(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,var1_orig,var2_orig,& + & var1,var2) + +! Account for the special case where you must have two coincident +! values to do the interpolation, like Tair and rh to interpolate +! rh, and wind speed and dir to interpolate the winds. + + use snowmodel_inc + implicit none + + integer nstns ! number of input values, all good + integer nstns_orig ! number of input values + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real elev(nstns_max) ! input stn elevation + real undef ! undefined value + double precision xstn_orig(nstns_max) ! input stn x coords + double precision ystn_orig(nstns_max) ! input stn y coords + real elev_orig(nstns_max) ! input stn elevation + + real var1_orig(nstns_max) ! input values + real var2_orig(nstns_max) ! input values + real var1(nstns_max) ! input values + real var2(nstns_max) ! input values + + integer k + +! Before performing the interpolation, sort through the data and +! toss out any undefined values. + nstns = 0 + do k=1,nstns_orig + if (var1_orig(k).ne.undef .and. var2_orig(k).ne.undef) then + nstns = nstns + 1 + xstn(nstns) = xstn_orig(k) + ystn(nstns) = ystn_orig(k) + var1(nstns) = var1_orig(k) + var2(nstns) = var2_orig(k) + elev(nstns) = elev_orig(k) + endif + enddo + + return + end subroutine get_good_values2 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_obs_data(nstns_orig,Tair_orig,rh_orig,xstn_orig,& + & ystn_orig,elev_orig,iyear,imonth,iday,xhour,undef,& + & windspd_orig,winddir_orig,prec_orig,isingle_stn_flag,& + & igrads_metfile,iter) + + use snowmodel_inc + implicit none + + integer iyr,imo,idy ! year, month, and day of data + real xhr ! decimal hour + integer idstn ! station id number + + integer k,nstns_orig,isingle_stn_flag,igrads_metfile,iter + integer iyear,imonth,iday + + real Tair_orig(nstns_max),rh_orig(nstns_max) + real winddir_orig(nstns_max),windspd_orig(nstns_max) + double precision xstn_orig(nstns_max),ystn_orig(nstns_max) + real elev_orig(nstns_max),xhour,prec_orig(nstns_max) + real undef ! undefined value + + if (isingle_stn_flag.eq.1) then + nstns_orig = 1 + else + read(20,*) nstns_orig + endif + + if (nstns_orig.gt.nstns_max) then + print * + print *, 'You must increase the value of nstns_max in' + print *, ' snowmodel.inc to be greater than nstns_orig.' + print *, 'nstns_max = ',nstns_max + print *, 'nstns_orig = ',nstns_orig + print * + stop + endif + + do k=1,nstns_orig + if (igrads_metfile.eq.1) then + read(20,rec=iter) iyr,imo,idy,xhr,idstn,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),Tair_orig(k),rh_orig(k),& + & windspd_orig(k),winddir_orig(k),prec_orig(k) + else + read(20,*) iyr,imo,idy,xhr,idstn,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),Tair_orig(k),rh_orig(k),& + & windspd_orig(k),winddir_orig(k),prec_orig(k) + endif + +! MicroMet assumes that the air temperature comes in as deg C, but +! all computations must be done in K. Check for this and make +! an appropriate adjustment. + if (Tair_orig(k).lt.150.0 .and. Tair_orig(k).ne.undef) & + & Tair_orig(k) = Tair_orig(k) + 273.15 + +! Do some error checking. Check for the presence of data from +! the same date. + if (iyr.ne.iyear .or. imo.ne.imonth .or. idy.ne.iday & + & .or. xhr.ne.xhour) then + print *,'model time does not match data input time' + print *,' model =', iyear,imonth,iday,xhour + print *,' obs =', iyr,imo,idy,xhr + stop + endif + + enddo + + return + end subroutine get_obs_data + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_model_time(iyear_init,imonth_init,iday_init,& + & xhour_init,iter,dt,iyear,imonth,iday,xhour,J_day) + + implicit none + + integer iyear,imonth,iday ! model year, month, and day + real xhour ! model decimal hour + real dt ! model time step, in seconds + integer iter ! model iteration + integer iyear_init ! model start year + integer imonth_init ! model start month + integer iday_init ! model start day + real xhour_init ! model decimal start hour + integer J_day ! model day of year + +! Misc. variables. + real xmin,xhour_frac,xhour_tmp,xday + integer ihour,last + + integer lastday(12) + data lastday/31,28,31,30,31,30,31,31,30,31,30,31/ + +! Convert the simulation time to the exact year, month, day, and +! decimal hour. + +! Number of minutes into the simulation. Here I have assumed that +! dt will never be in fractions of minutes. +! xmin = ((real(iter) - 1.0) * dt) / 60.0 + xmin = (real(iter) - 1.0) * (dt / 60.0) + +! Model integration time in decimal hours. The xhour_frac variable +! needs to be fixed for dt < 3600 sec. + xhour_tmp = xhour_init + xmin / 60.0 + ihour = mod(int(xhour_tmp),24) + xhour_frac = 0.0 + xhour = real(ihour) + xhour_frac + +! Number of days. + xday = xhour_tmp / 24.0 + iday = iday_init + int(xday) + +! Month and year, while accounting for leap-years. + imonth = imonth_init + iyear = iyear_init + 20 continue + last = lastday(imonth) + if (imonth.eq.2 .and. mod(iyear,4).eq.0 & + & .and. (mod(iyear,100).ne.0 .or. mod(iyear,1000).eq.0)) then + last = last + 1 + endif + if (iday.gt.last) then + iday = iday - last + imonth = imonth + 1 + if (imonth.gt.12) then + imonth = 1 + iyear = iyear + 1 + endif + go to 20 + endif + +! Calculate the day of year (1...365,366) corresponding to the date +! iyear-imonth-iday. + J_day = iday & + & + min(1,max(0,imonth-1))*31 & + & + min(1,max(0,imonth-2))*(28+(1-min(1,mod(iyear,4)))) & + & + min(1,max(0,imonth-3))*31 & + & + min(1,max(0,imonth-4))*30 & + & + min(1,max(0,imonth-5))*31 & + & + min(1,max(0,imonth-6))*30 & + & + min(1,max(0,imonth-7))*31 & + & + min(1,max(0,imonth-8))*31 & + & + min(1,max(0,imonth-9))*30 & + & + min(1,max(0,imonth-10))*31 & + & + min(1,max(0,imonth-11))*30 & + & + min(1,max(0,imonth-12))*31 + +! print *, iyear,imonth,iday,xhour,J_day + + return + end subroutine get_model_time + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_lapse_rates(imonth,iday,T_lapse_rate,& + & Td_lapse_rate,xlat,lapse_rate_user_flag,& + & precip_lapse_rate,iprecip_lapse_rate_user_flag) + + implicit none + + integer imonth,iday,mbefore,mafter,k,& + & lapse_rate_user_flag,iprecip_lapse_rate_user_flag + real weight,T_lapse_rate,Td_lapse_rate,A,B,C,xlat,& + & precip_lapse_rate + integer, parameter :: months = 12 + integer lastday(months) + data lastday/31,28,31,30,31,30,31,31,30,31,30,31/ + +! The lapse rate units are in deg_C km-1. They are converted to +! negative_deg_C m-1 below. + real lapse_rate(months) + real lapse_rate_nohem(months) + real lapse_rate_sohem(months) + real lapse_rate_user(months) + data lapse_rate_nohem /4.4,5.9,7.1,7.8,8.1,8.2,& + & 8.1,8.1,7.7,6.8,5.5,4.7/ + data lapse_rate_sohem /8.1,8.1,7.7,6.8,5.5,4.7,& + & 4.4,5.9,7.1,7.8,8.1,8.2/ + +! If you want to use the 'user' array, put your monthly values in +! here and set lapse_rate_user_flag = 1 in the .par file. + data lapse_rate_user /4.4,5.9,7.1,7.8,8.1,8.2, & + & 8.1,8.1,7.7,6.8,5.5,4.7/ + +! The initial vapor pressure coeffs are in units of km-1. + real am(months) + real am_nohem(months) + real am_sohem(months) + real am_user(months) + data am_nohem /0.41,0.42,0.40,0.39,0.38,0.36, & + & 0.33,0.33,0.36,0.37,0.40,0.40/ + data am_sohem /0.33,0.33,0.36,0.37,0.40,0.40, & + & 0.41,0.42,0.40,0.39,0.38,0.36/ + +! If you want to use the 'user' array, put your monthly values in +! here and set lapse_rate_user_flag = 1 in the .par file. + data am_user /0.41,0.42,0.40,0.39,0.38,0.36, & + & 0.33,0.33,0.36,0.37,0.40,0.40/ + +! The precipitation lapse rate units are in km-1. + real prec_lapse_rate(months) + real precip_lapse_rate_nohem(months) + real precip_lapse_rate_sohem(months) + real precip_lapse_rate_user(months) + data precip_lapse_rate_nohem /0.35,0.35,0.35,0.30,0.25,0.20,& + & 0.20,0.20,0.20,0.25,0.30,0.35/ + data precip_lapse_rate_sohem /0.20,0.20,0.20,0.25,0.30,0.35,& + & 0.35,0.35,0.35,0.30,0.25,0.20/ + +! If you want to use the 'user' array, put your monthly values in +! here and set iprecip_lapse_rate_user_flag = 1 in the .par file. + data precip_lapse_rate_user /0.35,0.35,0.35,0.30,0.25,0.20,& + & 0.20,0.20,0.20,0.25,0.30,0.35/ + +! Air and dewpoint temperature. + do k=1,months + if (lapse_rate_user_flag.eq.0) then + if (xlat.lt.0.0) then + lapse_rate(k) = lapse_rate_sohem(k) + am(k) = am_sohem(k) + else + lapse_rate(k) = lapse_rate_nohem(k) + am(k) = am_nohem(k) + endif + elseif (lapse_rate_user_flag.eq.1) then + lapse_rate(k) = lapse_rate_user(k) + am(k) = am_user(k) + endif + enddo + +! Precipitation. + do k=1,months + if (iprecip_lapse_rate_user_flag.eq.0) then + if (xlat.lt.0.0) then + prec_lapse_rate(k) = precip_lapse_rate_sohem(k) + else + prec_lapse_rate(k) = precip_lapse_rate_nohem(k) + endif + elseif (iprecip_lapse_rate_user_flag.eq.1) then + prec_lapse_rate(k) = precip_lapse_rate_user(k) + endif + enddo + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. + A = 6.1121 * 100.0 + B = 17.502 + C = 240.97 + +! Over ice. +! A = 6.1115 * 100.0 +! B = 22.452 +! C = 272.55 + +! Find the month before and after the day in question. + if (iday.le.15) then + mbefore = imonth - 1 + if (mbefore.eq.0) mbefore = 12 + mafter = imonth + weight = (real(lastday(mbefore)) - 15. + real(iday)) / & + & real(lastday(mbefore)) + else + mbefore = imonth + mafter = imonth + 1 + if (mafter.eq.13) mafter = 1 + weight = (real(iday) - 15.) / real(lastday(mbefore)) + endif + +! Define the temperature lapse rate (deg C/m). + T_lapse_rate = (- (weight * lapse_rate(mafter) + & + & (1. - weight) * lapse_rate(mbefore))) / 1000.0 + +! Define the dew-point temperature lapse rate (deg C/m). + Td_lapse_rate = (- ((weight * am(mafter) + & + & (1. - weight) * am(mbefore)) * C)) / (B * 1000.0) + +! Define the precipitation lapse rate (km-1). + precip_lapse_rate = weight * prec_lapse_rate(mafter) + & + & (1. - weight) * prec_lapse_rate(mbefore) + + return + end subroutine get_lapse_rates + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_dn(nx,ny,deltax,deltay,nstns,dn,iobsint) + + implicit none + + integer nx,ny,nstns + real deltax,deltay,dn + real dn_max ! the max obs spacing, dn_r + real dn_min ! dn_r, for large n + integer iobsint ! flag (=1) use dn value from .par file + +! Calculate an appropriate filtered wavelength value. First +! calculate dn for the case of severely nonuniform data, and +! then for the case where there is just about a station for +! every grid cell. Then assume that the average of these two +! is a reasonable value to use in the interpolation. + dn_max = sqrt(deltax*real(nx) * deltay*real(ny)) * & + & ((1.0 + sqrt(real(nstns))) / (real(nstns) - 1.0)) + dn_min = sqrt((deltax*real(nx) * deltay*real(ny)) / & + & real(nstns)) + + if (iobsint.eq.1) then +! dn = dn + else + dn = 0.5 * (dn_min + dn_max) + endif + +! print *,'You are using an average obs spacing of',dn +! print *,' the program indicates a min, max range of', +! & dn_min,dn_max + + return + end subroutine get_dn + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine barnes_oi(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,var,dn,grid,undef,ifill) + +! This is an implementation of the Barnes objective analysis scheme +! as described in: +! +! Koch, S. E., M. DesJardins, and P. J. Kocin, 1983: An +! interactive Barnes objective map analysis scheme for use with +! satellite and conventional data. J. Climate and Applied +! Meteorology, 22(9), 1487-1503. + + use snowmodel_inc + implicit none + + real, parameter :: gamma = 0.2 + + real pi + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn !center x coords of lower left grid cell + double precision ymn !center y coords of lower left grid cell + + integer nstns ! number of input values, all good + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real var(nstns_max) ! input values + integer nflag ! determines if output will be undef value + real undef ! undefined value + + real dn ! average observation spacing + real grid(nx,ny) ! output values + + integer i,j ! col, row counters + integer mm,nn ! station counters + integer ifill ! flag (=1) forces a value in every cell + + double precision xg,yg !temporary x and y coords of current cell + real w1,w2 ! weights for Gauss-weighted average + real wtot1,wtot2 ! sum of weights + real ftot1,ftot2 ! accumulators for values, corrections + real dsq ! delx**2 + dely**2 + double precision xa,ya ! x, y coords of current station + double precision xb,yb ! x, y coords of current station + real dvar(nstns_max) ! estimated error + + real xkappa_1 ! Gauss constant for first pass + real xkappa_2 ! Gauss constant for second pass + real rmax_1 ! maximum scanning radii, for first + real rmax_2 ! and second passes + real anum_1 ! numerator, beyond scanning radius, + real anum_2 ! for first and second passes + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Compute the first and second pass values of the scaling parameter +! and the maximum scanning radius used by the Barnes scheme. +! Values above this maximum will use a 1/r**2 weighting. Here I +! have assumed a gamma value of 0.2. + +! First-round values, Eqn (13). + pi = 2.0 * acos(0.0) + xkappa_1 = 5.052 * (2.0*dn/pi)**2 + +! Define the maximum scanning radius to have weight defined by +! wt = 1.0 x 10**(-30) = exp(-rmax_1/xkappa_1) +! Also scale the 1/r**2 wts so that when dsq = rmax, the wts match. + rmax_1 = xkappa_1 * 30.0 * log(10.0) + anum_1 = 1.0e-30 * rmax_1 + +! Second-round values, Eqn (4). + xkappa_2 = gamma * xkappa_1 + rmax_2 = rmax_1 * gamma + anum_2 = 1.0e-30 * rmax_2 + +! Scan each input data point and construct estimated error, dvar, at +! that point. + do nn=1,nstns + + xa = xstn(nn) + ya = ystn(nn) + wtot1 = 0.0 + ftot1 = 0.0 + + do mm=1,nstns + + xb = xstn(mm) + yb = ystn(mm) + dsq = (xb - xa)**2 + (yb - ya)**2 + + if (dsq.le.rmax_1) then + + w1 = exp((- dsq)/xkappa_1) + + else + +! Assume a 1/r**2 weight. + w1 = anum_1/dsq + + endif + + wtot1 = wtot1 + w1 + ftot1 = ftot1 + w1 * var(mm) + + end do ! end loop on sites m + + if (wtot1.eq.0.0) print *,'stn wt totals zero' + + dvar(nn) = var(nn) - ftot1/wtot1 + + end do ! end prediction loop on sites nn + +! Grid-prediction loop. Generate the estimate using first set of +! weights, and correct using error estimates, dvar, and second +! set of weights. + + do j=1,ny + do i=1,nx + +! xcoords of grid nodes at index i,j +! ycoords of grid nodes at index i,j + xg = xmn + deltax * (real(i) - 1.0) + yg = ymn + deltay * (real(j) - 1.0) + +! Scan each input data point. + ftot1 = 0.0 + wtot1 = 0.0 + ftot2 = 0.0 + wtot2 = 0.0 + nflag = 0 + + do nn=1,nstns + + xa = xstn(nn) + ya = ystn(nn) + dsq = (xg - xa)**2 + (yg - ya)**2 + + if (dsq.le.rmax_2) then + + w1 = exp((- dsq)/xkappa_1) + w2 = exp((- dsq)/xkappa_2) + + elseif (dsq.le.rmax_1) then + + w1 = exp((- dsq)/xkappa_1) + w2 = anum_2/dsq + + else + +! Assume a 1/r**2 weight. + w1 = anum_1/dsq + nflag = nflag + 1 +! With anum_2/dsq. + w2 = gamma * w1 + + endif + + wtot1 = wtot1 + w1 + wtot2 = wtot2 + w2 + ftot1 = ftot1 + w1 * var(nn) + ftot2 = ftot2 + w2 * dvar(nn) + + end do ! end loop on data sites nn + + if (wtot1.eq.0.0 .or. wtot2.eq.0.0) print *,'wts total zero' + + if (ifill.eq.1) then + grid(i,j) = ftot1/wtot1 + ftot2/wtot2 + else + if (nflag.lt.nstns) then + grid(i,j) = ftot1/wtot1 + ftot2/wtot2 + else + grid(i,j) = undef + endif + endif + + end do ! end loop on cols i + end do ! end loop on rows j + + return + end subroutine barnes_oi + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine barnes_oi_ij(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,var,dn,grid,& + & undef,ifill,i,j,snowmodel_line_flag,xg_line,yg_line) + +! This is an implementation of the Barnes objective analysis scheme +! as described in: +! +! Koch, S. E., M. DesJardins, and P. J. Kocin, 1983: An +! interactive Barnes objective map analysis scheme for use with +! satellite and conventional data. J. Climate and Applied +! Meteorology, 22(9), 1487-1503. + + use snowmodel_inc + implicit none + + real, parameter :: gamma = 0.2 + + real pi + + integer nx ! number of x output values + integer ny ! number of y output values + real deltax ! grid increment in x + real deltay ! grid increment in y + double precision xmn !center x coords of lower left grid cell + double precision ymn !center y coords of lower left grid cell + + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + integer nstns ! number of input values, all good + double precision xstn(nstns_max) ! input stn x coords + double precision ystn(nstns_max) ! input stn y coords + real var(nstns_max) ! input values + integer nflag ! determines if output will be undef value + real undef ! undefined value + + real dn ! average observation spacing + real grid(nx,ny) ! output values + + integer i,j ! col, row counters + integer mm,nn ! station counters + integer ifill ! flag (=1) forces a value in every cell + + double precision xg,yg !temporary x and y coords of current cell + real w1,w2 ! weights for Gauss-weighted average + real wtot1,wtot2 ! sum of weights + real ftot1,ftot2 ! accumulators for values, corrections + real dsq ! delx**2 + dely**2 + double precision xa,ya ! x, y coords of current station + double precision xb,yb ! x, y coords of current station + real dvar(nstns_max) ! estimated error + + real xkappa_1 ! Gauss constant for first pass + real xkappa_2 ! Gauss constant for second pass + real rmax_1 ! maximum scanning radii, for first + real rmax_2 ! and second passes + real anum_1 ! numerator, beyond scanning radius, + real anum_2 ! for first and second passes + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Compute the first and second pass values of the scaling parameter +! and the maximum scanning radius used by the Barnes scheme. +! Values above this maximum will use a 1/r**2 weighting. Here I +! have assumed a gamma value of 0.2. + +! First-round values, Eqn (13). + pi = 2.0 * acos(0.0) + xkappa_1 = 5.052 * (2.0*dn/pi)**2 + +! Define the maximum scanning radius to have weight defined by +! wt = 1.0 x 10**(-30) = exp(-rmax_1/xkappa_1) +! Also scale the 1/r**2 wts so that when dsq = rmax, the wts match. + rmax_1 = xkappa_1 * 30.0 * log(10.0) + anum_1 = 1.0e-30 * rmax_1 + +! Second-round values, Eqn (4). + xkappa_2 = gamma * xkappa_1 + rmax_2 = rmax_1 * gamma + anum_2 = 1.0e-30 * rmax_2 + +! Scan each input data point and construct estimated error, dvar, at +! that point. + do nn=1,nstns + + xa = xstn(nn) + ya = ystn(nn) + wtot1 = 0.0 + ftot1 = 0.0 + + do mm=1,nstns + + xb = xstn(mm) + yb = ystn(mm) + dsq = (xb - xa)**2 + (yb - ya)**2 + + if (dsq.le.rmax_1) then + + w1 = exp((- dsq)/xkappa_1) + + else + +! Assume a 1/r**2 weight. + w1 = anum_1/dsq + + endif + + wtot1 = wtot1 + w1 + ftot1 = ftot1 + w1 * var(mm) + + end do ! end loop on sites m + + if (wtot1.eq.0.0) print *,'stn wt totals zero' + + dvar(nn) = var(nn) - ftot1/wtot1 + + end do ! end prediction loop on sites nn + +! Grid-prediction loop. Generate the estimate using first set of +! weights, and correct using error estimates, dvar, and second +! set of weights. + +! do 666 j=1,ny +! do 555 i=1,nx + +! xcoords of grid nodes at index i,j +! ycoords of grid nodes at index i,j + if (snowmodel_line_flag.eq.1.0) then + xg = xg_line(i,j) + yg = yg_line(i,j) + else + xg = xmn + deltax * (real(i) - 1.0) + yg = ymn + deltay * (real(j) - 1.0) + endif + +! Scan each input data point. + ftot1 = 0.0 + wtot1 = 0.0 + ftot2 = 0.0 + wtot2 = 0.0 + nflag = 0 + + do nn=1,nstns + + xa = xstn(nn) + ya = ystn(nn) + dsq = (xg - xa)**2 + (yg - ya)**2 + + if (dsq.le.rmax_2) then + + w1 = exp((- dsq)/xkappa_1) + w2 = exp((- dsq)/xkappa_2) + + elseif (dsq.le.rmax_1) then + + w1 = exp((- dsq)/xkappa_1) + w2 = anum_2/dsq + + else + +! Assume a 1/r**2 weight. + w1 = anum_1/dsq + nflag = nflag + 1 +! With anum_2/dsq. + w2 = gamma * w1 + + endif + + wtot1 = wtot1 + w1 + wtot2 = wtot2 + w2 + ftot1 = ftot1 + w1 * var(nn) + ftot2 = ftot2 + w2 * dvar(nn) + + end do ! end loop on data sites nn + + if (wtot1.eq.0.0 .or. wtot2.eq.0.0) print *,'wts total zero' + + if (ifill.eq.1) then + grid(i,j) = ftot1/wtot1 + ftot2/wtot2 + else + if (nflag.lt.nstns) then + grid(i,j) = ftot1/wtot1 + ftot2/wtot2 + else + grid(i,j) = undef + endif + endif + +!c 555 continue ! end loop on cols i +!c 666 continue ! end loop on rows j + + return + end subroutine barnes_oi_ij + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine single_stn(nx,ny,nstns,var,grid) + + use snowmodel_inc + implicit none + + integer nstns ! number of input values, all good + integer nx ! number of x output values + integer ny ! number of y output values + + real var(nstns_max) ! input values + real grid(nx,ny) ! output values + integer i,j ! col, row counters + +!c Assign the station value to every grid cell. + do j=1,ny + do i=1,nx + grid(i,j) = var(nstns) + enddo + enddo + + return + end subroutine single_stn + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine pressure(nx,ny,topo,sfc_pressure) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny + + real topo(nx,ny),sfc_pressure(nx,ny) + real one_atmos,scale_ht + + one_atmos = 101300.0 +! scale_ht = 8500.0 + scale_ht = 8000.0 + +! Compute the average station pressure (in Pa). + do j=1,ny + do i=1,nx + sfc_pressure(i,j) = one_atmos * exp((- topo(i,j))/scale_ht) + enddo + enddo + + return + end subroutine pressure + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine shortwave_data(nx,ny,deltax,deltay,xmn,ymn,& + & iyear,imonth,iday,xhour,undef,var_grid,iter) + +! This program takes observations as discrete points, compares +! those observations with a gridded model representation of those +! observations, at the corresponding grid cells, computes a +! difference between the observations and modeled values, fits +! a gridded surface through those differences, and adds the +! difference grid to the model grid. Thus, correcting the model +! outputs with the observations. + + use snowmodel_inc + implicit none + + real deltax,deltay,xhour,xhr,elev(nstns_max),undef + real var_grid(nx,ny),delta_var_grid(nx,ny) + real var_obs(nstns_max),elev_orig(nstns_max),var_orig(nstns_max) + + double precision xmn,ymn + double precision xstn(nstns_max),ystn(nstns_max) + double precision xstn_orig(nstns_max),ystn_orig(nstns_max) + + integer nx,ny,k,nstns,iter,iyr,imo,idy,iyear,imonth,iday,& + & idstn_orig,nstns_orig,i,j + +! Open the observation data file. + if (iter.eq.1) open (unit=71,file='extra_met/shortwave.dat') + +! Read the data describing the time, location, and variable values +! for each station, at this time step. Here I have assumed that +! the data file is in the 'non-single-station' format (with a +! station count listed at the begining at each new time step). + read(71,*) nstns_orig + do k=1,nstns_orig + read(71,*) iyr,imo,idy,xhr,idstn_orig,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),var_orig(k) + enddo + +! Compare the observation time with the model time. + if (iyr.ne.iyear .or. imo.ne.imonth .or. idy.ne.iday & + & .or. xhr.ne.xhour) then + print *,'model time does not match obs data input time' + print *,' model =', iyear,imonth,iday,xhour + print *,' obs =', iyr,imo,idy,xhr + stop + endif + +! Filter through the original input data, and eliminate any +! missing values. + call get_good_values1(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,var_orig,var_obs) + +! If there are no observational data at this time step, use the +! modeled values without any modification. If there are some +! good data, do the correction/data assimilation. + if (nstns.gt.0) then + call DATA_ASSIM(nx,ny,deltax,deltay,xmn,ymn,xstn,ystn,& + & nstns,var_obs,delta_var_grid,var_grid) + endif + +! For incoming shortwave, incoming longwave, and surface pressure, +! make sure no negetive numbers have been produced. + do j=1,ny + do i=1,nx + var_grid(i,j) = max(0.0,var_grid(i,j)) + enddo + enddo + + open (74,file='extra_met/shortwave_grid.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + write (74,rec=iter) ((delta_var_grid(i,j),i=1,nx),j=1,ny) + close(74) + + return + end subroutine shortwave_data + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine longwave_data(nx,ny,deltax,deltay,xmn,ymn,& + & iyear,imonth,iday,xhour,undef,var_grid,iter) + +! This program takes observations as discrete points, compares +! those observations with a gridded model representation of those +! observations, at the corresponding grid cells, computes a +! difference between the observations and modeled values, fits +! a gridded surface through those differences, and adds the +! difference grid to the model grid. Thus, correcting the model +! outputs with the observations. + + use snowmodel_inc + implicit none + + real deltax,deltay,xhour,xhr,elev(nstns_max),undef + real var_grid(nx,ny),delta_var_grid(nx,ny) + real var_obs(nstns_max),elev_orig(nstns_max),var_orig(nstns_max) + + double precision xmn,ymn + double precision xstn(nstns_max),ystn(nstns_max) + double precision xstn_orig(nstns_max),ystn_orig(nstns_max) + + integer nx,ny,k,nstns,iter,iyr,imo,idy,iyear,imonth,iday,& + & idstn_orig,nstns_orig,i,j + +! Open the observation data file. + if (iter.eq.1) open (unit=72,file='extra_met/longwave.dat') + +! Read the data describing the time, location, and variable values +! for each station, at this time step. Here I have assumed that +! the data file is in the 'non-single-station' format (with a +! station count listed at the begining at each new time step). + read(72,*) nstns_orig + do k=1,nstns_orig + read(72,*) iyr,imo,idy,xhr,idstn_orig,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),var_orig(k) + enddo + +! Compare the observation time with the model time. + if (iyr.ne.iyear .or. imo.ne.imonth .or. idy.ne.iday & + & .or. xhr.ne.xhour) then + print *,'model time does not match obs data input time' + print *,' model =', iyear,imonth,iday,xhour + print *,' obs =', iyr,imo,idy,xhr + stop + endif + +! Filter through the original input data, and eliminate any +! missing values. + call get_good_values1(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,var_orig,var_obs) + +! If there are no observational data at this time step, use the +! modeled values without any modification. If there are some +! good data, do the correction/data assimilation. + if (nstns.gt.0) then + call DATA_ASSIM(nx,ny,deltax,deltay,xmn,ymn,xstn,ystn,& + & nstns,var_obs,delta_var_grid,var_grid) + endif + +! For incoming shortwave, incoming longwave, and surface pressure, +! make sure no negetive numbers have been produced. + do j=1,ny + do i=1,nx + var_grid(i,j) = max(0.0,var_grid(i,j)) + enddo + enddo + +! open (75,file='extra_met/longwave_grid.gdat', +! & form='unformatted',access='direct',recl=4*nx*ny) +! write (75,rec=iter) ((delta_var_grid(i,j),i=1,nx),j=1,ny) +! close(75) + + return + end subroutine longwave_data + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine sfc_pressure_data(nx,ny,deltax,deltay,xmn,ymn,& + & iyear,imonth,iday,xhour,undef,var_grid,iter) + +! This program takes observations as discrete points, compares +! those observations with a gridded model representation of those +! observations, at the corresponding grid cells, computes a +! difference between the observations and modeled values, fits +! a gridded surface through those differences, and adds the +! difference grid to the model grid. Thus, correcting the model +! outputs with the observations. + + use snowmodel_inc + implicit none + + real deltax,deltay,xhour,xhr,elev(nstns_max),undef + real var_grid(nx,ny),delta_var_grid(nx,ny) + real var_obs(nstns_max),elev_orig(nstns_max),var_orig(nstns_max) + + double precision xmn,ymn + double precision xstn(nstns_max),ystn(nstns_max) + double precision xstn_orig(nstns_max),ystn_orig(nstns_max) + + integer nx,ny,k,nstns,iter,iyr,imo,idy,iyear,imonth,iday,& + & idstn_orig,nstns_orig,i,j + +! Open the observation data file. + if (iter.eq.1) open (unit=73,file='extra_met/sfc_pressure.dat') + +! Read the data describing the time, location, and variable values +! for each station, at this time step. Here I have assumed that +! the data file is in the 'non-single-station' format (with a +! station count listed at the begining at each new time step). + read(73,*) nstns_orig + do k=1,nstns_orig + read(73,*) iyr,imo,idy,xhr,idstn_orig,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),var_orig(k) + enddo + +! Compare the observation time with the model time. + if (iyr.ne.iyear .or. imo.ne.imonth .or. idy.ne.iday & + & .or. xhr.ne.xhour) then + print *,'model time does not match obs data input time' + print *,' model =', iyear,imonth,iday,xhour + print *,' obs =', iyr,imo,idy,xhr + stop + endif + +! Filter through the original input data, and eliminate any +! missing values. + call get_good_values1(nstns_orig,xstn_orig,ystn_orig,& + & elev_orig,undef,nstns,xstn,ystn,elev,var_orig,var_obs) + +! If there are no observational data at this time step, use the +! modeled values without any modification. If there are some +! good data, do the correction/data assimilation. + if (nstns.gt.0) then + call DATA_ASSIM(nx,ny,deltax,deltay,xmn,ymn,xstn,ystn,& + & nstns,var_obs,delta_var_grid,var_grid) + endif + +! For incoming shortwave, incoming longwave, and surface pressure, +! make sure no negetive numbers have been produced. + do j=1,ny + do i=1,nx + var_grid(i,j) = max(0.0,var_grid(i,j)) + enddo + enddo + +! open (76,file='extra_met/sfc_pressure_grid.gdat', +! & form='unformatted',access='direct',recl=4*nx*ny) +! write (76,rec=iter) ((delta_var_grid(i,j),i=1,nx),j=1,ny) +! close(76) + + return + end subroutine sfc_pressure_data + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine DATA_ASSIM(nx,ny,deltax,deltay,xmn,ymn,xstn,ystn,& + & nstns,var_obs,delta_var_grid,var_grid) + + use snowmodel_inc + implicit none + + real deltax,deltay,undef,dn + real var_grid(nx,ny),delta_var_grid(nx,ny) + real var_model(nstns_max),var_obs(nstns_max),& + & delta_var(nstns_max) + + double precision xmn,ymn + double precision xstn(nstns_max),ystn(nstns_max) + + integer ii(nstns_max),jj(nstns_max) + integer nx,ny,i,j,ifill,iobsint,k,nstns + +! Convert the x and y locations to (ii,jj) locations. + do k=1,nstns + ii(k) = 1 + nint((xstn(k) - xmn) / deltax) + jj(k) = 1 + nint((ystn(k) - ymn) / deltay) + enddo + +! Extract the modeled data at the appropriate grid cells. + do k=1,nstns + var_model(k) = var_grid(ii(k),jj(k)) + enddo + +! Calculate the difference between the modeled variable and the +! observation at each point/grid cell. + do k=1,nstns + delta_var(k) = var_obs(k) - var_model(k) + enddo + +! Now that I have the differences calculated at each observation +! point, interpolate them over the simulation domain. Use the +! barnes oi scheme to create the distribution. If there is +! only a single station, distribute those data uniformly over +! the domain. Make sure that ifill=1, and then undef is not +! really used (so it does not have to be the same as defined in +! the .par file). + undef = -9999.0 + ifill = 1 + iobsint = 0 + + if (nstns.ge.2) then + call get_dn(nx,ny,deltax,deltay,nstns,dn,iobsint) + call barnes_oi(nx,ny,deltax,deltay,xmn,ymn,& + & nstns,xstn,ystn,delta_var,dn,delta_var_grid,undef,ifill) + elseif (nstns.eq.1) then + call single_stn(nx,ny,nstns,delta_var,delta_var_grid) + endif + +! Use the gridded delta surface to correct the modeled variable. + do j=1,ny + do i=1,nx + var_grid(i,j) = var_grid(i,j) + delta_var_grid(i,j) + enddo + enddo + + return + end subroutine DATA_ASSIM + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_lai(J_day,forest_LAI) + + implicit none + + integer J_day,n + integer, parameter :: nftypes = 5 + + real vlai_summer(nftypes),vlai_winter(nftypes),& + & forest_LAI(nftypes) + + real pi,daysinyr,tmax,tmin,peak_jday,dtseason,vtrans,tseason,& + & fseason + +! The five forest types in MicroMet/SnowModel: +! 1 coniferous forest +! 2 deciduous forest +! 3 mixed forest +! 4 scattered short-conifer +! 5 clearcut conifer + + data vlai_summer /2.5, 2.5, 2.5, 1.5, 1.0/ + data vlai_winter /2.5, 0.5, 1.5, 1.5, 1.0/ + +! Note: A maximum forest LAI of 5.0 will give almost zero (like +! 10 W m^2) incoming solar under the canopy. Values for Fraser +! Experimental Forest in Colorado are 2-3 (LSOS site = 1.8, +! Kelly's/Gus' site = 2.3). + +! Calculate a seasonally varying temperature, assuming a max and +! min temperature and a cos distribution peaking in mid July +! (J_day = 200). Then use this to define the seasonal lai +! variation. + pi = 2.0 * acos(0.0) + daysinyr = 366.0 + tmax = 298.0 + tmin = 273.0 + peak_jday = 200.0 + + dtseason = tmax - tmin + vtrans = tmin + dtseason / 2.0 + + tseason = vtrans + dtseason / 2.0 * & + & cos(2.0 * pi / daysinyr * (real(J_day) - peak_jday)) + + fseason = 0.0016 * (tmax - tseason)**2 + + do n=1,nftypes + forest_LAI(n) = (1.0 - fseason) * vlai_summer(n) + & + & fseason * vlai_winter(n) + enddo + +! print *,J_day,(forest_LAI(n),n=1,nftypes) + + return + end subroutine get_lai + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine read_wind_file(nx,ny,iter,uwind_grid,vwind_grid,& + & windspd_grid,winddir_grid,windspd_flag,winddir_flag,& + & windspd_min) + + use snowmodel_inc + implicit none + + integer nx + integer ny + + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + real winddir_grid(nx,ny) + real windspd_grid(nx,ny) + + real pi,deg2rad,rad2deg + integer i,j,iter,irec + real windspd_flag,winddir_flag,u_sum,v_sum,windspd_min + +! Define the required constants. + pi = 2.0 * acos(0.0) + deg2rad = pi / 180.0 + rad2deg = 180.0 / pi + +! Read in the u and v arrays for this time step. + if (iter.eq.1) then + open (66,file='/data10/baffin/nuatmos/wind_spd_dir.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + endif + + irec = (iter - 1) * 2 + read (66,rec=irec+1) ((uwind_grid(i,j),i=1,nx),j=1,ny) + read (66,rec=irec+2) ((vwind_grid(i,j),i=1,nx),j=1,ny) + +! Convert these u and v components to speed and directions. + do j=1,ny + do i=1,nx + +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(uwind_grid(i,j)).lt.1e-10) uwind_grid(i,j) = 1e-10 + + winddir_grid(i,j) = rad2deg * & + & atan2(uwind_grid(i,j),vwind_grid(i,j)) + if (winddir_grid(i,j).ge.180.0) then + winddir_grid(i,j) = winddir_grid(i,j) - 180.0 + else + winddir_grid(i,j) = winddir_grid(i,j) + 180.0 + endif + windspd_grid(i,j) = & + & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) + enddo + enddo + +! Avoid problems of zero (low) winds (for example, turbulence +! theory, log wind profile, etc., says that we must have some +! wind. Thus, some equations blow up when the wind speed gets +! very small). + do j=1,ny + do i=1,nx + if (windspd_grid(i,j).lt.windspd_min) then + windspd_grid(i,j) = windspd_min + uwind_grid(i,j) = (- windspd_grid(i,j)) * & + & sin(deg2rad*winddir_grid(i,j)) + vwind_grid(i,j) = (- windspd_grid(i,j)) * & + & cos(deg2rad*winddir_grid(i,j)) + endif + enddo + enddo + +! Find the maximum wind speed in the domain, and the +! domain-averaged wind direction. + windspd_flag = 0.0 + u_sum = 0.0 + v_sum = 0.0 + do j=1,ny + do i=1,nx + windspd_flag = max(windspd_flag,windspd_grid(i,j)) + u_sum = u_sum + uwind_grid(i,j) + v_sum = v_sum + vwind_grid(i,j) + enddo + enddo + u_sum = u_sum / real(nx*ny) + v_sum = v_sum / real(nx*ny) + +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(u_sum).lt.1e-10) u_sum = 1e-10 + + winddir_flag = rad2deg * atan2(u_sum,v_sum) + if (winddir_flag.ge.180.0) then + winddir_flag = winddir_flag - 180.0 + else + winddir_flag = winddir_flag + 180.0 + endif + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_daily_irec (iter,dt,irec_day) + + implicit none + + integer iter,irec_day + real dt,secs_in_day,secs_in_sim + + secs_in_day = 60.0 * 60.0 * 24.0 + + secs_in_sim = dt * real(iter - 1) + irec_day = int(secs_in_sim / secs_in_day) + 1 + + return + end subroutine get_daily_irec + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/outputs_user.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/outputs_user.f90 new file mode 100755 index 000000000..33f59ecef --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/outputs_user.f90 @@ -0,0 +1,483 @@ +! outputs_user.f90 + +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + + subroutine OUTPUTS_USER(nx,ny,iter,Tair_grid,rh_grid,& + & uwind_grid,vwind_grid,windspd_grid,winddir_grid,& + & Qsi_grid,Qli_grid,prec_grid,Tsfc,Qle,Qh,Qe,Qc,Qm,Qf,& + & e_balance,snow_depth,xro_snow,swe_depth,ro_nsnow,& + & runoff,rain,sprec,sum_prec,sum_runoff,w_balance,& + & snow_d,topo_land,wbal_qsubl,sum_sprec,wbal_salt,& + & wbal_susp,ro_snow_grid,sum_Qcs,canopy_int,Qcs,& + & iyear,imonth,iday,xhour,undef,deltax,xmn,ymn,& + & wbal_subgrid,canopy_unload,sum_qsubl,sum_trans,& + & sum_unload,sum_glacmelt,glacier_melt,swemelt,& + & sfc_pressure,sum_swemelt,albedo,nrecs_max,& + & icorr_factor_loop,swesublim,vegtype,iter_start,& + & seaice_run,print_inc,cloud_frac_grid,& + & output_path_wo_assim,output_path_wi_assim,print_var,& + & print_outvars,Qsubl_depth,Qsalt,Qsusp) + +! This subroutine is available to provide user-defined outputs. +! These might be special-case situations, like just writing out +! data at the end of every day, writing out a few grid cells, +! saving each data arrays to individual files, etc. + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,iter,max_poly,num_poly,iyear,imonth,iday,& + & icorr_factor_loop,iter_start,icorr_loop_new,& + & individual_files,k,irec + + real Tair_grid(nx,ny),rh_grid(nx,ny),& + & uwind_grid(nx,ny),vwind_grid(nx,ny),& + & windspd_grid(nx,ny),winddir_grid(nx,ny),& + & Qsi_grid(nx,ny),Qli_grid(nx,ny),& + & prec_grid(nx,ny),Tsfc(nx,ny),& + & Qle(nx,ny),Qh(nx,ny),Qe(nx,ny),& + & Qc(nx,ny),Qm(nx,ny),Qf(nx,ny),& + & e_balance(nx,ny),snow_depth(nx,ny),& + & xro_snow(nx,ny),swe_depth(nx,ny),& + & ro_nsnow(nx,ny),runoff(nx,ny),& + & rain(nx,ny),sprec(nx,ny),& + & sum_prec(nx,ny),sum_runoff(nx,ny),& + & w_balance(nx,ny),snow_d(nx,ny),& + & topo_land(nx,ny),wbal_qsubl(nx,ny),& + & sum_sprec(nx,ny),wbal_salt(nx,ny),& + & wbal_susp(nx,ny),ro_snow_grid(nx,ny),& + & sum_Qcs(nx,ny),canopy_int(nx,ny),& + & Qcs(nx,ny),wbal_subgrid(nx,ny),& + & canopy_unload(nx,ny),sum_qsubl(nx,ny),& + & sum_trans(nx,ny),glacier_melt(nx,ny),& + & sum_unload(nx,ny),sum_glacmelt(nx,ny),& + & swemelt(nx,ny),sfc_pressure(nx,ny),& + & sum_swemelt(nx,ny),swesublim(nx,ny),& + & vegtype(nx,ny),albedo(nx,ny),& + & cloud_frac_grid(nx,ny),Qsubl_depth(nx,ny),& + & Qsalt(nx,ny),Qsusp(nx,ny) + + real undef,xhour,deltax,pi,rad2deg,seaice_run,print_inc + double precision xmn,ymn + double precision nrecs_max,nrecs + + real uwnd(nx,ny) + real vwnd(nx,ny) + +! Define the output variable data block. Note that the print_var +! "yes/no" array was generated in readparam_code.f. +! real vars(nx_max,ny_max,n_print_vars) + real vars(nx,ny,n_print_vars) ! KRA + + character*80 output_path_wo_assim,output_path_wi_assim + character*1 print_var(n_print_vars) + character*4 print_outvars(n_print_vars) + +! This was defined in preprocess_code.f, in subroutine mk_ctl_files. +! data print_outvars /'tair','relh','wspd','qsin','qlin', +! & 'qlem','albd','wdir','prec','rpre', +! & 'spre','smlt','ssub','roff','glmt', +! & 'snod','sden','swed','sspr','ssmt', +! & 'cldf','var1','var2','var3','var4', +! & 'var5','var6','var7','var8','var9'/ + +! These now come in from the .par file. +! character path1*(*) +! character path2*(*) + + integer i_trailing_blanks,trailing_blanks,i_len_wo,i_len_wi + +! Calculate how long the paths are. + i_len_wo = 80 - trailing_blanks(output_path_wo_assim) + i_len_wi = 80 - trailing_blanks(output_path_wi_assim) +! print *, i_len_wo,i_len_wi +! print *, output_path_wo_assim(1:i_len_wo) +! print *, output_path_wi_assim(1:i_len_wi) + +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + +! BEGIN USER EDIT SECTION. + +! Define which variables you want to save, whether they will be +! output at every time step or some time-step increment, which +! directories the data will be put in, etc. + +! Define the output file locations (paths). +! These now come in from the .par file. +! parameter (path1 = +! & 'outputs/wo_assim/') +! parameter (path2 = +! & 'outputs/wi_assim/') + +! Write a seperate file for each variable (individual_files = 1). +! No other option has been implemented here. + individual_files = 1 + +! Define the number of time steps you are going to sum or average +! over. If you want to output data at every model time step, set +! print_inc = 1.0. For run with an hourly time step and data +! writes once a day, print_inc = 24.0. For a run with 3-hourly +! time steps and data writes once a day, print_inc = 8.0. +! This now comes in from the .par file. +! print_inc = 24.0 +! print_inc = 1.0 +! print_inc = 8.0 + +! Define the variables you want to save. The following are the +! variables this subroutine is currently set up to output. +! Listed are the output variable name and the corresponding model +! variable name. +! Note that these "yes/no" flags are now defined in snowmodel.par. + +! VALUES AVERAGED OVER THE PERIOD. +! 1 tair(i,j) = Tair_grid(i,j) - 273.15 +! 2 relh(i,j) = rh_grid(i,j) +! 3 wspd(i,j) = windspd_grid(i,j) +! 4 qsin(i,j) = Qsi_grid(i,j) +! 5 qlin(i,j) = Qli_grid(i,j) +! 6 qlem(i,j) = Qle(i,j) +! 7 albd(i,j) = albedo(i,j) +! 8 wdir(i,j) = from uwind_grid(i,j) and vwind_grid(i,j) + +! VALUES SUMMED OVER THE PERIOD. +! 9 prec(i,j) = prec_grid(i,j) +! 10 rpre(i,j) = rain(i,j) +! 11 spre(i,j) = sprec(i,j) +! 12 smlt(i,j) = swemelt(i,j) +! 13 ssub(i,j) = swesublim(i,j) +! 14 roff(i,j) = runoff(i,j) +! 15 glmt(i,j) = glacier_melt(i,j) + +! VALUES SAVED AT THE END OF THE PERIOD. +! 16 snod(i,j) = snow_depth(i,j) +! 17 sden(i,j) = xro_snow(i,j) +! 18 swed(i,j) = swe_depth(i,j) +! 19 sspr(i,j) = sum_sprec(i,j) +! 20 ssmt(i,j) = sum_swemelt(i,j) + +! NEW VARIABLES ADDED TO THE OUTPUT DATA BLOCK. +! (you have to modify the code below to +! do the processing you want for these) +! 21 cldf(i,j) = cloud_fraction_grid(i,j) + +! Define which variables you want to save by placing a yes = 'y' or +! no = 'n' in front of the variable number. + +! VALUES AVERAGED OVER THE PERIOD. +! VALUES AVERAGED OVER THE PERIOD. +! 1 = tair(i,j) = Tair_grid(i,j) - 273.15 +! print_var(1) = 'y' + +! 2 = relh(i,j) = rh_grid(i,j) +! print_var(2) = 'n' + +! 3 = wspd(i,j) = windspd_grid(i,j) +! print_var(3) = 'n' + +! 4 = qsin(i,j) = Qsi_grid(i,j) +! print_var(4) = 'n' + +! 5 = qlin(i,j) = Qli_grid(i,j) +! print_var(5) = 'n' + +! 6 = qlem(i,j) = Qle(i,j) +! print_var(6) = 'n' + +! 7 = albd(i,j) = albedo(i,j) +! print_var(7) = 'n' + +! 8 = wdir(i,j) = from uwind_grid(i,j) and vwind_grid(i,j) +! print_var(8) = 'n' + +! VALUES SUMMED OVER THE PERIOD. +! VALUES SUMMED OVER THE PERIOD. +! 9 = prec(i,j) = prec_grid(i,j) +! print_var(9) = 'y' + +! 10 = rpre(i,j) = rain(i,j) +! print_var(10) = 'y' + +! 11 = spre(i,j) = sprec(i,j) +! print_var(11) = 'y' + +! 12 = smlt(i,j) = swemelt(i,j) +! print_var(12) = 'n' + +! 13 = ssub(i,j) = swesublim(i,j) +! print_var(13) = 'n' + +! 14 = roff(i,j) = runoff(i,j) +! print_var(14) = 'n' + +! 15 = glmt(i,j) = glacier_melt(i,j) +! print_var(15) = 'n' + +! VALUES SAVED AT THE END OF THE PERIOD. +! VALUES SAVED AT THE END OF THE PERIOD. +! 16 = snod(i,j) = snow_depth(i,j) +! print_var(16) = 'y' + +! 17 = sden(i,j) = xro_snow(i,j) +! print_var(17) = 'y' + +! 18 = swed(i,j) = swe_depth(i,j) +! print_var(18) = 'y' + +! 19 = sspr(i,j) = sum_sprec(i,j) +! print_var(19) = 'y' + +! 20 = ssmt(i,j) = sum_swemelt(i,j) +! print_var(20) = 'y' + +! NEW VARIABLES ADDED TO THE OUTPUT DATA BLOCK. +! NEW VARIABLES ADDED TO THE OUTPUT DATA BLOCK. +! (you have to modify the code below to +! do the processing you want for these) +! 21 = cldf(i,j) = cloud_fraction_grid(i,j) +! print_var(21) = 'n' + +! Extra variables. +! print_var(22) = 'n' +! print_var(23) = 'n' +! print_var(24) = 'n' +! print_var(25) = 'n' +! print_var(26) = 'n' +! print_var(27) = 'n' +! print_var(28) = 'n' +! print_var(29) = 'n' +! print_var(30) = 'n' + +! Note that this data output implementation is currently configured +! to mask out the ocean points (vegtype.eq.24.0) if this is a +! land run (seaice_run = 0.0); mask out all land points (vegtype. +! ne.24.0) if this is an ocean/sea ice run (seaice_run = 1.0, 3.0, +! or 4.0); and to not mask out anything if this is a combined land +! and sea ice run (seaice_run = 2.0). + +! END USER EDIT SECTION. + +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + +! Define the constants used in the wind-direction averaging. + pi = 2.0 * acos(0.0) + rad2deg = 180.0 / pi + +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + + uwnd = 0.0 + vwnd = 0.0 + +! Use individual output files for each variable. + if (individual_files.eq.1) then + + if (iter.eq.iter_start) then + nrecs = nx * ny + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the .gdat files like the write statements' + print *,'are currently configured. You will have to change' + print *,'them to look like:' + print *,' do j=1,ny' + print *,' write (51,rec=j) (var(i,j),i=1,nx)' + print *,' enddo' + stop + endif + endif + +! Open individual output files for each variable. + if (iter.eq.iter_start) then + if (icorr_factor_loop.eq.1) then + do k=1,n_print_vars + if (print_var(k).eq.'y') then + open (220+k,& + &file=output_path_wo_assim(1:i_len_wo)//print_outvars(k)//'.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny,& + & status='replace') + endif + enddo + endif + + if (icorr_factor_loop.eq.2) then + do k=1,n_print_vars + if (print_var(k).eq.'y') then + open (320+k,& + &file=output_path_wi_assim(1:i_len_wi)//print_outvars(k)//'.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny,& + & status='replace') + endif + enddo + endif + endif + + if (iter.eq.iter_start) then +! Initialize the averaging and summing arrays. + do j=1,ny + do i=1,nx + do k=1,n_print_vars + vars(i,j,k) = 0.0 + enddo + uwnd(i,j) = 0.0 + vwnd(i,j) = 0.0 + enddo + enddo + endif + +! Perform the avaraging, summing, etc. + do j=1,ny + do i=1,nx +! Values averaged over the period. + vars(i,j,1) = vars(i,j,1) + (Tair_grid(i,j) - 273.15) / & + & print_inc + vars(i,j,2) = vars(i,j,2) + rh_grid(i,j) / print_inc + vars(i,j,3) = vars(i,j,3) + windspd_grid(i,j) / print_inc + vars(i,j,4) = vars(i,j,4) + Qsi_grid(i,j) / print_inc + vars(i,j,5) = vars(i,j,5) + Qli_grid(i,j) / print_inc + vars(i,j,6) = vars(i,j,6) + Qle(i,j) / print_inc + vars(i,j,7) = vars(i,j,7) + albedo(i,j) / print_inc + + uwnd(i,j) = uwnd(i,j) + uwind_grid(i,j) / print_inc + vwnd(i,j) = vwnd(i,j) + vwind_grid(i,j) / print_inc + +! Some compilers do not allow both u and v to be 0.0 in +! the atan2 computation. + if (abs(uwnd(i,j)).lt.1e-10) uwnd(i,j) = 1e-10 + + vars(i,j,8) = rad2deg * atan2(uwnd(i,j),vwnd(i,j)) + if (vars(i,j,8).ge.180.0) then + vars(i,j,8) = vars(i,j,8) - 180.0 + else + vars(i,j,8) = vars(i,j,8) + 180.0 + endif + +! Values summed over the period. + vars(i,j,9) = vars(i,j,9) + prec_grid(i,j) + vars(i,j,10) = vars(i,j,10) + rain(i,j) + vars(i,j,11) = vars(i,j,11) + sprec(i,j) + vars(i,j,12) = vars(i,j,12) + swemelt(i,j) + vars(i,j,13) = vars(i,j,13) + swesublim(i,j) + vars(i,j,14) = vars(i,j,14) + runoff(i,j) + vars(i,j,15) = vars(i,j,15) + glacier_melt(i,j) + +! Values saved at the end of the day. + vars(i,j,16) = snow_depth(i,j) + vars(i,j,17) = xro_snow(i,j) + vars(i,j,18) = swe_depth(i,j) + vars(i,j,19) = sum_sprec(i,j) + vars(i,j,20) = sum_swemelt(i,j) + +! Values averaged over the period. + vars(i,j,21) = vars(i,j,21) + cloud_frac_grid(i,j) / print_inc + +! New variables. + vars(i,j,22) = vars(i,j,22) + Qsubl_depth(i,j) + vars(i,j,23) = sum_trans(i,j) + vars(i,j,24) = vars(i,j,24) + Qsalt(i,j) + vars(i,j,25) = vars(i,j,25) + Qsusp(i,j) + + enddo + enddo + +! Check to see whether this is the data-write time step. + if (mod(iter,nint(print_inc)).eq.0) then + +! Mask out the ocean points (vegtype.eq.24.0) if this is +! a land run (seaice_run = 0.0). Mask out all land points +! (vegtype.ne.24.0) if this is an ocean/sea ice run +! (seaice_run = 1.0, 3.0, or 4.0). Do not mask out anything +! if this this is a combined land and sea ice run (seaice_run +! = 2.0). + if (seaice_run.eq.0.0) then + do j=1,ny + do i=1,nx + if (vegtype(i,j).eq.24.0) then + do k=1,n_print_vars + vars(i,j,k) = undef + enddo + endif + enddo + enddo + elseif (seaice_run.eq.1.0 .or. seaice_run.eq.3.0 .or. & + & seaice_run.eq.4.0) then + do j=1,ny + do i=1,nx + if (vegtype(i,j).ne.24.0) then + do k=1,n_print_vars + vars(i,j,k) = undef + enddo + endif + enddo + enddo + endif + +! Write out the data. + irec = iter / nint(print_inc) + if (icorr_factor_loop.eq.1) then + do k=1,n_print_vars + if (print_var(k).eq.'y') then + write (220+k,rec=irec) ((vars(i,j,k),i=1,nx),j=1,ny) + endif + enddo + elseif (icorr_factor_loop.eq.2) then + do k=1,n_print_vars + if (print_var(k).eq.'y') then + write (320+k,rec=irec) ((vars(i,j,k),i=1,nx),j=1,ny) + endif + enddo + endif + +! Reinitialize the averaging and summing arrays. + do j=1,ny + do i=1,nx + do k=1,n_print_vars + vars(i,j,k) = 0.0 + enddo + uwnd(i,j) = 0.0 + vwnd(i,j) = 0.0 + enddo + enddo + endif + +! Use more than one variable in an output file. + else + + print *,'Use more than one variable in an output file:' + print *,' THIS HAS NOT BEEN IMPLEMENTED YET' + + endif + + return + end + +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc +!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc + +! THIS IS AN EXAMPLE OF SAVING DATA IN ASCII/TEXT FORMAT. + +! I have completely removed this example; I now do this with +! improved codes as part of post-processing steps. It is +! just too slow to do it as part of the model simulation. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! THE CODE BELOW WAS USED TO SAVE AVERAGES OVER POLYGONS. + +! I have completely removed this example; if I were to do this +! again I would do it as a post-processing step. If you really +! want to see what I did here, you can look in one of the pre- +! 2018 code distributions. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/preprocess_code.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/preprocess_code.f90 new file mode 100755 index 000000000..56355b2ec --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/preprocess_code.f90 @@ -0,0 +1,4328 @@ +! preprocess_code.f90 + +! Perform a variety of preprocessing steps, like read in topography +! and vegetation arrays, open input and output files, etc. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE PREPROCESS_CODE(topoveg_fname,const_veg_flag,& + & vegtype,veg_z0,vegsnowdepth,fetch,xmu,C_z,h_const,& + & wind_min,Up_const,dz_susp,ztop_susp,fall_vel,Ur_const,& + & ro_water,ro_air,gravity,vonKarman,pi,twopio360,snow_z0,& + & nx,ny,sum_sprec,sum_qsubl,sum_trans,sum_unload,topo,& + & topo_land,snow_d,topoflag,snow_d_init,snow_d_init_const,& + & soft_snow_d,met_input_fname,igrads_metfile,deltax,deltay,& + & snowtran_output_fname,micromet_output_fname,& + & enbal_output_fname,snowpack_output_fname,print_micromet,& + & print_enbal,print_snowpack,print_snowtran,run_micromet,& + & run_enbal,run_snowpack,run_snowtran,ro_snow_grid,swe_depth,& + & sum_runoff,sum_prec,ro_snow,twolayer_flag,sum_Qcs,& + & canopy_int,ascii_topoveg,topo_ascii_fname,icorr_factor_loop,& + & veg_ascii_fname,undef,isingle_stn_flag,max_iter,& + & i_tair_flag,i_rh_flag,i_wind_flag,i_prec_flag,sum_glacmelt,& + & snow_depth,sum_d_canopy_int,corr_factor,icorr_factor_index,& + & sum_sfcsublim,barnes_lg_domain,n_stns_used,k_stn,xmn,ymn,& + & ro_soft_snow_old,sum_swemelt,xlat,lat_solar_flag,xlat_grid,& + & xlon_grid,UTC_flag,dt,swe_depth_old,canopy_int_old,& + & vegsnowd_xy,iveg_ht_flag,ihrestart_flag,i_dataassim_loop,& + & multilayer_snowpack,max_layers,multilayer_output_fname,& + & print_multilayer,KK,tslsnowfall,tsls_threshold,& + & irun_data_assim,izero_snow_date,iclear_mn,iclear_dy,& + & xclear_hr,snod_layer,swed_layer,ro_layer,T_old,gamma,& + & icond_flag,curve_lg_scale_flag,curve_wt_lg,check_met_data,& + & seaice_run,snowmodel_line_flag,xg_line,yg_line,print_user,& + & cf_precip_flag,cf_precip,print_inc,xhour_init,Tabler_1_flag,& + & Tabler_2_flag,iyear_init,imonth_init,iday_init,print_var,& + & output_path_wo_assim,output_path_wi_assim,nrecs_max,& + & tabler_sfc_path_name,print_outvars,diam_layer) + + use snowmodel_inc + implicit none + +!KRA + logical snowmodel_masterproc +!KRA + + integer i,j,k,nx,ny,igrads_metfile,n_recs_out,iheader,& + & isingle_stn_flag,max_iter,i_tair_flag,i_rh_flag,i_wind_flag,& + & i_prec_flag,iter,iobs_num,n_stns_used,nveg,iveg_ht_flag,& + & lat_solar_flag,ihrestart_flag,nstns_orig,i_dataassim_loop,& + & multilayer_snowpack,max_layers,irun_data_assim,& + & izero_snow_date,iclear_mn,iclear_dy,icond_flag,& + & iyear_init,imonth_init,iday_init + + real ro_water,ro_air,gravity,vonKarman,snow_z0,& + & fetch,xmu,C_z,h_const,wind_min,Up_const,check_met_data,& + & dz_susp,ztop_susp,fall_vel,Ur_const,pi,twopio360,topoflag,& + & snow_d_init_const,const_veg_flag,ro_snow,twolayer_flag,& + & ascii_topoveg,undef,barnes_lg_domain,xlat,UTC_flag,dt,& + & print_multilayer,xclear_hr,curve_lg_scale_flag,seaice_run,& + & snowmodel_line_flag,print_user,print_inc,xhour_init,& + & Tabler_1_flag,Tabler_2_flag + + real topo_land(nx,ny) + real topo(nx,ny) + real vegtype(nx,ny) + real xlat_grid(nx,ny) + real xlon_grid(nx,ny) + + real snow_d(nx,ny) + real snow_depth(nx,ny) + real snow_d_init(nx,ny) + real canopy_int(nx,ny) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + + real sum_sprec(nx,ny) + real sum_qsubl(nx,ny) + real sum_trans(nx,ny) + real sum_unload(nx,ny) + real soft_snow_d(nx,ny) + real ro_soft_snow_old(nx,ny) + real ro_snow_grid(nx,ny) + real swe_depth(nx,ny) + real sum_prec(nx,ny) + real sum_runoff(nx,ny) + real sum_Qcs(nx,ny) + real sum_glacmelt(nx,ny) + real sum_swemelt(nx,ny) + real sum_d_canopy_int(nx,ny) + real sum_sfcsublim(nx,ny) + + real vegsnowdepth(nvegtypes) + real veg_z0(nx,ny) + real vegsnowd_xy(nx,ny) + + real curve_wt_lg(nx,ny) + + real corr_factor(nx_max,ny_max,max_obs_dates+1) + integer icorr_factor_index(max_time_steps) + integer icorr_factor_loop + + integer k_stn(nx,ny,9) + double precision xmn,ymn + double precision nrecs_max,nrecs + real deltax,deltay + integer icount,iii,jjj + double precision xg_line(nx,ny),yg_line(nx,ny) + + real run_micromet,run_enbal,run_snowpack,run_snowtran + real print_micromet,print_enbal,print_snowpack,print_snowtran + + character*80 topoveg_fname,met_input_fname,topo_ascii_fname,& + & veg_ascii_fname + character*80 snowtran_output_fname,micromet_output_fname,& + & enbal_output_fname,snowpack_output_fname,& + & multilayer_output_fname + + character*80 tabler_sfc_path_name + character*80 output_path_wo_assim,output_path_wi_assim + + character*1 print_var(n_print_vars) + character*4 print_outvars(n_print_vars) + + integer KK(nx,ny) + real tslsnowfall(nx,ny) + real tsls_threshold + real snod_layer(nx,ny,nz_max) + real swed_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real gamma(nx,ny,nz_max) + real diam_layer(nx,ny,nz_max) + + real cf_precip(nx,ny) + real cf_precip_flag,cf_precip_scalar + + integer ipath_length,i_len_wo,i_len_wi,trailing_blanks + character*80 vege_ht_fname + + integer nyears,nyear,nobs_total,nobs_dates,nstns,krec + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! seaice_run = 3.0 is no longer supported. If seaice_run has been +! set to 3.0 in the .par file, send a message describing your +! options. + if (seaice_run.eq.3.0) then + print *, 'Eulerian sea ice runs are not longer supported' + print *, '(seaice_run = 3.0). If you want to restart this' + print *, 'option, see the notes in here:' + print *, '/sm/misc_programs/Eulerian_incremental_remapper/' + stop + endif + +! Check to see whether the maximum array dimensions defined in +! snowmodel.inc are adequate for the simulation domain defined +! in snowmodel.par. + if (snowmodel_line_flag.eq.0.0) then + if (seaice_run.eq.3.0) then + if (nx.ne.nx_max .or. ny.ne.ny_max) then + print *, 'For a sea ice remapping run, nx==nx_max' + print *, ' and ny==ny_max in the snowmodel.par and' + print *, ' snowmodel.inc.' + stop + endif + else + if (nx+1.gt.nx_max .or. ny+1.gt.ny_max) then + print *, 'Must increase the value of nx_max or ny_max' + print *, ' in snowmodel.inc to be greater than nx+1' + print *, ' and/or ny+1.' + print *, 'nx_max = ',nx_max,' ny_max = ',ny_max + print *, 'nx = ',nx,' ny = ',ny + stop + endif + endif + else + if (nx.ge.nx_max .or. ny.ne.1 .or. ny_max.ne.2) then + print *, 'For snowmodel_line_flag = 1.0, we suggest setting' + print *, 'nx = number of grid cells, ny = 1, nx_max = nx+1,' + print *, 'and ny_max = ny+1 = 2 in snowmodel.inc.' + print *, ' The current values are:' + print *, ' nx_max = ',nx_max,' ny_max = ',ny_max + print *, ' nx = ',nx,' ny = ',ny + stop + endif + endif + + if (multilayer_snowpack.eq.1) then + if (max_layers+1.gt.nz_max) then + print *, 'nz_max in snowmodel.inc must be at least 1 greater' + print *, ' than max_layers in the snowmodel.inc file. So,' + print *, ' if you want to run the multi-layer snowpack model' + print *, ' with a single snow layer, set nz_max=2. If you' + print *, ' want to run the original single-layer snowpack' + print *, ' model, you can set nz_max=1 in snowmodel.inc.' + print *, 'nz_max = ',nz_max + print *, 'max_layers = ',max_layers + stop + endif + endif + + if (max_iter.gt.max_time_steps) then + print *, 'Must increase the value of max_time_steps' + print *, ' in snowmodel.inc to be greater than max_iter.' + print *, 'max_time_steps = ',max_time_steps + print *, 'max_iter = ',max_iter + stop + endif + +! If running the concatenated configuration of the model, check to +! make sure the rest of the model is configured correctly. + if (snowmodel_line_flag.eq.1.0) then + if (run_snowtran.eq.1.0 .and. seaice_run.ne.4.0) then + print *, 'You cannot run snowmodel_line_flag = 1.0 with' + print *, 'run_snowtran = 1.0' + stop + endif + if (barnes_lg_domain.eq.0.0) then + print *, 'If snowmodel_line_flag = 1.0, then you must run' + print *, 'the model with barnes_lg_domain = 1.0' + stop + endif + endif + +! Make sure the time since last snowfall treshold is not less +! than the model time step. + if (multilayer_snowpack.eq.1) then + if (tsls_threshold.lt.dt/3600.0) then + print *,'Need to correct tsls_threshold to' + print *,' be >= dt (in hours).' + stop + endif + endif + +! Check the model dt value, and send an error message if dt < 3600. + if (dt.lt.3600.0) then + print *, 'You must modify the hour fraction calculation' + print *, ' in get_model_time subroutine to handle' + print *, ' dt values less that 3600.0 seconds.' + print *, 'dt = ',dt + stop + endif + +! Define the date on which the snow arrays will be zeroed out. + iclear_mn = izero_snow_date / 10000 + iclear_dy = (izero_snow_date - iclear_mn * 10000) / 100 + xclear_hr = & + & real((izero_snow_date - iclear_mn * 10000) - iclear_dy * 100) + +! Check to see whether there is enough snow layers to calculate +! conductive surface fluxes. + if (icond_flag.eq.1) then + if (multilayer_snowpack.eq.0 .or. max_layers.lt.2) then + print *,'If icond_flag = 1, then multilayer_snowpack = 1' + print *,' and max_layers >= 2.' + stop + endif + endif + +! Read in the topography array. + if (ascii_topoveg.eq.0.0) then + + open (unit=37,file=topoveg_fname, & + & form='unformatted',access='direct',recl=4*nx*ny) + read (37,rec=1) ((topo_land(i,j),i=1,nx),j=1,ny) + + elseif (ascii_topoveg.eq.1.0) then + +! Read off the header lines. I will assume that all of this +! information was input in the .par file correctly. + open (37,file=topo_ascii_fname,form='formatted') + iheader = 6 + do k=1,iheader + read (37,*) + enddo +! Read the data in as real numbers, and do the yrev. + do j=ny,1,-1 + read (37,*) (topo_land(i,j),i=1,nx) + enddo + + endif + +! If vegetation data is not available on the topography grid, +! define the vegetation to be constant. + if (const_veg_flag.ne.0.0) then + do i=1,nx + do j=1,ny + vegtype(i,j) = const_veg_flag + enddo + enddo + +! Read in the vegetation array. + else + + if (ascii_topoveg.eq.0.0) then + read (37,rec=2) ((vegtype(i,j),i=1,nx),j=1,ny) + + elseif (ascii_topoveg.eq.1.0) then + +! Read off the header lines. I will assume that all of this +! information was input in the .par file correctly. + open (38,file=veg_ascii_fname,form='formatted') + do k=1,iheader + read (38,*) + enddo +! Read the data in as real numbers, and do the yrev. + do j=ny,1,-1 + read (38,*) (vegtype(i,j),i=1,nx) + enddo + + endif + + endif + +! Now that we have read in the topo and veg data arrays, check +! whether all of the values look like valid numbers. +! KRA + if (ascii_topoveg.eq.0.0 .or. ascii_topoveg.eq.1.0) then + do i=1,nx + do j=1,ny + if (vegtype(i,j).lt.1.0 .or. vegtype(i,j).gt.30.0) then + print *, 'Found Invalid Vegetation-Type Value' + print *, ' Value =',vegtype(i,j),' at ',i,j + stop + endif + + if (topo_land(i,j).lt.0.0 .or. topo_land(i,j).gt.9000.0) then + print *, 'Found Invalid Topography Value' + print *, ' Value =',topo_land(i,j),' at ',i,j + stop + endif + enddo + enddo +! KRA + endif + +! Fill the the vegetation snow-holding depth array for vegetation +! types 1 through 24 (types 25 through 30 were filled from the +! .par file. + call fill_veg_shd(nvegtypes,vegsnowdepth) + +! Use vegsnowdepth to fill the 2D spatial array, or read in the +! user-provided file of the vegetation heights (in m). + if (iveg_ht_flag.eq.-1) then + +! Find the last occurance of '/' in the topo_vege path. + ipath_length = 0 + do k=1,len(topoveg_fname) + if (topoveg_fname(k:k).eq.'/') then + ipath_length = k + endif + enddo + + if (ipath_length.eq.0) then + print *,'vege_ht_fname path not found; looking' + print *,' in the SnowModel run directory' + endif + + vege_ht_fname = & + & topoveg_fname(1:ipath_length)//'veg_ht.gdat' + + open (191,file=vege_ht_fname, & + & form='unformatted',access='direct',recl=4*nx*ny) + read (191,rec=1) ((vegsnowd_xy(i,j),i=1,nx),j=1,ny) + close(191) + + elseif (iveg_ht_flag.eq.1) then + +! Find the last occurance of '/' in the veg_ascii_fname path. + ipath_length = 0 + do k=1,len(veg_ascii_fname) + if (veg_ascii_fname(k:k).eq.'/') then + ipath_length = k + endif + enddo + + if (ipath_length.eq.0) then + print *,'vege_ht_fname path not found; looking' + print *,' in the SnowModel run directory' + endif + + vege_ht_fname = & + & veg_ascii_fname(1:ipath_length)//'veg_ht.asc' + + open (191,file=vege_ht_fname,form='formatted') + iheader = 6 + do k=1,iheader + read (191,*) + enddo +! Read the data in as real numbers, and do the yrev. + do j=ny,1,-1 + read (191,*) (vegsnowd_xy(i,j),i=1,nx) + enddo + close(191) + + elseif (iveg_ht_flag.eq.0) then + + do i=1,nx + do j=1,ny + nveg = nint(vegtype(i,j)) + vegsnowd_xy(i,j) = vegsnowdepth(nveg) + enddo + enddo + + endif + +! Define the roughness lengths for each of the vegetation types. +! Note that this is pretty arbitrary, because these values are +! really only used when there is no blowing snow, and thus have +! no impact on the simulation except to provide a non-zero value +! for any such parts of the domain. + do i=1,nx + do j=1,ny + veg_z0(i,j) = 0.25 * vegsnowd_xy(i,j) + enddo + enddo + +! Read in the large-scale curvature weighting array, if the run +! requires it. + if (curve_lg_scale_flag.eq.1.0) then + open (444,file='extra_met/large_curvature_wt.gdat', & + & form='unformatted',access='direct',recl=4*nx*ny) + read (444,rec=1) ((curve_wt_lg(i,j),i=1,nx),j=1,ny) + close (444) + endif + +! If this is a sea ice run, open the sea ice concentration file. + if (seaice_run.ne.0.0) then + open (445,file='seaice/ice_conc.gdat', & + & form='unformatted',access='direct',recl=4*nx*ny) + endif + +! If this is a Lagrangian sea ice parcel trajectory simulation, +! do some setup checking. + if (seaice_run.eq.4.0) then + if (barnes_lg_domain.ne.1.0 .or. n_stns_used.ne.1.0 .or. & + & snowmodel_line_flag.ne.1.0) then + print * + print *,'if seaice_run = 4.0, then' + print *,' barnes_lg_domain = 1.0' + print *,' n_stns_used = 1' + print *,' snowmodel_line_flag = 1.0' + print * + stop + endif + endif + +! Check to make sure that if you are running SnowTran-3D and the +! EnBal and SnowPack models, you have also set the flag to run +! the SnowTran-3D two-layer submodel. + if (run_enbal.eq.1.0 .and. run_snowpack.eq.1.0 .and. & + & run_snowtran.eq.1.0) then + if (twolayer_flag.ne.1.0) then + print *, 'For SnowTran-3D with EnBal and SnowPack,' + print *, ' twolayer_flag must equal 1.0' + stop + endif + endif + +! Check to see that the defined domain is large enough to be +! running SnowTran-3D. + if (run_snowtran.eq.1.0 .and. seaice_run.ne.4.0) then + if (nx.lt.3 .or. ny.lt.3) then + print *, 'To run SnowTran-3D, nx and ny must both be 3' + print *, ' or greater (see SnowTran-3D code/notes)' + stop + endif + endif + +! Check to see whether the model is configured correctly to be +! running the multi-layer snow model. + if (multilayer_snowpack.eq.1) then + if (ihrestart_flag.ne.-2 .or. snow_d_init_const.ne.0.0) then + print *, 'The multi-layer snowpack model requires:' + print *, ' ihrestart_flag = -2' + print *, ' snow_d_init_const = 0.0' + stop + endif + endif + +! Get a collection of constants that are not generally modified. + call constants(fetch,xmu,C_z,h_const,wind_min,Up_const, & + & dz_susp,ztop_susp,fall_vel,Ur_const,ro_water,ro_air, & + & gravity,vonKarman,pi,twopio360,snow_z0) + +! Run a check to see if SnowTran-3D is being run with grid +! increments that are too large. + if (deltax.gt.500.0 .or. deltay.gt.500.0) then + if (seaice_run.eq.0.0) then + if (run_snowtran.eq.1.0) then + print * + print *, '!!! deltax,y should not be greater than 500 m' + print *, '!!! if you are also running SnowTran-3D' + print * + stop + endif + endif + endif + +! Initialize the summing arrays, and define the initial snow-depth +! distributions. + call initialize(nx,ny,sum_sprec,sum_qsubl,sum_trans,& + & sum_unload,topo,topo_land,snow_d,topoflag,snow_d_init,& + & snow_d_init_const,soft_snow_d,ro_water,sum_sfcsublim,& + & ro_snow_grid,swe_depth,sum_runoff,sum_prec,ro_snow,& + & sum_Qcs,canopy_int,sum_glacmelt,snow_depth,sum_d_canopy_int,& + & ro_soft_snow_old,sum_swemelt,swe_depth_old,canopy_int_old,& + & ihrestart_flag,i_dataassim_loop,max_iter,corr_factor,& + & icorr_factor_index,KK,tslsnowfall,tsls_threshold,snod_layer,& + & swed_layer,ro_layer,T_old,gamma,diam_layer) + +! Check to see whether the data assimilation has been configured +! correctly. + if (irun_data_assim.eq.1) then + +! Check to see whether the required output files will be created. + if (print_user.ne.1.0) then + print *, 'For a data assimilation run print_user must = 1.0' + stop + endif + + if (print_var(19).ne.'y') then + print *, 'print_var_19 == y for a data assimilation run' + stop + endif + + if (print_var(20).ne.'y') then + print *, 'print_var_20 == y for a data assimilation run' + stop + endif + +! Check to see whether the corr_factor array is defined in the +! snowmodel.inc file to be large enough to do the assimilation. +! max_obs_dates is used in the data assimilation routines. It +! must be greater than or equal to the number of observation +! dates in the entire simulation + (plus) the number of years +! in the simulation. For example, for a 6-year simulation with +! 2 observation dates in each year, you would set max_obs_dates +! to be = 2obs*6yrs+6yrs = 18 or greater. For a 6-year run with +! 4 observation dates in 2 of the years, and 0 observation dates +! in the other 4 years, max_obs_dates = 8obs+6yrs = 14 or +! greater. +! parameter (max_obs_dates=18) + if (icorr_factor_loop.eq.1) then + open (unit=61,file='swe_assim/swe_obs.dat') + read(61,*) nyears + nobs_total = 0 + do nyear=1,nyears + read(61,*) nobs_dates + if (nobs_dates.gt.0) then + nobs_total = nobs_total + nobs_dates + do iobs_num=1,nobs_dates +! read(61,*) iiyr,iimo,iidy + read(61,*) + read(61,*) nstns + do k=1,nstns +! read(61,*) obsid(k),xstn(k),ystn(k),swe_obs(k) + read(61,*) + enddo + enddo + endif + enddo + close (61) + krec = nobs_total + nyears + if (krec.gt.max_obs_dates) then + print * + print *, 'For a DATA ASSIMILATION RUN, MAX_OBS_DATES must be' + print *, 'defined in SNOWMODEL.INC to be greater than the' + print *, 'number of obs dates in the entire simulation +' + print *, '(plus) the number of years in the simulation. For' + print *, 'example, for a 6-year simulation with 2 observation' + print *, 'dates in each year, you would set max_obs_dates to' + print *, 'be = 2obs*6yrs+6yrs = 18 or greater. For a 6-year' + print *, 'run with 4 observation dates in 2 of the years,' + print *, 'and 0 observation dates in the other 4 years,' + print *, 'max_obs_dates = 8obs+6yrs = 14 or greater.' + print * + print *, 'max_obs_dates must be increased in snowmodel.inc' + print *, 'It looks like you should set max_obs_dates = ',krec + print *, 'Right now, max_obs_dates = ',max_obs_dates + print * + stop + endif + endif + endif + +! Initialize the precipitation factor for the first iteration to +! equal 1.0. + if (icorr_factor_loop.eq.1) then + do iobs_num=1,max_obs_dates+1 + do j=1,ny + do i=1,nx + corr_factor(i,j,iobs_num) = 1.0 + enddo + enddo + enddo + do iter=1,max_iter + icorr_factor_index(iter) = 1 + enddo + endif + +! Read or build the latitude array that will be used to do the +! latitude weighting when calculating incoming solar radiation. + if (lat_solar_flag.eq.-1) then + + write(*,*) "SM: Reading in gridded latitude binary file" + open (91,file='extra_met/grid_lat.gdat', & + & form='unformatted',access='direct',recl=4*nx*ny) + read (91,rec=1) ((xlat_grid(i,j),i=1,nx),j=1,ny) + close(91) + + elseif (lat_solar_flag.eq.1) then + + open (91,file='extra_met/grid_lat.asc',form='formatted') + iheader = 6 + do k=1,iheader + read (91,*) + enddo +! Read the data in as real numbers, and do the yrev. + do j=ny,1,-1 + read (91,*) (xlat_grid(i,j),i=1,nx) + enddo + close(91) + + elseif (lat_solar_flag.eq.0) then + +! Print an error if the y-domain is big enough to have important +! solar radiation differences from south to north. + if (ny*deltay.gt.500000.0) then + print * + print *,'YOUR DOMAIN IS PRETTY BIG TO NOT ACCOUNT FOR' + print *,' SOLAR RADIATION VARIATIONS WITH LATITUDE' + print *,' see the "lat_solar_flag" in snowmodel.par' + print * + stop + endif + + do i=1,nx + do j=1,ny + xlat_grid(i,j) = xlat + enddo + enddo + + endif + +! Read or build the longitude array that will be used to do the +! longitude influence when calculating incoming solar radiation. + if (UTC_flag.eq.-1.0) then + + write(*,*) "SM: Reading in gridded longitude binary file" + open (91,file='extra_met/grid_lon.gdat', & + & form='unformatted',access='direct',recl=4*nx*ny) + read (91,rec=1) ((xlon_grid(i,j),i=1,nx),j=1,ny) + close(91) + + elseif (UTC_flag.eq.1.0) then + + open (91,file='extra_met/grid_lon.asc',form='formatted') + iheader = 6 + do k=1,iheader + read (91,*) + enddo +! Read the data in as real numbers, and do the yrev. + do j=ny,1,-1 + read (91,*) (xlon_grid(i,j),i=1,nx) + enddo + close(91) + + elseif (UTC_flag.eq.0.0) then + +! Print an error if the x-domain is big enough to have important +! solar radiation differences from east to west. + if (nx*deltax.gt.500000.0 .and. seaice_run.ne.4) then + print * + print *,'YOUR DOMAIN IS PRETTY BIG TO NOT ACCOUNT FOR' + print *,' SOLAR RADIATION VARIATIONS WITH LONGITUDE' + print *,' see the "UTC_flag" in snowmodel.par' + print * + endif + + endif + +! Open the MicroMet station data input file. + if (igrads_metfile.eq.1) then + open(20,file=met_input_fname,form='unformatted', & + & access='direct',recl=4*13) + else + open (20,file=met_input_fname,form='formatted') + endif + +! Run a check to see whether there are any time slices with no +! valid data. + if (check_met_data.eq.1.0) then + print * + print *,'Checking for sufficient met forcing data to' + print *,' complete the model simulation. This may' + print *,' take a while, depending on how big your met' + print *,' input file is.' + print * + call met_data_check(undef,isingle_stn_flag,igrads_metfile, & + & max_iter,i_tair_flag,i_rh_flag,i_wind_flag,i_prec_flag) + endif + +! If the concatenated configuration of the model is used, read +! in the x and y coordinates for the concatenated grid cells. + if (snowmodel_line_flag.eq.1.0) then + open (1331,file='extra_met/snowmodel_line_pts.dat') + do j=1,ny + do i=1,nx + read (1331,*) icount,iii,jjj,xg_line(i,j),yg_line(i,j) + enddo + enddo + close (1331) + endif + +! If the large-domain barnes oi scheme is used, generate the +! nearest-station indexing array. + if (barnes_lg_domain.eq.1.0) then +! if (barnes_lg_domain.eq.1.0 .and. snowmodel_masterproc) then + print * + print *,'You are running the large-domain Barnes oi scheme' + print *,' This requires:' + print *,' 1) no missing data for the fields of interest' + print *,' 2) no missing stations during the simulation' + print *,' 3) met file must list stations in the same order' + print *,' 4) the number of nearest stations used is 9 or less' + print *,' 5) **** no error checking for this is done ****' + print * + print *,'Generating nearest-station index. Be patient.' + print * + if (n_stns_used.gt.9 .or. n_stns_used.lt.1) then + print *,'invalid n_stns_used value' + stop + endif +! KRA +! call get_nearest_stns_1(nx,ny,xmn,ymn,deltax,deltay, +! & n_stns_used,k_stn,snowmodel_line_flag,xg_line,yg_line) +! KRA + endif + +! If this is a history restart run, advance the micromet input +! file to the restart time. + if (ihrestart_flag.ge.0) then + if (igrads_metfile.eq.0) then + do iter=1,ihrestart_flag + if (isingle_stn_flag.eq.1) then + nstns_orig = 1 + else + read(20,*) nstns_orig + endif + do k=1,nstns_orig + read(20,*) + enddo + enddo + endif + endif + +! Open the files to be used to store model output. + +! nrecs_max corresponds to the approximately 2.1 GB Fortran +! array limit for direct access binary inputs and outputs. +! The number listed here corresponds to nx = ny = 23170. +! "nrecs_max * 4 bytes per number" gives the 2.1 GB limit. + nrecs_max = 536848900 + +! For MicroMet. + if (run_micromet.eq.1.0 .and. print_micromet.eq.1.0) then + n_recs_out = 9 + nrecs = n_recs_out * nx * ny + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the micromet.gdat file. You must set' + print *,'print_micromet = 0.0 and use print_user = 1.0.' + stop + else + if (icorr_factor_loop.eq.2) close (81) + open (81,file=micromet_output_fname,& + & form='unformatted',access='direct',recl=4*n_recs_out*nx*ny,& + & status='replace') + endif + endif + +! For EnBal. + if (run_enbal.eq.1.0 .and. print_enbal.eq.1.0) then + n_recs_out = 11 + nrecs = n_recs_out * nx * ny + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the enbal.gdat file. You must set' + print *,'print_enbal = 0.0 and use print_user = 1.0.' + stop + else + if (icorr_factor_loop.eq.2) close (82) + open (82,file=enbal_output_fname,& + & form='unformatted',access='direct',recl=4*n_recs_out*nx*ny,& + & status='replace') + endif + endif + +! For SnowPack. + if (run_snowpack.eq.1.0 .and. print_snowpack.eq.1.0) then + n_recs_out = 16 + nrecs = n_recs_out * nx * ny + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the snowpack.gdat file. You must set' + print *,'print_snowpack = 0.0 and use print_user = 1.0.' + stop + else + if (icorr_factor_loop.eq.2) close (83) + open (83,file=snowpack_output_fname, & + & form='unformatted',access='direct',recl=4*n_recs_out*nx*ny,& + & status='replace') + endif + endif + +! For SnowTran-3D. + if (run_snowtran.eq.1.0 .and. print_snowtran.eq.1.0) then + n_recs_out = 7 + nrecs = n_recs_out * nx * ny + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the snowtran.gdat file. You must set' + print *,'print_snowtran = 0.0 and use print_user = 1.0.' + stop + else + if (icorr_factor_loop.eq.2) close (84) + open (84,file=snowtran_output_fname,& + & form='unformatted',access='direct',recl=4*n_recs_out*nx*ny,& + & status='replace') + endif + endif + +! For Multi-Layer SnowPack. + if (run_snowpack.eq.1.0 .and. multilayer_snowpack.eq.1 .and.& + & print_multilayer.eq.1.0) then + nrecs = 4 * nx * ny + 4 * nx * ny * nz_max + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the multilayer.gdat file. Since you' + print *,'clearly want this information, it will be written' + print *,'to the directory you defined in the .par file for' + print *,'the parameter "output_path_wo_assim".' + else + if (icorr_factor_loop.eq.2) close (401) + open (401,file=multilayer_output_fname, & + & form='unformatted',access='direct', & + & recl=4*(4*nx*ny+4*nx*ny*nz_max), & + & status='replace') + endif + elseif (run_snowpack.eq.1.0 .and. multilayer_snowpack.eq.1 .and. & + & print_multilayer.eq.2.0) then + nrecs = nx * ny * nz_max + if (nrecs.gt.nrecs_max) then + print *,'Your simulation domain has too many grid cells' + print *,'to print the print_multilayer = 2.0 files. You' + print *,'will have to restructure the write statements.' + print *,'See the example in the outputs_user.f subroutine' + print *,'where it does the "if (nrecs.gt.nrecs_max) then"' + print *,'test.' + stop + else + + if (icorr_factor_loop.eq.1) then + + i_len_wo = 80 - trailing_blanks(output_path_wo_assim) + open (401,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_2Dxy.gdat',& + & form='unformatted',access='direct',& + & recl=4*(4*nx*ny),status='replace') + open (402,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_snod.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (403,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_sden.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (404,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_swed.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (405,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_diam.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (406,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_flux.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (407,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_temp.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (408,& + & file=output_path_wo_assim(1:i_len_wo)//'multilayer_cond.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + + elseif (icorr_factor_loop.eq.2) then + + close (401) + close (402) + close (403) + close (404) + close (405) + close (406) + close (407) + close (408) + + i_len_wi = 80 - trailing_blanks(output_path_wi_assim) + open (401,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_2Dxy.gdat',& + & form='unformatted',access='direct',& + & recl=4*(4*nx*ny),status='replace') + open (402,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_snod.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (403,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_sden.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (404,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_swed.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (405,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_diam.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (406,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_flux.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (407,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_temp.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + open (408,& + & file=output_path_wi_assim(1:i_len_wi)//'multilayer_cond.gdat',& + & form='unformatted',access='direct',& + & recl=4*nx*ny*nz_max,status='replace') + + endif + endif + endif + +! Read in the precipitation correction factor array. + if (cf_precip_flag.eq.1.0) then + + open (unit=144,file='precip_cf/cf_precip.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + read (144,rec=1) ((cf_precip(i,j),i=1,nx),j=1,ny) + + elseif (cf_precip_flag.eq.2.0) then + +! Read off the header lines. I will assume that all of this +! information was input in the .par file correctly. + open (144,file='precip_cf/cf_precip.asc',form='formatted') + iheader = 6 + do k=1,iheader + read (144,*) + enddo +! Read the data in as real numbers, and do the yrev. + do j=ny,1,-1 + read (144,*) (cf_precip(i,j),i=1,nx) + enddo + + elseif (cf_precip_flag.eq.3.0) then + + open (144,file='precip_cf/cf_precip.dat',form='formatted') + read (144,*) cf_precip_scalar + do j=1,ny + do i=1,nx + cf_precip(i,j) = cf_precip_scalar + enddo + enddo + + endif + +! This must be closed so it can be reread if there is a (second) +! data assimilation loop. + close (144) + +! Generate all of the GrADS control (.ctl) files that correspond +! to all of the GrADS output (.gdat) files that were generated as +! part of this model run. They are (mostly) all placed in a +! directory called "ctl_files". + call mk_ctl_files(nx,ny,deltax,deltay,xmn,ymn,dt,& + & print_inc,iyear_init,imonth_init,iday_init,xhour_init,& + & max_iter,undef,output_path_wo_assim,output_path_wi_assim,& + & print_micromet,micromet_output_fname,print_enbal,& + & enbal_output_fname,print_snowpack,snowpack_output_fname,& + & print_snowtran,snowtran_output_fname,Tabler_1_flag,& + & tabler_sfc_path_name,Tabler_2_flag,irun_data_assim,& + & print_var,print_outvars,print_multilayer,& + & multilayer_output_fname) + +! If this is going to be a SnowTran-3D run, print the Copyright +! header. + if (run_snowtran.eq.1.0) then + print * + print *,& + & 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' + print *,& + & 'c Snow-Transport Modeling System - 3D (SnowTran-3D) c' + print *,& + & 'c Copyright (C) 1998 c' + print *,& + & 'c by Glen E. Liston, InterWorks Consulting c' + print *,& + & 'c All Rights Reserved c' + print *,& + & 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' + print * + print * + endif + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine initialize(nx,ny,sum_sprec,sum_qsubl,sum_trans,& + & sum_unload,topo,topo_land,snow_d,topoflag,snow_d_init,& + & snow_d_init_const,soft_snow_d,ro_water,sum_sfcsublim,& + & ro_snow_grid,swe_depth,sum_runoff,sum_prec,ro_snow,& + & sum_Qcs,canopy_int,sum_glacmelt,snow_depth,sum_d_canopy_int,& + & ro_soft_snow_old,sum_swemelt,swe_depth_old,canopy_int_old,& + & ihrestart_flag,i_dataassim_loop,max_iter,corr_factor,& + & icorr_factor_index,KK,tslsnowfall,tsls_threshold,snod_layer,& + & swed_layer,ro_layer,T_old,gamma,diam_layer) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,ihrestart_flag,i_dataassim_loop,max_iter,k + + real topoflag,snow_d_init_const,ro_water,ro_snow + real sum_sprec(nx,ny) + real sum_qsubl(nx,ny) + real sum_trans(nx,ny) + real sum_unload(nx,ny) + real topo(nx,ny) + real topo_land(nx,ny) + real snow_d(nx,ny) + real snow_depth(nx,ny) + real soft_snow_d(nx,ny) + real ro_soft_snow_old(nx,ny) + real ro_snow_grid(nx,ny) + real swe_depth(nx,ny) + real sum_prec(nx,ny) + real sum_runoff(nx,ny) + real sum_Qcs(nx,ny) + real canopy_int(nx,ny) + real sum_glacmelt(nx,ny) + real sum_swemelt(nx,ny) + real sum_d_canopy_int(nx,ny) + real sum_sfcsublim(nx,ny) + real snow_d_init(nx,ny) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + + integer KK(nx,ny) + real tslsnowfall(nx,ny) + real tsls_threshold + real snod_layer(nx,ny,nz_max) + real swed_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real gamma(nx,ny,nz_max) + real diam_layer(nx,ny,nz_max) + + integer icorr_factor_index(max_time_steps) + real corr_factor(nx_max,ny_max,max_obs_dates+1) + + if (ihrestart_flag.ge.0) then + +! Read in the saved data. + CALL HRESTART_READ(nx,ny,snow_d,snow_depth,& + & canopy_int,soft_snow_d,ro_snow_grid,swe_depth,& + & ro_soft_snow_old,snow_d_init,swe_depth_old,& + & canopy_int_old,topo,sum_sprec,ihrestart_flag,& + & i_dataassim_loop) + + if (i_dataassim_loop.lt.0.0) then + CALL HRESTART_READ_DA(nx,ny,max_iter,corr_factor,& + & icorr_factor_index,i_dataassim_loop) + endif + + do i=1,nx + do j=1,ny +! Fill the summing arrays. + sum_runoff(i,j) = 0.0 + sum_prec(i,j) = 0.0 +! sum_sprec(i,j) = 0.0 + sum_qsubl(i,j) = 0.0 + sum_trans(i,j) = 0.0 + sum_unload(i,j) = 0.0 + sum_Qcs(i,j) = 0.0 + sum_glacmelt(i,j) = 0.0 + sum_swemelt(i,j) = 0.0 + sum_d_canopy_int(i,j) = 0.0 + sum_sfcsublim(i,j) = 0.0 + +! Define the initial snow-depth distributions. +! snow_d_init(i,j) = snow_d_init_const +! snow_d(i,j) = snow_d_init(i,j) +! snow_depth(i,j) = snow_d_init(i,j) +! canopy_int(i,j) = 0.0 +! soft_snow_d(i,j) = snow_d(i,j) +! ro_snow_grid(i,j) = ro_snow +! swe_depth(i,j) = snow_d(i,j) * ro_snow_grid(i,j) / ro_water +! ro_soft_snow_old(i,j) = 50.0 +! swe_depth_old(i,j) = swe_depth(i,j) +! canopy_int_old(i,j) = canopy_int(i,j) + enddo + enddo + + else + + do i=1,nx + do j=1,ny +! Fill the summing arrays. + sum_runoff(i,j) = 0.0 + sum_prec(i,j) = 0.0 + sum_sprec(i,j) = 0.0 + sum_qsubl(i,j) = 0.0 + sum_trans(i,j) = 0.0 + sum_unload(i,j) = 0.0 + sum_Qcs(i,j) = 0.0 + sum_glacmelt(i,j) = 0.0 + sum_swemelt(i,j) = 0.0 + sum_d_canopy_int(i,j) = 0.0 + sum_sfcsublim(i,j) = 0.0 + +! Define the initial snow-depth distributions. + snow_d_init(i,j) = snow_d_init_const + snow_d(i,j) = snow_d_init(i,j) + snow_depth(i,j) = snow_d_init(i,j) + canopy_int(i,j) = 0.0 + soft_snow_d(i,j) = snow_d(i,j) + ro_snow_grid(i,j) = ro_snow + swe_depth(i,j) = snow_d(i,j) * ro_snow_grid(i,j) / ro_water + ro_soft_snow_old(i,j) = 50.0 + swe_depth_old(i,j) = swe_depth(i,j) + canopy_int_old(i,j) = canopy_int(i,j) + +! Initialize the multi-layer snowpack arrays. + KK(i,j) = 0 + tslsnowfall(i,j) = tsls_threshold + enddo + enddo + + do i=1,nx + do j=1,ny + do k=1,nz_max + snod_layer(i,j,k) = 0.0 + swed_layer(i,j,k) = 0.0 + ro_layer(i,j,k) = ro_snow + T_old(i,j,k) = 273.15 + gamma(i,j,k) = 0.138 - 1.01 * (ro_layer(i,j,k)/1000.0) + & + & 3.233 * (ro_layer(i,j,k)/1000.0)**2 + diam_layer(i,j,k) = 0.5 / 1000.0 + enddo + enddo + enddo + + if (topoflag.eq.1.0) then + do i=1,nx + do j=1,ny + topo(i,j) = topo_land(i,j) + snow_d(i,j) + enddo + enddo + elseif (topoflag.eq.0.0) then + do i=1,nx + do j=1,ny + topo(i,j) = topo_land(i,j) + enddo + enddo + endif + + endif + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine constants(fetch,xmu,C_z,h_const,wind_min,Up_const,& + & dz_susp,ztop_susp,fall_vel,Ur_const,ro_water,ro_air,& + & gravity,vonKarman,pi,twopio360,snow_z0) + + implicit none + + real fetch,xmu,C_z,h_const,wind_min,Up_const,& + & dz_susp,ztop_susp,fall_vel,Ur_const,ro_water,ro_air,& + & gravity,vonKarman,pi,twopio360,snow_z0 + +! These constants are not generally modified for a particular model +! run. + +! Snow surface roughness length. + snow_z0 = 0.001 + +! Constants related to surface shear stress and saltation +! transport. + fetch = 500.0 + xmu = 3.0 + C_z = 0.12 + h_const = 1.6 + wind_min = 4.0 + +! Constants related to suspended snow profile. + Up_const = 2.8 + dz_susp = 0.20 + ztop_susp = 2.0 + fall_vel = 0.3 + Ur_const = 0.5 + +! General constants. + ro_water = 1000.0 + ro_air = 1.275 + gravity = 9.81 + vonKarman = 0.4 + pi = 2.0 * acos(0.0) + twopio360 = 2.0 * pi / 360.0 + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine fill_veg_shd(nvegtypes,vegsnowdepth) + + implicit none + + integer k,nvegtypes,nvegtypes_fixed + + parameter (nvegtypes_fixed=24) + + real vegsnowdepth(nvegtypes),vegsnowdepth_fixed(nvegtypes_fixed) + +! Fill the the vegetation snow-holding depth array for +! vegetation types 1 through 24 (types 25 through 30 were filled +! from the .par file. +! +! The following summary was taken from the .par file. +! +! The vegetation types are assumed to range from 1 through 30. The +! last 6 types are available to be user-defined vegetation types +! and vegetation snow-holding depth. The first 24 vegetation +! types, and the associated vegetation snow-holding depth +! (meters), are hard-coded to be: +! +! code description veg_shd example class +! +! 1 coniferous forest 15.00 spruce-fir/taiga/lodgepole forest +! 2 deciduous forest 12.00 aspen forest forest +! 3 mixed forest 14.00 aspen/spruce-fir/low taiga forest +! 4 scattered short-conifer 8.00 pinyon-juniper forest +! 5 clearcut conifer 4.00 stumps and regenerating forest +! +! 6 mesic upland shrub 0.50 deeper soils, less rocky shrub +! 7 xeric upland shrub 0.25 rocky, windblown soils shrub +! 8 playa shrubland 1.00 greasewood, saltbush shrub +! 9 shrub wetland/riparian 1.75 willow along streams shrub +! 10 erect shrub tundra 0.65 arctic shrubland shrub +! 11 low shrub tundra 0.30 low to medium arctic shrubs shrub +! +! 12 grassland rangeland 0.15 graminoids and forbs grass +! 13 subalpine meadow 0.25 meadows below treeline grass +! 14 tundra (non-tussock) 0.15 alpine, high arctic grass +! 15 tundra (tussock) 0.20 graminoid and dwarf shrubs grass +! 16 prostrate shrub tundra 0.10 graminoid dominated grass +! 17 arctic gram. wetland 0.20 grassy wetlands, wet tundra grass +! +! 18 bare 0.01 bare +! +! 19 water/possibly frozen 0.01 water +! 20 permanent snow/glacier 0.01 water +! +! 21 residential/urban 0.01 human +! 22 tall crops 0.40 e.g., corn stubble human +! 23 short crops 0.25 e.g., wheat stubble human +! 24 ocean 0.01 water +! +! 25 user defined (see below) +! 26 user defined (see below) +! 27 user defined (see below) +! 28 user defined (see below) +! 29 user defined (see below) +! 30 user defined (see below) +! +! Define the vegetation snow-holding depth (meters) for each +! of the user-defined vegetation types. The numbers in the +! list below correspond to the vegetation-type numbers in the +! vegetation-type data array (veg type 25.0 -> veg_shd_25). Note +! that even if these are not used, they cannot be commented out +! or you will get an error message. +! veg_shd_25 = 0.10 +! veg_shd_26 = 0.10 +! veg_shd_27 = 0.10 +! veg_shd_28 = 0.10 +! veg_shd_29 = 0.10 +! veg_shd_30 = 0.10 + + data vegsnowdepth_fixed/15.00, 12.00, 14.00, 8.00, 4.00, & + & 0.50, 0.25, 1.00, 1.75, 0.65, 0.30,& + & 0.15, 0.25, 0.15, 0.20, 0.10, 0.20,& + & 0.01, 0.01, 0.01, 0.01, 0.40, 0.25,& + & 0.01/ + + do k=1,nvegtypes_fixed + vegsnowdepth(k) = vegsnowdepth_fixed(k) + enddo + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine met_data_check(undef,isingle_stn_flag,igrads_metfile,& + & max_iter,i_tair_flag,i_rh_flag,i_wind_flag,i_prec_flag) + + use snowmodel_inc + implicit none + + integer iyr,imo,idy ! year, month, and day of data + real xhr ! decimal hour + integer idstn ! station id number + + integer k,nstns_orig,isingle_stn_flag,igrads_metfile,iter,& + & n_good_Tair,n_good_rh,n_good_wspd,n_good_wdir,n_good_prec,& + & n_notgood_vars,i_tair_flag,i_rh_flag,i_wind_flag,i_prec_flag,& + & max_iter + + real Tair_orig(nstns_max),rh_orig(nstns_max) + real winddir_orig(nstns_max),windspd_orig(nstns_max) + double precision xstn_orig(nstns_max),ystn_orig(nstns_max) + real elev_orig(nstns_max),prec_orig(nstns_max) + real undef ! undefined value + real elevation_flag + + n_notgood_vars = 0 + elevation_flag = 0.0 + + do iter=1,max_iter + + n_good_Tair = 0 + n_good_rh = 0 + n_good_wspd = 0 + n_good_wdir = 0 + n_good_prec = 0 + + if (igrads_metfile.eq.1) then + nstns_orig = 1 + else + if (isingle_stn_flag.eq.1) then + nstns_orig = 1 + else + read(20,*) nstns_orig + endif + endif + + if (nstns_orig.gt.nstns_max) then + print *, 'The number of met stations in your MicroMet' + print *, 'input file exceeds nstns_max in snowmodel.inc.' + print *, 'This occurs at iter =',iter + stop + endif + + do k=1,nstns_orig + + if (igrads_metfile.eq.1) then + read(20,rec=iter) iyr,imo,idy,xhr,idstn,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),Tair_orig(k),rh_orig(k),& + & windspd_orig(k),winddir_orig(k),prec_orig(k) + else + read(20,*) iyr,imo,idy,xhr,idstn,xstn_orig(k),& + & ystn_orig(k),elev_orig(k),Tair_orig(k),rh_orig(k),& + & windspd_orig(k),winddir_orig(k),prec_orig(k) + endif + +! Check for any NaN values. They are not allowed. + if (Tair_orig(k).ne.Tair_orig(k) .or.& + & rh_orig(k).ne.rh_orig(k) .or.& + & windspd_orig(k).ne.windspd_orig(k) .or.& + & winddir_orig(k).ne.winddir_orig(k) .or.& + & prec_orig(k).ne.prec_orig(k)) then + print * + print *,' YOU HAVE NaN VALUES IN YOUR MET FORCING INPUT' + print *,' FILE. THEY ARE NOT ALLOWED ANYWHERE IN THE' + print *,' MicroMet INPUT FILE. THIS MUST BE CORRECTED' + print *,' BEFORE YOU CAN CONTINUE.' + print * + stop + endif + +! Count the good values at this time. + if (Tair_orig(k).ne.undef) n_good_Tair = n_good_Tair + 1 + if (rh_orig(k).ne.undef) n_good_rh = n_good_rh + 1 + if (windspd_orig(k).ne.undef) n_good_wspd = n_good_wspd + 1 + if (winddir_orig(k).ne.undef) n_good_wdir = n_good_wdir + 1 + if (prec_orig(k).ne.undef) n_good_prec = n_good_prec + 1 + + if (elev_orig(k).lt.0.0) then + elevation_flag = 1.0 + print *,'elevation = ',elev_orig(k),' for stn id = ',idstn + endif + + enddo + +! Check to see whether there are any variables with no valid data +! at this time slice. + if (n_good_Tair.eq.0 .and. i_tair_flag.eq.1) then + n_notgood_vars = n_notgood_vars + 1 + print *,'no good Tair data at ',iyr,imo,idy,xhr + endif + + if (n_good_rh.eq.0 .and. i_rh_flag.eq.1) then + n_notgood_vars = n_notgood_vars + 1 + print *,'no good rh data at ',iyr,imo,idy,xhr + endif + + if (n_good_wspd.eq.0 .and. i_wind_flag.eq.1) then + n_notgood_vars = n_notgood_vars + 1 + print *,'no good wind speed data at ',iyr,imo,idy,xhr + endif + + if (n_good_wdir.eq.0 .and. i_wind_flag.eq.1) then + n_notgood_vars = n_notgood_vars + 1 + print *,'no good wind direction data at ',iyr,imo,idy,xhr + endif + + if (n_good_prec.eq.0 .and. i_prec_flag.eq.1) then + n_notgood_vars = n_notgood_vars + 1 + print *,'no good precipitation data at ',iyr,imo,idy,xhr + endif + + enddo + + if (n_notgood_vars.gt.0) then + print * + print *,' FOUND TIMES WITH NO VALID MET OBSERVATIONS' + print *,'NEED TO CORRECT THE PROBLEM BEFORE CONTINUING' + stop + endif + + if (elevation_flag.eq.1.0) then + print * + print *,' FOUND A NEGATIVE OR UNDEFINED STATION ELEVATION.' + print *,'STATION ELEVATIONS CANNOT BE UNDEFINED, BUT THEY.' + print *,'CAN BE NEGATIVE FOR A PLACE LIKE DEATH VALLEY.' + print *,'YOU NEED TO CORRECT ANY PROBLEMS BEFORE CONTINUING.' + stop + endif + + if (igrads_metfile.eq.0) rewind (20) + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_nearest_stns_1(nx,ny,xmn,ymn,deltax,deltay,& + & n_stns_used,k_stn,snowmodel_line_flag,xg_line,yg_line) + + use snowmodel_inc + implicit none + + double precision xstn(nstns_max) + double precision ystn(nstns_max) + double precision dsq(nstns_max) + double precision xg_line(nx,ny),yg_line(nx,ny) + real snowmodel_line_flag + + double precision xg,yg,xmn,ymn,dist_min + real deltax,deltay,x1,x2,x3,x4,x5,x6,x7 + + integer i,j,k,kk,nstns,n_stns_used,nx,ny,i1,i2,i3,i4 + integer k_stn(nx,ny,9) + +! Read the station information for the first (and all) time step(s). + read(20,*) nstns + do k=1,nstns + read(20,*) i1,i2,i3,x1,i4,xstn(k),ystn(k),& + & x2,x3,x4,x5,x6,x7 + enddo + rewind (20) + + do j=1,ny + do i=1,nx + +! xcoords of grid nodes at index i,j +! ycoords of grid nodes at index i,j + if (snowmodel_line_flag.eq.1.0) then + xg = xg_line(i,j) + yg = yg_line(i,j) + else + xg = xmn + deltax * (real(i) - 1.0) + yg = ymn + deltay * (real(j) - 1.0) + endif + +! Loop through all of the stations, calculating the distance +! between the current grid point and each of the stations. + do k=1,nstns + dsq(k) = (xg - xstn(k))**2 + (yg - ystn(k))**2 + enddo + +! Loop through each of the station distances and find the +! stations closest to the grid point in question. + do kk=1,n_stns_used + dist_min = 1.0e30 + do k=1,nstns + if (dsq(k).le.dist_min) then + k_stn(i,j,kk) = k + dist_min = dsq(k) + endif + enddo + +! Eliminate the last found minimum from the next search by making +! its distance a big number. + dsq(k_stn(i,j,kk)) = 1.0e30 + enddo + + enddo + enddo + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine HRESTART_SAVE(nx,ny,iter,snow_d,snow_depth,& + & canopy_int,soft_snow_d,ro_snow_grid,swe_depth,& + & ro_soft_snow_old,snow_d_init,swe_depth_old,& + & canopy_int_old,topo,sum_sprec,icorr_factor_loop,& + & max_iter) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,iter,icorr_factor_loop,max_iter + real snow_d(nx,ny) + real snow_depth(nx,ny) + real canopy_int(nx,ny) + real soft_snow_d(nx,ny) + real ro_snow_grid(nx,ny) + real swe_depth(nx,ny) + real ro_soft_snow_old(nx,ny) + real snow_d_init(nx,ny) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + real topo(nx,ny) + real sum_sprec(nx,ny) + + character*18 name1 + character*1 name2 + character*5 name3 + character*5 niter + character*1 iloop + character*30 fname + +! Build the file name so it includes the interation number. + name1 = 'hrestart/hrestart_' + name2 = '_' + name3 = '.gdat' + + write(niter,'(i5.5)') iter + write(iloop,'(i1.1)') icorr_factor_loop + fname = name1//niter//name2//iloop//name3 + +! Save the data. + open(151,file=fname,& + & form='unformatted',access='direct',recl=4*nx*ny) + + write (151,rec=1) ((snow_d(i,j),i=1,nx),j=1,ny) + write (151,rec=2) ((snow_depth(i,j),i=1,nx),j=1,ny) + write (151,rec=3) ((canopy_int(i,j),i=1,nx),j=1,ny) + write (151,rec=4) ((soft_snow_d(i,j),i=1,nx),j=1,ny) + write (151,rec=5) ((ro_snow_grid(i,j),i=1,nx),j=1,ny) + write (151,rec=6) ((swe_depth(i,j),i=1,nx),j=1,ny) + write (151,rec=7) ((ro_soft_snow_old(i,j),i=1,nx),j=1,ny) + write (151,rec=8) ((snow_d_init(i,j),i=1,nx),j=1,ny) + write (151,rec=9) ((swe_depth_old(i,j),i=1,nx),j=1,ny) + write (151,rec=10) ((canopy_int_old(i,j),i=1,nx),j=1,ny) + write (151,rec=11) ((topo(i,j),i=1,nx),j=1,ny) + write (151,rec=12) ((sum_sprec(i,j),i=1,nx),j=1,ny) + + close (151) + +! Save a copy that can be used as the initial condition for the +! start of the second data assimilation loop. + if (iter.eq.max_iter) then + write(niter,'(i5.5)') 0 + write(iloop,'(i1.1)') 2 + fname = name1//niter//name2//iloop//name3 + +! Save the data. + open(151,file=fname,& + & form='unformatted',access='direct',recl=4*nx*ny) + + write (151,rec=1) ((snow_d(i,j),i=1,nx),j=1,ny) + write (151,rec=2) ((snow_depth(i,j),i=1,nx),j=1,ny) + write (151,rec=3) ((canopy_int(i,j),i=1,nx),j=1,ny) + write (151,rec=4) ((soft_snow_d(i,j),i=1,nx),j=1,ny) + write (151,rec=5) ((ro_snow_grid(i,j),i=1,nx),j=1,ny) + write (151,rec=6) ((swe_depth(i,j),i=1,nx),j=1,ny) + write (151,rec=7) ((ro_soft_snow_old(i,j),i=1,nx),j=1,ny) + write (151,rec=8) ((snow_d_init(i,j),i=1,nx),j=1,ny) + write (151,rec=9) ((swe_depth_old(i,j),i=1,nx),j=1,ny) + write (151,rec=10) ((canopy_int_old(i,j),i=1,nx),j=1,ny) + write (151,rec=11) ((topo(i,j),i=1,nx),j=1,ny) + write (151,rec=12) ((sum_sprec(i,j),i=1,nx),j=1,ny) + + close (151) + endif + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine HRESTART_SAVE_DA(nx,ny,max_iter,corr_factor,& + & icorr_factor_index,nobs_dates) + + use snowmodel_inc + implicit none + + integer iobs_num,nobs_dates,nx,ny,i,j,max_iter,iter + integer icorr_factor_index(max_time_steps) + real corr_factor(nx_max,ny_max,max_obs_dates+1) + + +! Save the correction factors for each observation date. + open(152,file='hrestart/hrestart_corr_factor.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + + do iobs_num=1,nobs_dates+1 + write(152,rec=iobs_num)& + & ((corr_factor(i,j,iobs_num),i=1,nx),j=1,ny) + enddo + + close (152) + +! Save the correction factor index. + open(153,file='hrestart/hrestart_corr_factor_index.dat') + + do iter=1,max_iter + write (153,*) iter,icorr_factor_index(iter) + enddo + + close (153) + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine HRESTART_READ(nx,ny,snow_d,snow_depth,& + & canopy_int,soft_snow_d,ro_snow_grid,swe_depth,& + & ro_soft_snow_old,snow_d_init,swe_depth_old,& + & canopy_int_old,topo,sum_sprec,ihrestart_flag,& + & i_dataassim_loop) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,ihrestart_flag,i_dataassim_loop,& + & i_dataassim_loop_tmp + real snow_d(nx,ny) + real snow_depth(nx,ny) + real canopy_int(nx,ny) + real soft_snow_d(nx,ny) + real ro_snow_grid(nx,ny) + real swe_depth(nx,ny) + real ro_soft_snow_old(nx,ny) + real snow_d_init(nx,ny) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + real topo(nx,ny) + real sum_sprec(nx,ny) + + character*18 name1 + character*1 name2 + character*5 name3 + character*5 niter + character*1 iloop + character*30 fname + +! Build the file name so it includes the interation number. + name1 = 'hrestart/hrestart_' + name2 = '_' + name3 = '.gdat' + + if (i_dataassim_loop.lt.0.0) then + i_dataassim_loop_tmp = 2 + else + i_dataassim_loop_tmp = 1 + endif + + write(niter,'(i5.5)') ihrestart_flag + write(iloop,'(i1.1)') i_dataassim_loop_tmp + fname = name1//niter//name2//iloop//name3 + +! Save the data. + open(152,file=fname,& + & form='unformatted',access='direct',recl=4*nx*ny) + + read (152,rec=1) ((snow_d(i,j),i=1,nx),j=1,ny) + read (152,rec=2) ((snow_depth(i,j),i=1,nx),j=1,ny) + read (152,rec=3) ((canopy_int(i,j),i=1,nx),j=1,ny) + read (152,rec=4) ((soft_snow_d(i,j),i=1,nx),j=1,ny) + read (152,rec=5) ((ro_snow_grid(i,j),i=1,nx),j=1,ny) + read (152,rec=6) ((swe_depth(i,j),i=1,nx),j=1,ny) + read (152,rec=7) ((ro_soft_snow_old(i,j),i=1,nx),j=1,ny) + read (152,rec=8) ((snow_d_init(i,j),i=1,nx),j=1,ny) + read (152,rec=9) ((swe_depth_old(i,j),i=1,nx),j=1,ny) + read (152,rec=10) ((canopy_int_old(i,j),i=1,nx),j=1,ny) + read (152,rec=11) ((topo(i,j),i=1,nx),j=1,ny) + read (152,rec=12) ((sum_sprec(i,j),i=1,nx),j=1,ny) + + close (152) + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine HRESTART_READ_DA(nx,ny,max_iter,corr_factor,& + & icorr_factor_index,i_dataassim_loop) + + use snowmodel_inc + implicit none + + integer iobs_num,nobs_dates,nx,ny,i,j,max_iter,iter,dummy,& + & i_dataassim_loop + integer icorr_factor_index(max_time_steps) + real corr_factor(nx_max,ny_max,max_obs_dates+1) + +! Read the correction factors for each observation date. + open(152,file='hrestart/hrestart_corr_factor.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + + if (i_dataassim_loop.lt.0.0) nobs_dates = - i_dataassim_loop + + do iobs_num=1,nobs_dates+1 + read(152,rec=iobs_num)& + & ((corr_factor(i,j,iobs_num),i=1,nx),j=1,ny) + enddo + + close (152) + +! Read the correction factor index. + open(153,file='hrestart/hrestart_corr_factor_index.dat') + + do iter=1,max_iter + read (153,*) dummy,icorr_factor_index(iter) + enddo + + close (153) + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_ctl_files(nx,ny,deltax,deltay,xmn,ymn,dt,& + & print_inc,iyear_init,imonth_init,iday_init,xhour_init,& + & max_iter,undef,output_path_wo_assim,output_path_wi_assim,& + & print_micromet,micromet_output_fname,print_enbal,& + & enbal_output_fname,print_snowpack,snowpack_output_fname,& + & print_snowtran,snowtran_output_fname,Tabler_1_flag,& + & tabler_sfc_path_name,Tabler_2_flag,irun_data_assim,& + & print_var,print_outvars,print_multilayer,& + & multilayer_output_fname) + + use snowmodel_inc + implicit none + + real deltax,deltay,dt,print_inc,xhour_init,print_micromet,& + & print_enbal,print_snowpack,print_snowtran,Tabler_1_flag,& + & Tabler_2_flag,undef,print_multilayer + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & irun_data_assim,k,kk + + double precision xmn,ymn + + character*1 print_var(n_print_vars) + + character*80 micromet_output_fname + character*80 enbal_output_fname + character*80 snowpack_output_fname + character*80 snowtran_output_fname + character*80 multilayer_output_fname + character*80 tabler_sfc_path_name + character*80 output_path + character*80 output_path_wo_assim,output_path_wi_assim + + character*4 print_outvars(n_print_vars) + character*80 description(n_print_vars) + +! This is done below to avoid some array definition conflict (you +! cannot use the "data" statement like this when the array is +! being passed in and out of differet subroutines. +! data print_outvars /'tair','relh','wspd','qsin','qlin', +! & 'qlem','albd','wdir','prec','rpre', +! & 'spre','smlt','ssub','roff','glmt', +! & 'snod','sden','swed','sspr','ssmt', +! & 'cldf','var1','var2','var3','var4', +! & 'var5','var6','var7','var8','var9'/ + + data description / & + & 'tair 0 0 air temperature (deg C)',& + & 'relh 0 0 relative humidity (%)',& + & 'wspd 0 0 wind speed (m/s)',& + & 'qsin 0 0 incoming solar rad at the surface (W/m2)',& + & 'qlin 0 0 incoming longwave rad at the surface (W/m2)',& + + & 'qlem 0 0 emitted longwave radiation (W/m2)',& + & 'albd 0 0 albedo (0-1)',& + & 'wdir 0 0 wind direction (0-360, true N)',& + & 'prec 0 0 water-equivalent precipitation (m/time_step)',& + & 'rpre 0 0 liquid precipitation, rain (m/time_step)',& + + & 'spre 0 0 solid precipitation, snowfall (m/time_step)',& + & 'smlt 0 0 snow-water-equivalent melt (m)',& + & 'ssub 0 0 static-surface sublimation (m)',& + & 'roff 0 0 runoff from snowpack base (m/time_step)',& + & 'glmt 0 0 snow-water-equivalent melt from glacier ice (m)',& + + & 'snod 0 0 snow depth (m)',& + & 'sden 0 0 snow density (kg/m3)',& + & 'swed 0 0 snow-water-equivalent depth (m)',& + & 'sspr 0 0 summed snow precip during year (m)',& + & 'ssmt 0 0 summed snow-water-equivalent melt (m)',& + + & 'cldf 0 0 cloud fraction (0-1)',& + & 'var1 0 0 to be defined in future applications',& + & 'var2 0 0 to be defined in future applications',& + & 'var3 0 0 to be defined in future applications',& + & 'var4 0 0 to be defined in future applications',& + + & 'var5 0 0 to be defined in future applications',& + & 'var6 0 0 to be defined in future applications',& + & 'var7 0 0 to be defined in future applications',& + & 'var8 0 0 to be defined in future applications',& + & 'var9 0 0 to be defined in future applications'/ + + character*14 den_outvars(3) + character*80 den_description(3) + + data den_outvars / & + & 'dden_den_assim','sden_den_assim','snod_den_assim'/ + + data den_description / & + & 'dden 0 0 assimilated snow density difference (kg/m^3)',& + & 'sden 0 0 snow density after the assimilation (kg/m^3)',& + & 'snod 0 0 snow depth with assimilated snow density (m)'/ + + print_outvars(1) = 'tair' + print_outvars(2) = 'relh' + print_outvars(3) = 'wspd' + print_outvars(4) = 'qsin' + print_outvars(5) = 'qlin' + print_outvars(6) = 'qlem' + print_outvars(7) = 'albd' + print_outvars(8) = 'wdir' + print_outvars(9) = 'prec' + print_outvars(10) = 'rpre' + print_outvars(11) = 'spre' + print_outvars(12) = 'smlt' + print_outvars(13) = 'ssub' + print_outvars(14) = 'roff' + print_outvars(15) = 'glmt' + print_outvars(16) = 'snod' + print_outvars(17) = 'sden' + print_outvars(18) = 'swed' + print_outvars(19) = 'sspr' + print_outvars(20) = 'ssmt' + print_outvars(21) = 'cldf' + print_outvars(22) = 'var1' + print_outvars(23) = 'var2' + print_outvars(24) = 'var3' + print_outvars(25) = 'var4' + print_outvars(26) = 'var5' + print_outvars(27) = 'var6' + print_outvars(28) = 'var7' + print_outvars(29) = 'var8' + print_outvars(30) = 'var9' + +! Create the GrADS .ctl (control) files to go with the GrADS +! .gdat output files that were generated by this model run. + if (print_micromet.eq.1.0) then + call mk_micromet_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,micromet_output_fname) + endif + + if (print_enbal.eq.1.0) then + call mk_enbal_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,enbal_output_fname) + endif + + if (print_snowpack.eq.1.0) then + call mk_snowpack_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,snowpack_output_fname) + endif + + if (print_snowtran.eq.1.0) then + call mk_snowtran_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,snowtran_output_fname) + endif + + if (Tabler_1_flag.eq.1.0) then + call mk_tabler_1_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & undef,tabler_sfc_path_name) + endif + + if (print_multilayer.eq.1.0) then + call mk_multilayer_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,multilayer_output_fname) + endif + +! If you are not doing data assimilation, then you just need .ctl +! files for the wo_assim directory. If you are also doing the +! data assimilation, then you also need .ctl files for the .gdat +! data files that are in the wi_assim directory. + do k=1,irun_data_assim+1 + if (k.eq.1) then + output_path = output_path_wo_assim + elseif (k.eq.2) then + output_path = output_path_wi_assim + endif + + if (Tabler_2_flag.eq.1.0) then + call mk_tabler_2_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k,print_inc) + endif + + do kk=1,n_print_vars + if (print_var(kk).eq.'y') then + call mk_4char_vars_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k,print_outvars(kk),description(kk),& + & print_inc) + endif + enddo + + if (print_multilayer.eq.2.0) then + call mk_multilayer_2Dxy_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + call mk_multilayer_snod_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + call mk_multilayer_sden_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + call mk_multilayer_swed_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + call mk_multilayer_diam_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + call mk_multilayer_flux_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + call mk_multilayer_temp_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + call mk_multilayer_cond_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + endif + + enddo + +! if (irun_density_assim.eq.1) then +! call mk_density_assim_sfc_ctl(nx,ny,deltax,deltay,xmn,ymn, +! & undef,den_outvars(1),den_description(1)) +! do kk=2,3 +! call mk_density_assim_ctl(nx,ny,deltax,deltay,xmn,ymn, +! & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter, +! & undef,output_path_wi_assim,print_inc,den_outvars(kk), +! & den_description(kk)) +! enddo +! endif + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_density_assim_sfc_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & undef,den_outvars,den_description) + + implicit none + + integer nx,ny,igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,undef + + integer len_name,len_path,len_desc,trailing_blanks + + character*80 output_fname,filename,den_description + character*80 output_path_tmp + character*14 den_outvars + character*3 cmo + character*2 cdt + + data cmo /'jan'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + + igrads_dt = 1 + cdt = 'yr' + + filename = 'data/'//den_outvars//'.ctl' + + output_path_tmp = '^' + + len_path = 80 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//den_outvars//'.gdat' + len_name = 80 - trailing_blanks(output_fname) + len_desc = 80 - trailing_blanks(den_description) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) 1,12,1,cmo,9999,igrads_dt,cdt + write (71,58) + write (71,59) den_description(1:len_desc) + write (71,60) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE SnowModel Density Assimilation correction file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 59 format (a) + 60 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_density_assim_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,print_inc,den_outvars,& + & den_description) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef,& + & print_inc + + integer len_name,len_path,len_desc,trailing_blanks + + character*105 output_fname + character*80 filename,den_description + character*80 output_path + character*86 output_path_tmp + character*14 den_outvars + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert the write interval from seconds to hours or a day. + if (dt*print_inc.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt*print_inc.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt*print_inc.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'This mk_ctl program has not been set up to deal' + print *, 'with this combination of dt and print_inc values:' + print *, 'dt =',dt,' print_inc =',print_inc + stop + endif + + filename = 'ctl_files/wi_assim/'//den_outvars//'.ctl' + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//den_outvars//'.gdat' + len_name = 105 - trailing_blanks(output_fname) + len_desc = 80 - trailing_blanks(den_description) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) den_description(1:len_desc) + write (71,60) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE SnowModel Density Assimilation output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 59 format (a) + 60 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_4char_vars_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k,print_outvars,description,& + & print_inc) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef,& + & print_inc + + integer len_name,len_path,len_desc,trailing_blanks + + character*95 output_fname + character*80 filename,description + character*80 output_path + character*86 output_path_tmp + character*4 print_outvars + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert the write interval from seconds to hours or a day. + if (dt*print_inc.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt*print_inc.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt*print_inc.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'This mk_ctl program has not been set up to deal' + print *, 'with this combination of dt and print_inc values:' + print *, 'dt =',dt,' print_inc =',print_inc + stop + endif + + if (k.eq.1) then + filename = 'ctl_files/wo_assim/'//print_outvars//'.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/'//print_outvars//'.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//print_outvars//'.gdat' + len_name = 95 - trailing_blanks(output_fname) + len_desc = 80 - trailing_blanks(description) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) int(real(max_iter)/print_inc),nint(xhour_init),& + & iday_init,cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) description(1:len_desc) + write (71,60) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE SnowModel single-variable output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 59 format (a) + 60 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_micromet_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_fname) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*80 output_fname,filename + character*83 output_fname_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + + filename = 'ctl_files/micromet.ctl' + +! Deal with the case with relative paths. + if (output_fname(1:1).ne.'/') then + output_fname_tmp = '../'//output_fname + else + output_fname_tmp = output_fname//' ' + endif + + len_name = 83 - trailing_blanks(output_fname_tmp) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname_tmp(1:len_name) + else + write (71,51) output_fname_tmp(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,63) + write (71,64) + write (71,65) + write (71,66) + write (71,67) + write (71,68) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE MicroMet output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 9') + 59 format ('tair 0 0 air temperature (deg C)') + 60 format ('relh 0 0 relative humidity (%)') + 61 format ('uwnd 0 0 meridional wind component (m/s)') + 62 format ('vwnd 0 0 zonal wind component (m/s)') + 63 format ('wspd 0 0 wind speed (m/s)') + 64 format ('wdir 0 0 wind direction (0-360, true N)') + 65 format ('qsin 0 0 incoming solar rad at the surface (W/m2)') + 66 format ('qlin 0 0 incoming longwave rad at the surface (W/m2)') + 67 format ('prec 0 0 precipitation (m/time_step)') + 68 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_enbal_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_fname) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*80 output_fname,filename + character*83 output_fname_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + + filename = 'ctl_files/enbal.ctl' + +! Deal with the case with relative paths. + if (output_fname(1:1).ne.'/') then + output_fname_tmp = '../'//output_fname + else + output_fname_tmp = output_fname//' ' + endif + + len_name = 83 - trailing_blanks(output_fname_tmp) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname_tmp(1:len_name) + else + write (71,51) output_fname_tmp(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,63) + write (71,64) + write (71,65) + write (71,66) + write (71,67) + write (71,68) + write (71,69) + write (71,70) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE EnBal output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 11') + 59 format ('tair 0 0 air temperature (deg C)') + 60 format ('tsfc 0 0 surface (skin) temperature (deg C)') + 61 format ('qsin 0 0 incoming solar rad at the surface (W/m2)') + 62 format ('qlin 0 0 incoming longwave rad at the surface (W/m2)') + 63 format ('qlem 0 0 emitted longwave radiation (W/m2)') + 64 format ('qh 0 0 sensible heat flux (W/m2)') + 65 format ('qe 0 0 latent heat flux (W/m2)') + 66 format ('qc 0 0 conductive heat flux (W/m2)') + 67 format ('qm 0 0 melt energy flux (W/m2)') + 68 format ('albd 0 0 albedo (0-1)') + 69 format ('ebal 0 0 energy balance error (W/m2)') + 70 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_snowpack_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_fname) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*80 output_fname,filename + character*83 output_fname_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + + filename = 'ctl_files/snowpack.ctl' + +! Deal with the case with relative paths. + if (output_fname(1:1).ne.'/') then + output_fname_tmp = '../'//output_fname + else + output_fname_tmp = output_fname//' ' + endif + + len_name = 83 - trailing_blanks(output_fname_tmp) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname_tmp(1:len_name) + else + write (71,51) output_fname_tmp(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,63) + write (71,64) + write (71,65) + write (71,66) + write (71,67) + write (71,68) + write (71,69) + write (71,70) + write (71,71) + write (71,72) + write (71,73) + write (71,74) + write (71,75) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE SnowPack output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 16') + 59 format ('snod 0 0 snow depth (m)') + 60 format ('sden 0 0 snow density (kg/m3)') + 61 format ('swed 0 0 snow-water-equivalent depth (m)') + 62 format ('roff 0 0 runoff from snowpack base (m/time_step)') + 63 format ('rain 0 0 liquid precipitation (m/time_step)') + 64 format ('spre 0 0 solid precipitation (m/time_step)') + 65 format ('qcs 0 0 canopy sublimation (m/time_step)') + 66 format ('canopy 0 0 canopy interception store (m)') + 67 format ('sumqcs 0 0 summed canopy sublim during year (m)') + 68 format ('sumprec 0 0 summed precipitation during year (m)') + 69 format ('sumsprec 0 0 summed snow precip during year (m)') + 70 format ('sumunload 0 0 summed canopy unloading during year (m)') + 71 format ('sumroff 0 0 summed runoff during the year (m)') + 72 format ('sumswemelt 0 0 summed snow-water-equivalent melt (m)') + 73 format ('sumsublim 0 0 summed static-surface sublimation (m)') + 74 format ('wbal 0 0 summed water bal error during year (m)') + 75 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_snowtran_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_fname) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*80 output_fname,filename + character*83 output_fname_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + + filename = 'ctl_files/snowtran.ctl' + +! Deal with the case with relative paths. + if (output_fname(1:1).ne.'/') then + output_fname_tmp = '../'//output_fname + else + output_fname_tmp = output_fname//' ' + endif + + len_name = 83 - trailing_blanks(output_fname_tmp) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname_tmp(1:len_name) + else + write (71,51) output_fname_tmp(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,63) + write (71,64) + write (71,65) + write (71,66) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE SnowTran output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 7') + 59 format ('snod 0 0 snow depth (m)') + 60 format ('subl 0 0 sublimation at this time step (m)') + 61 format ('salt 0 0 saltation transport at this time step (m)') + 62 format ('susp 0 0 suspended transport at this time step (m)') + 63 format ('subgrid 0 0 tabler snow redist at this time step (m)') + 64 format ('sumsubl 0 0 summed sublimation during the year (m)') + 65 format ('sumtran 0 0 summed blowing-snow transport for year (m)') + 66 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_tabler_1_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & undef,output_path) + + implicit none + + integer nx,ny,igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,undef + + integer len_name,len_path,trailing_blanks + + character*99 output_fname + character*80 filename + character*80 output_path + character*83 output_path_tmp + character*3 cmo + character*2 cdt + + data cmo /'jan'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + + igrads_dt = 1 + cdt = 'yr' + + filename = 'ctl_files/tabler_sfcs.ctl' + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 83 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'tabler_sfcs.gdat' + len_name = 99 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) 1,12,1,cmo,9999,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,63) + write (71,64) + write (71,65) + write (71,66) + write (71,67) + write (71,68) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Tabler Equilibrium Surfaces for snow-free land') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 9') + 59 format ('nn 0 0 tabler surface from north winds (m)') + 60 format ('ne 0 0 tabler surface from northeast winds (m)') + 61 format ('ee 0 0 tabler surface from east winds (m)') + 62 format ('se 0 0 tabler surface from southeast winds (m)') + 63 format ('ss 0 0 tabler surface from south winds (m)') + 64 format ('sw 0 0 tabler surface from southwest winds (m)') + 65 format ('ww 0 0 tabler surface from west winds (m)') + 66 format ('nw 0 0 tabler surface from northwest winds (m)') + 67 format ('topo 0 0 topography (m)') + 68 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_tabler_2_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k,print_inc) + + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef,& + & print_inc + + integer len_name,len_path,trailing_blanks + + character*97 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert the write interval from seconds to hours or a day. + if (dt*print_inc.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt*print_inc.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt*print_inc.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'This mk_ctl program has not been set up to deal' + print *, 'with this combination of dt and print_inc values:' + print *, 'dt =',dt,' print_inc =',print_inc + stop + endif + + if (k.eq.1) then + filename = 'ctl_files/wo_assim/tabler_sfc_iter.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/tabler_sfc_iter.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname=output_path_tmp(1:len_path)//'tabler_sfcs_iter.gdat' + len_name = 97 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Tabler Equilibrium Surface output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF 1 LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 59 format ('tablersfc 0 0 Tabler equilibrium surface (m)') + 60 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_ctl(nx,ny,deltax,deltay,xmn,ymn,dt,& + & iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_fname) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*80 output_fname,filename + character*83 output_fname_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + + filename = 'ctl_files/multilayer.ctl' + +! Deal with the case with relative paths. + if (output_fname(1:1).ne.'/') then + output_fname_tmp = '../'//output_fname + else + output_fname_tmp = output_fname//' ' + endif + + len_name = 83 - trailing_blanks(output_fname_tmp) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname_tmp(1:len_name) + else + write (71,51) output_fname_tmp(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,63) nz_max + write (71,64) nz_max + write (71,65) nz_max + write (71,66) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 8') + 59 format ('KK 1 0 number of snow layers') + 60 format ('snod 1 0 snow depth (m)') + 61 format ('sden 1 0 snow density (kg/m3)') + 62 format ('swed 1 0 snow-water-equivalent depth (m)') + 63 format ('snodz ',i6,' 0 layer-specific snow depth (m)') + 64 format ('sdenz ',i6,' 0 layer-specific snow density (kg/m3)') + 65 format ('swedz ',i6,' 0 layer-specific swe depth (m)') + 66 format ('diamz ',i6,' 0 layer-specific grain diameter (m)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_2Dxy_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_2Dxy.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_2Dxy.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_2Dxy.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,59) + write (71,60) + write (71,61) + write (71,62) + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 4') + 59 format ('KK 1 0 number of snow layers') + 60 format ('snod 1 0 snow depth (m)') + 61 format ('sden 1 0 snow density (kg/m3)') + 62 format ('swed 1 0 snow-water-equivalent depth (m)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_snod_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_snod.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_snod.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_snod.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,63) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 63 format ('snodz ',i6,' 0 layer-specific snow depth (m)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_sden_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_sden.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_sden.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_sden.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,64) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 64 format ('sdenz ',i6,' 0 layer-specific snow density (kg/m3)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_swed_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_swed.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_swed.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_swed.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,65) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 65 format ('swedz ',i6,' 0 layer-specific swe depth (m)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_diam_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_diam.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_diam.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_diam.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,66) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 66 format ('diamz ',i6,' 0 layer-specific grain diameter (m)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_flux_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_flux.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_flux.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_flux.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,66) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 66 format ('fluxz ',i6,' 0 layer-specific vapor flux (kg m-2 dt-1)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_temp_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_temp.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_temp.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_temp.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,66) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 66 format ('tempz ',i6,' 0 layer-specific snow temperature (deg K)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine mk_multilayer_cond_ctl(nx,ny,deltax,deltay,xmn,ymn,& + & dt,iyear_init,imonth_init,iday_init,xhour_init,max_iter,& + & undef,output_path,k) + + use snowmodel_inc + implicit none + + integer nx,ny,iyear_init,imonth_init,iday_init,max_iter,& + & igrads_dt,len_path,k + double precision xmn,ymn,xmn_km,ymn_km + real deltax,deltay,deltax_km,deltay_km,xhour_init,dt,undef + + integer len_name,trailing_blanks + + character*106 output_fname + character*80 filename + character*80 output_path + character*86 output_path_tmp + character*3 cmo(12) + character*2 cdt + + data cmo /'jan','feb','mar','apr','may','jun',& + & 'jul','aug','sep','oct','nov','dec'/ + + deltax_km = deltax / 1000.0 + deltay_km = deltay / 1000.0 + xmn_km = xmn / 1000.0 + ymn_km = ymn / 1000.0 + +! Convert dt from seconds to hours or a day. + if (dt.eq.86400.0) then + igrads_dt = 1 + cdt = 'dy' + elseif (dt.eq.10800.0) then + igrads_dt = 3 + cdt = 'hr' + elseif (dt.eq.3600.0) then + igrads_dt = 1 + cdt = 'hr' + else + print *, 'the mk_ctl program cannot deal with this dt value' + stop + endif + +! Define the name and location of the .ctl file. + if (k.eq.1) then + filename = 'ctl_files/wo_assim/multilayer_cond.ctl' + elseif (k.eq.2) then + filename = 'ctl_files/wi_assim/multilayer_cond.ctl' + endif + +! Deal with the case with relative paths. + if (output_path(1:1).ne.'/') then + output_path_tmp = '../../'//output_path + else + output_path_tmp = output_path//' ' + endif + + len_path = 86 - trailing_blanks(output_path_tmp) + output_fname = output_path_tmp(1:len_path)//'multilayer_cond.gdat' + len_name = 106 - trailing_blanks(output_fname) + + open (71,file=filename) + + if (output_fname(1:1).eq.'/') then + write (71,50) output_fname(1:len_name) + else + write (71,51) output_fname(1:len_name) + endif + + write (71,52) + write (71,53) undef +! (i,j) indexing. + write (71,54) nx,1.0,1.0 + write (71,55) ny,1.0,1.0 +! (meters,meters) indexing, with (zero,zero) origin. + write (71,541) nx,0.0,deltax + write (71,551) ny,0.0,deltay +! (km,km) indexing, with (zero,zero) origin. + write (71,542) nx,0.0,deltax_km + write (71,552) ny,0.0,deltay_km +! (meters,meters) indexing, with (xmn,ymn) origin. + write (71,543) nx,xmn,deltax + write (71,553) ny,ymn,deltay +! (km,km) indexing, with (xmn,ymn) origin. + write (71,544) nx,xmn_km,deltax_km + write (71,554) ny,ymn_km,deltay_km + + write (71,56) nz_max + write (71,57) max_iter,nint(xhour_init),iday_init,& + & cmo(imonth_init),iyear_init,igrads_dt,cdt + write (71,58) + write (71,66) nz_max + write (71,67) + + close (71) + +! This "a" by itself clips the trailing blanks in the a80 string. + 50 format ('DSET ',a) + 51 format ('DSET ^',a) + 52 format ('TITLE Multi-Layer output file') + 53 format ('UNDEF ',f10.1) + + 54 format ('XDEF ',i8,' LINEAR ',2f20.8) + 55 format ('YDEF ',i8,' LINEAR ',2f20.8) + 541 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 551 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 542 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 552 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 543 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 553 format ('#YDEF ',i8,' LINEAR ',2f20.8) + 544 format ('#XDEF ',i8,' LINEAR ',2f20.8) + 554 format ('#YDEF ',i8,' LINEAR ',2f20.8) + + 56 format ('ZDEF ',i6,' LINEAR 1 1') +! This i2.2 puts a zero in front of single digit numbers like 1. + 57 format ('TDEF ',i8,' LINEAR ',i2.2,'Z',i2.2,a3,i4,' ',i2,a2) + 58 format ('VARS 1') + 66 format ('condz ',i6,' 0 layer thermal conductivity (W m-1 K-1)') + 67 format ('ENDVARS') + + return + end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/readparam_code.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/readparam_code.f90 new file mode 100755 index 000000000..816fef876 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/readparam_code.f90 @@ -0,0 +1,2043 @@ +! readparam_code.f + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine READPARAM_CODE(dt,deltax,deltay,Utau_t_flag,& + & subgrid_flag,twolayer_flag,snowmodel_dot_par_fname,& + & bc_flag,curve_len_scale,slopewt,curvewt,ht_windobs,& + & ht_rhobs,ro_snow,snow_d_init_const,const_veg_flag,& + & vegsnowdepth,nx,ny,max_iter,met_input_fname,xmn,ymn,& + & iyear_init,imonth_init,iday_init,xhour_init,undef,ifill,& + & iobsint,dn,xlat,i_tair_flag,i_rh_flag,i_wind_flag,& + & i_solar_flag,i_prec_flag,isingle_stn_flag,igrads_metfile,& + & windspd_min,icond_flag,run_micromet,run_enbal,run_snowpack,& + & run_snowtran,topoflag,topoveg_fname,snowtran_output_fname,& + & micromet_output_fname,enbal_output_fname,Utau_t_const,& + & snowpack_output_fname,print_micromet,print_enbal,& + & print_snowpack,print_snowtran,i_longwave_flag,print_user,& + & ascii_topoveg,topo_ascii_fname,veg_ascii_fname,& + & irun_data_assim,lapse_rate_user_flag,& + & iprecip_lapse_rate_user_flag,use_shortwave_obs,& + & use_longwave_obs,use_sfc_pressure_obs,calc_subcanopy_met,& + & sfc_sublim_flag,gap_frac,cloud_frac_factor,& + & albedo_snow_forest,albedo_snow_clearing,albedo_glacier,& + & barnes_lg_domain,n_stns_used,tabler_dir,slope_adjust,& + & lat_solar_flag,UTC_flag,iveg_ht_flag,ihrestart_flag,& + & ihrestart_inc,i_dataassim_loop,tsls_threshold,dz_snow_min,& + & print_multilayer,multilayer_snowpack,max_layers,& + & multilayer_output_fname,izero_snow_date,curve_lg_scale_flag,& + & check_met_data,seaice_run,snowmodel_line_flag,wind_lapse_rate,& + & iprecip_scheme,cf_precip_flag,snowfall_frac,print_inc,& + & output_path_wo_assim,output_path_wi_assim,Tabler_1_flag,& + & Tabler_2_flag,tabler_sfc_path_name,print_var) + +! These programs read and process the input parameter data. +! +! The following must be true: +! +! All comment lines start with a ! in the first position. +! +! Blank lines are permitted. +! +! All parameter statements start with the parameter name, followed +! by a space, followed by an =, followed by a space, followed by +! the actual value, with nothing after that. These statements can +! have leading blanks, and must fit within 120 columns, and the +! parameter value cannot be longer than 80 characters (so, for +! example, your paths/file_names to the right of the "=" sign +! cannot be longer than 80 characters). +! +! It is set up to deal with integer, real, and string (character) +! input values. + + use snowmodel_vars, only: allocate_arrays + use snowmodel_inc + implicit none + +! Put parameter names here: + real dt,deltax,deltay,Utau_t_flag,topoflag,Utau_t_const,& + & subgrid_flag,twolayer_flag,& + & bc_flag,curve_len_scale,slopewt,curvewt,ht_windobs,& + & ht_rhobs,ro_snow,snow_d_init_const,const_veg_flag,& + & windspd_min,ascii_topoveg,gap_frac,cloud_frac_factor,& + & albedo_snow_forest,albedo_snow_clearing,albedo_glacier,& + & barnes_lg_domain,tabler_dir,slope_adjust,UTC_flag,& + & tsls_threshold,dz_snow_min,print_multilayer,& + & curve_lg_scale_flag,check_met_data,seaice_run,& + & snowmodel_line_flag,wind_lapse_rate,cf_precip_flag,& + & snowfall_frac,Tabler_1_flag,Tabler_2_flag + + character*1 print_var(n_print_vars) + + character*1 print_var_01,print_var_02,print_var_03,& + & print_var_04,print_var_05,print_var_06,print_var_07,& + & print_var_08,print_var_09,print_var_10,print_var_11,& + & print_var_12,print_var_13,print_var_14,print_var_15,& + & print_var_16,print_var_17,print_var_18,print_var_19,& + & print_var_20,print_var_21,print_var_22,print_var_23,& + & print_var_24,print_var_25,print_var_26,print_var_27,& + & print_var_28,print_var_29,print_var_30 + + real vegsnowdepth(nvegtypes) + real run_micromet,run_enbal,run_snowpack,run_snowtran,& + & print_micromet,print_enbal,print_snowpack,print_snowtran,& + & print_user,use_shortwave_obs,use_longwave_obs,print_inc,& + & use_sfc_pressure_obs,calc_subcanopy_met,sfc_sublim_flag + + integer nx,ny,max_iter,icond_flag,irun_data_assim + + character*80 topoveg_fname,met_input_fname,topo_ascii_fname,& + & veg_ascii_fname + + character*80 snowtran_output_fname,micromet_output_fname,& + & enbal_output_fname,snowpack_output_fname,multilayer_output_fname + + character*80 output_path_wo_assim,output_path_wi_assim,& + & tabler_sfc_path_name + + integer iyear_init,imonth_init,iday_init,& + & i_tair_flag,i_rh_flag,i_wind_flag,i_solar_flag,i_prec_flag,& + & i_longwave_flag,isingle_stn_flag,igrads_metfile,& + & lapse_rate_user_flag,iprecip_lapse_rate_user_flag,& + & n_stns_used,iveg_ht_flag,lat_solar_flag,ihrestart_inc,& + & ihrestart_flag,i_dataassim_loop,multilayer_snowpack,max_layers,& + & izero_snow_date,iprecip_scheme, metforce_opt + + double precision xmn,ymn + real xhour_init,dn + real undef ! undefined value + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + real xlat ! approx. latitude of domain center, decimal deg + + character*100 snowmodel_dot_par_fname + +! Working parameters. + character*120 input_string + character*80 c_param + character*80 c_value + integer k,max_par_lines,i_param_chars,i_value_chars,& + & icomment_flag,ipar_flag + +! integer, parameter :: npars=139 + integer, parameter :: npars=140 + integer ipar_count + character*40 cpar_name(npars) + + max_par_lines = 1500 + +! open (40,file='snowmodel.par') + open (40,file=snowmodel_dot_par_fname) + +! Initialize the input-parameter counting array. This is used to +! make sure all of the input parameters are read in correctly. +! Also initialize a array that will collect the variable names +! that have been read in, so it can be compared against the .par +! file to help figure out which variables have not been defined +! before the model simulation starts. + ipar_count = 0 + do k=1,npars + cpar_name(k) = ' BLANK: SOMETHING IS NOT DEFINED' + enddo + + do k=1,max_par_lines + read (40,'(a120)',end=99) input_string + + call get_param_data(input_string,c_param,c_value,& + & i_param_chars,i_value_chars,icomment_flag) + +! Process the string if it is not a comment. + if (icomment_flag.eq.0) then + +! GENERAL MODEL SETUP. + if (c_param(1:i_param_chars).eq.'nx') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) +! KRA +! call char2int(nx,i_value_chars,c_value,& +! & c_param(1:i_param_chars)) + if (nx.le.0) then + print *,'nx cannot be less than or equal to 0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ny') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) +! KRA +! call char2int(ny,i_value_chars,c_value,& +! & c_param(1:i_param_chars)) + if (ny.le.0) then + print *,'ny cannot be less than or equal to 0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'deltax') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(deltax,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (deltax.le.0.0) then + print *,'deltax cannot be less than or equal to 0.0' + stop + endif + endif + + !Subroutine effective only on first invocation. + !Check performed inside the routine. + if(nx /= 0 .and. ny /= 0) call allocate_arrays(nx,ny) + + if (c_param(1:i_param_chars).eq.'deltay') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(deltay,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (deltay.le.0.0) then + print *,'deltay cannot be less than or equal to 0.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'xmn') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2double(xmn,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'ymn') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2double(ymn,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'dt') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(dt,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (dt.le.0.0 .or. dt.gt.86400.0) then + print *,'dt out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'iyear_init') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(iyear_init,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (iyear_init.lt.1900 .or. iyear_init.gt.2100) then + print *,'iyear_init out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'imonth_init') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(imonth_init,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (imonth_init.lt.1 .or. imonth_init.gt.12) then + print *,'imonth_init out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'iday_init') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(iday_init,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (iday_init.lt.1 .or. iday_init.gt.31) then + print *,'iday_init out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'xhour_init') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(xhour_init,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (xhour_init.lt.0.0 .or. xhour_init.ge.24.0) then + print *,'xhour_init out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'max_iter') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(max_iter,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (max_iter.le.0 .or. max_iter.gt.300000) then + print *,'max_iter out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'isingle_stn_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(isingle_stn_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (isingle_stn_flag.ne.0 .and. isingle_stn_flag.ne.1) then + print *,'isingle_stn_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'metforce_opt') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(metforce_opt,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (metforce_opt.ne.0 .and. metforce_opt.ne.1) then + print *,'metforce_opt not 0 or 1' + stop + endif + endif + + + if (c_param(1:i_param_chars).eq.'igrads_metfile') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(igrads_metfile,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (igrads_metfile.ne.0 .and. igrads_metfile.ne.1) then + print *,'igrads_metfile not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'met_input_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(met_input_fname,c_value,i_value_chars,& + & c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'undef') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(undef,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'ascii_topoveg') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(ascii_topoveg,i_value_chars,c_value,& + & c_param(1:i_param_chars)) +! KRA +! Update here to allow for fields to be read in from LDT (KRA; 2020-07-16) + if (ascii_topoveg.lt.0.0 .and. ascii_topoveg.gt.2.0) then + print *,'ascii_topoveg not 0.0, 1.0, or 2.0' +! if (ascii_topoveg.ne.0.0 .and. ascii_topoveg.ne.1.0) then +! print *,'ascii_topoveg not 0.0 or 1.0' +! KRA + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'topoveg_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(topoveg_fname,c_value,i_value_chars,& + & c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'topo_ascii_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(topo_ascii_fname,c_value,i_value_chars,& + & c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'veg_ascii_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(veg_ascii_fname,c_value,i_value_chars,& + & c_param(1:i_param_chars)) + endif + +! if (c_param(1:i_param_chars).eq.'veg_shd_24') then +! call char2real(vegsnowdepth(24),i_value_chars,c_value,& +! & c_param(1:i_param_chars)) +! if (vegsnowdepth(24).lt.0.0 .or. vegsnowdepth(24).gt.20.0) +! & then +! print *,'veg_shd_24 out of range' +! stop +! endif +! endif + + if (c_param(1:i_param_chars).eq.'veg_shd_25') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(vegsnowdepth(25),i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (vegsnowdepth(25).lt.0.0 .or. vegsnowdepth(25).gt.20.0)& + & then + print *,'veg_shd_25 out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'veg_shd_26') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(vegsnowdepth(26),i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (vegsnowdepth(26).lt.0.0 .or. vegsnowdepth(26).gt.20.0)& + & then + print *,'veg_shd_26 out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'veg_shd_27') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(vegsnowdepth(27),i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (vegsnowdepth(27).lt.0.0 .or. vegsnowdepth(27).gt.20.0)& + & then + print *,'veg_shd_27 out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'veg_shd_28') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(vegsnowdepth(28),i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (vegsnowdepth(28).lt.0.0 .or. vegsnowdepth(28).gt.20.0)& + & then + print *,'veg_shd_28 out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'veg_shd_29') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(vegsnowdepth(29),i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (vegsnowdepth(29).lt.0.0 .or. vegsnowdepth(29).gt.20.0)& + & then + print *,'veg_shd_29 out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'veg_shd_30') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(vegsnowdepth(30),i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (vegsnowdepth(30).lt.0.0 .or. vegsnowdepth(30).gt.20.0)& + & then + print *,'veg_shd_30 out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'const_veg_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(const_veg_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (const_veg_flag.lt.0.0 .or. const_veg_flag.gt.30.0) then + print *,'const_veg_flag out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'iveg_ht_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(iveg_ht_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (iveg_ht_flag.lt.-1 .or. iveg_ht_flag.gt.1) then + print *,'iveg_ht_flag out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'xlat') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(xlat,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (xlat.lt.-90.0 .or. xlat.gt.90.0) then + print *,'xlat out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'lat_solar_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(lat_solar_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (lat_solar_flag.lt.-1 .or. lat_solar_flag.gt.1) then + print *,'lat_solar_flag out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'UTC_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(UTC_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (UTC_flag.lt.-1 .or. UTC_flag.gt.1) then + print *,'UTC_flag out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'run_micromet') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(run_micromet,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (run_micromet.ne.0.0 .and. run_micromet.ne.1.0) then + print *,'run_micromet not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'run_enbal') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(run_enbal,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (run_enbal.ne.0.0 .and. run_enbal.ne.1.0) then + print *,'run_enbal not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'run_snowpack') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(run_snowpack,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (run_snowpack.ne.0.0 .and. run_snowpack.ne.1.0) then + print *,'run_snowpack not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'run_snowtran') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(run_snowtran,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (run_snowtran.ne.0.0 .and. run_snowtran.ne.1.0) then + print *,'run_snowtran not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'irun_data_assim') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(irun_data_assim,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (irun_data_assim.ne.0 .and. irun_data_assim.ne.1) then + print *,'irun_data_assim not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ihrestart_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(ihrestart_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (ihrestart_flag.lt.-2 .or. ihrestart_flag.gt.300000) then + print *,'ihrestart_flag out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'i_dataassim_loop') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_dataassim_loop,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_dataassim_loop.lt.-366 .or. i_dataassim_loop.gt.1)& + & then + print *,'i_dataassim_loop out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ihrestart_inc') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(ihrestart_inc,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (ihrestart_inc.lt.0 .or. ihrestart_inc.gt.8784) then + print *,'ihrestart_inc out of range' + stop + endif + endif + +! MICROMET MODEL SETUP. + if (c_param(1:i_param_chars).eq.'i_tair_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_tair_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_tair_flag.ne.0 .and. i_tair_flag.ne.1) then + print *,'i_tair_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'i_rh_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_rh_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_rh_flag.ne.0 .and. i_rh_flag.ne.1) then + print *,'i_rh_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'i_wind_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_wind_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_wind_flag.ne.-1 .and. i_wind_flag.ne.0 .and. & + & i_wind_flag.ne.1) then + print *,'i_wind_flag not -1, 0, or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'i_solar_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_solar_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_solar_flag.ne.0 .and. i_solar_flag.ne.1) then + print *,'i_solar_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'i_longwave_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_longwave_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_longwave_flag.ne.0 .and. i_longwave_flag.ne.1) then + print *,'i_longwave_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'i_prec_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(i_prec_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (i_prec_flag.ne.0 .and. i_prec_flag.ne.1) then + print *,'i_prec_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ifill') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(ifill,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (ifill.ne.0 .and. ifill.ne.1) then + print *,'ifill not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'iobsint') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(iobsint,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (iobsint.ne.0 .and. iobsint.ne.1) then + print *,'iobsint not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'dn') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(dn,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (dn.lt.1.0 .or. dn.gt.10000.0) then + print *,'dn out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'barnes_lg_domain') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(barnes_lg_domain,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (barnes_lg_domain.ne.0.0 .and. barnes_lg_domain.ne.1.0& + & .and. barnes_lg_domain.ne.2.0) then + print *,'barnes_lg_domain not 0.0 or 1.0 or 2.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'n_stns_used') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(n_stns_used,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (n_stns_used.lt.1 .or. n_stns_used.gt.9) then + print *,'n_stns_used out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'snowmodel_line_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(snowmodel_line_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (snowmodel_line_flag.ne.0.0 .and.& + & snowmodel_line_flag.ne.1.0)& + & then + print *,'snowmodel_line_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'check_met_data') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(check_met_data,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (check_met_data.ne.0.0 .and. check_met_data.ne.1.0)& + & then + print *,'check_met_data not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'curve_len_scale') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(curve_len_scale,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (curve_len_scale.le.0.0 .or. curve_len_scale.gt.5000.0)& + & then + print *,'curve_len_scale out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'slopewt') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(slopewt,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (slopewt.lt.0.0 .or. slopewt.gt.1.0) then + print *,'slopewt out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'curvewt') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(curvewt,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (curvewt.lt.0.0 .or. curvewt.gt.1.0) then + print *,'curvewt out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'curve_lg_scale_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(curve_lg_scale_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (curve_lg_scale_flag.ne.0.0 .and. & + & curve_lg_scale_flag.ne.1.0) then + print *,'curve_lg_scale_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'windspd_min') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(windspd_min,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (windspd_min.lt.0.1 .or. windspd_min.gt.2.0) then + print *,'windspd_min out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'lapse_rate_user_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(lapse_rate_user_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (lapse_rate_user_flag.ne.0 .and. & + & lapse_rate_user_flag.ne.1) then + print *,'lapse_rate_user_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq. & + & 'iprecip_lapse_rate_user_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(iprecip_lapse_rate_user_flag,i_value_chars, & + & c_value,c_param(1:i_param_chars)) + if (iprecip_lapse_rate_user_flag.ne.0 .and. & + & iprecip_lapse_rate_user_flag.ne.1) then + print *,'iprecip_lapse_rate_user_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'iprecip_scheme') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(iprecip_scheme,i_value_chars, & + & c_value,c_param(1:i_param_chars)) + if (iprecip_scheme.ne.1 .and. iprecip_scheme.ne.2) then + print *,'iprecip_scheme not 1 or 2' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'snowfall_frac') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(snowfall_frac,i_value_chars,c_value, & + & c_param(1:i_param_chars)) + if (snowfall_frac.ne.1.0 .and. snowfall_frac.ne.2.0 & + & .and. snowfall_frac.ne.3.0) then + print *,'snowfall_frac must be = 1.0, 2.0, or 3.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'wind_lapse_rate') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(wind_lapse_rate,i_value_chars,c_value, & + & c_param(1:i_param_chars)) + if (wind_lapse_rate.lt.0.0) then + print *,'wind_lapse_rate must be >= 0.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'calc_subcanopy_met') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(calc_subcanopy_met,i_value_chars,c_value, & + & c_param(1:i_param_chars)) + if (calc_subcanopy_met.ne.0.0 .and. & + & calc_subcanopy_met.ne.1.0) then + print *,'calc_subcanopy_met not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'gap_frac') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(gap_frac,i_value_chars,c_value, & + & c_param(1:i_param_chars)) + if (gap_frac.lt.0.0 .or. gap_frac.gt.1.0) then + print *,'gap_frac out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'cloud_frac_factor') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(cloud_frac_factor,i_value_chars,c_value, & + & c_param(1:i_param_chars)) + if (cloud_frac_factor.lt.0.0 .or. cloud_frac_factor.gt.1.0) & + & then + print *,'cloud_frac_factor out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'use_shortwave_obs') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(use_shortwave_obs,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (use_shortwave_obs.ne.0.0 .and. use_shortwave_obs.ne.1.0) & + & then + print *,'use_shortwave_obs not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'use_longwave_obs') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(use_longwave_obs,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (use_longwave_obs.ne.0.0 .and. use_longwave_obs.ne.1.0) & + & then + print *,'use_longwave_obs not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'use_sfc_pressure_obs') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(use_sfc_pressure_obs,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (use_sfc_pressure_obs.ne.0.0 .and. & + & use_sfc_pressure_obs.ne.1.0) then + print *,'use_sfc_pressure_obs not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'cf_precip_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(cf_precip_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (cf_precip_flag.ne.0.0 .and. cf_precip_flag.ne.1.0 .and. & + & cf_precip_flag.ne.2.0 .and. cf_precip_flag.ne.3.0) then + print *,'cf_precip_flag not 0.0, 1.0, 2.0, or 3.0' + stop + endif + endif + +! SNOWTRAN-3D MODEL SETUP. + if (c_param(1:i_param_chars).eq.'Utau_t_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(Utau_t_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (Utau_t_flag.ne.0.0 .and. Utau_t_flag.ne.1.0) then + print *,'Utau_t_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'Utau_t_const') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(Utau_t_const,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (Utau_t_const.le.0.0 .and. Utau_t_const.gt.1.0) then + print *,'Utau_t_const out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'subgrid_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(subgrid_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (subgrid_flag.ne.0.0 .and. subgrid_flag.ne.1.0) then + print *,'subgrid_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'tabler_dir') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(tabler_dir,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (tabler_dir.lt.-360.0 .or. tabler_dir.gt.360.0) then + print *,'tabler_dir out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'slope_adjust') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(slope_adjust,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (slope_adjust.lt.0.0 .or. slope_adjust.gt.3.0) then + print *,'slope_adjust out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'twolayer_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(twolayer_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (twolayer_flag.ne.0.0 .and. twolayer_flag.ne.1.0) then + print *,'twolayer_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'bc_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(bc_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (bc_flag.ne.0.0 .and. bc_flag.ne.1.0) then + print *,'bc_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ht_windobs') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(ht_windobs,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (ht_windobs.le.0.0 .or. ht_windobs.gt.20.0) then + print *,'ht_windobs out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ht_rhobs') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(ht_rhobs,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (ht_rhobs.le.0.0 .or. ht_rhobs.gt.20.0) then + print *,'ht_rhobs out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'ro_snow') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(ro_snow,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (ro_snow.le.100.0 .or. ro_snow.gt.550.0) then + print *,'ro_snow out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'snow_d_init_const') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(snow_d_init_const,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (snow_d_init_const.lt.0.0 .or. & + & snow_d_init_const.gt.5.0) then + print *,'snow_d_init_const out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'topoflag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(topoflag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (topoflag.ne.0.0 .and. topoflag.ne.1.0) then + print *,'topoflag not 0.0 or 1.0' + stop + endif + endif + +! ENBAL MODEL SETUP. + if (c_param(1:i_param_chars).eq.'icond_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(icond_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (icond_flag.ne.0 .and. icond_flag.ne.1) then + print *,'icond_flag not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'albedo_snow_forest') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(albedo_snow_forest,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (albedo_snow_forest.lt.0.3 .or. & + & albedo_snow_forest.gt.0.8) then + print *,'albedo_snow_forest out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'albedo_snow_clearing') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(albedo_snow_clearing,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (albedo_snow_clearing.lt.0.4 .or. & + & albedo_snow_clearing.gt.0.8) then + print *,'albedo_snow_clearing out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'albedo_glacier') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(albedo_glacier,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (albedo_glacier.lt.0.3 .or. albedo_glacier.gt.0.8) then + print *,'albedo_glacier out of range' + stop + endif + endif + +! SNOWPACK MODEL SETUP. + if (c_param(1:i_param_chars).eq.'sfc_sublim_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(sfc_sublim_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (sfc_sublim_flag.ne.0.0 .and. sfc_sublim_flag.ne.1.0)& + & then + print *,'sfc_sublim_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'multilayer_snowpack') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(multilayer_snowpack,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (multilayer_snowpack.ne.0 .and. multilayer_snowpack.ne.1)& + & then + print *,'multilayer_snowpack not 0 or 1' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'tsls_threshold') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(tsls_threshold,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (tsls_threshold.lt.1.0 .or. tsls_threshold.gt.8760.0) & + & then + print *,'tsls_threshold out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'max_layers') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(max_layers,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (max_layers.lt.1 .or. max_layers.gt.100) then + print *,'max_layers out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'dz_snow_min') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(dz_snow_min,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (dz_snow_min.lt.0.0 .or. dz_snow_min.gt.5.0) then + print *,'dz_snow_min out of range' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'izero_snow_date') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2int(izero_snow_date,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (izero_snow_date.lt.10100 .or. & + & izero_snow_date.gt.999999) then + print *,'izero_snow_date out of range' + stop + endif + endif + +! SEAICE MODEL SETUP. + if (c_param(1:i_param_chars).eq.'seaice_run') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(seaice_run,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (seaice_run.ne.0.0 .and. seaice_run.ne.1.0 .and. & + & seaice_run.ne.2.0 .and. seaice_run.ne.3.0 .and. & + & seaice_run.ne.4.0) then + print *,'seaice_run not 0.0, 1.0, 2.0, 3.0, or 4.0' + stop + endif + endif + +! PRINTING OUTPUT FILES. + if (c_param(1:i_param_chars).eq.'print_micromet') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_micromet,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_micromet.ne.0.0 .and. print_micromet.ne.1.0) then + print *,'print_micromet not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'micromet_output_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(micromet_output_fname,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'print_snowtran') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_snowtran,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_snowtran.ne.0.0 .and. print_snowtran.ne.1.0) then + print *,'print_snowtran not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'snowtran_output_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(snowtran_output_fname,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'Tabler_1_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(Tabler_1_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (Tabler_1_flag.ne.0.0 .and. Tabler_1_flag.ne.1.0) then + print *,'Tabler_1_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'tabler_sfc_path_name') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(tabler_sfc_path_name,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'Tabler_2_flag') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(Tabler_2_flag,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (Tabler_2_flag.ne.0.0 .and. Tabler_2_flag.ne.1.0) then + print *,'Tabler_2_flag not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_enbal') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_enbal,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_enbal.ne.0.0 .and. print_enbal.ne.1.0) then + print *,'print_enbal not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'enbal_output_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(enbal_output_fname,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'print_snowpack') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_snowpack,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_snowpack.ne.0.0 .and. print_snowpack.ne.1.0) then + print *,'print_snowpack not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'snowpack_output_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(snowpack_output_fname,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'print_multilayer') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_multilayer,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_multilayer.ne.0.0 .and. print_multilayer.ne.1.0& + & .and. print_multilayer.ne.2.0) & + & then + print *,'print_multilayer not 0.0 or 1.0 or 2.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq. & + & 'multilayer_output_fname') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(multilayer_output_fname,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'print_user') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_user,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_user.ne.0.0 .and. print_user.ne.1.0) then + print *,'print_user not 0.0 or 1.0' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_inc') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2real(print_inc,i_value_chars,c_value,& + & c_param(1:i_param_chars)) + if (print_inc.ne.1.0 .and. print_inc.ne.8.0 .and.& + & print_inc.ne.24.0) then + print *,'print_inc not 1.0 or 8.0 or 24.0. You are' + print *,'using some number that is not typical and' + print *,'should make certain you and the code are' + print *,'doing exactly what you think it is and want' + print *,'to do.' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'output_path_wo_assim') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(output_path_wo_assim,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + + if (c_param(1:i_param_chars).eq.'output_path_wi_assim') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(output_path_wi_assim,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + endif + +! THESE ARE THE 30 PRINT_VAR_## FLAGS. + if (c_param(1:i_param_chars).eq.'print_var_01') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_01,c_value, & + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_01.ne.'y' .and. print_var_01.ne.'n') then + print *,'print_var_01 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_02') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_02,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_02.ne.'y' .and. print_var_02.ne.'n') then + print *,'print_var_02 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_03') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_03,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_03.ne.'y' .and. print_var_03.ne.'n') then + print *,'print_var_03 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_04') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_04,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_04.ne.'y' .and. print_var_04.ne.'n') then + print *,'print_var_04 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_05') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_05,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_05.ne.'y' .and. print_var_05.ne.'n') then + print *,'print_var_05 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_06') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_06,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_06.ne.'y' .and. print_var_06.ne.'n') then + print *,'print_var_06 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_07') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_07,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_07.ne.'y' .and. print_var_07.ne.'n') then + print *,'print_var_07 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_08') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_08,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_08.ne.'y' .and. print_var_08.ne.'n') then + print *,'print_var_08 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_09') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_09,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_09.ne.'y' .and. print_var_09.ne.'n') then + print *,'print_var_09 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_10') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_10,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_10.ne.'y' .and. print_var_10.ne.'n') then + print *,'print_var_10 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_11') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_11,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_11.ne.'y' .and. print_var_11.ne.'n') then + print *,'print_var_11 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_12') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_12,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_12.ne.'y' .and. print_var_12.ne.'n') then + print *,'print_var_12 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_13') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_13,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_13.ne.'y' .and. print_var_13.ne.'n') then + print *,'print_var_13 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_14') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_14,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_14.ne.'y' .and. print_var_14.ne.'n') then + print *,'print_var_14 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_15') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_15,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_15.ne.'y' .and. print_var_15.ne.'n') then + print *,'print_var_15 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_16') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_16,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_16.ne.'y' .and. print_var_16.ne.'n') then + print *,'print_var_16 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_17') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_17,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_17.ne.'y' .and. print_var_17.ne.'n') then + print *,'print_var_17 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_18') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_18,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_18.ne.'y' .and. print_var_18.ne.'n') then + print *,'print_var_18 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_19') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_19,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_19.ne.'y' .and. print_var_19.ne.'n') then + print *,'print_var_19 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_20') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_20,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_20.ne.'y' .and. print_var_20.ne.'n') then + print *,'print_var_20 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_21') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_21,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_21.ne.'y' .and. print_var_21.ne.'n') then + print *,'print_var_21 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_22') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_22,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_22.ne.'y' .and. print_var_22.ne.'n') then + print *,'print_var_22 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_23') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_23,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_23.ne.'y' .and. print_var_23.ne.'n') then + print *,'print_var_23 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_24') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_24,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_24.ne.'y' .and. print_var_24.ne.'n') then + print *,'print_var_24 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_25') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_25,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_25.ne.'y' .and. print_var_25.ne.'n') then + print *,'print_var_25 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_26') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_26,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_26.ne.'y' .and. print_var_26.ne.'n') then + print *,'print_var_26 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_27') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_27,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_27.ne.'y' .and. print_var_27.ne.'n') then + print *,'print_var_27 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_28') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_28,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_28.ne.'y' .and. print_var_28.ne.'n') then + print *,'print_var_28 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_29') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_29,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_29.ne.'y' .and. print_var_29.ne.'n') then + print *,'print_var_29 not y or n' + stop + endif + endif + + if (c_param(1:i_param_chars).eq.'print_var_30') then + ipar_count = ipar_count + 1 + cpar_name(ipar_count) = c_param(1:i_param_chars) + call char2char(print_var_30,c_value,& + & i_value_chars,c_param(1:i_param_chars)) + if (print_var_30.ne.'y' .and. print_var_30.ne.'n') then + print *,'print_var_30 not y or n' + stop + endif + endif + +! Real example +! if (c_param(1:i_param_chars).eq.'') +! & call char2real(,i_value_chars,c_value, +! & c_param(1:i_param_chars)) + +! Integer example. +! if (c_param(1:i_param_chars).eq.'nx') +! & call char2int(nx,i_value_chars,c_value, +! & c_param(1:i_param_chars)) + +! Character example. +! if (c_param(1:i_param_chars).eq.'fname_out') +! & call char2char(fname_out,c_value,i_value_chars, +! & c_param(1:i_param_chars)) + + endif + enddo + + 99 continue + +! Use the print_var_## parameters to build the print control +! array "print_var(n_print_vars)" used in output_user.f. + print_var(1) = print_var_01 + print_var(2) = print_var_02 + print_var(3) = print_var_03 + print_var(4) = print_var_04 + print_var(5) = print_var_05 + print_var(6) = print_var_06 + print_var(7) = print_var_07 + print_var(8) = print_var_08 + print_var(9) = print_var_09 + print_var(10) = print_var_10 + print_var(11) = print_var_11 + print_var(12) = print_var_12 + print_var(13) = print_var_13 + print_var(14) = print_var_14 + print_var(15) = print_var_15 + print_var(16) = print_var_16 + print_var(17) = print_var_17 + print_var(18) = print_var_18 + print_var(19) = print_var_19 + print_var(20) = print_var_20 + print_var(21) = print_var_21 + print_var(22) = print_var_22 + print_var(23) = print_var_23 + print_var(24) = print_var_24 + print_var(25) = print_var_25 + print_var(26) = print_var_26 + print_var(27) = print_var_27 + print_var(28) = print_var_28 + print_var(29) = print_var_29 + print_var(30) = print_var_30 + +! Check the input-parameter counting array to be sure that all +! parameters have been defined. + ipar_flag = npars - ipar_count + if (ipar_flag.ne.0) then + print * + print * + print *,'THERE ARE MISSING VARIABLES IN THE .PAR FILE.' + print * + print *,' THIS MANY VARIABLES ARE MISSING:',ipar_flag + print * + print *,' THESE ARE THE VARIABLES THAT HAVE BEEN READ IN:' + + do k=1,npars + print *,'VARIABLE NAME =',k,' ',cpar_name(k) + enddo + + print * + print *,'ALL .PAR VARIABLES MUST BE DEFINED BEFORE' + print *,' YOU CAN CONTINUE.' + print * + + stop + endif + +! Put some space at the end of the parameter printouts. + print * + + return + end subroutine READPARAM_CODE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine char2char(cvar,c_value,i_value_chars,& + & c_param) + + implicit none + + character*(*) c_value,c_param,cvar + integer i_value_chars + + cvar = c_value(1:i_value_chars) + +!KRA +! print *,c_param,' = ',cvar(1:i_value_chars) + + return + end subroutine char2char + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine char2real(rvar,i_value_chars,c_value,& + & c_param) + + implicit none + + character*(*) c_value,c_param + integer i_value_chars + real rvar + character*8 form + +! Read an real value (rvar) from the character string (c_value). + write (form,90) i_value_chars + 90 format ('(f',i2,'.0)') + read (c_value,form) rvar + +!KRA +! print *,c_param,' =',rvar + + return + end subroutine char2real + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine char2double(dvar,i_value_chars,c_value,& + & c_param) + + implicit none + + character*(*) c_value,c_param + integer i_value_chars + double precision dvar + character*8 form + +! Read an double precision value (dvar) from the character +! string (c_value). + write (form,90) i_value_chars + 90 format ('(f',i2,'.0)') + read (c_value,form) dvar + +!KRA +! print *,c_param,' =',dvar + + return + end subroutine char2double + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine char2int(ivar,i_value_chars,c_value,& + & c_param) + + implicit none + + character*(*) c_value,c_param + integer i_value_chars,ivar + character*8 form + +! Read an integer value (ivar) from the character string (c_value). + write (form,90) i_value_chars + 90 format ('(i',i2,')') + read (c_value,form) ivar + +!KRA +! print *,c_param,' =',ivar + + return + end subroutine char2int + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine get_param_data(input_string,c_param,c_value,& + & i_param_chars,i_value_chars,icomment_flag) + + implicit none + + character*(*) input_string,c_param,c_value + + integer leading_blanks,trailing_blanks + integer i,icomment_flag + integer i_param_start,i_equals_position,i_param_end,& + & i_value_start,i_value_end,i_param_chars,i_value_chars,& + & i_loc,i_leading_blanks,i_trailing_blanks + +! If the input string is not a comment line, process the data. + if (input_string(1:1).ne.'!') then + +! First count the number of leading and trailing blanks. + i_leading_blanks = leading_blanks(input_string) + i_trailing_blanks = trailing_blanks(input_string) + +! If the input string is not completely blank, process the data. + if (i_leading_blanks.ne.len(input_string)) then + icomment_flag = 0 + +! Define the starting and ending points of the parameter name and +! parameter value. + i_param_start = i_leading_blanks + 1 + i_equals_position = index(input_string,'=') + i_param_end = i_equals_position - 2 + i_value_start = i_equals_position + 2 + i_value_end = len(input_string) - i_trailing_blanks + i_param_chars = i_param_end - i_param_start + 1 + i_value_chars = i_value_end - i_value_start + 1 + +! Pull out the parameter name and value. + do i=1,i_param_chars + i_loc = i + i_param_start - 1 + c_param(i:i) = input_string(i_loc:i_loc) + enddo + + do i=1,i_value_chars + i_loc = i + i_value_start - 1 + c_value(i:i) = input_string(i_loc:i_loc) + enddo + +! Check to see whether we have found any paths/fnames that are +! longer than 80 characters. + if (i_value_chars.gt.80) then + print * + print *, input_string + print *, 'Number of characters found =',i_value_chars + print * + print *, 'Found path/fname longer than 80 characters;' + print *, 'the limit is 80 characters for the string' + print *, 'starting in the second character position' + print *, 'after the "=" sign.' + print * + stop + endif + + else + icomment_flag = 1 + endif + + else + icomment_flag = 1 + endif + + return + end subroutine get_param_data + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + integer function leading_blanks(input_string) + + implicit none + + integer k + character*(*) input_string + +! Count the number of blanks preceeding the first non-blank +! character. + leading_blanks = 0 + do k=1,len(input_string) + if (input_string(k:k).eq.' ') then + leading_blanks = leading_blanks + 1 + else + return + endif + enddo + + return + end function leading_blanks + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + integer function trailing_blanks(input_string) + + implicit none + + integer k + character*(*) input_string + +! Count the number of blanks following the last non-blank +! character. + trailing_blanks = 0 + do k=len(input_string),1,-1 + if (input_string(k:k).eq.' ') then + trailing_blanks = trailing_blanks + 1 + else + return + endif + enddo + + return + end function trailing_blanks + + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine GET_DOT_PAR_PATH_LOCATION(snowmodel_dot_par_fname) + +! The following provides the ability to read in a 'snowmodel.par' +! file that is called something other than 'snowmodel.par' and/or +! located somewhere different than the directory where the +! 'snowmodel' executable file is located. If you run: +! snowmodel +! it assumes the .par file is called 'snowmodel.par' and is +! located in the default location. You can also run the code as +! follows: +! snowmodel parpath/parname.par +! and it will look for the .par file in the different location +! and/or the different name. + + implicit none + + integer nargs,iargc + character*100 snowmodel_dot_par_fname + + snowmodel_dot_par_fname = "snowmodel.par" + + nargs = iargc() + + if (nargs.eq.1) then + call getarg (1,snowmodel_dot_par_fname) + endif + + print * + print *, snowmodel_dot_par_fname + + return + end subroutine GET_DOT_PAR_PATH_LOCATION + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/snowmodel_inc.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowmodel_inc.f90 new file mode 100755 index 000000000..593666819 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowmodel_inc.f90 @@ -0,0 +1,60 @@ +module snowmodel_inc + public + ! THESE FIRST THREE PARAMETER VALUES OFTEN NEED TO BE CHANGED + ! FOR BIG AND LONG MODEL SIMULATIONS. + + ! nx_max and ny_max define the maximum nx and ny grid points + ! that you can have in your model run. If you want to run a + ! larger domain, then you have to change these numbers and + ! recompile the code. + +! integer,parameter :: nx_max=1001,ny_max=1001 +! integer,parameter :: nx_max=3131,ny_max=3603 +! integer,parameter :: nx_max=10001,ny_max=10001 +! integer,parameter :: nx_max=17636,ny_max=17784 + integer,parameter :: nx_max=22001,ny_max=22001 + + ! max_time_steps defines the maximum number of time steps that + ! will be used in the current compliled version of the code. + ! If you want to run a longer time domain, then you have to + ! change this number and recompile the code. + + integer, parameter :: max_time_steps=8784 + + ! nstns_max is the maximum number of stations that can be used + ! in the data assimilation routines. +! integer, parameter :: nstns_max=10000 + integer, parameter :: nstns_max=22894 + + ! max_obs_dates is used in the data assimilation routines. It + ! must be greater than or equal to the number of observation + ! dates in the entire simulation + (plus) the number of years + ! in the simulation. For example, for a 6-year simulation with + ! 2 observation dates in each year, you would set max_obs_dates + ! to be = 2obs*6yrs+6yrs = 18 or greater. For a 6-year run with + ! 4 observation dates in 2 of the years, and 0 observation dates + ! in the other 4 years, max_obs_dates = 8obs+6yrs = 14 or + ! greater. + integer, parameter :: max_obs_dates=12 + + ! If you are running the multi-layer snow model (even with a single + ! layer) nz_max must be at least one greater than max_layers in + ! snowmodel.par. This is because the model will build a new layer + ! with the new snowfall and then it is merged with the layer below + ! if you only want a single snow layer. If you are running + ! SnowModel's original single layer model, nz_max can be 1 (but if + ! nz_max=2 it will avoid a warning message if you are compiling + ! the code with gfortran). + ! parameter (nz_max=25) + integer, parameter :: nz_max=2 + + ! This is the number of print variables that are controlled by + ! the variable list in snowmodel.par. + integer, parameter :: n_print_vars=30 + + ! nvegtypes is the number of vegetation types used in the model + ! run. If you change this then you have made some big changes + ! in the codes' vegetation description. + integer, parameter :: nvegtypes=30 + +end module snowmodel_inc diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/snowmodel_vars.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowmodel_vars.f90 new file mode 100755 index 000000000..8474d6897 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowmodel_vars.f90 @@ -0,0 +1,393 @@ +module snowmodel_vars + + use snowmodel_inc + implicit none + +! Misc variables. + character*100 snowmodel_dot_par_fname + +! SnowTran-3D variables. + integer max_iter + +! Add top-level log message flag (master processor); for parallel runs !KRA + logical snowmodel_masterproc !KRA + +! integer nx_max, ny_max ! KRA + + integer i,j,iter,nx,ny + + real ro_snow,ro_water,ro_air,gravity,vonKarman,snow_z0 + real deltax,deltay,dt,curvewt,utau_t_flag + real fetch,xmu,C_z,h_const,wind_min,windspd_flag + real Up_const,dz_susp,ztop_susp,fall_vel,Ur_const + real pi,twopio360,bc_flag,topoflag,Utau_t_const + real ht_windobs,ht_rhobs,slopewt,bs_flag,twolayer_flag + real subgrid_flag,curve_len_scale + real snow_d_init_const,const_veg_flag,winddir_flag + real windspd_min,tabler_dir,slope_adjust + + real, allocatable :: topo_land(:,:) + real, allocatable :: tabler_nn(:,:) + real, allocatable :: tabler_ss(:,:) + real, allocatable :: tabler_ee(:,:) + real, allocatable :: tabler_ww(:,:) + real, allocatable :: tabler_ne(:,:) + real, allocatable :: tabler_se(:,:) + real, allocatable :: tabler_sw(:,:) + real, allocatable :: tabler_nw(:,:) + real, allocatable :: topo(:,:) + real, allocatable :: vegtype(:,:) + + real, allocatable :: uwind_grid(:,:),vwind_grid(:,:) + real, allocatable :: windspd_grid(:,:),winddir_grid(:,:) + real, allocatable :: tair_grid(:,:),sprec(:,:) + real, allocatable :: rh_grid(:,:), curvature(:,:) + + real, allocatable :: slope_az(:,:) + real, allocatable :: terrain_slope(:,:) + + !Not dynamic + integer index_ue(ny_max,2*nx_max+1),index_uw(ny_max,2*nx_max+1) + integer index_vn(nx_max,2*ny_max+1),index_vs(nx_max,2*ny_max+1) + + real, allocatable :: snow_d(:,:) + real, allocatable :: snow_d_init(:,:) + real, allocatable :: Utau(:,:) + real, allocatable :: Utau_t(:,:) + real, allocatable :: z_0(:,:) + real, allocatable :: h_star(:,:) + real, allocatable :: conc_salt(:,:) + + real, allocatable :: Qsalt_max(:,:) + real, allocatable :: Qsalt_maxu(:,:),Qsalt_maxv(:,:) + real, allocatable :: Qsalt(:,:) + real, allocatable :: Qsalt_u(:,:),Qsalt_v(:,:) + real, allocatable :: dh_salt(:,:) + real, allocatable :: dh_salt_u(:,:),dh_salt_v(:,:) + + real, allocatable :: Qsusp(:,:) + real, allocatable :: Qsusp_u(:,:),Qsusp_v(:,:) + real, allocatable :: dh_susp(:,:) + real, allocatable :: dh_susp_u(:,:),dh_susp_v(:,:) + + real, allocatable :: Qsubl(:,:) + real, allocatable :: Qsubl_depth(:,:) + + real, allocatable :: sum_sprec(:,:) + + real, allocatable :: wbal_qsubl(:,:) + real, allocatable :: wbal_salt(:,:) + real, allocatable :: wbal_susp(:,:) + real, allocatable :: wbal_subgrid(:,:) + real, allocatable :: sum_qsubl(:,:) + real, allocatable :: sum_trans(:,:) + real, allocatable :: soft_snow_d(:,:) + real, allocatable :: ro_soft_snow(:,:) + real, allocatable :: ro_soft_snow_old(:,:) + + real vegsnowdepth(nvegtypes) + real, allocatable :: veg_z0(:,:) + real, allocatable :: vegsnowd_xy(:,:) + integer iveg_ht_flag + + real run_micromet,run_enbal,run_snowpack,run_snowtran + + character*80 topoveg_fname,met_input_fname,topo_ascii_fname,& + & veg_ascii_fname + + real curve_lg_scale_flag + real, allocatable :: curve_wt_lg(:,:) + + character*80 tabler_sfc_path_name + real Tabler_1_flag,Tabler_2_flag +! End SnowTran-3D variables. + +! MicroMet variables. + double precision xmn ! center x coords of lower left grid cell + double precision ymn ! center y coords of lower left grid cell + !double precision xg_line(nx_max,ny_max),yg_line(nx_max,ny_max) + double precision, allocatable :: xg_line(:,:),yg_line(:,:) + + real dn ! average observation spacing + + real, allocatable :: Qsi_grid(:,:) ! output + real, allocatable :: Qli_grid(:,:) ! output + real, allocatable :: prec_grid(:,:) ! output + real, allocatable :: xlat_grid(:,:) ! lat (dec deg) of cell centers + real, allocatable :: xlon_grid(:,:) ! lon (dec deg) of cell centers + + integer iyear_init ! model start year + integer imonth_init ! model start month + integer iday_init ! model start day + real xhour_init ! model start hour + real xlat ! approx. latitude of domain center, decimal deg + + real undef ! undefined value + integer ifill ! flag (=1) forces a value in every cell + integer iobsint ! flag (=1) use dn value from .par file + + integer i_tair_flag,i_rh_flag,i_wind_flag,i_solar_flag,& + & i_prec_flag,i_longwave_flag,isingle_stn_flag,igrads_metfile,& + & lapse_rate_user_flag,iprecip_lapse_rate_user_flag,n_stns_used,& + & lat_solar_flag,ihrestart_inc,iter_start,ihrestart_flag,& + & iprecip_scheme, metforce_opt + + real xhour,ascii_topoveg,use_shortwave_obs,gap_frac,& + & use_longwave_obs,use_sfc_pressure_obs,calc_subcanopy_met,& + & cloud_frac_factor,barnes_lg_domain,UTC_flag,check_met_data,& + & snowmodel_line_flag,wind_lapse_rate + + integer, parameter :: nftypes = 5 + real forest_LAI(nftypes) + + integer iyear,imonth,iday + !integer k_stn(nx_max,ny_max,9) + integer, allocatable :: k_stn(:,:,:)!Last dim is 9 + + real, allocatable :: cf_precip(:,:) + real cf_precip_flag + + real, allocatable :: cloud_frac_grid(:,:) + real snowfall_frac +! End MicroMet variables. + +! EnBal variables. + integer icond_flag + + real, allocatable :: Tsfc(:,:),Qle(:,:),& + & Qh(:,:),Qe(:,:),Qc(:,:),& + & Qm(:,:),e_balance(:,:),Qf(:,:),& + & swe_depth(:,:),sfc_pressure(:,:),& + & albedo(:,:) + + real albedo_snow_forest,albedo_snow_clearing,albedo_glacier +! End EnBal variables. + + ! SnowPack variables. + + real, allocatable :: ro_nsnow(:,:),w_balance(:,:),& + & runoff(:,:),rain(:,:),& + & sum_prec(:,:),sum_runoff(:,:),& + & xro_snow(:,:),ro_snow_grid(:,:),& + & sum_Qcs(:,:),canopy_int(:,:),& + & Qcs(:,:),canopy_unload(:,:),& + & snow_depth(:,:),glacier_melt(:,:),& + & sum_unload(:,:),sum_glacmelt(:,:),& + & swemelt(:,:),d_canopy_int(:,:),& + & sum_d_canopy_int(:,:),sum_sfcsublim(:,:),& + & sum_swemelt(:,:),swesublim(:,:),& + & swe_depth_old(:,:),canopy_int_old(:,:),& + & windspd_2m_grid(:,:) + + real sfc_sublim_flag + + integer max_layers,multilayer_snowpack,k + integer, allocatable :: KK(:,:) + integer, allocatable :: melt_flag(:,:,:)!nz_max + + + real ro_snowmax,tsls_threshold,dz_snow_min + real, allocatable :: tslsnowfall(:,:) + real, allocatable :: change_layer(:,:) + real, allocatable :: snod_layer(:,:,:) + real, allocatable :: swed_layer(:,:,:) + real, allocatable :: ro_layer(:,:,:) + real, allocatable :: T_old(:,:,:) + real, allocatable :: gamma(:,:,:) + real, allocatable :: diam_layer(:,:,:) + real, allocatable :: flux_layer(:,:,:) + + integer iclear_mn,iclear_dy,izero_snow_date + real xclear_hr +! End SnowPack variables. + +! SeaIce variables. + real seaice_run + real, allocatable :: seaice_conc(:,:,:) +! End SeaIce variables. + +! Data assimilaion (precipitation and melt) factor variables. + real corr_factor(nx_max,ny_max,max_obs_dates+1) + integer icorr_factor_index(max_time_steps) + + integer icorr_factor_loop,irun_data_assim,nobs_dates,& + & i_dataassim_loop,i_corr_start + +! End data assimilaion (precipitation and melt) factor variables. + +! Print output variables. + real print_micromet,print_enbal,print_snowpack,print_snowtran,& + & print_multilayer + real print_user,print_inc + double precision nrecs_max + + character*80 micromet_output_fname + character*80 enbal_output_fname + character*80 snowtran_output_fname + character*80 snowpack_output_fname + character*80 multilayer_output_fname + character*80 output_path_wo_assim,output_path_wi_assim + + character*1 print_var(n_print_vars) + character*4 print_outvars(n_print_vars) +! End print output variables. +contains + + subroutine allocate_arrays(nx,ny) + implicit none + + integer, intent(in) :: nx,ny + integer, save :: first = 1 + + real,dimension(nx,ny) :: zero_real + + zero_real = 0.0 + + if(first == 0) return + first = 0 + + allocate(topo_land(nx,ny),source=zero_real) + allocate(tabler_nn(nx,ny),source=zero_real) + allocate( tabler_ss(nx,ny),source=zero_real) + allocate( tabler_ee(nx,ny),source=zero_real) + allocate( tabler_ww(nx,ny),source=zero_real) + allocate( tabler_ne(nx,ny),source=zero_real) + allocate( tabler_se(nx,ny),source=zero_real) + allocate( tabler_sw(nx,ny),source=zero_real) + allocate( tabler_nw(nx,ny),source=zero_real) + allocate( topo(nx,ny),source=zero_real) + allocate( vegtype(nx,ny),source=zero_real) + allocate( uwind_grid(nx,ny),source=zero_real) + allocate( vwind_grid(nx,ny),source=zero_real) + allocate( windspd_grid(nx,ny),source=zero_real) + allocate( winddir_grid(nx,ny),source=zero_real) + allocate( tair_grid(nx,ny),source=zero_real) + allocate( sprec(nx,ny),source=zero_real) + allocate( rh_grid(nx,ny),source=zero_real) + allocate( curvature(nx,ny),source=zero_real) + + allocate( slope_az(nx,ny),source=zero_real) + allocate( terrain_slope(nx,ny),source=zero_real) + + ! The following 2 variables have nx and ny swapped. + ! Nx (cols) is also doubled + !integer,allocatable :: index_ue(:,:),index_uw(:,:) + ! The following 2 variables have ny (cols) doubled + !integer,allocatable :: index_vn(:,:),index_vs(:,:) + + allocate( snow_d(nx,ny),source=zero_real) + + allocate( snow_d_init(nx,ny),source=zero_real) + allocate( Utau(nx,ny),source=zero_real) + allocate( Utau_t(nx,ny),source=zero_real) + allocate( z_0(nx,ny),source=zero_real) + allocate( h_star(nx,ny),source=zero_real) + allocate( conc_salt(nx,ny),source=zero_real) + + allocate( Qsalt_max(nx,ny),source=zero_real) + allocate( Qsalt_maxu(nx,ny),source=zero_real) + allocate( Qsalt_maxv(nx,ny),source=zero_real) + allocate( Qsalt(nx,ny),source=zero_real) + allocate( Qsalt_u(nx,ny),source=zero_real) + allocate( Qsalt_v(nx,ny),source=zero_real) + allocate( dh_salt(nx,ny),source=zero_real) + allocate( dh_salt_u(nx,ny),source=zero_real) + allocate( dh_salt_v(nx,ny),source=zero_real) + + allocate( Qsusp(nx,ny),source=zero_real) + allocate( Qsusp_u(nx,ny),source=zero_real) + allocate( Qsusp_v(nx,ny),source=zero_real) + allocate( dh_susp(nx,ny),source=zero_real) + allocate( dh_susp_u(nx,ny),source=zero_real) + allocate( dh_susp_v(nx,ny),source=zero_real) + + allocate( Qsubl(nx,ny),source=zero_real) + allocate( Qsubl_depth(nx,ny),source=zero_real) + + allocate( sum_sprec(nx,ny),source=zero_real) + + allocate( wbal_qsubl(nx,ny),source=zero_real) + allocate( wbal_salt(nx,ny),source=zero_real) + allocate( wbal_susp(nx,ny),source=zero_real) + allocate( wbal_subgrid(nx,ny),source=zero_real) + allocate( sum_qsubl(nx,ny),source=zero_real) + allocate( sum_trans(nx,ny),source=zero_real) + + allocate( soft_snow_d(nx,ny),source=zero_real) + allocate( ro_soft_snow(nx,ny),source=zero_real) + allocate( ro_soft_snow_old(nx,ny),source=zero_real) + + allocate( veg_z0(nx,ny),source=zero_real) + allocate( vegsnowd_xy(nx,ny),source=zero_real) + + allocate( curve_wt_lg(nx,ny),source=zero_real) + + allocate (xg_line(nx,ny),yg_line(nx,ny)) + xg_line = 0.0 + yg_line = 0.0 + allocate( Qsi_grid(nx,ny),source=zero_real) ! output + allocate( Qli_grid(nx,ny),source=zero_real) ! output + + allocate( prec_grid(nx,ny),source=zero_real) ! output + allocate( xlat_grid(nx,ny),source=zero_real) ! lat (dec deg) of cell centers + allocate( xlon_grid(nx,ny),source=zero_real) ! lon (dec deg) of cell centers + + allocate( cf_precip(nx,ny),source=zero_real) + + allocate(k_stn(nx,ny,9))!Last dim is 9 + k_stn = 0 + + allocate( cloud_frac_grid(nx,ny),source=zero_real) + + allocate(Tsfc(nx,ny),Qle(nx,ny),& + & Qh(nx,ny),Qe(nx,ny),Qc(nx,ny),& + & Qm(nx,ny),e_balance(nx,ny),Qf(nx,ny),& + & swe_depth(nx,ny),sfc_pressure(nx,ny),& + & albedo(nx,ny),source=zero_real) + + allocate(ro_nsnow(nx,ny),w_balance(nx,ny),& + & runoff(nx,ny),rain(nx,ny),& + & sum_prec(nx,ny),sum_runoff(nx,ny),& + & xro_snow(nx,ny),ro_snow_grid(nx,ny),& + & sum_Qcs(nx,ny),canopy_int(nx,ny),& + & Qcs(nx,ny),canopy_unload(nx,ny),& + & snow_depth(nx,ny),glacier_melt(nx,ny),& + & sum_unload(nx,ny),sum_glacmelt(nx,ny),& + & swemelt(nx,ny),d_canopy_int(nx,ny),& + & sum_d_canopy_int(nx,ny),sum_sfcsublim(nx,ny),& + & sum_swemelt(nx,ny),swesublim(nx,ny),& + & swe_depth_old(nx,ny),canopy_int_old(nx,ny),& + & windspd_2m_grid(nx,ny), source=zero_real) + + allocate(KK(nx,ny)) + KK = 0 + allocate(melt_flag(nx,ny,nz_max))!nz_max + melt_flag = 0 + + allocate( tslsnowfall(nx,ny),source=zero_real) + + allocate( change_layer(nx,ny),source=zero_real) + allocate( snod_layer(nx,ny,nz_max)) + snod_layer = 0.0 + allocate( swed_layer(nx,ny,nz_max)) + swed_layer = 0.0 + allocate( ro_layer(nx,ny,nz_max)) + ro_layer = 0.0 + allocate( T_old(nx,ny,nz_max)) + T_old = 0.0 + allocate( gamma(nx,ny,nz_max)) + gamma = 0.0 + allocate( diam_layer(nx,ny,nz_max)) + diam_layer = 0.0 + allocate( flux_layer(nx,ny,nz_max)) + flux_layer = 0.0 + allocate(seaice_conc(nx,ny,nz_max)) + seaice_conc = 0.0 + +!KRA + snowmodel_masterproc = .true. +!KRA + + end subroutine allocate_arrays + +end module snowmodel_vars diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/snowpack_code.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowpack_code.f90 new file mode 100755 index 000000000..a39707228 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowpack_code.f90 @@ -0,0 +1,3211 @@ +! snowpack_code.f + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SNOWPACK_CODE(nx,ny,Tair_grid,rh_grid,ro_nsnow,& + & dt,swe_depth,Tsfc,snow_d,prec_grid,runoff,Qm,rain,& + & sprec,iter,w_balance,sum_prec,sum_runoff,xro_snow,& + & undef,ro_snow,ro_snow_grid,soft_snow_d,sum_sprec,& + & snow_depth,windspd_grid,Qsi_grid,sum_Qcs,canopy_int,& + & Qcs,vegtype,forest_LAI,albedo,glacier_melt,& + & canopy_unload,sum_unload,sum_glacmelt,run_snowtran,& + & swemelt,d_canopy_int,sum_d_canopy_int,snow_d_init,& + & sfc_pressure,Qe,sfc_sublim_flag,sum_sfcsublim,& + & sum_swemelt,corr_factor,icorr_factor_index,swesublim,& + & swe_depth_old,canopy_int_old,KK,max_layers,melt_flag,& + & ro_snowmax,tsls_threshold,dz_snow_min,tslsnowfall,& + & change_layer,snod_layer,swed_layer,ro_layer,T_old,gamma,& + & multilayer_snowpack,seaice_run,seaice_conc,ht_windobs,& + & windspd_2m_grid,diam_layer,flux_layer,sum_trans) + + use snowmodel_inc + implicit none + + integer nx,ny,iter,i,j + + integer max_layers,multilayer_snowpack,k,n_tsteps_in_day,irec + integer KK(nx,ny) + integer melt_flag(nx,ny,nz_max) + + real ro_snowmax,tsls_threshold,dz_snow_min,Cp_snow + real tslsnowfall(nx,ny) + real change_layer(nx,ny) + real snod_layer(nx,ny,nz_max) + real swed_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real gamma(nx,ny,nz_max) + real diam_layer(nx,ny,nz_max) + real flux_layer(nx,ny,nz_max) + + integer melt_flag_z(nz_max) + real snod_layer_z(nz_max) + real swed_layer_z(nz_max) + real ro_layer_z(nz_max) + real T_old_z(nz_max) + real gamma_z(nz_max) + real diam_z(nz_max) + real flux_z(nz_max) + + real Tair_grid(nx,ny) + real rh_grid(nx,ny) + real prec_grid(nx,ny) + real windspd_grid(nx,ny) + real windspd_2m_grid(nx,ny) + real Qsi_grid(nx,ny) + real vegtype(nx,ny) + real albedo(nx,ny) + real glacier_melt(nx,ny) + real canopy_unload(nx,ny) + real sum_unload(nx,ny) + real sum_glacmelt(nx,ny) + real sum_swemelt(nx,ny) + real swemelt(nx,ny) + real swesublim(nx,ny) + real snow_d_init(nx,ny) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + real seaice_conc(nx,ny) + real sum_trans(nx,ny) + real ro_snow + + real, dimension(nx,ny) :: ro_nsnow,snow_d,& + & runoff,rain, & + & sprec,w_balance,& + & sum_prec,sum_runoff,& + & xro_snow,sfc_pressure,& + & ro_snow_grid,swe_depth,& + & Tsfc,Qm,& + & soft_snow_d,sum_sprec,& + & snow_depth,sum_Qcs,& + & canopy_int,Qcs,& + & d_canopy_int,sum_d_canopy_int,& + & Qe,sum_sfcsublim + + real dt,undef,Cp,xLf,Tf,A1,A2,ro_water,xLs,ro_ice,Twb,& + & run_snowtran,sfc_sublim_flag,seaice_run,ht_windobs + + real corr_factor(nx_max,ny_max,max_obs_dates+1) + real corr_factor_ij + integer icorr_factor_index(max_time_steps) + + integer, parameter :: nftypes = 5 + real forest_LAI(nftypes) + +! print *,' solving the snow-cover evolution' + +! Define the constants used in the computations. + CALL CONSTS_SNOWPACK(Cp,xLs,ro_ice,xLf,Tf,A1,A2,ro_water,& + & Cp_snow,ro_snowmax) + +! Run the snowpack evolution sub-model. + do j=1,ny + do i=1,nx + +! Extract the vertical column for this i,j point, and send it +! to the subroutine. *** Note that I should use f95, then I would +! not have to do this (I could pass in subsections of the arrays). + if (multilayer_snowpack.eq.1) then + do k=1,nz_max + melt_flag_z(k) = melt_flag(i,j,k) + snod_layer_z(k) = snod_layer(i,j,k) + swed_layer_z(k) = swed_layer(i,j,k) + ro_layer_z(k) = ro_layer(i,j,k) + T_old_z(k) = T_old(i,j,k) + gamma_z(k) = gamma(i,j,k) + diam_z(k) = diam_layer(i,j,k) + enddo + endif + +! Extract the correction factor from the data assimilation array +! so it can be passed into the SnowPack routines without the +! negative array index. + if (icorr_factor_index(iter).lt.0) then + k = -icorr_factor_index(iter) + corr_factor_ij = corr_factor(i,j,k) + else + corr_factor_ij = undef + endif + + CALL SNOWPACK_CORE(Twb,Tf,Tair_grid(i,j),rh_grid(i,j),xLs,& + & Cp,sfc_pressure(i,j),ro_nsnow(i,j),dt,ro_snow,& + & swe_depth(i,j),Tsfc(i,j),A1,A2,snow_d(i,j),ro_water,& + & ro_ice,prec_grid(i,j),runoff(i,j),Qm(i,j),xLf,rain(i,j),& + & sprec(i,j),iter,w_balance(i,j),sum_prec(i,j),& + & sum_runoff(i,j),xro_snow(i,j),undef,& + & soft_snow_d(i,j),sum_sprec(i,j),ro_snow_grid(i,j),& + & snow_depth(i,j),windspd_grid(i,j),Qsi_grid(i,j),& + & sum_Qcs(i,j),canopy_int(i,j),Qcs(i,j),vegtype(i,j),& + & forest_LAI,albedo(i,j),canopy_unload(i,j),& + & sum_unload(i,j),sum_glacmelt(i,j),run_snowtran,& + & swemelt(i,j),d_canopy_int(i,j),sum_d_canopy_int(i,j),& + & snow_d_init(i,j),Qe(i,j),glacier_melt(i,j),& + & sfc_sublim_flag,sum_sfcsublim(i,j),sum_swemelt(i,j),& + & corr_factor_ij,icorr_factor_index(iter),swesublim(i,j),& + & swe_depth_old(i,j),canopy_int_old(i,j),KK(i,j),& + & max_layers,melt_flag_z,ro_snowmax,tsls_threshold,& + & dz_snow_min,tslsnowfall(i,j),change_layer(i,j),snod_layer_z,& + & swed_layer_z,ro_layer_z,T_old_z,gamma_z,multilayer_snowpack,& + & Cp_snow,seaice_run,ht_windobs,windspd_2m_grid(i,j),& + & diam_z,flux_z) + +! Re-build the 3-D arrays. See note above about using f95 to avoid this. + if (multilayer_snowpack.eq.1) then + do k=1,nz_max + melt_flag(i,j,k) = melt_flag_z(k) + snod_layer(i,j,k) = snod_layer_z(k) + swed_layer(i,j,k) = swed_layer_z(k) + ro_layer(i,j,k) = ro_layer_z(k) + T_old(i,j,k) = T_old_z(k) + gamma(i,j,k) = gamma_z(k) + diam_layer(i,j,k) = diam_z(k) + flux_layer(i,j,k) = flux_z(k) + enddo + endif + + enddo + enddo + + if (run_snowtran.eq.0.0) then + do j=1,ny + do i=1,nx + swe_depth_old(i,j) = swe_depth(i,j) + canopy_int_old(i,j) = canopy_int(i,j) + enddo + enddo + endif + +! Read in the sea ice concentration. These are daily data, so +! first calculate which record in the data file this time step +! corresponds to. + if (seaice_run.ne.0.0) then + n_tsteps_in_day = nint(86400.0 / dt) + if (mod(iter-1,n_tsteps_in_day).eq.0) then + irec = int((real(iter) - 0.5) * dt / 86400.0) + 1 + print *,'sea ice irec =',irec + read (445,rec=irec) ((seaice_conc(i,j),i=1,nx),j=1,ny) + endif + endif + +! If this simulation is not running SnowTran-3D, then zero out +! the ocean grid cells that have no sea ice here. If it is +! running with SnowTran-3D, then do this in the SnowTran-3D +! subroutine. + if (run_snowtran.eq.0.0) then + if (seaice_run.ne.0.0) then + CALL ZERO_SEAICE_SNOW(nx,ny,snow_depth,ro_snow_grid,& + & ro_snow,swe_depth,swe_depth_old,canopy_int_old,KK,& + & tslsnowfall,snod_layer,swed_layer,ro_layer,T_old,& + & multilayer_snowpack,tsls_threshold,seaice_conc,& + & sum_sprec,sum_trans) + endif + endif + + return + end SUBROUTINE SNOWPACK_CODE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SNOWPACK_CORE(Twb,Tf,Tair,rh,xLs,& + & Cp,sfc_pressure,ro_nsnow,dt,ro_snow,& + & swe_depth,Tsfc,A1,A2,snow_d,ro_water,& + & ro_ice,prec,runoff,Qm,xLf,rain,& + & sprec,iter,w_balance,sum_prec,& + & sum_runoff,xro_snow,undef,& + & soft_snow_d,sum_sprec,ro_snow_grid,& + & snow_depth,windspd,Qsi,& + & sum_Qcs,canopy_int,Qcs,vegtype,& + & forest_LAI,albedo,canopy_unload,& + & sum_unload,sum_glacmelt,run_snowtran,& + & swemelt,d_canopy_int,sum_d_canopy_int,& + & snow_d_init,Qe,glacier_melt,& + & sfc_sublim_flag,sum_sfcsublim,sum_swemelt,& + & corr_factor,icorr_factor_index,swesublim,& + & swe_depth_old,canopy_int_old,KK,& + & max_layers,melt_flag,ro_snowmax,tsls_threshold,& + & dz_snow_min,tslsnowfall,change_layer,snod_layer,& + & swed_layer,ro_layer,T_old,gamma,multilayer_snowpack,& + & Cp_snow,seaice_run,ht_windobs,windspd_2m,& + & diam_layer,flux_layer) + + use snowmodel_inc + implicit none + + integer iter,icorr_factor_index + + integer KK,max_layers,multilayer_snowpack + + real ro_snowmax,tsls_threshold,dz_snow_min,tslsnowfall,Cp_snow + + integer melt_flag(nz_max) + real change_layer + real snod_layer(nz_max) + real swed_layer(nz_max) + real ro_layer(nz_max) + real T_old(nz_max) + real gamma(nz_max) + real diam_layer(nz_max) + real flux_layer(nz_max) + + real Twb,Tf,Tair,rh,xLs,Cp,ro_nsnow,dt,ro_snow,swe_depth,& + & Tsfc,A1,A2,snow_d,ro_water,ro_ice,prec,runoff,Qm,xLf,rain,& + & sprec,w_balance,sum_prec,sum_runoff,xro_snow,undef,& + & soft_snow_d,sum_sprec,ro_snow_grid,snow_depth,sprec_grnd,& + & windspd,Qsi,sum_Qcs,canopy_int,Qcs,canopy_unload,& + & vegtype,albedo,glacier_melt,sum_unload,sum_glacmelt,& + & run_snowtran,swemelt,d_canopy_int,sfc_pressure,& + & sum_d_canopy_int,snow_d_init,Qe,sfc_sublim_flag,& + & sum_sfcsublim,sum_swemelt,corr_factor,swesublim,& + & swe_depth_old,canopy_int_old,sprec_grnd_ml,seaice_run,& + & ro_nsnow_wind,ht_windobs,windspd_2m + + integer,parameter :: nftypes = 5 + real forest_LAI(nftypes) + +! Calculate the canopy sublimation, loading and unloading. Note +! that here I have assumed that trees are type 1-5. + if (vegtype.le.5.0) then + CALL CANOPY_SNOW(rh,Tair,windspd,Qsi,sum_Qcs,albedo,& + & canopy_int,sprec,Qcs,dt,canopy_unload,& + & forest_LAI(nint(vegtype)),sum_unload,d_canopy_int,& + & sum_d_canopy_int) + sprec_grnd = sprec + canopy_unload - d_canopy_int + sprec_grnd_ml = sprec - d_canopy_int + else + Qcs = 0.0 + sprec_grnd = sprec + sprec_grnd_ml = sprec + endif + +! Calculate the wind speed at 2 meters. + CALL WINDSPEED_2M(windspd,ht_windobs,windspd_2m) + +! Solve for the wet bulb temperature. + CALL SOLVEWB(Twb,Tf,Tair,rh,xLs,Cp,sfc_pressure) + +! Compute the new snow density. + CALL NSNOWDEN(ro_nsnow,Twb,Tf,dt) + +! Call the subroutine that increases the snow density due to +! blowing snow wind speeds during a snowfall event. Here we +! are only calculating a increment to the previous NSNOWDEN +! new snow density calculation. + CALL NSNOW_DENSITY_FROM_BLOWING_SNOW(windspd_2m,sprec,dt,& + & ro_nsnow_wind) + +! Update the new snow density with the wind contribution. + ro_nsnow = ro_nsnow + ro_nsnow_wind + +! Make sure the snow density falls within reasonable limits. + ro_nsnow = min(ro_nsnow,ro_snowmax) + +! Call the multi-layer snowpack model. + if (multilayer_snowpack.eq.1) then + + CALL MULTI_LAYER_SNOW(KK,ro_layer,Tf,dt,ro_water,& + & ro_ice,T_old,snod_layer,swed_layer,Qm,ro_snowmax,rain,& + & xLf,Cp_snow,melt_flag,runoff,tslsnowfall,ro_nsnow,& + & sprec,Tsfc,tsls_threshold,gamma,max_layers,change_layer,& + & dz_snow_min,snow_depth,swe_depth,undef,canopy_unload,& + & vegtype,glacier_melt,sum_glacmelt,sum_swemelt,snow_d,& + & Qe,sfc_sublim_flag,sum_sfcsublim,soft_snow_d,ro_snow,& + & sum_sprec,sprec_grnd_ml,sum_prec,prec,sum_runoff,& + & ro_snow_grid,xro_snow,swesublim,A1,A2,windspd_2m,& + & sfc_pressure,diam_layer,flux_layer,corr_factor,& + & icorr_factor_index) + +! Call the original single-layer snowpack model. + else + +! Compute the snow density change due to settling. + CALL DDENSITY(ro_snow_grid,swe_depth,Tf,Tsfc,dt,A1,A2,& + & snow_depth,ro_water,ro_snowmax) + +! Compute the melt, rain, and snow contributions to modifying +! the snowpack depth, density, and snow water equivalent. + CALL SNOWPACK(swe_depth,snow_d,ro_snow_grid,& + & prec,ro_water,ro_nsnow,runoff,Qm,xLf,dt,rain,sprec,& + & sum_prec,sum_runoff,soft_snow_d,sum_sprec,ro_snow,& + & snow_depth,sprec_grnd,vegtype,glacier_melt,sum_glacmelt,& + & swemelt,canopy_unload,Qe,sfc_sublim_flag,sum_sfcsublim,& + & sum_swemelt,corr_factor,icorr_factor_index,swesublim,& + & ro_snowmax) + +! Post process the data for output. + CALL POSTPROC(ro_snow_grid,xro_snow,snow_depth,undef) + + endif + +! Perform a water balance check (see notes in this subroutine). + if (seaice_run.eq.0.0) then + if (run_snowtran.eq.0.0) then + CALL WATERBAL_SNOWPACK(w_balance,prec,Qcs,runoff,& + & d_canopy_int,swe_depth,glacier_melt,swe_depth_old,iter,& + & swesublim,canopy_unload,canopy_int_old,canopy_int) + endif + endif + + return + end SUBROUTINE SNOWPACK_CORE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE CANOPY_SNOW(rh,Tair,windspd,Qsi,sum_Qcs,albedo,& + & canopy_int,sprec,Qcs,dt,canopy_unload,& + & forest_LAI,sum_unload,d_canopy_int,& + & sum_d_canopy_int) + + implicit none + + real rh,Tair,windspd,V_s,Qsi,forest_LAI,dt,xImax,canopy_int,& + & d_canopy_int,Qcs,Ce,sprec,C_0,unload_melt,canopy_unload,& + & sum_Qcs,albedo,sum_unload,sum_d_canopy_int + +! Note that all of this must deal with the (kg/m2)=(mm), => (m) +! issues. Precip is in (m), all of these equations are in +! (kg/m2), and I want the outputs to be in (m). + +! Compute the sublimation loss rate coefficient for canopy snow. + CALL SUBLIM_COEF(rh,Tair,windspd,V_s,Qsi,albedo) + +! Maximum interception storage. + xImax = 4.4 * forest_LAI + +! Change in canopy load due to snow precipitation during this time +! step. Convert the canopy interception to mm. + canopy_int = 1000.0 * canopy_int + d_canopy_int = 0.7 * (xImax - canopy_int) * & + & ( 1.0 - exp((- sprec)*1000.0/xImax)) + +! Update the interception load. + canopy_int = canopy_int + d_canopy_int + +! Canopy exposure coefficient. + if (canopy_int.eq.0.0) then + Ce = 0.0 + else +! Pomeroy's k_c value +! Ce = 0.0114 * (canopy_int/xImax)**(-0.4) +! My k_c value. + Ce = 0.00995 * (canopy_int/xImax)**(-0.4) + endif + +! Canopy sublimation (kg/m2), (a negative mumber). Make sure that +! you don't sublimate more than is available. + Qcs = Ce * canopy_int * V_s * dt + Qcs = -min(canopy_int,-Qcs) + +! Remove the sublimated moisture from the canopy store. + canopy_int = canopy_int + Qcs + +! Save the sublimation in (m). + Qcs = Qcs / 1000.0 + sum_Qcs = sum_Qcs + Qcs + +! Perform a second unloading due to melt. Assume an unloading rate +! of 5.0 mm/day/C. + C_0 = 5.0 / 86400.0 + unload_melt = C_0 * max(0.0,Tair-273.15) * dt + unload_melt = min(canopy_int,unload_melt) + canopy_int = canopy_int - unload_melt + +! Keep track of the unloaded snow that reached the ground during +! this time step (m) (this will add to the snow depth). + canopy_unload = unload_melt / 1000.0 + d_canopy_int = d_canopy_int / 1000.0 + +! Save a summing array of this unloaded snow. + sum_unload = sum_unload + canopy_unload + +! Save a summing array of the change in canopy load. + sum_d_canopy_int = sum_d_canopy_int + d_canopy_int + +! Save the interception load for the next time step. Convert to m. + canopy_int = canopy_int / 1000.0 + + return + end SUBROUTINE CANOPY_SNOW + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SUBLIM_COEF(rh,Tair,windspd,V_s,Qsi,albedo) + +! Compute the sublimation loss rate coefficient for canopy snow. + + implicit none + + real pi,ro_ice,xM,R,R_dryair,vonKarman,visc_air,h_s,xlamdaT,& + & D,ro_sat,sigma,V_s,radius,xmass,windspd,rh,Tair,Qsi,Sp,& + & xN_r,xNu,xSh,top,bottom,omega,albedo + +! Constants. + pi = 2.0 * acos(0.0) + ro_ice = 917.0 + xM = 18.01 + R = 8313. + R_dryair = 287. + vonKarman = 0.4 + visc_air = 13.e-6 + h_s = 2.838e6 + xlamdaT = 0.024 + +! Particle radius. + radius = 5.0e-4 + +! Particle mass. + xmass = 4.0/3.0 * pi * ro_ice * radius**3 + +! Diffusivity of water vapor in the atmosphere. + D = 2.06e-5 * (Tair/273.0)**(1.75) + +! Saturation density of water vapor. + ro_sat = 0.622 / (R_dryair * Tair) * & + & 611.15 * exp(22.452 * (Tair - 273.15) / (Tair - 0.61)) + +! Humidity deficit. + sigma = 0.01 * rh - 1.0 + sigma = min(0.0,sigma) + sigma = max(-1.0,sigma) + +! Reynolds, Nusselt, and Sherwood numbers. + xN_r = 2.0 * radius * windspd / visc_air + xNu = 1.79 + 0.606 * xN_r**(0.5) + xSh = xNu + +! Solar radiation absorbed by the snow particle. Here assume that +! the general snow albedo is the same as the snow particle albedo. + Sp = pi * radius**2 * (1.0 - albedo) * Qsi + +! Sublimation-loss rate coefficient for an ice sphere. + omega = ((h_s * xM)/(R * Tair) - 1.0) / (xlamdaT * Tair * xNu) + top = 2.0 * pi * radius * sigma - Sp * omega + bottom = h_s * omega + 1.0/(D * ro_sat * xSh) + V_s = (top/bottom)/xmass + + return + end SUBROUTINE SUBLIM_COEF + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE WATERBAL_SNOWPACK(w_balance,prec,Qcs,runoff,& + & d_canopy_int,swe_depth,glacier_melt,swe_depth_old,iter,& + & swesublim,canopy_unload,canopy_int_old,canopy_int) + + implicit none + + integer iter + + real w_balance,prec,Qcs,runoff,d_canopy_int,swe_depth_old,& + & swe_depth,glacier_melt,swesublim,canopy_unload,canopy_int_old,& + & canopy_int + +! Note that the following balances should hold. These aren't quite +! right, but it is a place to start. +! Canopy Balance (forest): +! canopy = sprec - unload + Qcs ==> unload = sprec - canopy + Qcs +! +! Snowpack Balance (forest): +! swe_d = unload + rain - runoff ==> +! canopy + swe_d = sprec + rain + Qcs - runoff +! prec = sprec + rain +! sum_rain = sum_sprec - sum_prec +! +! Snowpack Balance (non-forest): +! swe_d = sprec + rain - runoff + subl + salt + susp + subgrid + +! glaciermelt +! +! Everywhere: +! w_balance = sum_prec + sum_Qcs - sum_runoff + sum_subl + +! sum_trans - canopy_int - swe_depth + sum_glacmelt +! +! The related variables that would need to be brought in are: +! d_canopy_int,sum_d_canopy_int,sum_unload + +! This subroutine is called for the case where SnowTran-3D is not +! run. The subroutine WATERBAL_SNOWTRAN is used if the model +! simulation includes SnowTran-3D. +! w_balance = swe_depth_old - swe_depth + prec - runoff + +! & glacier_melt - swesublim + canopy_int_old - canopy_int - +! & d_canopy_int + Qcs + canopy_unload + +! Do the snowpack. +! w_balance = swe_depth_old - swe_depth + prec - runoff - +! & glacier_melt - swesublim + +! Do the canopy. +! w_balance = canopy_int_old - canopy_int + d_canopy_int + +! & Qcs - canopy_unload + +! Do the snowpack and canopy store. + w_balance = swe_depth_old - swe_depth + prec - runoff + & + & glacier_melt - swesublim + canopy_int_old - canopy_int + & + & Qcs + + if (abs(w_balance).gt.1.0e-5) & + & print*,'water imbalance found, iter =',iter,' ',w_balance + + return + end SUBROUTINE WATERBAL_SNOWPACK + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SNOWPACK(swe_depth,snow_d,ro_snow_grid,& + & prec,ro_water,ro_nsnow,runoff,Qm,xLf,dt,rain,sprec,& + & sum_prec,sum_runoff,soft_snow_d,sum_sprec,ro_snow,& + & snow_depth,sprec_grnd,vegtype,glacier_melt,sum_glacmelt,& + & swemelt,canopy_unload,Qe,sfc_sublim_flag,sum_sfcsublim,& + & sum_swemelt,corr_factor,icorr_factor_index,swesublim,& + & ro_snowmax) + + implicit none + + real ro_snowmax,runoff,Qm,swe_depth,potmelt,swemelt,dt,& + & ro_water,xLf,snow_depth,ro_snow_grid,snow_d_melt,dz_water,& + & soft_snow_d,prec,rain,snow_d,sum_sprec,sum_prec,& + & sum_runoff,ro_nsnow,sprec,ro_snow,snow_d_new,sprec_grnd,& + & vegtype,glacier_melt,sum_glacmelt,canopy_unload,Qe,& + & xLsublim,potsublim,swesublim,snow_d_sublim,sfc_sublim_flag,& + & sum_sfcsublim,sum_swemelt,corr_factor,potmelt_tmp + integer icorr_factor_index + + runoff = 0.0 + +! SURFACE SUBLIMATION. + +! Whether static-surface (non-blowing snow) sublimation is included +! in the model calculations is controlled by the sfc_sublim_flag. +! I am waiting for the flux-tower data Matthew and I are collecting +! in Alaska, to compare with the model simulations, before +! including this part of the model in all simulations. + +! If the sfc_sublim_flag is turned on, the latent heat flux (Qe) +! calculated in ENBAL is used to add/remove snow from the snowpack. +! xLsublim = xLf + xLv = 2.5104x10^6 J/kg + 3.334x10^5 J/kg, and +! potsublim is in m swe. + + if (swe_depth.gt.0.0 .and. sfc_sublim_flag.eq.1.0) then + if (Qe.lt.0.0) then + +! Compute the snow-surface sublimation (m, swe). + xLsublim = 2.844e6 + potsublim = (- dt) * Qe / (ro_water * xLsublim) + swesublim = min(potsublim,swe_depth) + +! Save a summing array of the static surface snow sublimation. + sum_sfcsublim = sum_sfcsublim + swesublim + +! Compute the change in snow depth. Assume that this sublimated +! snow does not change the snow density and does not change the +! soft snow depth. It only reduces the snow depth and the +! associated swe depth. + swe_depth = swe_depth - swesublim + if (swe_depth.eq.0.0) then + snow_depth = 0.0 + else + snow_d_sublim = swesublim * ro_water / ro_snow_grid + snow_depth = snow_depth - snow_d_sublim + endif + else + swesublim = 0.0 + endif + else + swesublim = 0.0 + endif + +! MELTING. + +! If melting occurs, decrease the snow depth, and place the melt +! water in the 'runoff' variable. Keep track of the liquid water +! produced. + + if (Qm.gt.0.0) then + +! Compute the snow melt (m). + potmelt = dt * Qm / (ro_water * xLf) + +! Account for any snowmelt data assimilation. + if (icorr_factor_index.lt.0) then + potmelt_tmp = potmelt * corr_factor + swemelt = min(potmelt_tmp,swe_depth) +! Handle the case of no snowmelt data assimilation. + else + swemelt = min(potmelt,swe_depth) + endif + +! Compute any glacier or permanent snow-field melt (m water equiv.). + if (vegtype.eq.20.0) then + glacier_melt = potmelt - swemelt + else + glacier_melt = 0.0 + endif + +! Save a summing array of the glacier melt. + sum_glacmelt = sum_glacmelt + glacier_melt + +! Save the runoff contribution. + runoff = runoff + glacier_melt + +! Save a summing array of the snow melt. + sum_swemelt = sum_swemelt + swemelt + +! Compute the change in snow depth. + snow_d_melt = swemelt * ro_water / ro_snow_grid + snow_depth = snow_depth - snow_d_melt + snow_depth = max(0.0,snow_depth) + +! Clip snow depth values that are within machine precision of +! zero. Add the clipped moisture to the swe_melt value to +! satisfy the moisture budget. + if (snow_depth.lt.1.0e-6) then + swemelt = swemelt + snow_depth + snow_depth = 0.0 + endif + +! Compute the changes in snow density resulting from the melt. +! Assume that the melted snow is redistributed through the new +! snow depth up to a maximum density. Any additional melt water +! is added to the runoff. + if (snow_depth.eq.0.0) then + ro_snow_grid = ro_snowmax + runoff = runoff + swemelt + else + ro_snow_grid = swe_depth * ro_water / snow_depth + endif + + if (ro_snow_grid.gt.ro_snowmax) then + dz_water = snow_depth * & + & (ro_snow_grid - ro_snowmax) / ro_water + ro_snow_grid = ro_snowmax + swe_depth = snow_depth * ro_snow_grid / ro_water + runoff = runoff + dz_water + else + swe_depth = snow_depth * ro_snow_grid / ro_water + endif + + soft_snow_d = 0.0 + + else + +! These prevent values from the previous time step from being +! carried through to the next time step. + swemelt = 0.0 + glacier_melt = 0.0 + + endif + +! PRECIPITATION. + +! Precipitation falling as rain on snow contributes to a snow +! density increase, precipitation falling as snow adds to the +! snow depth, and rain falling on bare ground contributes to the +! runoff. This latest version of this section follows Justin +! Pflug's code updates. + +! We have precipitation. + if (prec.gt.0.0) then + rain = prec - sprec + +! If there is snow on the ground, all of the precipitation (rain +! and snowfall) is added to the snowpack. If there is no +! snowpack, then snowfall builds a new snowpack, and rain goes +! into runoff. + if (snow_depth.gt.0.0) then + swe_depth = swe_depth + rain + sprec_grnd + else + swe_depth = sprec_grnd + runoff = runoff + rain + endif + +! Update the new snow depth, the total snow depth, and the snow +! density. + snow_d_new = ro_water / ro_nsnow * sprec_grnd + snow_depth = snow_depth + snow_d_new + if (snow_depth.gt.0.0) then + ro_snow_grid = ro_water * swe_depth / snow_depth + endif + +! If the density threshold is exceeded, adjust that and place the +! excess moisture in the runoff array. + if (ro_snow_grid.gt.ro_snowmax) then + dz_water = snow_depth * (ro_snow_grid - ro_snowmax) / ro_water + ro_snow_grid = ro_snowmax + swe_depth = snow_depth * ro_snow_grid / ro_water + runoff = runoff + dz_water + endif + +! Here we handle the case where there is no precipitation, but +! there is snow falling from the canopy to the snowpack. + else + rain = 0.0 + if (sprec_grnd.gt.0.0) then + swe_depth = swe_depth + sprec_grnd + snow_d_new = ro_water / ro_snow * sprec_grnd + snow_depth = snow_depth + snow_d_new + ro_snow_grid = ro_water * swe_depth / snow_depth + endif + endif + +! The following are set up to be compatible with SnowTran-3D, and +! are in snow-depth units. The sum_sprec corrections are done +! in the SnowTran-3D code. + +! Assume any rain sets the soft snow depth to zero. + if (rain.eq.0.0) then + soft_snow_d = soft_snow_d + sprec_grnd * ro_water / ro_snow + else + soft_snow_d = 0.0 + endif + + snow_d = swe_depth * ro_water / ro_snow + sum_sprec = sum_sprec + sprec_grnd + +! The following are in swe-depth units. + sum_prec = sum_prec + prec + sum_runoff = sum_runoff + runoff + + return + end SUBROUTINE SNOWPACK + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE DDENSITY(ro_snow_grid,swe_depth,Tf,Tsfc,dt,A1,A2,& + & snow_depth,ro_water,ro_snowmax) + + implicit none + + real snow_depth,Tsg,Tf,Tsnow,Tsfc,ro_snow_grid,dt,A1,A2,& + & swe_depth_star,ro_snowmax,ro_water,swe_depth,ro_adjust + +! ro_adjust is a snow density rate adjustment factor that can be +! used to make the snow density increase faster (ro_adjust > 1.0) +! or slower (ro_adjust < 1.0). + ro_adjust = 5.0 + + if (snow_depth.gt.0.0) then + +! Assume that the snow-ground interface temperature is -1.0 C. + Tsg = Tf - 1.0 + Tsnow = 0.5 * (Tsg + Tsfc) + swe_depth_star= 0.5 * swe_depth + ro_snow_grid = ro_snow_grid + ro_adjust * dt * & + & (A1 * swe_depth_star * ro_snow_grid * & + & exp((- 0.08)*(Tf-Tsnow)) * exp((- A2)*ro_snow_grid)) + ro_snow_grid = min(ro_snowmax,ro_snow_grid) + snow_depth = ro_water * swe_depth / ro_snow_grid + + endif + + return + end SUBROUTINE DDENSITY + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SOLVEWB(xnew,Tf,Tair,rh,xLs,Cp,sfc_pressure) + + implicit none + + real A,B,C,ea,rh,Tair,Tf,tol,old,fprime,xLs,Cp,funct,xnew,& + & sfc_pressure + + integer maxiter,i + +! Coeffs for saturation vapor pressure over water (Buck 1981). +! Note: temperatures for Buck`s equations are in deg C, and +! vapor pressures are in mb. Do the adjustments so that the +! calculations are done with temperatures in K, and vapor +! pressures in Pa. + +! Over water. + A = 6.1121 * 100.0 + B = 17.502 + C = 240.97 +! Over ice. +! A = 6.1115 * 100.0 +! B = 22.452 +! C = 272.55 + +! Atmospheric vapor pressure from relative humidity data. + ea = rh / 100.0 * A * exp((B * (Tair - Tf))/(C + (Tair - Tf))) + +! Solve for the wet bulb temperature. + tol = 1.0e-2 + maxiter = 20 + old = Tair + + do i=1,maxiter + fprime = 1.0 + xLs/Cp * 0.622/sfc_pressure * log(10.0) * & + & 2353. * (10.0**(11.40 - 2353./old)) / old**2 + funct = old - Tair + xLs/Cp * 0.622/sfc_pressure * & + & (10.0**(11.40-2353./old) - ea) + xnew = old - funct/fprime + if (abs(xnew - old).lt.tol) return + old = xnew + end do + +! If the maximum iterations are exceeded, send a message and set +! the wet bulb temperature to the air temperature. + write (*,102) + 102 format('max iteration exceeded when solving for Twb') + xnew = Tair + + return + end SUBROUTINE SOLVEWB + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE NSNOWDEN(ro_nsnow,Twb,Tf,dt) + + implicit none + + real Twgmax,Tf,Twb,ro_nsnow,scalefact,dt,wt + + Twgmax = Tf + 1.0 + if (Twb.ge.258.15 .and. Twb.le.Twgmax) then + ro_nsnow = 50. + 1.7 * (Twb - 258.15)**1.5 + elseif (Twb.lt.258.15) then + ro_nsnow = 50.0 + else + ro_nsnow = 158.8 + endif + +! For one day time steps, this equation gives a new snow density at +! the end of the 24 hour period which is too low, by an approximate +! factor of X. Thus, for a daily time step, I scale the density by +! X before returning it to the main program. + + scalefact = 1.0 + if (dt.eq.86400.0) then + if (ro_nsnow.le.158.8) then + wt = 1.0 + (50.0 - ro_nsnow) / 108.8 + ro_nsnow = wt * scalefact * ro_nsnow + ro_nsnow + ro_nsnow = min(158.8,ro_nsnow) + endif + endif + + return + end SUBROUTINE NSNOWDEN + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE POSTPROC(ro_snow_grid,xro_snow,snow_depth,undef) + + implicit none + + real snow_depth,xro_snow,undef,ro_snow_grid + + if (snow_depth.eq.0.0) then + xro_snow = undef + else + xro_snow = ro_snow_grid + endif + + return + end SUBROUTINE POSTPROC + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE CONSTS_SNOWPACK(Cp,xLs,ro_ice,xLf,Tf,A1,A2,ro_water,& + & Cp_snow,ro_snowmax) + + implicit none + + real Cp,xLs,ro_ice,xLf,Tf,A1,A2,ro_water,Cp_snow,ro_snowmax + + Cp = 1004. + xLs = 2.500e6 + ro_ice = 917.0 + xLf = 3.34e5 + Tf = 273.15 + A1 = 0.0013 + A2 = 0.021 + ro_water = 1000.0 + Cp_snow = 2106. + ro_snowmax = 550.0 + + return + end SUBROUTINE CONSTS_SNOWPACK + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE MULTI_LAYER_SNOW(KK,ro_layer,Tf,dt,ro_water,& + & ro_ice,T_old,snod_layer,swed_layer,Qm,ro_snowmax,rain,& + & xLf,Cp_snow,melt_flag,runoff,tslsnowfall,ro_nsnow,& + & sprec,Tsfc,tsls_threshold,gamma,max_layers,change_layer,& + & dz_snow_min,snow_depth,swe_depth,undef,canopy_unload,& + & vegtype,glacier_melt,sum_glacmelt,sum_swemelt,snow_d,& + & Qe,sfc_sublim_flag,sum_sfcsublim,soft_snow_d,ro_snow,& + & sum_sprec,sprec_grnd_ml,sum_prec,prec,sum_runoff,& + & ro_snow_grid,xro_snow,swesublim,A1,A2,windspd_2m,& + & sfc_pressure,diam_layer,flux_layer,corr_factor,& + & icorr_factor_index) + + use snowmodel_inc + implicit none + + integer KK,max_layers,k + integer melt_flag(nz_max) + + real snod_layer(nz_max) + real swed_layer(nz_max) + real ro_layer(nz_max) + real T_old(nz_max) + real gamma(nz_max) + real diam_layer(nz_max) + real flux_layer(nz_max) + real frac_liq(nz_max) + + real Tf,dt,ro_water,ro_ice,Qm,ro_snowmax,rain,xLf,Cp_snow,& + & runoff,tslsnowfall,ro_nsnow,sprec,Tsfc,tsls_threshold,& + & dz_snow_min,snow_depth,swe_depth,undef,change_layer,& + & canopy_unload,vegtype,glacier_melt,sum_glacmelt,sum_swemelt,& + & soft_snow_d,Qe,sfc_sublim_flag,sum_sfcsublim,snow_d,& + & ro_snow,sum_sprec,sprec_grnd_ml,sum_prec,prec,sum_runoff,& + & ro_snow_grid,xro_snow,swesublim,A1,A2,windspd_2m,& + & sfc_pressure,corr_factor + + integer icorr_factor_index + +! THIS IS THE MULTI-LAYER SNOWPACK MODEL. + +! Note there is some confusion with the dy - dz notation used here. +! In the multi-layer code 'y' is the vertical coordinate. This is +! a hold-over from a time when my temperature solution code had +! y going up-down. + +! Compute the snow density change due to compaction and the impact +! of wind on the top snow layer. + CALL DDENSITY_ML(ro_layer,Tf,dt,ro_water,ro_snowmax,& + & T_old,KK,snod_layer,A1,A2,windspd_2m) + +! Calculate the rainfall from prec and sprec. + if (prec.gt.0.0) then + rain = prec - sprec + else + rain = 0.0 + endif + +! Distribute surface melt and rain precipitation through the snowpack. + CALL MELT_SNOW_ML(KK,swed_layer,ro_water,ro_layer,Qm,dt,& + & snod_layer,ro_snowmax,rain,xLf,Cp_snow,Tf,T_old,melt_flag,& + & runoff,canopy_unload,swe_depth,snow_depth,vegtype,& + & glacier_melt,sum_glacmelt,sum_swemelt,soft_snow_d,Qe,& + & sfc_sublim_flag,sum_sfcsublim,swesublim,ro_snow,& + & corr_factor,icorr_factor_index) + +! Account for the accumulation of snow precipitation on the snowpack. + CALL PRECIP_ML(KK,ro_layer,snod_layer,ro_water,tslsnowfall,& + & swed_layer,ro_nsnow,T_old,Tsfc,tsls_threshold,dt,& + & melt_flag,soft_snow_d,ro_snow,sum_sprec,sprec_grnd_ml,& + & sum_prec,prec,sum_runoff,runoff,snow_d,snow_depth,swe_depth,& + & diam_layer) + +! Merge layers if the number of layers exceeds some maximum number of +! layers or if a layer gets thinner than some minimum thickness. + CALL MERGE_LAYERS_ML(KK,ro_layer,snod_layer,swed_layer,& + & T_old,ro_water,max_layers,change_layer,dz_snow_min,melt_flag,& + & diam_layer) + +! The grain-growth model can account for the liquid fraction in the +! snow. The model deals with three different wetness conditions +! differently: +! frac_liq < 1.0e-4 is considered dry +! 1.0e-4 <= frac_liq < 0.09 is considered wet +! frac_liq >= 0.09 is considered very wet +! Note that there is also a different vapor diffusion threshold +! that is also used (0.02). +! I have not implemented these yet, and for now assume that the +! snow is dry. + do k=1,KK + frac_liq(k) = 0.0 + enddo + +! Update the grain size using the SNTHERM equations. + CALL GET_GRAIN_SIZE_SNTHERM(KK,dt,ro_layer,undef,& + & diam_layer,frac_liq,T_old,snod_layer,Tf,sfc_pressure,& + & flux_layer) + +! Calculate the temperature of each snow layer. + CALL SNOWTEMP_ML(gamma,T_old,Tsfc,KK,dt,ro_layer,Cp_snow,& + & Tf,snod_layer,melt_flag,diam_layer) + +! Postprocess the data. + CALL POST_PROC_ML(KK,snod_layer,snow_depth,swe_depth,undef,& + & swed_layer,gamma,ro_layer,melt_flag,T_old,Tf,ro_snow_grid,& + & ro_water,xro_snow,ro_snow) + + return + end SUBROUTINE MULTI_LAYER_SNOW + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GET_GRAIN_SIZE_SNTHERM(nlayers,dt,ro_layer,undef,& + & diam_layer,frac_liq,T_layer,dz,Tf,press,& + & flux_layer) + +! Someday I need to make the above terminology consistent with the +! rest of the code (like that below). +! SUBROUTINE GET_GRAIN_SIZE_SNTHERM(KK,dt,ro_layer,diam_layer, +! & frac_liq,T_old,snod_layer,Tf,sfc_pressure) + +! This code follows Jordan 1991 (Tech Doc for SNTHERM.89; this is +! referenced as "SNTH89" in the comments below). The equations +! that are solved are those in the original SNTHERM89 code. + +! De0 : Effective diffusion coefficient for water vapor in +! snow (m^2/s) at 100000 Pa and 273.15K +! press : Barometric pressure (Pa) +! dc(nlayers) : Vapor diffusion coefficient for = de*change in +! saturation vapor pressure with temperature +! vapor_flux(nlayers) : Average diffusive flux at nodal centroid +! [(upper+lower)/2] (kg/m^2 s) +! T_layer(nlayers) : Temperature in center (node) of layer (K) +! g1 : Grain growth constant for dry snow (5.0e-7) +! g2 : Grain growth constant for wet snow (4.0e-12) +! diam : Nodal effective grain diameter (m) +! frac_liq : Volume fraction of liquid water +! dt : Time step (s) +! e0 : Saturation vapor pressure at 0 degrees C (mb) +! Rw : Gas constant for water vapor (461.5) (j/kg-K) +! ro_ice : Ice density (917.0) (kg/m^3) +! ro_snow(nlayers) : Nodal bulk snow density (kg/m^3) + + use snowmodel_inc + implicit none + +! integer k,KK + integer nlayers,k,nzm + + real diam_layer(nz_max) + real flux_layer(nz_max) + real ro_layer(nz_max) + real T_layer(nz_max) + real frac_liq(nz_max) + real dz(nz_max) + real porosity(nz_max) + real diff_coef(nz_max) + real C_kT(nz_max) + real vapor_flux(nz_max) + +! These are the values at the control volume boundaries. + real T_layer_bndry(nz_max+1) + real dz_bndry(nz_max+1) + real diff_coef_bndry(nz_max+1) + + real g1,g2,ro_ice,De0,Des,dt,Tf,press,grain_scale,pi,& + & xLvi_o_Rw,c1i,xLvw_o_Rw,c1w,vaporvol,Uv_bot,Uv_top,& + & diam_mm,undef + +! real e0,Rw,xLvw,xLvi + + data g1 /5.0e-7/ + data g2 /4.0e-12/ + data ro_ice /917.0/ + data De0 /9.2e-5/ + +! Calculate the vapor diffusion constants for water(w) and ice(i). +! These are constants, so I just save the values as data values. +! data e0 /613.6/ +! data Rw /461.5/ +! data xLvw /2.505e6/ +! data xLvi /2.838e6/ +! xLvw_o_Rw = xLvw / Rw +! c1w = e0 * exp(xLvw_o_Rw / Tf) / Rw +! xLvi_o_Rw = xLvi / Rw +! c1i = e0 * exp(xLvi_o_Rw / Tf) / Rw +! print *,xLvw_o_Rw +! print *,c1w +! print *,xLvi_o_Rw +! print *,c1i + + data xLvw_o_Rw /5427.952/ + data c1w /5.6739e8/ + data xLvi_o_Rw /6149.513/ + data c1i /7.9639e9/ + + pi = 2.0 * acos(0.0) + +! This 'grain_scale' controls allows the user additional control +! on the grain-growth calculations. Values greater than 1.0 +! grows grains faster, and values less than 1.0 grows grains +! slower. +! data grain_scale /1.0/ +! data grain_scale /0.5/ + data grain_scale /2.5/ + +! Initialize the flux output variable so the no-layer outputs make +! sense. + do k=1,nz_max + flux_layer(k) = undef + enddo + +! Define the snow porosity. + do k=1,nlayers + porosity(k) = 1.0 - (ro_layer(k) / ro_ice) + +! The only place this value should have problems is if ro_layer is +! undef. It should be well-constrained before getting to this +! subroutine. + if (porosity(k) .lt. 0.0) porosity(k) = 0.0 + enddo + +! Diffusion coefficient for each snow layer. + do k=1,nlayers + +! Eqn. 20 of SNTH89. + if (frac_liq(k) .gt. 0.02) then + C_kT(k) = c1w * exp(- xLvw_o_Rw / T_layer(k)) * & + & (xLvw_o_Rw / T_layer(k) - 1.0) / T_layer(k)**2 + else + C_kT(k) = c1i * exp(- xLvi_o_Rw / T_layer(k)) * & + & (xLvi_o_Rw / T_layer(k) - 1.0) / T_layer(k)**2 + endif + +! SNTH89 assumed the porosity does not affect the fluxes. SNTH89 +! had a note that said "The diffusive vapor flux in snow is +! customarily taken as independent of porosity, which is +! generally a consequence of the 'hand-to-hand' process of +! vapor diffusion." Conceptually, it seems like if the porosity +! goes to zero the fluxes should stop. I do that here. If you +! don't like this idea, you can just comment out these 3 lines. +! Scale the flux by the available vapor. + vaporvol = porosity(k) - frac_liq(k) + vaporvol = max(0.0,vaporvol) + C_kT(k) = vaporvol * C_kT(k) + +! Left part of Eqn. 21 of SNTH89. + Des = De0 * (100000.0 / press) * (T_layer(k) / Tf)**6 + +! Eqn. 21 of SNTH89. The vapor diffusion coefficents. + diff_coef(k) = Des * C_kT(k) + + if (diff_coef(k).le.0.0) then + print *,'diff_coef(k) <= 0.0',k,diff_coef(k) + print *,porosity(k),ro_layer(k) + endif + + enddo + +! Include the boundary information in the required arrays. This +! information, and the flux calcuations below, follow Glen's 3D +! thermal sea ice growth model code (see /nice/heat/temp_3d.f, +! or SeaIce-3D). + +! Number of shifted layers. + nzm = nlayers + 1 + +! Control volume size. + dz_bndry(1) = 0.0 + do k=2,nzm + dz_bndry(k) = dz(k-1) + enddo + dz_bndry(nzm+1) = 0.0 + +! do k=1,nzm+1 +! print *, k,dz_bndry(k) +! enddo + +! Temperature. + T_layer_bndry(1) = T_layer(1) + do k=2,nzm + T_layer_bndry(k) = T_layer(k-1) + enddo + T_layer_bndry(nzm+1) = T_layer(nzm-1) + +! do k=1,nzm+1 +! print *, k,T_layer_bndry(k) +! enddo + +! Diffusion coefficients. + diff_coef_bndry(1) = diff_coef(1) + do k=2,nzm + diff_coef_bndry(k) = diff_coef(k-1) + enddo + diff_coef_bndry(nzm+1) = diff_coef(nzm-1) + +! do k=1,nzm+1 +! print *, k,diff_coef_bndry(k) +! enddo + +! Calculate the vapor flux across the control volume walls (Eqn. +! 21 of SNTH89). This is: flux = - diff_coef * dT/dz, where +! diff_coef = Des * C_kT. See page 45 of Patankar (1980) for +! a description of what is being done with the harmonic mean +! calculations. Here I am solving Patankar's Eqn. 4.8, with +! delx_e- = 0.5*dx_P, and delx_e+ = 0.5*dx_E. + do k=2,nzm + + if (dz_bndry(k-1).eq.0.0 .and. dz_bndry(k).eq.0.0) then + Uv_bot = 0.0 + elseif (dz_bndry(k).eq.0.0 .and. dz_bndry(k+1).eq.0.0) then + Uv_top = 0.0 + else + Uv_bot = - 2.0 * (T_layer_bndry(k) - T_layer_bndry(k-1)) / & + & (dz_bndry(k-1) / diff_coef_bndry(k-1) + & + & dz_bndry(k) / diff_coef_bndry(k)) + Uv_top = - 2.0 * (T_layer_bndry(k+1) - T_layer_bndry(k)) / & + & (dz_bndry(k) / diff_coef_bndry(k) + & + & dz_bndry(k+1) / diff_coef_bndry(k+1)) + endif + +! Assume the flux at the center of the control volume is the average +! of the fluxes at the control volume walls. Also note that we +! don't care about the direction of the fluxes; we are just +! assuming that the vapor transport is growing grains, regardless +! of the direction. This is used in the grain growth algorithm. + vapor_flux(k-1) = (abs(Uv_bot) + abs(Uv_top)) / 2.0 + +! Save a record of the layer fluxes, including the direction of the +! flow. Here I am saving the flux across the top of each layer. +! Under the assumption that the flux across the bottom of the +! bottom layer is zero, this should be enough information to +! calculate d_flux/d_z and get the mass loss and/or gain in each +! layer. + flux_layer(k-1) = Uv_top + + enddo + +! Because the zero temperature gradient assumed at the boundaries +! is not realistic, set the boundary fluxes equal to those just +! inside the boundaries. + vapor_flux(1) = vapor_flux(2) + vapor_flux(nlayers) = vapor_flux(nlayers-1) + +! Because below we don't allow the abs(fluxes) to be over 1.0e-6, +! do the same thing here. + do k=1,nlayers + + if (flux_layer(k).lt.-1.0e-6) then + flux_layer(k) = -1.0e-6 + elseif (flux_layer(k).gt.1.0e-6) then + flux_layer(k) = 1.0e-6 + endif + +! Convert these to fluxes per dt (instead of per sec). Without +! this the values are something like 10^-11. + flux_layer(k) = dt * flux_layer(k) + + enddo + +! Update the snow grain diameter. + do k=1,nlayers + + if (diam_layer(k) .le. 0.0) then + print *, 'execution halted because diam_layer <= 0.0' + print *, 'layer = ',k,' diam_layer(k) =',diam_layer(k) + stop + endif + +! Dry snow: The cut-off bewteen dry and wet snow is arbitrarily +! set at 0.0001. + if (frac_liq(k) .lt. 1.0e-4) then + +! The max vapor flux available for growth is arbitrarily set at +! 1.0e-6. This can be increased if you want to allow larger +! grains to grow, if the temperature gradients are available to +! drive greater fluxes. Here I have also included a scaling +! term that can be used to increase or decrease the growth rate +! of the grains to better match any observational datasets you +! might have. Eqn. 33 of SNTH89. + if (abs(vapor_flux(k)) .lt. 1.0e-6) then + diam_layer(k) = diam_layer(k) + grain_scale * dt * g1 * & + & abs(vapor_flux(k)) / diam_layer(k) + else + diam_layer(k) = diam_layer(k) + grain_scale * dt * g1 * & + & 1.0e-6 / diam_layer(k) + endif + +! Wet snow: Different equations for liquid volume fraction +! above and below 0.09. + else + if (frac_liq(k) .lt. 0.09) then +! Eqn. 34a of SNTH89. + diam_layer(k) = diam_layer(k) + grain_scale * dt * g2 * & + & (frac_liq(k)+0.05) / diam_layer(k) + else +! Eqn. 34b of SNTH89. + diam_layer(k) = diam_layer(k) + grain_scale * dt * g2 * & + & 0.14 / diam_layer(k) + endif + endif + +! Max grain size set at 5mm, based on Arctic Alaska depth hoar +! observations (larger sizes are possible but not common). + if (diam_layer(k) .gt. 5.0e-3) diam_layer(k) = 5.0e-3 + + enddo + + return + end SUBROUTINE GET_GRAIN_SIZE_SNTHERM + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GETGAMMA(KK,ro_layer,gamma) + + use snowmodel_inc + implicit none + + integer k,KK + real ro_layer(nz_max) + real gamma(nz_max) + +! Compute the snow thermal conductivity (gamma) from the snow density. + do k=1,KK + if (ro_layer(k).lt.156.0) then + gamma(k) = 0.023 + 0.234 * (ro_layer(k)/1000.0) + else + gamma(k) = 0.138 - 1.01 * (ro_layer(k)/1000.0) + 3.233 * & + & (ro_layer(k)/1000.0)**2 + endif + enddo + + return + end SUBROUTINE GETGAMMA + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GET_THERMAL_CONDUCTIVITY(KK,ro_layer,diam_layer,gamma) + +! This program calculates the thermal conductivity for a given +! grain size. + +! The grain size here is provided in mm, and is assumed to range +! from 0.5 mm (wind slab) to 5.0 mm (depth hoar). + + use snowmodel_inc + implicit none + + integer k,KK + real ro_layer(nz_max) + real gamma(nz_max) + real diam_layer(nz_max) + + real cond_slab,cond_hoar,wt,x1,x2,xx + +! Convert the diameter limits from mm to m. + x1 = 0.5 / 1000.0 + x2 = 5.0 / 1000.0 + + do k=1,KK + if (ro_layer(k).lt.180.0) then + cond_slab = 3.94e-2 + 2.00e-4*ro_layer(k) + else + cond_slab = 1.55e-1 - 1.02e-3*ro_layer(k) + & + & 3.21e-6*ro_layer(k)**2 + endif + + cond_hoar = 3.00e-2 + 2.00e-4*ro_layer(k) + +! Calculate the weighting factors. + xx = diam_layer(k) + wt = (xx - x1) / (x2 - x1) + +! Calculate the thermal conductivity. + gamma(k) = wt * cond_hoar + (1.0 - wt) * cond_slab + + enddo + + return + end SUBROUTINE GET_THERMAL_CONDUCTIVITY + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE POST_PROC_ML(KK,snod_layer,snow_depth,swe_depth,undef,& + & swed_layer,gamma,ro_layer,melt_flag,T_old,Tf,ro_snow_grid,& + & ro_water,xro_snow,ro_snow) + + use snowmodel_inc + implicit none + + integer k,KK + + real snod_layer(nz_max) + real swed_layer(nz_max) + real gamma(nz_max) + real ro_layer(nz_max) + real T_old(nz_max) + integer melt_flag(nz_max) + + real snow_depth,swe_depth,undef,Tf,ro_snow_grid,ro_water,& + & xro_snow,ro_snow + +! Calculate the total snow and swe depth, and the bulk snow density. + snow_depth = 0.0 + swe_depth = 0.0 + do k=1,KK + snow_depth = snow_depth + snod_layer(k) + swe_depth = swe_depth + swed_layer(k) + enddo + if (snow_depth.le.0.0) then + ro_snow_grid = ro_snow + else + ro_snow_grid = swe_depth * ro_water / snow_depth + endif + +! Set any areas outside the snowpack to undef. + do k=KK+1,nz_max + gamma(k) = undef + ro_layer(k) = undef + T_old(k) = undef + Tf + melt_flag(k) = nint(undef) + snod_layer(k) = undef + swed_layer(k) = undef + enddo + +! Clean up the snow density array so there are no values when +! there is no snow. + if (snow_depth.eq.0.0) then + xro_snow = undef + else + xro_snow = ro_snow_grid + endif + + return + end SUBROUTINE POST_PROC_ML + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE MERGE_LAYERS_ML(KK,ro_layer,snod_layer,swed_layer,& + & T_old,ro_water,max_layers,change_layer,dz_snow_min,melt_flag,& + & diam_layer) + + use snowmodel_inc + implicit none + + integer k,KK,kkk,k_small,max_layers,icount,kkkk + + real swed_layer(nz_max) + real ro_layer(nz_max) + real snod_layer(nz_max) + real T_old(nz_max) + real diam_layer(nz_max) + integer melt_flag(nz_max) + + real snod_layer_small,ro_water,dz_snow_min,change_layer + +! Merge layers if the number of layers exceeds some maximum number of +! layers or if a layer gets thinner than some minimum thickness. +! Do this in snow_depth space because that is the grid the snow +! temperatures are being calculated on. + +! If any layer is thinner than the minimum layer thickness, merge it +! with the layer below. If that layer is layer 1, merge it with +! layer 2. If there is only one layer left, let it be smaller than +! the minimum thickness. Don't do any of this if a new layer is +! being built; only do it for layers below the top layer. + change_layer = 0.0 + +! Count how many layers are less than the minimum thickness, excluding +! the case where there is only one layer. + icount = 0 + if (KK.gt.1) then +! do k=1,KK + do k=1,KK-1 + if (snod_layer(k).lt.dz_snow_min) then + icount = icount + 1 + endif + enddo + endif + +! Note that if two thin layers are together, the merge may take +! out the other one. + do k=1,icount + change_layer = 1.0 + +! This gets and processes the last occurance. +! do kkkk=1,KK + do kkkk=1,KK-1 + if (snod_layer(kkkk).lt.dz_snow_min) then + k_small = kkkk + endif + enddo + + if (k_small.eq.1) then + snod_layer(1) = snod_layer(1) + snod_layer(2) + swed_layer(1) = swed_layer(1) + swed_layer(2) + ro_layer(1) = swed_layer(1) * ro_water / snod_layer(1) + T_old(1) = T_old(2) + diam_layer(1) = diam_layer(2) + melt_flag(1) = melt_flag(2) + KK = KK - 1 + do kkk=2,KK + snod_layer(kkk) = snod_layer(kkk+1) + swed_layer(kkk) = swed_layer(kkk+1) + ro_layer(kkk) = swed_layer(kkk) * ro_water / snod_layer(kkk) + T_old(kkk) = T_old(kkk+1) + diam_layer(kkk) = diam_layer(kkk+1) + melt_flag(kkk) = melt_flag(kkk+1) + enddo + else + snod_layer(k_small-1) = snod_layer(k_small-1) + & + & snod_layer(k_small) + swed_layer(k_small-1) = swed_layer(k_small-1) + & + & swed_layer(k_small) + ro_layer(k_small-1) = swed_layer(k_small-1) * ro_water / & + & snod_layer(k_small-1) + T_old(k_small-1) = T_old(k_small) + diam_layer(k_small-1) = diam_layer(k_small) + melt_flag(k_small-1) = melt_flag(k_small) + KK = KK - 1 + do kkk=k_small,KK + snod_layer(kkk) = snod_layer(kkk+1) + swed_layer(kkk) = swed_layer(kkk+1) + ro_layer(kkk) = swed_layer(kkk) * ro_water / snod_layer(kkk) + T_old(kkk) = T_old(kkk+1) + diam_layer(kkk) = diam_layer(kkk+1) + melt_flag(kkk) = melt_flag(kkk+1) + enddo + endif + enddo + +! Where the number of layers exceeds some maximum number of layers, +! find the thinnest layer and merge it with the one below. For the +! case where the thinnest layer is the bottom layer, merge it with +! layer 2. + if (KK.eq.max_layers+1) then + change_layer = 1.0 +! Find the thinnest layer. + snod_layer_small = 1000.0 + do k=1,KK + if (snod_layer(k).lt.snod_layer_small) then + snod_layer_small = snod_layer(k) + k_small = k + endif + enddo + +! Adjust accordingly. Note that layers below the thin layer do not +! change, unless the thin layer is layer 1. Also, since the layer +! is thin, assign the new layer the thick layer temperature. + if (k_small.eq.1) then + snod_layer(1) = snod_layer(1) + snod_layer(2) + swed_layer(1) = swed_layer(1) + swed_layer(2) + ro_layer(1) = swed_layer(1) * ro_water / snod_layer(1) + T_old(1) = T_old(2) + diam_layer(1) = diam_layer(2) + melt_flag(1) = melt_flag(2) + KK = KK - 1 + do kkk=2,KK + snod_layer(kkk) = snod_layer(kkk+1) + swed_layer(kkk) = swed_layer(kkk+1) + ro_layer(kkk) = swed_layer(kkk) * ro_water / snod_layer(kkk) + T_old(kkk) = T_old(kkk+1) + diam_layer(kkk) = diam_layer(kkk+1) + melt_flag(kkk) = melt_flag(kkk+1) + enddo + else + snod_layer(k_small-1) = snod_layer(k_small-1) + & + & snod_layer(k_small) + swed_layer(k_small-1) = swed_layer(k_small-1) + & + & swed_layer(k_small) + ro_layer(k_small-1) = swed_layer(k_small-1) * ro_water / & + & snod_layer(k_small-1) + T_old(k_small-1) = T_old(k_small) + diam_layer(k_small-1) = diam_layer(k_small) + melt_flag(k_small-1) = melt_flag(k_small) + KK = KK - 1 + do kkk=k_small,KK + snod_layer(kkk) = snod_layer(kkk+1) + swed_layer(kkk) = swed_layer(kkk+1) + ro_layer(kkk) = swed_layer(kkk) * ro_water / snod_layer(kkk) + T_old(kkk) = T_old(kkk+1) + diam_layer(kkk) = diam_layer(kkk+1) + melt_flag(kkk) = melt_flag(kkk+1) + enddo + endif + endif + +! Now that we are done with change_layer, set it equal to k_small, +! the position of the change. + if (change_layer.eq.1.0) change_layer = real(k_small) + + return + end SUBROUTINE MERGE_LAYERS_ML + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE MELT_SNOW_ML(KK,swed_layer,ro_water,ro_layer,Qm,dt,& + & snod_layer,ro_snowmax,rain,xLf,Cp_snow,Tf,T_old,melt_flag,& + & runoff,canopy_unload,swe_depth,snow_depth,vegtype,& + & glacier_melt,sum_glacmelt,sum_swemelt,soft_snow_d,Qe,& + & sfc_sublim_flag,sum_sfcsublim,swesublim,ro_snow,& + & corr_factor,icorr_factor_index) + + use snowmodel_inc + implicit none + + integer k,KK + + real swed_layer(nz_max) + real ro_layer(nz_max) + real snod_layer(nz_max) + real T_old(nz_max) + real swemelt,extra,ro_water,swe_space,add,runoff,ro_snowmax,& + & rain,delta_T,xLf,Cp_snow,extra_delta_T,Tf,dt,Qm,canopy_unload,& + & potmelt,swe_depth,snow_depth,vegtype,glacier_melt,& + & sum_glacmelt,sum_swemelt,soft_snow_d,Qe,sfc_sublim_flag,& + & xLsublim,potsublim,swesublim,sum_sfcsublim,ro_snow,& + & potmelt_tmp,corr_factor + + integer icorr_factor_index + + integer melt_flag(nz_max) + +! Initialize the runoff array. + runoff = 0.0 + +! SURFACE SUBLIMATION. + +! Whether static-surface (non-blowing snow) sublimation is included +! in the model calculations is controlled by the sfc_sublim_flag. +! I am waiting for the flux-tower data Matthew and I are collecting +! in Alaska, to compare with the model simulations, before +! including this part of the model in all simulations. + +! If the sfc_sublim_flag is turned on, the latent heat flux (Qe) +! calculated in ENBAL is used to add/remove snow from the snowpack. +! xLsublim = xLf + xLv = 2.5104x10^6 J/kg + 3.334x10^5 J/kg, and +! potsublim is in m swe. + + if (swe_depth.gt.0.0 .and. sfc_sublim_flag.eq.1.0) then + if (Qe.lt.0.0) then +! Compute the snow-surface sublimation (m, swe). + xLsublim = 2.844e6 + potsublim = (- dt) * Qe / (ro_water * xLsublim) + swesublim = min(potsublim,swe_depth) +! Save a summing array of the static surface snow sublimation. + sum_sfcsublim = sum_sfcsublim + swesublim + else + swesublim = 0.0 + endif + else + swesublim = 0.0 + endif + +! Modify the swe layer thicknesses, and reduce the number of layers +! if needed. + if (swesublim.gt.0.0) then +! Check to see whether this sublimation requires a layer reduction. + CALL REDUCE_LAYERS(swesublim,swed_layer,KK) + +! Build the new snow layer thicknesses, and recalculate the total +! snow and swe depths. Assume this sublimated snow does not +! change the snow density and does not change the soft snow depth. +! It only reduces the snow depth and the associated swe depth. + snow_depth = 0.0 + swe_depth = 0.0 + do k=1,KK + snod_layer(k) = swed_layer(k) * ro_water / ro_layer(k) + snow_depth = snow_depth + snod_layer(k) + swe_depth = swe_depth + swed_layer(k) + enddo + endif + +! MELTING. + + if (Qm.gt.0.0) then + +! Convert the melt energy to water equivalent melt depth (m). + potmelt = dt * Qm / (ro_water * xLf) + +! Account for any snowmelt data assimilation. + if (icorr_factor_index.lt.0) then + potmelt_tmp = potmelt * corr_factor + swemelt = min(potmelt_tmp,swe_depth) +! Handle the case of no snowmelt data assimilation. + else + swemelt = min(potmelt,swe_depth) + endif + +! Compute any glacier or permanent snow-field melt (m water equiv.). + if (vegtype.eq.20.0) then + glacier_melt = potmelt - swemelt + else + glacier_melt = 0.0 + endif + +! Save a summing array of the glacier melt. + sum_glacmelt = sum_glacmelt + glacier_melt + +! Save the runoff contribution. + runoff = runoff + glacier_melt + +! Save a summing array of the snow melt. + sum_swemelt = sum_swemelt + swemelt + +! In the presence of melt, zero out the soft snow layer. + soft_snow_d = 0.0 + + else + +! These prevent values from the previous time step from being +! carried through to the next time step. + swemelt = 0.0 + glacier_melt = 0.0 + + endif + +! Handle the case where rain and canopy_unload fall on snow-free +! ground (this is not included in the code below, nor in the +! PRECIP_ML subroutine, so I include it here). + if (swe_depth.eq.0.0) then + runoff = runoff + rain + canopy_unload + endif + +! Deal with melting snow. + + if (swemelt.gt.0.0) then +! Check to see whether this melt leads to a reduction in layers. + CALL REDUCE_LAYERS(swemelt,swed_layer,KK) + +! Build the new snow layer thicknesses, and initiate the melt_flag. + do k=1,KK + snod_layer(k) = swed_layer(k) * ro_water / ro_layer(k) + melt_flag(k) = 0 + enddo + endif + +! Add the melt, rain, and canopy unloading (assumed to be wet as rain) +! to the remaining snow layer thicknesses, up to the maximum snow +! density, and let the rest of the melt drain out the snowpack bottom +! as runoff. + extra = swemelt + rain + canopy_unload + if (extra.gt.0.0) then + do k=KK,1,-1 + if (extra.gt.0.0) then + swe_space = snod_layer(k) * (ro_snowmax - ro_layer(k)) / & + & ro_water + add = min(swe_space,extra) + swed_layer(k) = swed_layer(k) + add + extra = extra - add + endif + if (snod_layer(k).le.0.0) then + ro_layer(k) = ro_snow + else + ro_layer(k) = swed_layer(k) * ro_water / snod_layer(k) + endif + enddo + runoff = extra + endif + +! Also take into account the refreezing of this liquid in a cold +! snowpack. Assume that the liquid will fully warm each layer before +! moving on to the next layer. + extra = swemelt + rain + canopy_unload + if (extra.gt.0.0) then + do k=KK,1,-1 + if (extra.gt.0.0) then + +! Compute the change in temperature that would result if this liquid +! was used to freeze and raise the snow temperature. + if (snod_layer(k).le.0.0) then + delta_T = 0.0 + else + delta_T = (extra * xLf) / (Cp_snow * snod_layer(k)) + endif + +! Use this potential temperature change to adjust the snow +! temperature in the presence of the liquid. + T_old(k) = T_old(k) + delta_T + extra_delta_T = max(0.0,T_old(k)-Tf) + T_old(k) = min(T_old(k),Tf) + +! Keep track of which layers have been pushed to Tf. This will be +! used in the temperature solution subroutine to fix the snow +! temperature at Tf (if melt_flag = 1). + if (T_old(k).eq.Tf) then + melt_flag(k) = 1 + else + melt_flag(k) = 0 + endif + +! Define the amount of liquid this remaining temperature change +! represents, so it can be used in the layer below (that may be +! a different size). + extra = Cp_snow * snod_layer(k) * extra_delta_T / xLf + + endif + enddo + endif + + return + end SUBROUTINE MELT_SNOW_ML + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE REDUCE_LAYERS(swemelt,swed_layer,KK) + + use snowmodel_inc + implicit none + + integer k,KK + real swed_layer(nz_max) + real eps,swemelt_tmp,swemelt,excess + + eps = 1e-6 + swemelt_tmp = swemelt + +! The use of eps here does not allow the vertical grid increment to +! be less that eps. + + do k=KK,1,-1 + excess = swed_layer(k) - swemelt_tmp + +! if (excess.gt.0.0) then + if (excess.gt.eps) then + swed_layer(k) = excess + KK = k + return +! elseif (excess.eq.0.0) then + elseif (excess.ge.0.0 .and. excess.le.eps) then + KK = k - 1 + return + else + swemelt_tmp = - excess + endif + enddo + +! If there is no snow left. + KK = 0 + + return + end SUBROUTINE REDUCE_LAYERS + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE PRECIP_ML(KK,ro_layer,snod_layer,ro_water,tslsnowfall,& + & swed_layer,ro_nsnow,T_old,Tsfc,tsls_threshold,dt,& + & melt_flag,soft_snow_d,ro_snow,sum_sprec,sprec_grnd_ml,& + & sum_prec,prec,sum_runoff,runoff,snow_d,snow_depth,swe_depth,& + & diam_layer) + + use snowmodel_inc + implicit none + + integer k,KK + + real snod_layer(nz_max) + real ro_layer(nz_max) + real swed_layer(nz_max) + real T_old(nz_max) + real diam_layer(nz_max) + real ro_nsnow,ro_water,z_nsnow,tsls_threshold,& + & z_snowtopl,sweq_topl,Tsfc,tslsnowfall,dt,soft_snow_d,ro_snow,& + & sum_sprec,sprec_grnd_ml,sum_prec,prec,sum_runoff,runoff,snow_d,& + & snow_depth,swe_depth + + integer melt_flag(nz_max) + +! If the melt from the previous subroutine reduced the snowpack +! to no snow, reset the time since last snowfall to the threshold, +! otherwise you will not build a new layer on the bare ground. + if (KK.eq.0) tslsnowfall = tsls_threshold + +! Create and/or modify the snow c.v.'s to account for new snowfall. + if (sprec_grnd_ml.gt.0.0) then + if (tslsnowfall.ge.tsls_threshold) then +! Create a new layer if snowfall has stopped for a period of time +! greater or equal to the defined threshold. + KK = KK + 1 + z_nsnow = ro_water / ro_nsnow * sprec_grnd_ml + snod_layer(KK) = z_nsnow + ro_layer(KK) = ro_nsnow + swed_layer(KK) = ro_layer(KK) * snod_layer(KK) / ro_water +! Define this new snow layer to have the surface temperature. + T_old(KK) = Tsfc +! Define this new layer to have the initial grain size (0.5 mm). + diam_layer(KK) = 0.5 / 1000.0 + + melt_flag(KK) = 0 + else +! Add to the existing top layer. + z_nsnow = ro_water / ro_nsnow * sprec_grnd_ml + z_snowtopl = snod_layer(KK) + z_nsnow + sweq_topl = sprec_grnd_ml + snod_layer(KK) * ro_layer(KK) / & + & ro_water + snod_layer(KK) = snod_layer(KK) + z_nsnow + ro_layer(KK) = ro_water * sweq_topl / z_snowtopl + swed_layer(KK) = ro_layer(KK) * snod_layer(KK) / ro_water + endif + +! Update the total swe and snow depths. + snow_depth = 0.0 + swe_depth = 0.0 + do k=1,KK + snow_depth = snow_depth + snod_layer(k) + swe_depth = swe_depth + swed_layer(k) + enddo + endif + +! Define the time since last snowfall, in hours. Handle the case +! where there is no snow on the ground. + if (sprec_grnd_ml.gt.0.0) then + tslsnowfall = 0.0 + else + tslsnowfall = tslsnowfall + dt / 3600.0 + endif + if (KK.eq.0) tslsnowfall = tsls_threshold + +! The following are set up to be compatible with SnowTran-3D, and +! are in snow-depth units. The sum_sprec corrections are done +! in the SnowTran-3D code. + soft_snow_d = soft_snow_d + sprec_grnd_ml * ro_water / ro_snow + snow_d = swe_depth * ro_water / ro_snow +! sum_sprec = sum_sprec + sprec_grnd_ml * ro_water / ro_snow + sum_sprec = sum_sprec + sprec_grnd_ml + +! The following are in swe-depth units. + sum_prec = sum_prec + prec + sum_runoff = sum_runoff + runoff + + return + end SUBROUTINE PRECIP_ML + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE DDENSITY_ML(ro_layer,Tf,dt,ro_water,ro_snowmax,& + & T_old,KK,snod_layer,A1,A2,windspd_2m) + + use snowmodel_inc + implicit none + + integer k,KK,kkk + + real snod_layer(nz_max) + real ro_layer(nz_max) + real T_old(nz_max) + real sweqstar(nz_max) + real sweql(nz_max) + + real A1,A2,ro_water,ro_snowmax,dt,Tf,ro_adjust,C,U,alfa,& + & windspd_2m + +! Define the density rate coefficients. +! C = 1.00 + C = 0.50 +! C = 0.10 + +! Define alfa. + alfa = 0.2 + +! ro_adjust is a snow density rate adjustment factor that can be +! used to make the snow density increase faster (ro_adjust > 1.0) +! or slower (ro_adjust < 1.0). + ro_adjust = 5.0 + + if (KK.gt.0) then + + do k=1,KK + sweql(k) = ro_layer(k) / ro_water * snod_layer(k) + enddo + + do kkk=1,KK + sweqstar(kkk) = sweql(kkk) / 2.0 + do k=kkk+1,KK + sweqstar(kkk) = sweqstar(kkk) + sweql(k) + enddo + enddo + +! Pre-wind-adjustment code. +! do k=1,KK +! ro_layer(k) = ro_layer(k) + ro_adjust * dt * +! & (A1 * sweqstar(k) * ro_layer(k) * +! & exp(-0.08*(Tf-T_old(k))) * exp(-A2*ro_layer(k))) +! ro_layer(k) = min(ro_snowmax,ro_layer(k)) +! snod_layer(k) = sweql(k) * ro_water / ro_layer(k) +! enddo + +! Update the density of all the layers except the top layer. + do k=1,KK-1 + ro_layer(k) = ro_layer(k) + ro_adjust * dt * & + & (A1 * sweqstar(k) * ro_layer(k) * & + & exp(-0.08*(Tf-T_old(k))) * exp(-A2*ro_layer(k))) + ro_layer(k) = min(ro_snowmax,ro_layer(k)) + snod_layer(k) = sweql(k) * ro_water / ro_layer(k) + enddo + +! Update the density of the top layer while including the influence +! of wind in this layer only. This is Equation (18) for U in +! Liston et al. (2007). C here has just been an assigned an +! arbitrary value; it controls the impact of U on the density +! evolution. + k=KK + + if (windspd_2m.ge.5.0) then + U = C * & + & (5.0 + 15.0 * (1.0 - exp(-(alfa*(windspd_2m - 5.0))))) + else + U = 1.0 + endif +! If you want to turn this off, you can uncomment the following +! line. +! U = 1.0 + +! The equation below is the same as that for the below-surface +! layers, except for the addition of the U term. + ro_layer(k) = ro_layer(k) + ro_adjust * dt * & + & (U * A1 * sweqstar(k) * ro_layer(k) * & + & exp(-0.08*(Tf-T_old(k))) * exp(-A2*ro_layer(k))) + ro_layer(k) = min(ro_snowmax,ro_layer(k)) + snod_layer(k) = sweql(k) * ro_water / ro_layer(k) + + endif + + return + end SUBROUTINE DDENSITY_ML + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SNOWTEMP_ML(gamma,T_old,Tsfc,KK,dt,ro_layer,Cp_snow,& + & Tf,snod_layer,melt_flag,diam_layer) + + use snowmodel_inc + implicit none + + real gamma(nz_max) + real diam_layer(nz_max) + real ro_layer(nz_max) + real snod_layer(nz_max) + real g_b_ns(nz_max+1) + real f_n(nz_max+1) + real aN(nz_max) + real aP0(nz_max) + real aS(nz_max) + real dely_p(nz_max+1) + real dy_p(nz_max) + real y_crds(nz_max+2) + real y_wall(nz_max+1) + real A_sub(nz_max) + real A_super(nz_max) + real A_main(nz_max) + real b_vector(nz_max) + real T_old(nz_max) + real Sc(nz_max) + real Sp(nz_max) + + integer melt_flag(nz_max) + + integer k,KK + real Tsfc,T_N,bc_N,bc_S,Cp_snow,Tf,dt,Tsg + +! Define the snow thermal conductivity (gamma) for each layer. +! CALL GETGAMMA(KK,ro_layer,gamma) + +! This is the thermal conductivity that depends on grain size. + CALL GET_THERMAL_CONDUCTIVITY(KK,ro_layer,diam_layer,gamma) + + if (KK.gt.1) then + +! Update the control volume information. + CALL GETCV(KK,dy_p,snod_layer) + CALL CV_INFO(dely_p,f_n,y_crds,y_wall,dy_p,KK) + +! Compute the general equation coefficients. + CALL GAMMA1(g_b_ns,gamma,f_n,KK) + CALL GE_COEF(aN,aS,aP0,dy_p,dely_p,g_b_ns,dt,KK,& + & ro_layer,Cp_snow) + +!--------------------------------------------------------------------- +!--------------------------------------------------------------------- +! Account for the boundary conditions. +! South boundary condition: +! For T_S = known, define +! bc_S = aS(1) * T_S; where T_S = known +! For dT_S/dn = 0, define +! bc_S = 0.0 +! aS(1) = 0.0 +! North boundary condition: +! For T_N = known, define +! bc_N = aN(KK) * T_N; where T_N = known +! For dT_N/dn = 0, define +! bc_N = 0.0 +! aN(KK) = 0.0 +!--------------------------------------------------------------------- +!--------------------------------------------------------------------- + +! Define the upper and lower boundary conditions. + T_N = Tsfc + bc_N = aN(KK) * T_N + bc_S = 0.0 + aS(1) = 0.0 + +! Provide the source terms. + +! Force the source terms to produce Tf at the positions where melting +! occurred during this time step. + do k=1,KK + if (melt_flag(k).eq.1) then + Sc(k) = 10e30 * Tf + Sp(k) = -10e30 + else + Sc(k) = 0.0 + Sp(k) = 0.0 + endif + enddo + +! Configure the information for the matrix solver. + CALL PREPSOLVE(A_sub,A_super,A_main,b_vector,T_old,& + & dy_p,bc_S,bc_N,Sc,Sp,aN,aS,aP0,KK) + +! Solve the system of equations. + CALL TRISOLVE(T_old,A_sub,A_main,A_super,b_vector,KK) + + elseif (KK.eq.1) then +! Assume that the snow-ground interface temperature is -1.0 C. + Tsg = Tf - 1.0 + T_old(1) = 0.5 * (Tsg + Tsfc) + endif + + return + end SUBROUTINE SNOWTEMP_ML + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GETCV(KK,dy_p,snod_layer) + + use snowmodel_inc + implicit none + + real dy_p(nz_max) + real snod_layer(nz_max) + + integer k,KK + +! Provide values of Control Volume size in the y direction. + do k=1,KK + dy_p(k) = snod_layer(k) + enddo + + return + end SUBROUTINE GETCV + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE PREPSOLVE(A_sub,A_super,A_main,b_vector,T_old,& + & dy_p,bc_S,bc_N,Sc,Sp,aN,aS,aP0,KK) + + use snowmodel_inc + implicit none + + real aP(nz_max) + real aN(nz_max) + real aS(nz_max) + real Sp(nz_max) + real Sc(nz_max) + real aP0(nz_max) + real dy_p(nz_max) + real T_old(nz_max) + real b_vector(nz_max) + real A_sub(nz_max) + real A_super(nz_max) + real A_main(nz_max) + + integer k,KK + real bc_S,bc_N + +! Compute matrix diagonal and b coeffs. + do k=1,KK + aP(k) = aN(k) + aS(k) + aP0(k) - Sp(k) * dy_p(k) + b_vector(k) = Sc(k) * dy_p(k) + aP0(k) * T_old(k) + enddo + +! Modify b to account for dirichlet boundary conditions. + b_vector(1) = b_vector(1) + bc_S + b_vector(KK) = b_vector(KK) + bc_N + +! Prepare to call the tridiagonal solver. + do k=1,KK-1 + A_sub(k) = - aS(k+1) + A_super(k) = - aN(k) + enddo + + do k=1,KK + A_main(k) = aP(k) + enddo + + return + end SUBROUTINE PREPSOLVE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE CV_INFO(dely_p,f_n,y_crds,y_wall,dy_p,KK) + + use snowmodel_inc + implicit none + + real dy_pbc(nz_max+2) + real dely_p(nz_max+1) + real f_n(nz_max+1) + real dy_p(nz_max) + real y_crds(nz_max+2) + real y_wall(nz_max+1) + + integer k,KK + real temp + +! PRESSURE CONTROL VOLUME SIZE AND POSITION INFORMATION + +! Include exterior boundary pressure grid points. + dy_pbc(1) = 0.0 + do k=2,KK+1 + dy_pbc(k) = dy_p(k-1) + enddo + dy_pbc(KK+2) = 0.0 + +! Compute the distance between pressure grid points. + do k=1,KK+1 + dely_p(k) = .5 * (dy_pbc(k) + dy_pbc(k+1)) + enddo + +! Compute the distance between the pressure grid points and the control +! volume wall. (The following is true because the grid points do +! pressure are defined to be in the center of the control volume.) +! And then compute f_e and f_n. These two steps are combined below. + do k=1,KK+1 + f_n(k) = .5 * dy_pbc(k+1) / dely_p(k) + enddo + +! Compute the x and y coordinates of the pressure c.v. grid points, +! including boundaries. + temp = 0.0 + do k=1,KK+2 + y_crds(k) = temp + .5 * dy_pbc(k) + temp = temp + dy_pbc(k) + enddo + +! Compute the x and y coordinates of the pressure c.v. walls. + y_wall(1) = 0.0 + do k=2,KK+1 + y_wall(k) = y_wall(k-1) + dy_p(k-1) + enddo + + return + end SUBROUTINE CV_INFO + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GAMMA1(g_b_ns,gamma,f_n,KK) + + use snowmodel_inc + implicit none + + real g_b_ns(nz_max+1) + real gamma(nz_max) + real g_ns(nz_max+2) + real f_n(nz_max+1) + + integer k,KK + +! This provides gamma information on c.v. walls. + +! Include gamma just outside of n, s boundaries. + g_ns(1) = gamma(1) + do k=2,KK+1 + g_ns(k) = gamma(k-1) + enddo + g_ns(KK+2) = gamma(KK) + +! Compute gamma (diffusion coefficient) at the n, s control +! volume boundaries using equation 4.9, p. 45. + do k=1,KK+1 + g_b_ns(k) = 1.0/((1.0 - f_n(k))/g_ns(k) + f_n(k)/g_ns(k+1)) + enddo + + return + end SUBROUTINE GAMMA1 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE GE_COEF(aN,aS,aP0,dy_p,dely_p,g_b_ns,dt,KK,& + & ro_layer,Cp_snow) + + use snowmodel_inc + implicit none + + real aN(nz_max) + real aS(nz_max) + real aP0(nz_max) + real dely_p(nz_max+1) + real g_b_ns(nz_max+1) + real dy_p(nz_max) + real ro_layer(nz_max) + + integer k,KK + real Cp_snow,dt + +! CALCULATE THE COEFFICIENTS aP, for the general phi equation. + do k=2,KK+1 + aN(k-1) = g_b_ns(k) / dely_p(k) + aS(k-1) = g_b_ns(k-1) / dely_p(k-1) + enddo + + do k=1,KK + aP0(k) = ro_layer(k) * Cp_snow * dy_p(k) / dt + enddo + + return + end SUBROUTINE GE_COEF + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE TRISOLVE(x,asub,amain,asuper,b,KK) + + use snowmodel_inc + implicit none + + real asub(nz_max) + real asuper(nz_max) + real amain(nz_max) + real b(nz_max) + real x(nz_max) + real z(nz_max) + real lmain(nz_max) + real lsub(nz_max) + real usuper(nz_max) + + integer k,KK + + lmain(1) = amain(1) + usuper(1) = asuper(1)/lmain(1) + + do k=2,KK-1 + lsub(k-1) = asub(k-1) + lmain(k) = amain(k) - lsub(k-1) * usuper(k-1) + usuper(k) = asuper(k) / lmain(k) + enddo + + lsub(KK-1) = asub(KK-1) + lmain(KK) = amain(KK) - lsub(KK-1) * usuper(KK-1) + z(1) = b(1) / lmain(1) + + do k=2,KK + z(k) = 1.0 / lmain(k) * (b(k) - lsub(k-1) * z(k-1)) + enddo + + x(KK) = z(KK) + + do k=KK-1,1,-1 + x(k) = z(k) - usuper(k) * x(k+1) + enddo + + return + end SUBROUTINE TRISOLVE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE ZERO_SNOW(nx,ny,snow_depth,ro_snow_grid,ro_snow,& + & swe_depth,swe_depth_old,canopy_int_old,KK,sum_swemelt,& + & tslsnowfall,snod_layer,swed_layer,ro_layer,T_old,& + & sum_sprec,multilayer_snowpack,tsls_threshold,& + & sum_trans) + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,k + + integer multilayer_snowpack + integer KK(nx,ny) + + real tsls_threshold,ro_snow + real tslsnowfall(nx,ny) + real snod_layer(nx,ny,nz_max) + real swed_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + real swe_depth(nx,ny) + real snow_depth(nx,ny) + real ro_snow_grid(nx,ny) + real sum_sprec(nx,ny) + real sum_swemelt(nx,ny) + real sum_trans(nx,ny) + + print *,'ZEROING OUT THE SNOW ARRAYS' + print *,'ZEROING OUT THE SNOW ARRAYS' + print *,'ZEROING OUT THE SNOW ARRAYS' + + do j=1,ny + do i=1,nx + canopy_int_old(i,j) = 0.0 + swe_depth_old(i,j) = 0.0 + snow_depth(i,j) = 0.0 + ro_snow_grid(i,j) = ro_snow + swe_depth(i,j) = 0.0 + sum_sprec(i,j) = 0.0 + sum_swemelt(i,j) = 0.0 + sum_trans(i,j) = 0.0 + enddo + enddo + + if (multilayer_snowpack.eq.1) then + do j=1,ny + do i=1,nx + tslsnowfall(i,j) = tsls_threshold + do k=1,KK(i,j) + snod_layer(i,j,k) = 0.0 + swed_layer(i,j,k) = 0.0 + ro_layer(i,j,k) = ro_snow + T_old(i,j,k) = 273.15 + enddo + KK(i,j) = 0 + enddo + enddo + endif + + return + end SUBROUTINE ZERO_SNOW + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE ZERO_SNOW_SEAICE_4(nx,ny,snow_depth,ro_snow_grid,& + & ro_snow,swe_depth,swe_depth_old,canopy_int_old,KK,& + & sum_swemelt,tslsnowfall,snod_layer,swed_layer,& + & ro_layer,T_old,sum_sprec,multilayer_snowpack,& + & tsls_threshold,iyear,diam_layer,output_path_wo_assim) + +! NOTE: This program is VERY specific to the original Lagrangian +! simulations. If you are doing something else, you will have to +! make numerous changes to this code and the subroutines that are +! called from it. + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,k,iyear,icount + + parameter (icount=70000) + + integer multilayer_snowpack + integer KK(nx,ny) + + real tsls_threshold,ro_snow + real tslsnowfall(nx,ny) + real snod_layer(nx,ny,nz_max) + real swed_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + real swe_depth(nx,ny) + real snow_depth(nx,ny) + real ro_snow_grid(nx,ny) + real sum_sprec(nx,ny) + real sum_swemelt(nx,ny) + real diam_layer(nx,ny,nz_max) + + real snod_init(icount) + real swed_init(icount) + real sden_init(icount) + + character*80 output_path_wo_assim + + print *,'TRANSFERRING THE SNOW DATA TO THE NEXT YEAR' + print *,'TRANSFERRING THE SNOW DATA TO THE NEXT YEAR' + print *,'TRANSFERRING THE SNOW DATA TO THE NEXT YEAR' + +! Calculate the snow data initial conditions that will be used +! in the next year. + CALL SUPERIMPOSED_ICE(iyear,output_path_wo_assim,& + & snod_init,swed_init,sden_init,ro_snow) + + do j=1,ny + do i=1,nx + + canopy_int_old(i,j) = 0.0 + swe_depth_old(i,j) = 0.0 + snow_depth(i,j) = 0.0 + ro_snow_grid(i,j) = ro_snow + swe_depth(i,j) = 0.0 + sum_sprec(i,j) = 0.0 + sum_swemelt(i,j) = 0.0 + + if (snod_init(i).ge.0.0) then + swe_depth_old(i,j) = swed_init(i) + snow_depth(i,j) = snod_init(i) + ro_snow_grid(i,j) = sden_init(i) + swe_depth(i,j) = swed_init(i) + endif + + enddo + enddo + + if (multilayer_snowpack.eq.1) then + do j=1,ny + do i=1,nx + tslsnowfall(i,j) = tsls_threshold + do k=1,KK(i,j) + snod_layer(i,j,k) = 0.0 + swed_layer(i,j,k) = 0.0 + ro_layer(i,j,k) = ro_snow + T_old(i,j,k) = 273.15 + diam_layer(i,j,k) = 0.5 / 1000.0 + enddo + + if (snod_init(i).ge.0.0) then + KK(i,j) = 1 + snod_layer(i,j,1) = snod_init(i) + swed_layer(i,j,1) = swed_init(i) + ro_layer(i,j,1) = sden_init(i) + T_old(i,j,1) = 273.15 + diam_layer(i,j,1) = 0.5 / 1000.0 + else + KK(i,j) = 0 + endif + + enddo + enddo + endif + + return + end SUBROUTINE ZERO_SNOW_SEAICE_4 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE ZERO_SEAICE_SNOW(nx,ny,snow_depth,ro_snow_grid,& + & ro_snow,swe_depth,swe_depth_old,canopy_int_old,KK,& + & tslsnowfall,snod_layer,swed_layer,ro_layer,T_old,& + & multilayer_snowpack,tsls_threshold,seaice_conc,& + & sum_sprec,sum_trans) + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,k + + integer multilayer_snowpack + integer KK(nx,ny) + + real tsls_threshold,ro_snow + real tslsnowfall(nx,ny) + real snod_layer(nx,ny,nz_max) + real swed_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real swe_depth_old(nx,ny) + real canopy_int_old(nx,ny) + real swe_depth(nx,ny) + real snow_depth(nx,ny) + real ro_snow_grid(nx,ny) + real seaice_conc(nx,ny) + real sum_sprec(nx,ny) + real sum_trans(nx,ny) + + do j=1,ny + do i=1,nx + if (seaice_conc(i,j).eq.0.0) then + canopy_int_old(i,j) = 0.0 + swe_depth_old(i,j) = 0.0 + snow_depth(i,j) = 0.0 + ro_snow_grid(i,j) = ro_snow + swe_depth(i,j) = 0.0 + sum_sprec(i,j) = 0.0 + sum_trans(i,j) = 0.0 + endif + enddo + enddo + + if (multilayer_snowpack.eq.1) then + do j=1,ny + do i=1,nx + if (seaice_conc(i,j).eq.0.0) then + tslsnowfall(i,j) = tsls_threshold + do k=1,KK(i,j) + snod_layer(i,j,k) = 0.0 + swed_layer(i,j,k) = 0.0 + ro_layer(i,j,k) = ro_snow + T_old(i,j,k) = 273.15 + enddo + KK(i,j) = 0 + endif + enddo + enddo + endif + + return + end SUBROUTINE ZERO_SEAICE_SNOW + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE NSNOW_DENSITY_FROM_BLOWING_SNOW(windspd_2m,sprec,dt,& + & ro_nsnow_wind) + + implicit none + + real alfa,windspd_2m,ro_nsnow_wind,sprec,dt_24hours,dt + +! Required constants. + alfa = 0.2 + dt_24hours = 86400.0 + +! This new snow density increase due to wind, is only for the single- +! layer snowpack. + if (sprec.gt.0.0) then + +! To define the offset I assumed under cold conditions (ro_nsnow = +! 50.0 kg/m3): +! 1) 24-hour ave wind speed >= 20 m/s gives ro_nsnow = 350 kg/m3. +! 2) 24-hour ave wind speed = 5 m/s gives ro_nsnow = 150 kg/m3, +! (actually what really matters here is the density difference +! of 200 kg/m3 for the wind speed difference from 5 to 20 m/s). +! 3) 24-hour ave wind speed < 5 m/s gives ro_nsnow = ro_nsnow. +! 4) It is appropriate to use an exponential decay function +! between the 5 and 20 m/s values. + if (windspd_2m.lt.5.0) then + ro_nsnow_wind = 0.0 + else + ro_nsnow_wind = 25.0 + & + & 250.0 * (1.0 - exp(-(alfa*(windspd_2m - 5.0)))) + +! Now scale this 24-hour value by dt. I checked, and this is the +! perfect way to do this. It makes the 3-hour and 24-hour dt +! cases identical! +! In the end I decided to not do this scaling because the resulting +! snow depth is scaled at this time step by the precipitation +! inputs, and because I think the wind speed is the main +! controlling factor, not the duration of the wind at this speed. +! ro_nsnow_wind = dt / dt_24hours * ro_nsnow_wind + endif + + else + + ro_nsnow_wind = 0.0 + + endif + +! If you want to turn this off, you can uncomment the following +! line. +! ro_nsnow_wind = 0.0 + + return + end SUBROUTINE NSNOW_DENSITY_FROM_BLOWING_SNOW + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE WINDSPEED_2M(windspd,ht_windobs,windspd_2m) + + implicit none + + real ht_windobs,snow_z0,windspd,windspd_2m + +! Required constants. + snow_z0 = 0.001 + +! Calculate the 2-m wind speed. + windspd_2m = windspd * & + & log(2.0/snow_z0)/log(ht_windobs/snow_z0) + + return + end SUBROUTINE WINDSPEED_2M + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + SUBROUTINE SUPERIMPOSED_ICE(iyear,output_path_wo_assim,& + & snod_col_init2,swed_col_init2,sden_col_init1,ro_snow) + +! Here I am going to sweep through June and July and determine +! whether the snowpack ever became isothermal during this +! period. + + implicit none + + integer k,iend_year,iyear,i,j,ii,jj + +! Number of tracked parcels. + integer, parameter :: icount = 70000 + + integer, parameter :: nnx=361,nny=361 + + character*80 output_path_wo_assim + +! Parcels. + real roff_col(icount) + real snod_col(icount) + real swed_col(icount) + real conc_col(icount) + real simp_col(icount) + real snod_col_init1(icount) + real snod_col_init2(icount) + real swed_col_init1(icount) + real swed_col_init2(icount) + real sden_col_init1(icount) + + real zi(icount) + real zj(icount) + real conc(icount) + +! EASE grid. + real snod1(nnx,nny) + real snod2(nnx,nny) + real swed1(nnx,nny) + + integer iyr_start,imo_start,idy_start,imo_end,idy_end,iiyear,& + & ioptn,julian_end,julian_start,irec,imo_beg,idy_beg,irec1,& + & irec2,irec3,julian_beg,i_len_wo,trailing_blanks,istart_year + + real undef,ro_snow + +! Parcel tracks and concentration from NSIDC. + character path3*(*) + parameter (path3= & + & '../../parcel_tracks/3_mk_daily/') + +! SnowModel run outputs on original parcels. +! character path1*(*) +! parameter (path1 = '/data4/lagrangian/sm_38yrs/merra/outputs/') + i_len_wo = 80 - trailing_blanks(output_path_wo_assim) + + undef = -9999.0 + + iend_year = 2018 + istart_year = 1981 + + iiyear = iyear - istart_year + 1 + +! Open the parcel track data. + if (iyear.eq.istart_year) then + open (7021,file=path3//'ij_parcels_1980-2018.gdat', & + & form='unformatted',access='direct',recl=4*2*icount) + + open (7022,file=path3//'conc_parcels_1980-2018.gdat',& + & form='unformatted',access='direct',recl=4*1*icount) + endif + +! Input files. +! open (7031,file=output_path_wo_assim(1:i_len_wo)//'roff.gdat', +! & form='unformatted',access='direct',recl=4*icount) + +! open (7032,file=output_path_wo_assim(1:i_len_wo)//'snod.gdat', +! & form='unformatted',access='direct',recl=4*icount) + +! open (7033,file=output_path_wo_assim(1:i_len_wo)//'swed.gdat', +! & form='unformatted',access='direct',recl=4*icount) + +! These have to be closed and reopened so the data are completely +! available for the following read statements. + close (234) + close (236) + close (238) + + open (234,file=output_path_wo_assim(1:i_len_wo)//'roff.gdat',& + & form='unformatted',access='direct',recl=4*icount) + + open (236,file=output_path_wo_assim(1:i_len_wo)//'snod.gdat',& + & form='unformatted',access='direct',recl=4*icount) + + open (238,file=output_path_wo_assim(1:i_len_wo)//'swed.gdat',& + & form='unformatted',access='direct',recl=4*icount) + +! Output files. + if (iyear.eq.istart_year) then + open (7051,file='seaice/superimposed_ice_flag_parcel.gdat',& + & form='unformatted',access='direct',recl=4*3*icount,& + & status='replace') + + open (7061,file='seaice/superimposed_ice_flag_ease.gdat',& + & form='unformatted',access='direct',recl=4*2*nnx*nny,& + & status='replace') + + open (7071,file='seaice/snod_init.gdat',& + & form='unformatted',access='direct',recl=4*3*icount,& + & status='replace') + endif + +! Find the irecs between 1 June and 31 July of each year. + +! This is the begining of the simulation. + iyr_start = 1980 + imo_start = 8 + idy_start = 1 + +! Julian start. + ioptn = 3 + call calndr (ioptn,idy_start,imo_start,iyr_start,julian_start) + +! This is the begining of the summer period. + imo_beg = 6 + idy_beg = 1 + +! This is the end of the simulation year. + imo_end = 7 + idy_end = 31 + +! Extracting the last day of the simulation year. + +! Initialize the array. + do k=1,icount + simp_col(k) = undef + enddo + +! Find the irecs for 1 June and 31 July. + call calndr (ioptn,idy_beg,imo_beg,iyear,julian_beg) + irec1 = julian_beg - julian_start + 1 + call calndr (ioptn,idy_end,imo_end,iyear,julian_end) + irec2 = julian_end - julian_start + 1 + + print *,iiyear,iyear,irec1,irec2 + print *,iiyear,iyear,irec1,irec2 + print *,iiyear,iyear,irec1,irec2 + + do irec=irec1,irec2 + +! Read in the parcel data. +! read (7031,rec=irec) (roff_col(k),k=1,icount) + read (234,rec=irec) (roff_col(k),k=1,icount) + read (7022,rec=irec) (conc_col(k),k=1,icount) + +! Perform some cleanup duties. This should be done in the +! SnowModel code before roff is written out. But right now +! it is not. + do k=1,icount + if (conc_col(k).eq.0.0) roff_col(k) = undef + enddo + +! These runoff data = 0.0 for parcels with snow (or no snow) and +! zero runoff at this time step, and = undef if there is no +! parcel (i.e., if conc = 0.0). + +! If there is any runoff out the base of the snowpack during +! June or July, then the snowpack is isothermal and we assume +! that any remaining snow on this parcel on 31 July is so wet +! that if and when it eventually re-freezes it will create +! superimposed ice. + do k=1,icount + if (roff_col(k).gt.0.0) then + simp_col(k) = 1.0 + endif + enddo + + enddo + +! Apply the 'ZERO THE SNOW DEPTH' requirement to the 31 July +! snow depth. +! read (7032,rec=irec2) (snod_col(k),k=1,icount) +! read (7033,rec=irec2) (swed_col(k),k=1,icount) + read (236,rec=irec2) (snod_col(k),k=1,icount) + read (238,rec=irec2) (swed_col(k),k=1,icount) + + do k=1,icount + snod_col_init1(k) = snod_col(k) + swed_col_init1(k) = swed_col(k) + if (simp_col(k).eq.1.0) then + snod_col_init1(k) = 0.0 + swed_col_init1(k) = 0.0 + endif + enddo + + write (7051,rec=iiyear) & + & (snod_col_init1(k),k=1,icount),& + & (snod_col(k),k=1,icount),& + & (simp_col(k),k=1,icount) + +! Grid these data to the EASE grid. + call parcel_to_ease(nnx,nny,icount,irec2,snod_col_init1,snod1,& + & undef) + call parcel_to_ease(nnx,nny,icount,irec2,snod_col,snod2,& + & undef) + call parcel_to_ease(nnx,nny,icount,irec2,swed_col_init1,swed1,& + & undef) + +! Save the EASE grid data. + write (7061,rec=iiyear)& + & ((snod1(i,j),i=1,nnx),j=1,nny),& + & ((snod2(i,j),i=1,nnx),j=1,nny) + +! Prepare the initial condition snow depth array for 1 Aug. +! snod1 is my initial condition on the EASE grid. Use this to +! define an initial condition on the 1 Aug parcels. Do this +! by finding the EASE grid (i,j) position that corresponds to +! each 1 Aug parcel location. And then assigning this initial +! snow depth (and the other corresponding variables) to that +! parcel. + +! NOTE: this is going to crash on the last year! I need to fix +! that! +! The +1 here is what is converting the end of year data to a +! begining of the year IC on the new parcels. +! This is a stupid way to fix that problem. + if (iyear.ne.iend_year) then + irec3 = irec2 + 1 + else + irec3 = irec2 + endif + + read (7021,rec=irec3) (zi(k),k=1,icount),(zj(k),k=1,icount) + read (7022,rec=irec3) (conc(k),k=1,icount) + + do k=1,icount + snod_col_init2(k) = 0.0 + swed_col_init2(k) = 0.0 + if (conc(k).ne.0.0) then + ii = nint(zi(k)) + jj = nint(zj(k)) + if (snod1(ii,jj).ne.undef) then + snod_col_init2(k) = snod1(ii,jj) + swed_col_init2(k) = swed1(ii,jj) + else + snod_col_init2(k) = 0.0 + swed_col_init2(k) = 0.0 + endif + endif + + if (snod_col_init2(k).eq.undef) then + print *,'snod_col_init2(k)=undef',k,conc(k) + endif + if (swed_col_init2(k).eq.undef) then + print *,'swed_col_init2(k)=undef',k,conc(k) + endif + + enddo + +! Calculate the snow density IC by using the swed and snod values. +! This cleans up the problem of having undef sden when the +! depths are 0.0. + do k=1,icount + if (snod_col_init2(k).ne.0.0 .and. & + & snod_col_init2(k).ne.undef) then + sden_col_init1(k) = 1000.0 * swed_col_init2(k) / & + & snod_col_init2(k) + else + sden_col_init1(k) = ro_snow + endif + enddo + +! Save the snow depth initial condition data. + write (7071,rec=iiyear) (snod_col_init2(k),k=1,icount),& + & (swed_col_init2(k),k=1,icount),& + & (sden_col_init1(k),k=1,icount) + +! close (7021) +! close (7022) +! close (7031) +! close (7032) +! close (7033) +! close (7051) +! close (7061) +! close (7071) + + return + end SUBROUTINE SUPERIMPOSED_ICE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine parcel_to_ease(nnx,nny,icount,iter,snow_col,snow,& + & undef) + + implicit none + + integer ii,jj,nnx,nny,i,j,k,iter,icount + + real zi(icount),zj(icount),conc(icount) + + real snow_col(icount) + real snow(nnx,nny) + + real cnt(nnx,nny) + real conc_area_sum(nnx,nny) + + real undef,zii,zjj + real center_x1,center_y1,center_x2,center_y2,area + +! Read in the parcel track data. + read (7021,rec=iter) (zi(k),k=1,icount),(zj(k),k=1,icount) + read (7022,rec=iter) (conc(k),k=1,icount) + +! Make any 0.0 concentrations undefined, and convert them +! from 0-100 to 0-1. + do k=1,icount + conc(k) = conc(k) / 100.0 + if (conc(k).eq.0.0) conc(k) = undef + enddo + +! Initialize the working arrays. + do j=1,nny + do i=1,nnx + +! Snow depth. + snow(i,j) = 0.0 + +! Counting array. + cnt(i,j) = 0.0 + +! Concentration-area product summing array. + conc_area_sum(i,j) = 0.0 + + enddo + enddo + + do k=1,icount + if (conc(k).ne.undef) then + +! Decimal coordinate of the center of the parcel. + center_x2 = zi(k) + center_y2 = zj(k) + +! Coordinate of the EASE grid cell center that this parcel +! center sits in, integer and real versions. + ii = nint(zi(k)) + jj = nint(zj(k)) + +! This eliminates any problems at the boundaries, if you have +! a situation where there is non-zero conc on the boundary +! grid cells. + if (ii.eq.1) ii = 2 + if (ii.eq.nnx) ii = nnx-1 + if (jj.eq.1) jj = 2 + if (jj.eq.nny) jj = nny-1 + + zii = real(ii) + zjj = real(jj) + +! Loop through the 3x3 grid cells surrounding the EASE grid cell. + do j=jj-1,jj+1 + do i=ii-1,ii+1 + +! Define the center coords of the surrounding EASE grid cells. + center_x1 = real(i) + center_y1 = real(j) + +! Find the overlap in fractional area of each EASE grid cell. So, +! the "area" coming out of this is: 0-1 = the fraction of the +! 25-km by 25-km EASE grid cell that this parcel covers. + call overlap_area (center_x1,center_y1,center_x2,& + & center_y2,area) + +! Use the concentration to weight the snow depth under the +! assumption that the concentration is proportional to the +! contributing area. + area = area * conc(k) + +! Count how many parcels contribute to each EASE grid cell. + if (area.gt.0.0) then + cnt(i,j) = cnt(i,j) + 1.0 + endif + +! Keep track of the concentrations that sum to over 1.0. They +! will be used to scale the result at the end of the averaging +! calculations. + conc_area_sum(i,j) = conc_area_sum(i,j) + area + +! Sum the snow depth contributions from each parcel in each EASE +! grid cell, by scaling the depth values by the area and conc. + snow(i,j) = snow(i,j) + area * snow_col(k) + + enddo + enddo + + endif + enddo + +! Take care of the problem where the area-concentrations summed +! to over 1.0. + do j=1,nny + do i=1,nnx + +! Clip the values below 1.0 so when you do the divide, only +! concentration sums above 1.0 scale the result (values below +! 1.0 are already grid-averaged values). + conc_area_sum(i,j) = max(1.0,conc_area_sum(i,j)) + +! Scale the snow depth averages for cases where the concentration +! summed to greater than 1.0. + snow(i,j) = snow(i,j) / conc_area_sum(i,j) + + enddo + enddo + +! Clean up any grid cells that never had any ice in them. + do j=1,nny + do i=1,nnx + if (cnt(i,j).eq.0.0) then + snow(i,j) = undef + endif + enddo + enddo + + return + end SUBROUTINE parcel_to_ease + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine overlap_area (center_x1,center_y1,center_x2,& + & center_y2,area) + +! Here center_x1,y1 is the EASE grid cell, and center_x2,y2 is +! the parcel cell. + + implicit none + + real center_x1,center_y1 + real center_x2,center_y2 + real x1_min,x1_max,y1_min,y1_max + real x2_min,x2_max,y2_min,y2_max + real x_overlap,y_overlap,area + +! These are the boundary coords of the EASE grid cell. + x1_min = center_x1 - 0.5 + x1_max = center_x1 + 0.5 + y1_min = center_y1 - 0.5 + y1_max = center_y1 + 0.5 + +! These are the boundary coords of the parcel. + x2_min = center_x2 - 0.5 + x2_max = center_x2 + 0.5 + y2_min = center_y2 - 0.5 + y2_max = center_y2 + 0.5 + +! Define the overlap in x and y. + x_overlap = max(0.0,min(x1_max,x2_max) - max(x1_min,x2_min)) + y_overlap = max(0.0,min(y1_max,y2_max) - max(y1_min,y2_min)) + +! Calculate the area overlap. + area = x_overlap * y_overlap + +! print 98, x_overlap,y_overlap,area +! 98 format (3f10.3) + + return + end subroutine overlap_area + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/lis/surfacemodels/land/subLSM/snowmodel/physics/snowtran_code.f90 b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowtran_code.f90 new file mode 100755 index 000000000..a55884d64 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/physics/snowtran_code.f90 @@ -0,0 +1,4059 @@ +! snowtran_code.f + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!! Snow-Transport Modeling System - 3D (SnowTran-3D) !!!!!! +!!!!! Copyright (C) 1998 !!!!!! +!!!!! by Glen E. Liston, InterWorks Consulting !!!!!! +!!!!! All Rights Reserved !!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! This FORTRAN code receives inputs of wind speed, wind direction, +! air temperature, relative humidity, vegetation type, topography, +! and precipitation, and it outputs snow depth, saltation flux, +! suspended flux, sublimation of blowing snow, and the snow depth +! changes resulting from these processes. +! +! All units are in m, kg, s, K. +! +! This model is described in the paper: +! A Snow-Transport Model for Complex Terrain, by Glen E. Liston +! and Matthew Sturm, Journal of Glaciology, 1998, Vol. 44, +! No. 148, pages 498-516. +! +! The author of this code is: +! Dr. Glen E. Liston +! InterWorks Consulting +! 15621 SnowMan Road +! Loveland, Colorado 80538 +! +! To run in 2-D mode, set nx = 3 and look at the data at i = 2. +! This is required because of the boundary conditions imposed +! along i = 1 and 3. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine SNOWTRAN_CODE(bc_flag,bs_flag,C_z,& + & conc_salt,deltax,deltay,dh_salt,dh_salt_u,dh_salt_v,& + & dh_susp,dh_susp_u,dh_susp_v,dt,dz_susp,fall_vel,fetch,& + & gravity,h_const,h_star,ht_rhobs,ht_windobs,index_ue,& + & index_uw,index_vn,index_vs,iter,nx,ny,pi,Qsalt,Qsalt_max,& + & Qsalt_maxu,Qsalt_maxv,Qsalt_u,Qsalt_v,Qsubl,Qsusp,& + & Qsusp_u,Qsusp_v,rh_grid,ro_air,ro_snow,ro_water,snow_d,& + & snow_d_init,snow_z0,soft_snow_d,sprec,sum_glacmelt,& + & subgrid_flag,wbal_salt,wbal_susp,wbal_qsubl,sum_sprec,& + & tabler_ee,tabler_ne,tabler_nn,tabler_nw,tabler_se,& + & tabler_ss,tabler_sw,tabler_ww,tair_grid,topo,topo_land,& + & topoflag,twolayer_flag,Up_const,Ur_const,Utau,& + & Utau_t,uwind_grid,veg_z0,vegsnowd_xy,vegtype,vonKarman,& + & vwind_grid,wind_min,winddir_flag,winddir_grid,& + & windspd_flag,windspd_grid,xmu,z_0,ztop_susp,max_iter,& + & run_enbal,run_snowpack,wbal_subgrid,sum_qsubl,sum_trans,& + & swe_depth,snow_depth,ro_snow_grid,sum_prec,sum_runoff,& + & sum_Qcs,canopy_int,w_balance,sum_sfcsublim,tabler_dir,& + & slope_adjust,Utau_t_const,Utau_t_flag,ro_soft_snow_old,& + & ro_soft_snow,ro_nsnow,prec,Qcs,runoff,d_canopy_int,& + & glacier_melt,swe_depth_old,swesublim,canopy_unload,& + & canopy_int_old,iter_start,multilayer_snowpack,swed_layer,& + & KK,snod_layer,ro_layer,curve_lg_scale_flag,curve_wt_lg,& + & seaice_run,seaice_conc,tslsnowfall,T_old,tsls_threshold,& + & curve_len_scale,Tabler_1_flag,Tabler_2_flag,undef,& + & tabler_sfc_path_name,output_path_wo_assim,& + & output_path_wi_assim,icorr_factor_loop,windspd_2m_grid,& + & Qsubl_depth) + + use snowmodel_inc + implicit none + + integer iter,nx,ny,i,j,iter_start,max_iter + + real ro_snow,ro_water,ro_air,gravity,vonKarman,snow_z0 + real deltax,deltay,dt,undef + real fetch,xmu,C_z,h_const,wind_min,windspd_flag + real Up_const,dz_susp,ztop_susp,fall_vel,Ur_const + real Utau_t_const,pi,bc_flag,topoflag,Utau_t_flag + real ht_windobs,ht_rhobs,bs_flag,twolayer_flag + real subgrid_flag,winddir_flag,curve_len_scale + real run_enbal,run_snowpack,tabler_dir,slope_adjust + + real topo_land(nx,ny) + real tabler_nn(nx,ny) + real tabler_ss(nx,ny) + real tabler_ee(nx,ny) + real tabler_ww(nx,ny) + real tabler_ne(nx,ny) + real tabler_se(nx,ny) + real tabler_sw(nx,ny) + real tabler_nw(nx,ny) + real topo(nx,ny) + real vegtype(nx,ny) + + real tabler_nn_orig(nx,ny) + real tabler_ss_orig(nx,ny) + real tabler_ee_orig(nx,ny) + real tabler_ww_orig(nx,ny) + real tabler_ne_orig(nx,ny) + real tabler_se_orig(nx,ny) + real tabler_sw_orig(nx,ny) + real tabler_nw_orig(nx,ny) + real snow_d_tabler(nx,ny) + real topo_tmp(nx,ny) + + real uwind_grid(nx,ny),vwind_grid(nx,ny) + real windspd_grid(nx,ny),winddir_grid(nx,ny) + real tair_grid(nx,ny),sprec(nx,ny) + real rh_grid(nx,ny),windspd_2m_grid(nx,ny) + + integer index_ue(ny_max,2*nx_max+1),index_uw(ny_max,2*nx_max+1) + integer index_vn(nx_max,2*ny_max+1),index_vs(nx_max,2*ny_max+1) + + real snow_d(nx,ny) + real snow_depth(nx,ny) + real swe_depth(nx,ny) + real ro_snow_grid(nx,ny) + real ro_soft_snow(nx,ny) + real ro_soft_snow_old(nx,ny) + real ro_nsnow(nx,ny) + real snow_d_init(nx,ny) + real Utau(nx,ny) + real Utau_t(nx,ny) + real z_0(nx,ny) + real h_star(nx,ny) + real conc_salt(nx,ny) + + real Qsalt_max(nx,ny) + real Qsalt_maxu(nx,ny),Qsalt_maxv(nx,ny) + real Qsalt(nx,ny) + real Qsalt_u(nx,ny),Qsalt_v(nx,ny) + real dh_salt(nx,ny) + real dh_salt_u(nx,ny),dh_salt_v(nx,ny) + + real Qsusp(nx,ny) + real Qsusp_u(nx,ny),Qsusp_v(nx,ny) + real dh_susp(nx,ny) + real dh_susp_u(nx,ny),dh_susp_v(nx,ny) + + real dh_subgrid(nx,ny) + real Qsubl(nx,ny) + real Qsubl_depth(nx,ny) + + real sum_sprec(nx,ny) + real wbal_qsubl(nx,ny) + real wbal_salt(nx,ny) + real wbal_susp(nx,ny) + real wbal_subgrid(nx,ny) + real sum_qsubl(nx,ny) + real sum_trans(nx,ny) + real soft_snow_d(nx,ny) + + real prec(nx,ny) + real Qcs(nx,ny) + real runoff(nx,ny) + real d_canopy_int(nx,ny) + real glacier_melt(nx,ny) + real swe_depth_old(nx,ny) + real swesublim(nx,ny) + real canopy_unload(nx,ny) + real canopy_int_old(nx,ny) + + real vegsnowd_xy(nx,ny) + real veg_z0(nx,ny) + + real sum_glacmelt(nx,ny),w_balance(nx,ny),& + & sum_prec(nx,ny),sum_runoff(nx,ny),& + & sum_Qcs(nx,ny),canopy_int(nx,ny),& + & sum_sfcsublim(nx,ny) + + integer multilayer_snowpack,k + integer KK(nx,ny) + real swe_change_tmp,swe_change,tsls_threshold + real swed_layer_z(nz_max) + real swed_layer(nx,ny,nz_max) + real snod_layer(nx,ny,nz_max) + real ro_layer(nx,ny,nz_max) + real T_old(nx,ny,nz_max) + real tslsnowfall(nx,ny) + + real curve_lg_scale_flag + real curve_wt_lg(nx_max,ny_max) + + real seaice_run + real seaice_conc(nx,ny) + + real Tabler_1_flag,Tabler_2_flag + character*80 output_path_wo_assim,output_path_wi_assim,& + & tabler_sfc_path_name + integer i_len_tabler,trailing_blanks,icorr_factor_loop,& + & i_len_wo,i_len_wi + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! Perform some intialization steps that are unique to SnowTran-3D. + if (iter.eq.iter_start) then + +! This is now done in preprocess_code.f +! print *, +! & 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' +! print *, +! & 'c Snow-Transport Modeling System - 3D (SnowTran-3D) c' +! print *, +! & 'c Copyright (C) 1998 c' +! print *, +! & 'c by Glen E. Liston, InterWorks Consulting c' +! print *, +! & 'c All Rights Reserved c' +! print *, +! & 'cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' + +! SnowTran-3D can only be run with SnowPack and EnBal turned on. + if (run_enbal.ne.1.0 .and. run_snowpack.ne.1.0) then + print *,'You cannot run SnowTran-3D without' + print *,'SnowPack and EnBal anymore.' + stop + endif + + if (subgrid_flag.eq.1.0) then + +! Check to make sure topoflag = 1.0. + if (subgrid_flag.eq.1.0 .and. topoflag.eq.0.0) then + print *,'If subgrid_flag=1.0, then topoflag must = 1.0' + print *,' Correct this in snowmodel.par to continue.' + stop + endif + +! The Tabler surfaces were originally developed assuming the grid +! increment would never be less than 1.0 m. You probably should +! not run it with deltax and deltay less than 1.0 without some +! further testing. + if (deltax.lt.1.0 .or. deltay.lt.1.0) then + print *,'The Tabler subgrid algorithm has not been' + print *,'tested for deltax and/or deltay less than' + print *,'1.0 m. You should probably do some testing' + print *,'before running the model at less than 1.0-m' + print *,'resolution. Acually I am pretty sure it will' + print *,'run, but it will not generate the correct' + print *,'snow-depth profiles.' + stop + endif + +! If this is the first time through, generate the Tabler snow +! accumulation surfaces for the land topography. + call tabler_3d(nx,ny,topo_land,deltax,deltay,& + & tabler_ww_orig,tabler_ee_orig,tabler_ss_orig,& + & tabler_nn_orig,tabler_ne_orig,tabler_se_orig,& + & tabler_sw_orig,tabler_nw_orig,slope_adjust) + +! Include the vegetation snow-holding depths in the Tabler +! surfaces. + do i=1,nx + do j=1,ny + tabler_nn_orig(i,j) = & + & max(tabler_nn_orig(i,j),vegsnowd_xy(i,j)) + tabler_ne_orig(i,j) = & + & max(tabler_ne_orig(i,j),vegsnowd_xy(i,j)) + tabler_ee_orig(i,j) = & + & max(tabler_ee_orig(i,j),vegsnowd_xy(i,j)) + tabler_se_orig(i,j) = & + & max(tabler_se_orig(i,j),vegsnowd_xy(i,j)) + tabler_ss_orig(i,j) = & + & max(tabler_ss_orig(i,j),vegsnowd_xy(i,j)) + tabler_sw_orig(i,j) = & + & max(tabler_sw_orig(i,j),vegsnowd_xy(i,j)) + tabler_ww_orig(i,j) = & + & max(tabler_ww_orig(i,j),vegsnowd_xy(i,j)) + tabler_nw_orig(i,j) = & + & max(tabler_nw_orig(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler equilibrium surfaces for each of the 8 main wind +! directions. Also save the land DEM distribution. + if (Tabler_1_flag.eq.1.0) then + i_len_tabler = 80 - trailing_blanks(tabler_sfc_path_name) + open(51,& + & file=tabler_sfc_path_name(1:i_len_tabler)//'tabler_sfcs.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + write(51,rec=1) ((tabler_nn_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=2) ((tabler_ne_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=3) ((tabler_ee_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=4) ((tabler_se_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=5) ((tabler_ss_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=6) ((tabler_sw_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=7) ((tabler_ww_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=8) ((tabler_nw_orig(i,j),i=1,nx),j=1,ny) + write(51,rec=9) ((topo_land(i,j),i=1,nx),j=1,ny) + close (51) + endif + +! This available if you want to save the Tabler surface that was +! used at each time step. + if (Tabler_2_flag.eq.1.0) then + if (icorr_factor_loop.eq.1) then + i_len_wo = 80 - trailing_blanks(output_path_wo_assim) + open(52,& + & file=output_path_wo_assim(1:i_len_wo)//'tabler_sfcs_iter.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + endif + if (icorr_factor_loop.eq.2) then + i_len_wi = 80 - trailing_blanks(output_path_wi_assim) + open(52,& + & file=output_path_wi_assim(1:i_len_wi)//'tabler_sfcs_iter.gdat',& + & form='unformatted',access='direct',recl=4*nx*ny) + endif + endif + endif + + endif + +! Print out some basic run information to the screen. +! print 102, windspd_flag,winddir_flag +! 102 format(25x,' wind spd = ',f5.2,' wind dir = ',f4.0) + +! In SnowTran-3D, the summed snow precipitation must be in units +! of snow-depth. The rest of the routines assume that it is in +! swe units. + do j=1,ny + do i=1,nx + sum_sprec(i,j) = sum_sprec(i,j) * ro_water / ro_snow + enddo + enddo + +! Update the threshold friction velocity. + if (Utau_t_flag.eq.0.0) then + if (curve_lg_scale_flag.eq.1.0) then + do j=1,ny + do i=1,nx + Utau_t(i,j) = curve_wt_lg(i,j) * Utau_t_const + enddo + enddo + else + do j=1,ny + do i=1,nx + Utau_t(i,j) = Utau_t_const + enddo + enddo + endif + elseif (Utau_t_flag.eq.1.0) then + do j=1,ny + do i=1,nx + call surface_snow_1(tair_grid(i,j),windspd_2m_grid(i,j),& + & sprec(i,j),ro_soft_snow(i,j),Utau_t(i,j),& + & ro_soft_snow_old(i,j),dt,ro_nsnow(i,j)) + enddo + enddo + if (curve_lg_scale_flag.eq.1.0) then + do j=1,ny + do i=1,nx + Utau_t(i,j) = curve_wt_lg(i,j) * Utau_t(i,j) + enddo + enddo + endif + endif + +! Set the blowing snow flag to zero until it is clear that we will +! have blowing snow. + bs_flag = 0.0 + +! If the wind speed is lower that some threshold, then don't +! need to do any of the snow transport computations. + if (windspd_flag.ge.4.0) then + +! Get the wind direction indexing arrays for this particular +! wind event (time step). + call getdirection(nx,ny,uwind_grid,vwind_grid,index_ue,& + & index_uw,index_vn,index_vs) + +! Solve for Utau and z_0 if snow is saltating, else solve assuming +! z_0 is known from snow depth and/or veg type, and solve for +! Utau. + call solveUtau(Utau,ht_windobs,windspd_grid,C_z,vonKarman,& + & gravity,z_0,h_star,h_const,vegsnowd_xy,snow_d,& + & snow_z0,veg_z0,bs_flag,nx,ny,Utau_t,soft_snow_d) + +! If the blowing snow flag indicates wind transported snow +! somewhere within the domain (bs_flag = 1.0), run the saltation +! and suspension models. + if (bs_flag.eq.1.0) then + +! Solve for the saltation flux. +! print *,' Saltation' + call saltation(Qsalt,deltax,fetch,Utau,Utau_t,nx,ny,& + & ro_air,gravity,vegsnowd_xy,snow_d,& + & Qsalt_max,Qsalt_maxu,Qsalt_maxv,deltay,Qsalt_u,Qsalt_v,& + & index_ue,index_uw,index_vn,index_vs,uwind_grid,& + & vwind_grid,xmu,soft_snow_d,bc_flag) + +! Solve for the suspension flux. +! print *,' Suspension' + call suspension(Utau,vonKarman,nx,ny,conc_salt,& + & Qsalt,Qsusp,z_0,h_star,dz_susp,ztop_susp,pi,& + & fall_vel,Ur_const,Up_const,Utau_t,Qsubl,ht_rhobs,& + & tair_grid,rh_grid,Qsusp_u,Qsusp_v,uwind_grid,& + & vwind_grid) + + elseif (bs_flag.eq.0.0) then + + call noblowsnow(nx,ny,Qsalt_max,Qsalt_maxu,& + & Qsalt_maxv,Qsalt,Qsalt_u,Qsalt_v,dh_salt,dh_salt_u,& + & dh_salt_v,conc_salt,Qsusp,Qsusp_u,Qsusp_v,dh_susp,& + & dh_susp_u,dh_susp_v,Qsubl,dh_subgrid) + + endif + + else + +! This 'noblowsnow' call zeros out data from a previous time step +! that had blowing snow. + call noblowsnow(nx,ny,Qsalt_max,Qsalt_maxu,& + & Qsalt_maxv,Qsalt,Qsalt_u,Qsalt_v,dh_salt,dh_salt_u,& + & dh_salt_v,conc_salt,Qsusp,Qsusp_u,Qsusp_v,dh_susp,& + & dh_susp_u,dh_susp_v,Qsubl,dh_subgrid) + + endif + +! If this is a normal SnowTran-3D run, adjust the accumulations +! and erosions in reponse to varying transport fluxes across +! the simulation domain. If it is a sea ice run with 25-km +! grid cells, just adjust the snow depth in response to the +! blowing snow sublimation fluxes only. + + if (seaice_run.eq.1.0 .and. deltax.eq.25000.0) then + +! Here Qsubl goes in as a flux, and comes out in snow depth units. +! And Qsubl_depth comes out in swe depth units. + call bs_sublimation_only(nx,ny,dt,bs_flag,ro_water,& + & snow_depth,swe_depth,ro_snow_grid,soft_snow_d,Qsubl,& + & vegsnowd_xy,Qsubl_depth) + + elseif (seaice_run.eq.4.0 .and. deltax.eq.25000.0) then + +! Here Qsubl goes in as a flux, and comes out in snow depth units. +! And Qsubl_depth comes out in swe depth units. + call bs_sublimation_only(nx,ny,dt,bs_flag,ro_water,& + & snow_depth,swe_depth,ro_snow_grid,soft_snow_d,Qsubl,& + & vegsnowd_xy,Qsubl_depth) + + else + +! Compute the new snow depth due to accumulation from precipitation, +! saltation, and suspension, and the mass loss due to +! sublimation. + call accum(snow_d,nx,ny,ro_snow,dt,ro_water,& + & deltax,deltay,vegsnowd_xy,Tabler_2_flag,& + & index_ue,index_uw,index_vn,index_vs,undef,& + & Qsalt_u,Qsalt_v,Qsusp_u,Qsusp_v,Qsubl,dh_salt,& + & dh_salt_u,dh_salt_v,dh_susp,dh_susp_u,dh_susp_v,& + & wbal_qsubl,wbal_salt,wbal_susp,bs_flag,& + & soft_snow_d,topo,topo_land,topoflag,subgrid_flag,& + & tabler_nn,tabler_ss,tabler_ee,tabler_ww,& + & tabler_ne,tabler_se,tabler_sw,tabler_nw,& + & uwind_grid,vwind_grid,wbal_subgrid,sum_qsubl,& + & sum_trans,swe_depth,snow_depth,ro_snow_grid,& + & dh_subgrid,tabler_dir,iter,slope_adjust,& + & curve_len_scale) + + endif + +! Use the changes in swe due to saltation, suspension, and +! blowing snow sublimation to adjust the multilayer snowpack +! layers. + if (multilayer_snowpack.eq.1) then + + if (seaice_run.ne.0.0) then + do j=1,ny + do i=1,nx +! This is the sublimation in terms of swe depth. + wbal_qsubl(i,j) = Qsubl(i,j) * ro_snow_grid(i,j) / & + & ro_water +! Because these simulations are done over grid cells that are +! around 25-km by 25-km, subgrid blowing snow processes are not +! simulated. + wbal_salt(i,j) = 0.0 + wbal_susp(i,j) = 0.0 + wbal_subgrid(i,j) = 0.0 + enddo + enddo + endif + + do j=1,ny + do i=1,nx + swe_change = wbal_qsubl(i,j) + wbal_salt(i,j) + & + & wbal_susp(i,j) + wbal_subgrid(i,j) + +! Net mass loss for this grid cell at this time step. + if (swe_change.lt.0.0) then + swe_change_tmp = -swe_change + +! Extract the vertical column for this i,j point, and send it +! to the subroutine. *** Note that I should use f95, then I would +! not have to do this (I could pass in subsections of the arrays). + do k=1,nz_max + swed_layer_z(k) = swed_layer(i,j,k) + enddo + +! Check to see whether a layer reduction is required. + CALL REDUCE_LAYERS(swe_change_tmp,swed_layer_z,KK(i,j)) + +! Re-build the 3-D array. See note above about using f95 to avoid this. + do k=1,nz_max + swed_layer(i,j,k) = swed_layer_z(k) + enddo + +! Update the snow layer thicknesses, and recalculate the total +! snow and swe depths. Assume this swe change does not change +! the snow density and does not change the soft snow depth. It +! only reduces the snow depth and the associated swe depth. + snow_depth(i,j) = 0.0 + swe_depth(i,j) = 0.0 + do k=1,KK(i,j) + snod_layer(i,j,k) = swed_layer(i,j,k) * ro_water / & + & ro_layer(i,j,k) +! ro_layer(i,j,k) = ro_layer(i,j,k) + snow_depth(i,j) = snow_depth(i,j) + snod_layer(i,j,k) + swe_depth(i,j) = swe_depth(i,j) + swed_layer(i,j,k) + enddo + +! Net mass gain for this grid cell at this time step. + elseif (swe_change.gt.0.0) then + +! Add to the existing top layer. + swed_layer(i,j,KK(i,j)) = swed_layer(i,j,KK(i,j)) + & + & swe_change +! ro_layer(i,j,k) = ro_layer(i,j,k) + snod_layer(i,j,KK(i,j)) = swed_layer(i,j,KK(i,j)) * & + & ro_water / ro_layer(i,j,KK(i,j)) + +! Update the snow layer thicknesses, and recalculate the total +! snow and swe depths. Assume this swe change does not change +! the snow density and does not change the soft snow depth. It +! only reduces the snow depth and the associated swe depth. + snow_depth(i,j) = 0.0 + swe_depth(i,j) = 0.0 + do k=1,KK(i,j) + snow_depth(i,j) = snow_depth(i,j) + snod_layer(i,j,k) + swe_depth(i,j) = swe_depth(i,j) + swed_layer(i,j,k) + enddo + + else + + snow_depth(i,j) = 0.0 + swe_depth(i,j) = 0.0 + do k=1,KK(i,j) + snow_depth(i,j) = snow_depth(i,j) + snod_layer(i,j,k) + swe_depth(i,j) = swe_depth(i,j) + swed_layer(i,j,k) + enddo + + endif + + enddo + enddo + endif + +! Perform a water balance check (see notes in this subroutine). + if (seaice_run.eq.0.0) then + +! Don't do this calculation for subgrid_flag = 1.0. This can be +! turned back on and the required adjustments made to the code, +! if needed. +! if (subgrid_flag.eq.0.0) then +! call waterbal_snowtran(w_balance,prec,Qcs, +! & runoff,d_canopy_int,swe_depth,glacier_melt,iter, +! & wbal_qsubl,wbal_salt,wbal_susp,wbal_subgrid,nx,ny, +! & swe_depth_old,swesublim,canopy_unload,canopy_int, +! & canopy_int_old) +! endif + endif + +! If this is a sea ice run, zero out the ocean grid cells that +! have no sea ice in them. + if (seaice_run.ne.0.0) then + CALL ZERO_SEAICE_SNOW(nx,ny,snow_depth,ro_snow_grid,& + & ro_snow,swe_depth,swe_depth_old,canopy_int_old,KK,& + & tslsnowfall,snod_layer,swed_layer,ro_layer,T_old,& + & multilayer_snowpack,tsls_threshold,seaice_conc,& + & sum_sprec,sum_trans) + endif + +! Save the mass balance variables from this time step. + do j=1,ny + do i=1,nx + swe_depth_old(i,j) = swe_depth(i,j) + canopy_int_old(i,j) = canopy_int(i,j) + enddo + enddo + +! In SnowTran-3D, the summed snow precipitation were in units +! of snow-depth. The rest of the routines assume that it is in +! swe units. + do j=1,ny + do i=1,nx + sum_sprec(i,j) = sum_sprec(i,j) * ro_snow / ro_water + enddo + enddo + +! Close the Tabler surface output file if this is the end of this +! assimulation loop. + if (iter.eq.max_iter) close(52) + + return + end subroutine SNOWTRAN_CODE + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine waterbal_snowtran(w_balance,prec,Qcs,& + & runoff,d_canopy_int,swe_depth,glacier_melt,iter,& + & wbal_qsubl,wbal_salt,wbal_susp,wbal_subgrid,nx,ny,& + & swe_depth_old,swesublim,canopy_unload,canopy_int,& + & canopy_int_old) + + use snowmodel_inc + implicit none + + integer iter,nx,ny,i,j + + real w_balance(nx,ny),prec(nx,ny),& + & Qcs(nx,ny),runoff(nx,ny),& + & d_canopy_int(nx,ny),swe_depth(nx,ny),& + & glacier_melt(nx,ny),wbal_qsubl(nx,ny),& + & wbal_salt(nx,ny),swe_depth_old(nx,ny),& + & swesublim(nx,ny),wbal_susp(nx,ny),& + & wbal_subgrid(nx,ny),canopy_unload(nx,ny),& + & canopy_int_old(nx,ny),canopy_int(nx,ny) + +! Note that the following balances should hold. These aren't quite +! right, but it is a place to start. +! Canopy Balance (forest): +! canopy = sprec - unload + Qcs ==> unload = sprec - canopy + Qcs +! +! Snowpack Balance (forest): +! swe_d = unload + rain - runoff ==> +! canopy + swe_d = sprec + rain + Qcs - runoff +! prec = sprec + rain +! sum_rain = sum_sprec - sum_prec +! +! Snowpack Balance (non-forest): +! swe_d = sprec + rain - runoff + subl + salt + susp + subgrid + +! glaciermelt +! +! Everywhere: +! w_balance = sum_prec + sum_Qcs - sum_runoff + sum_subl + +! sum_trans - canopy_int - swe_depth + sum_glacmelt +! +! The related variables that would need to be brought in are: +! d_canopy_int,sum_d_canopy_int,sum_unload + +! The subroutine WATERBAL_SNOWTRAN is used if the model simulation +! includes SnowTran-3D. + do j=1,ny + do i=1,nx + w_balance(i,j) = swe_depth_old(i,j) - swe_depth(i,j) + & + & prec(i,j) - runoff(i,j) + glacier_melt(i,j) +& + & wbal_qsubl(i,j) + wbal_salt(i,j) + wbal_susp(i,j) +& + & wbal_subgrid(i,j) - swesublim(i,j) + canopy_int_old(i,j) -& + & canopy_int(i,j) + Qcs(i,j) + + if (abs(w_balance(i,j)).gt.1.0e-5) & + & print*,'water imbalance at iter =',iter,' ',w_balance(i,j) + + enddo + enddo + + return + end subroutine waterbal_snowtran + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine noblowsnow(nx,ny,Qsalt_max,Qsalt_maxu,& + & Qsalt_maxv,Qsalt,Qsalt_u,Qsalt_v,dh_salt,dh_salt_u,& + & dh_salt_v,conc_salt,Qsusp,Qsusp_u,Qsusp_v,dh_susp,& + & dh_susp_u,dh_susp_v,Qsubl,dh_subgrid) + + use snowmodel_inc + implicit none + + integer nx,ny,i,j + real Qsalt_max(nx,ny) + real Qsalt_maxu(nx,ny),Qsalt_maxv(nx,ny) + real Qsalt(nx,ny) + real Qsalt_u(nx,ny),Qsalt_v(nx,ny) + real dh_salt(nx,ny) + real dh_salt_u(nx,ny),dh_salt_v(nx,ny) + + real conc_salt(nx,ny) + + real Qsusp(nx,ny) + real Qsusp_u(nx,ny),Qsusp_v(nx,ny) + real dh_susp(nx,ny) + real dh_susp_u(nx,ny),dh_susp_v(nx,ny) + real dh_subgrid(nx,ny) + + real Qsubl(nx,ny) + + do i=1,nx + do j=1,ny + Qsalt_max(i,j) = 0.0 + Qsalt_maxu(i,j) = 0.0 + Qsalt_maxv(i,j) = 0.0 + Qsalt(i,j) = 0.0 + Qsalt_u(i,j) = 0.0 + Qsalt_v(i,j) = 0.0 + dh_salt(i,j) = 0.0 + dh_salt_u(i,j) = 0.0 + dh_salt_v(i,j) = 0.0 + conc_salt(i,j) = 0.0 + Qsusp(i,j) = 0.0 + Qsusp_u(i,j) = 0.0 + Qsusp_v(i,j) = 0.0 + dh_susp(i,j) = 0.0 + dh_susp_u(i,j) = 0.0 + dh_susp_v(i,j) = 0.0 + Qsubl(i,j) = 0.0 + dh_subgrid(i,j) = 0.0 + enddo + enddo + + return + end + + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine bs_sublimation_only(nx,ny,dt,bs_flag,ro_water,& + & snow_depth,swe_depth,ro_snow_grid,soft_snow_d,Qsubl,& + & vegsnowd_xy,Qsubl_depth) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny + + real dt,bs_flag,ro_water,snowdmin,hard_snow_d + + real snow_depth(nx,ny) + real swe_depth(nx,ny) + real ro_snow_grid(nx,ny) + + real soft_snow_d(nx,ny) + real Qsubl(nx,ny) + real Qsubl_depth(nx,ny) + + real vegsnowd_xy(nx,ny) + +! Adjust the snow and swe depths to account for blowing-snow +! sublimation. + + if (bs_flag.eq.1.0) then + +! SUBLIMATION +! Make adjustments for the case where there is no snow available +! on the ground (or captured within the vegetation) to be +! eroded. Since Qsubl is blowing snow sublimation, don't let +! this sublimation reach down into the hard snow layer or into +! the vegsnowd, because that snow is not available to be blown +! around. + do i=1,nx + do j=1,ny + hard_snow_d = snow_depth(i,j) - soft_snow_d(i,j) + snowdmin = max(vegsnowd_xy(i,j),hard_snow_d) + +! Convert Qsubl from sublimation flux to sublimated snow depth. +! Qsubl is negative here. + Qsubl(i,j) = Qsubl(i,j) * dt / ro_snow_grid(i,j) + + if (snow_depth(i,j).gt.snowdmin) then + if (snow_depth(i,j)+Qsubl(i,j).le.snowdmin) then + Qsubl(i,j) = snowdmin - snow_depth(i,j) + endif + else + Qsubl(i,j) = 0.0 + endif + enddo + enddo + +! Account for decreases in snow depth due to sublimation. + do i=1,nx + do j=1,ny + snow_depth(i,j) = snow_depth(i,j) + Qsubl(i,j) + soft_snow_d(i,j) = soft_snow_d(i,j) + Qsubl(i,j) + enddo + enddo + + else + + do i=1,nx + do j=1,ny + Qsubl(i,j) = 0.0 + enddo + enddo + + endif + +! Convert any snow-depth adjustments that occurred above to +! swe using the spatially-distributed snow density from the +! snowpack model. Also convert the Qsubl_depth values from +! snow depth to swe depth units. + do i=1,nx + do j=1,ny + swe_depth(i,j) = snow_depth(i,j) * ro_snow_grid(i,j) / & + & ro_water + Qsubl_depth(i,j) = Qsubl(i,j) * ro_snow_grid(i,j) / & + & ro_water + enddo + enddo + + return + end subroutine bs_sublimation_only + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine accum(snow_d,nx,ny,ro_snow,dt,ro_water,& + & deltax,deltay,vegsnowd_xy,Tabler_2_flag,& + & index_ue,index_uw,index_vn,index_vs,undef,& + & Qsalt_u,Qsalt_v,Qsusp_u,Qsusp_v,Qsubl,dh_salt,& + & dh_salt_u,dh_salt_v,dh_susp,dh_susp_u,dh_susp_v,& + & wbal_qsubl,wbal_salt,wbal_susp,bs_flag,& + & soft_snow_d,topo,topo_land,topoflag,subgrid_flag,& + & tabler_nn,tabler_ss,tabler_ee,tabler_ww,& + & tabler_ne,tabler_se,tabler_sw,tabler_nw,& + & uwind_grid,vwind_grid,wbal_subgrid,sum_qsubl,& + & sum_trans,swe_depth,snow_depth,ro_snow_grid,& + & dh_subgrid,tabler_dir,iter,slope_adjust,& + & curve_len_scale) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,iter,k,loops_snowd_smoother,II,JJ,nnx,nny,& + & irotate_flag + + real ro_snow,dt,deltax,deltay,bs_flag,topoflag,ro_water + real snowdmin,hard_snow_d,subgrid_flag,tabler_dir + real slope_adjust,xmult,curve_len_scale,Tabler_2_flag + + real snow_d(nx,ny) + real snow_d_tmp(nx,ny) + real snow_depth(nx,ny) + real swe_depth(nx,ny) + real ro_snow_grid(nx,ny) + real snow_d_tabler(nx,ny) + real snow_d_dep(nx,ny) + real soft_snow_d_dep(nx,ny) + + real tabler_nn(nx,ny) + real tabler_ss(nx,ny) + real tabler_ee(nx,ny) + real tabler_ww(nx,ny) + real tabler_ne(nx,ny) + real tabler_se(nx,ny) + real tabler_sw(nx,ny) + real tabler_nw(nx,ny) + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + + real soft_snow_d(nx,ny) + real Qsubl(nx,ny) + real topo(nx,ny) + real topo_land(nx,ny) + real topo_tmp(nx,ny) + + real dh_salt(nx,ny) + real dh_salt_u(nx,ny) + real dh_salt_v(nx,ny) + + real dh_susp(nx,ny) + real dh_susp_u(nx,ny) + real dh_susp_v(nx,ny) + + real dh_subgrid(nx,ny) + real dh_dep(nx,ny) + + real Qsalt_u(nx,ny) + real Qsalt_v(nx,ny) + + real Qsusp_u(nx,ny) + real Qsusp_v(nx,ny) + + real wbal_qsubl(nx,ny) + real wbal_salt(nx,ny) + real wbal_susp(nx,ny) + real wbal_subgrid(nx,ny) + real sum_qsubl(nx,ny) + real sum_trans(nx,ny) + + real vegsnowd_xy(nx,ny) + + integer index_ue(ny_max,2*nx_max+1) + integer index_uw(ny_max,2*nx_max+1) + integer index_vn(nx_max,2*ny_max+1) + integer index_vs(nx_max,2*ny_max+1) + + real extra,space,fill,undef + real pi,rad2deg,bsflux_dir,bs_flux_u,bs_flux_v,subgrid_dir + +! Define the required constants. + pi = 2.0 * acos(0.0) + rad2deg = 180.0 / pi + +! COMPUTE THE NEW SNOW DEPTH. + +! PRECIPITATION +! Account for the addition due to snow precipitation. +! This is now updated at the beginning of the program (day). + +! Sum the precipitation in terms of snow depth. + if (bs_flag.eq.1.0) then + +! SALTATION + + call getnewdepth(nx,ny,deltax,deltay,Qsalt_u,& + & Qsalt_v,dh_salt_u,dh_salt_v,index_ue,index_uw,& + & index_vn,index_vs,ro_snow,dt,vegsnowd_xy,snow_d,& + & soft_snow_d,snow_d_dep,soft_snow_d_dep,subgrid_flag) + +! This saves the deposition part of the snow-depth change. + if (subgrid_flag.eq.1.0) then + do i=1,nx + do j=1,ny + dh_dep(i,j) = snow_d_dep(i,j) + enddo + enddo + endif + + do i=1,nx + do j=1,ny + dh_salt(i,j) = dh_salt_u(i,j) + dh_salt_v(i,j) + enddo + enddo + +! SUSPENSION + + call getnewdepth(nx,ny,deltax,deltay,Qsusp_u,& + & Qsusp_v,dh_susp_u,dh_susp_v,index_ue,index_uw,& + & index_vn,index_vs,ro_snow,dt,vegsnowd_xy,snow_d,& + & soft_snow_d,snow_d_dep,soft_snow_d_dep,subgrid_flag) + +! This adds the suspension part the deposition to the +! saltation part of the snow-depth change. + if (subgrid_flag.eq.1.0) then + do i=1,nx + do j=1,ny + dh_dep(i,j) = dh_dep(i,j) + snow_d_dep(i,j) + enddo + enddo + endif + + do i=1,nx + do j=1,ny + dh_susp(i,j) = dh_susp_u(i,j) + dh_susp_v(i,j) + enddo + enddo + +! Save a copy of the snow distribution to be used to calculate the +! snow distribution changes resulting from the subgrid +! redistribution. + do i=1,nx + do j=1,ny + snow_d_tmp(i,j) = snow_d(i,j) + enddo + enddo + +! Run the subgrid parameterization to account for unrealistic +! snow accumulation spikes. + if (subgrid_flag.eq.1.0) then + +! Do the Tabler corrections while assuming the constant snow density +! defined in snowmodel.par (ro_snow). This is done to avoid all +! of the messy tracking of different density snows that is being +! blown around by the wind. This simplification could be relaxed +! at some point, but it is not an easy accounting, and I don't +! think it is justified at this point, given everything else that +! we don't know. snow_d is coming in from SnowPack where the +! ro_snow adjustment has already been made. When all of the Tabler +! calculations are finished, then we will convert back from the +! SnowTran constant density convention to the SnowPack ro_snow_grid +! spatially distributed snow density. Note that here, that coming +! from SnowPack, if the snow depth equals zero, the snow density +! is undefined. This can cause problems for the case where Tabler +! has moved snow into a previously snow-free grid cell; that grid +! cell will also need a snow density assigned to it. Right now I +! am assigning that value to be ro_snow from snowmodel.par. + do i=1,nx + do j=1,ny + snow_d_tabler(i,j) = snow_d(i,j) + enddo + enddo + +! The following subgrid_1 subroutine was saved because it provides +! an example of how to relax the assumption of a single wind +! direction over the entire domain at a given time step. This +! is the old subgrid routine that is no longer used or supported. +! if (subgrid_flag.eq.1.0) then +! call subgrid_1(nx,ny,snow_d_tabler, +! & index_ue,index_uw,index_vn,index_vs, +! & tabler_nn,tabler_ss,tabler_ee,tabler_ww, +! & tabler_ne,tabler_se,tabler_sw,tabler_nw,uwind_grid, +! & vwind_grid,tabler_dir) +! endif + +! Calculate the integrated snow-transport direction. + +! Initialize the summing arrays. + bs_flux_u = 0.0 + bs_flux_v = 0.0 + +! Sum the fluxes in the u-v directions. Add the u-v sign to the +! fluxes so there is a direction associated with them. + do i=1,nx + do j=1,ny + bs_flux_u = bs_flux_u + & + & sign(Qsalt_u(i,j),uwind_grid(i,j)) + & + & sign(Qsusp_u(i,j),uwind_grid(i,j)) + bs_flux_v = bs_flux_v + & + & sign(Qsalt_v(i,j),vwind_grid(i,j)) + & + & sign(Qsusp_v(i,j),vwind_grid(i,j)) + enddo + enddo + +! Calculate the resulting direction. Some compilers do not +! allow both u and v to be 0.0 in the atan2 computation. + if (abs(bs_flux_u).lt.1e-10) bs_flux_u = 1e-10 + bsflux_dir = rad2deg * atan2(bs_flux_u,bs_flux_v) + if (bsflux_dir.ge.180.0) then + bsflux_dir = bsflux_dir - 180.0 + else + bsflux_dir = bsflux_dir + 180.0 + endif + +! print *,bsflux_dir,bs_flux_u,bs_flux_v +! print *,bsflux_dir,bs_flux_u,bs_flux_v +! print *,bsflux_dir,bs_flux_u,bs_flux_v +! print *,bsflux_dir,bs_flux_u,bs_flux_v + +! Decide whether tabler_dir or bsflux_dir is going to be used to do +! the Tabler-surface snow redistributions. + if (tabler_dir.lt.0.0) then + subgrid_dir = bsflux_dir +! print *, 'using bsflux_dir' + else + subgrid_dir = tabler_dir +! print *, 'using tabler_dir' + endif + +! Smooth the snow distribution to eliminate any sharp wind speed +! variations computed at the next time step. Define the number +! of times this is done to be a function of the curvature length +! scale and the grid increment. Unwanted peaks in the snow +! distributions can be further eliminated by adjusting the +! multiplication factor, xmult. Also see "loops_windwt_smoother" +! in micromet_code.f. +! xmult = 0.15 + xmult = 0.25 +! xmult = 0.5 + loops_snowd_smoother = nint(xmult * curve_len_scale / & + & (0.5 * (deltax + deltay))) + +! print * +! print *, 'loops_snowd_smoother ',loops_snowd_smoother +! print * + +! Don't do this smoothing if the domain is arbitrarily small. + if (nx.gt.100 .and. ny.gt.100) then + do k=1,loops_snowd_smoother + call smoother9(nx,ny,snow_d_tabler) + enddo + endif + +! Create Tabler surfaces from the snow on the ground at this +! time step, with just erosion taken into account (that's +! where we are at this point). Add that current snow depth +! to topo_land. Then use this to create the Tabler surface that +! will be used for this time step. Also define this depth to be +! dependent on the SnowPack spatially distributed snow density, +! not the constant density used in SnowTran. + do i=1,nx + do j=1,ny + topo_tmp(i,j) = snow_d_tabler(i,j) + topo_land(i,j) + enddo + enddo + +! The following loop does four things: + +! (1) Extract the Tabler surface for the direction of interest at +! this time step. + +! (2) The Tabler surfaces that were just generated have had topo_tmp +! subtracted off of them, giving just the drift profiles with +! things like zero drift depth on ridges and windwards slopes. +! So, add the snow depth, prior to any wind redistribution, to +! these Tabler surfaces. This will be the maximum snow depth +! allowed as part of the wind redistribution. + +! (3) Set the snow-free areas equal to the snow-holding depth. + +! (4) Save the calculated Tabler surface at this time step. You can +! comment this out if you don't want to write them out. + +! nn. +! Consider N winds. + if (subgrid_dir.gt.337.5 .and. subgrid_dir.le.360.0 .or. & + & subgrid_dir.ge.0.0 .and. subgrid_dir.le.22.5) then +! print *,'in nn' + +! Extract the Tabler surface. + irotate_flag = 1 + call tabler_n(nx,ny,topo_tmp,tabler_nn,deltay, & + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_nn(i,j) = snow_d_tabler(i,j) + tabler_nn(i,j) + tabler_nn(i,j) = max(tabler_nn(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0) & + & write(52,rec=iter) ((tabler_nn(i,j),i=1,nx),j=1,ny) + +! ne. +! Consider NE winds. + elseif (subgrid_dir.gt.22.5 .and. subgrid_dir.le.67.5) then +! print *,'in ne' + +! Extract the Tabler surface. + irotate_flag = 2 + call tabler_e(nx,ny,topo_tmp,tabler_ne,1.41*deltax, & + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_ne(i,j) = snow_d_tabler(i,j) + tabler_ne(i,j) + tabler_ne(i,j) = max(tabler_ne(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0) & + & write(52,rec=iter) ((tabler_ne(i,j),i=1,nx),j=1,ny) + +! ee. +! Consider E winds. + elseif (subgrid_dir.gt.67.5 .and. subgrid_dir.le.112.5) then +! print *,'in ee' + +! Extract the Tabler surface. + irotate_flag = 1 + call tabler_e(nx,ny,topo_tmp,tabler_ee,deltax, & + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_ee(i,j) = snow_d_tabler(i,j) + tabler_ee(i,j) + tabler_ee(i,j) = max(tabler_ee(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0) & + & write(52,rec=iter) ((tabler_ee(i,j),i=1,nx),j=1,ny) + +! se. +! Consider SE winds. + elseif(subgrid_dir.gt.112.5 .and. subgrid_dir.le.157.5)then +! print *,'in se' + +! Extract the Tabler surface. + irotate_flag = 2 + call tabler_s(nx,ny,topo_tmp,tabler_se,1.41*deltay,& + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_se(i,j) = snow_d_tabler(i,j) + tabler_se(i,j) + tabler_se(i,j) = max(tabler_se(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0)& + & write(52,rec=iter) ((tabler_se(i,j),i=1,nx),j=1,ny) + +! ss. +! Consider S winds. + elseif(subgrid_dir.gt.157.5 .and. subgrid_dir.le.202.5)then +! print *,'in ss' + +! Extract the Tabler surface. + irotate_flag = 1 + call tabler_s(nx,ny,topo_tmp,tabler_ss,deltay,& + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_ss(i,j) = snow_d_tabler(i,j) + tabler_ss(i,j) + tabler_ss(i,j) = max(tabler_ss(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0)& + & write(52,rec=iter) ((tabler_ss(i,j),i=1,nx),j=1,ny) + +! sw. +! Consider SW winds. + elseif(subgrid_dir.gt.202.5 .and. subgrid_dir.le.247.5)then +! print *,'in sw' + +! Extract the Tabler surface. + irotate_flag = 2 + call tabler_w(nx,ny,topo_tmp,tabler_sw,1.41*deltax,& + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_sw(i,j) = snow_d_tabler(i,j) + tabler_sw(i,j) + tabler_sw(i,j) = max(tabler_sw(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0)& + & write(52,rec=iter) ((tabler_sw(i,j),i=1,nx),j=1,ny) + +! ww. +! Consider W winds. + elseif(subgrid_dir.gt.247.5 .and. subgrid_dir.le.292.5)then +! print *,'in ww' + +! Extract the Tabler surface. + irotate_flag = 1 + call tabler_w(nx,ny,topo_tmp,tabler_ww,deltax,& + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_ww(i,j) = snow_d_tabler(i,j) + tabler_ww(i,j) + tabler_ww(i,j) = max(tabler_ww(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0)& + & write(52,rec=iter) ((tabler_ww(i,j),i=1,nx),j=1,ny) + +! nw. +! Consider NW winds. + elseif(subgrid_dir.gt.292.5 .and. subgrid_dir.le.337.5)then +! print *,'in nw' + +! Extract the Tabler surface. + irotate_flag = 2 + call tabler_n(nx,ny,topo_tmp,tabler_nw,1.41*deltay,& + & irotate_flag,slope_adjust) + +! Add the snow depth back on, and clip to the snow-holding depth. + do i=1,nx + do j=1,ny + tabler_nw(i,j) = snow_d_tabler(i,j) + tabler_nw(i,j) + tabler_nw(i,j) = max(tabler_nw(i,j),vegsnowd_xy(i,j)) + enddo + enddo + +! Save the Tabler surface. + if (Tabler_2_flag.eq.1.0)& + & write(52,rec=iter) ((tabler_nw(i,j),i=1,nx),j=1,ny) + + else + print *,'subgrid_dir not found' + stop + + endif + +! Now add the +dh snow back on, and do the sweep that does not +! allow any snow to exist above the Tabler surface. + do i=1,nx + do j=1,ny + snow_d_tabler(i,j) = snow_d_tabler(i,j) + dh_dep(i,j) + enddo + enddo + +! Sweep across the domain in the direction defined by tabler_dir +! or bsflux_dir (see above; now defined by subgrid_dir). This is +! done in the same direction across the entire domain. If using +! tabler_dir, then it is the same direction for all time steps. +! If using bsflux_dir, then it varies for each time step depending +! on the dominant transport direction. If you ever want to relax +! this "same direction over the entire domain" assumption, see +! the subgrid_1 subroutine (search subgrid_1 in this document; it +! is all commented out). + +! nn. +! Consider N winds. + if (subgrid_dir.gt.337.5 .and. subgrid_dir.le.360.0 .or. & + & subgrid_dir.ge.0.0 .and. subgrid_dir.le.22.5) then +! print *,'in nn' + +! Do the sweep in the direction of interest. + do i=1,nx + extra = 0.0 + do j=ny,1,-1 + if (snow_d_tabler(i,j).ge.tabler_nn(i,j)) then + extra = extra + snow_d_tabler(i,j) - tabler_nn(i,j) + snow_d_tabler(i,j) = tabler_nn(i,j) + else + space = tabler_nn(i,j) - snow_d_tabler(i,j) + fill = min(extra,space) + snow_d_tabler(i,j) = snow_d_tabler(i,j) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + enddo + enddo + +! ne. +! Consider NE winds. + elseif (subgrid_dir.gt.22.5 .and. subgrid_dir.le.67.5) then +! print *,'in ne' + +! Do the sweep in the direction of interest. + nny = nx + ny - 1 + do j=1,nny + extra = 0.0 + do i=nx,1,-1 + JJ = j + i - nx + if (JJ.ge.1 .and. JJ.le.ny) then + if (snow_d_tabler(i,JJ).ge.tabler_ne(i,JJ)) then + extra = extra+snow_d_tabler(i,JJ)-tabler_ne(i,JJ) + snow_d_tabler(i,JJ) = tabler_ne(i,JJ) + else + space = tabler_ne(i,JJ) - snow_d_tabler(i,JJ) + fill = min(extra,space) + snow_d_tabler(i,JJ) = snow_d_tabler(i,JJ) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + endif + enddo + enddo + +! ee. +! Consider E winds. + elseif (subgrid_dir.gt.67.5 .and. subgrid_dir.le.112.5) then +! print *,'in ee' + +! Do the sweep in the direction of interest. + do j=1,ny + extra = 0.0 + do i=nx,1,-1 + if (snow_d_tabler(i,j).ge.tabler_ee(i,j)) then + extra = extra + snow_d_tabler(i,j) - tabler_ee(i,j) + snow_d_tabler(i,j) = tabler_ee(i,j) + else + space = tabler_ee(i,j) - snow_d_tabler(i,j) + fill = min(extra,space) + snow_d_tabler(i,j) = snow_d_tabler(i,j) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + enddo + enddo + +! se. +! Consider SE winds. + elseif(subgrid_dir.gt.112.5 .and. subgrid_dir.le.157.5)then +! print *,'in se' + +! Do the sweep in the direction of interest. + nnx = nx + ny - 1 + do i=1,nnx + extra = 0.0 + do j=1,ny + II = i - j + 1 + if (II.ge.1 .and. II.le.nx) then + if (snow_d_tabler(II,j).ge.tabler_se(II,j)) then + extra = extra+snow_d_tabler(II,j)-tabler_se(II,j) + snow_d_tabler(II,j) = tabler_se(II,j) + else + space = tabler_se(II,j) - snow_d_tabler(II,j) + fill = min(extra,space) + snow_d_tabler(II,j) = snow_d_tabler(II,j) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + endif + enddo + enddo + +! ss. +! Consider S winds. + elseif(subgrid_dir.gt.157.5 .and. subgrid_dir.le.202.5)then +! print *,'in ss' + +! Do the sweep in the direction of interest. + do i=1,nx + extra = 0.0 + do j=1,ny + if (snow_d_tabler(i,j).ge.tabler_ss(i,j)) then + extra = extra + snow_d_tabler(i,j) - tabler_ss(i,j) + snow_d_tabler(i,j) = tabler_ss(i,j) + else + space = tabler_ss(i,j) - snow_d_tabler(i,j) + fill = min(extra,space) + snow_d_tabler(i,j) = snow_d_tabler(i,j) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + enddo + enddo + +! sw. +! Consider SW winds. + elseif(subgrid_dir.gt.202.5 .and. subgrid_dir.le.247.5)then +! print *,'in sw' + +! Do the sweep in the direction of interest. + nny = nx + ny - 1 + do j=1,nny + extra = 0.0 + do i=1,nx + JJ = j + i - nx + if (JJ.ge.1 .and. JJ.le.ny) then + if (snow_d_tabler(i,JJ).ge.tabler_sw(i,JJ)) then + extra = extra+snow_d_tabler(i,JJ)-tabler_sw(i,JJ) + snow_d_tabler(i,JJ) = tabler_sw(i,JJ) + else + space = tabler_sw(i,JJ) - snow_d_tabler(i,JJ) + fill = min(extra,space) + snow_d_tabler(i,JJ) = snow_d_tabler(i,JJ) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + endif + enddo + enddo + +! ww. +! Consider W winds. + elseif(subgrid_dir.gt.247.5 .and. subgrid_dir.le.292.5)then +! print *,'in ww' + +! Do the sweep in the direction of interest. + do j=1,ny + extra = 0.0 + do i=1,nx + if (snow_d_tabler(i,j).ge.tabler_ww(i,j)) then + extra = extra + snow_d_tabler(i,j) - tabler_ww(i,j) + snow_d_tabler(i,j) = tabler_ww(i,j) + else + space = tabler_ww(i,j) - snow_d_tabler(i,j) + fill = min(extra,space) + snow_d_tabler(i,j) = snow_d_tabler(i,j) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + enddo + enddo + +! nw. +! Consider NW winds. + elseif(subgrid_dir.gt.292.5 .and. subgrid_dir.le.337.5)then +! print *,'in nw' + +! Do the sweep in the direction of interest. + nnx = nx + ny - 1 + do i=1,nnx + extra = 0.0 + do j=ny,1,-1 + II = i - j + 1 + if (II.ge.1 .and. II.le.nx) then + if (snow_d_tabler(II,j).ge.tabler_nw(II,j)) then + extra = extra+snow_d_tabler(II,j)-tabler_nw(II,j) + snow_d_tabler(II,j) = tabler_nw(II,j) + else + space = tabler_nw(II,j) - snow_d_tabler(II,j) + fill = min(extra,space) + snow_d_tabler(II,j) = snow_d_tabler(II,j) + fill + extra = extra - fill + if (extra.lt.0.0) print *,'extra < 0.0',extra + endif + endif + enddo + enddo + + else + print *,'subgrid_dir not found' + stop + + endif + +! Update the snow depths using the Tabler adjustments. + do i=1,nx + do j=1,ny + snow_d(i,j) = snow_d_tabler(i,j) + enddo + enddo + + endif +! End subgrid_flag = 1.0. + +! Calculate the snow depth resulting from the subgrid +! redistribution. + do i=1,nx + do j=1,ny + dh_subgrid(i,j) = snow_d(i,j) - snow_d_tmp(i,j) + enddo + enddo + +! SUBLIMATION +! Make adjustments for the case where there is no snow available +! on the ground (or captured within the vegetation) to be +! eroded. Since Qsubl is blowing snow sublimation, don't let +! this sublimation reach down into the hard snow layer or into +! the vegsnowd, because that snow is not available to be blown +! around. I don't think it matters much whether this is done +! before or after the Tabler subgrid redistribution. + do i=1,nx + do j=1,ny + hard_snow_d = snow_d(i,j) - soft_snow_d(i,j) + snowdmin = max(vegsnowd_xy(i,j),hard_snow_d) + +! Convert Qsubl flux to sublimated snow depth. + Qsubl(i,j) = Qsubl(i,j) * dt / ro_snow + + if (snow_d(i,j).gt.snowdmin) then + if (snow_d(i,j)+Qsubl(i,j).le.snowdmin) then + Qsubl(i,j) = snowdmin - snow_d(i,j) + endif + else + Qsubl(i,j) = 0.0 + endif + enddo + enddo + +! Account for decreases in snow depth due to sublimation. Note +! that the subgrid_flag = 1.0 routines have not modified the +! soft snow depth in any way. Changes must be made if this is +! not an appropriate assumption. + do i=1,nx + do j=1,ny + snow_d(i,j) = snow_d(i,j) + Qsubl(i,j) + soft_snow_d(i,j) = soft_snow_d(i,j) + Qsubl(i,j) + enddo + enddo + +! Find any undefined ro_snow_grid(i,j) values, that correspond to +! non-zero snow_d(i,j) values, and fill them in with ro_snow. +! This no longer seems to be required. Any zero snow_d(i,j) +! values should have ro_snow in the ro_snow_grid(i,j) positions +! from the initial conditions that were provided. +! do i=1,nx +! do j=1,ny +! the checking code would go here. +! enddo +! enddo + +! Update the surface topography resulting from the snow setting +! on the land. + if (topoflag.eq.1.0) then + do i=1,nx + do j=1,ny +! This gives the constant density version. +! topo(i,j) = topo_land(i,j) + snow_d(i,j) +! This gives the spatially distributed density version. + topo(i,j) = topo_land(i,j) + snow_d(i,j) * & + & ro_snow_grid(i,j) / ro_snow + enddo + enddo + elseif (topoflag.eq.0.0) then + do i=1,nx + do j=1,ny + topo(i,j) = topo_land(i,j) + enddo + enddo + endif + + else +! Because a Tabler surface was not generated or used (because there +! was no blowing snow), save this time step as undef values. + if (Tabler_2_flag.eq.1.0)& + & write(52,rec=iter) ((undef,i=1,nx),j=1,ny) + +! This ends the "if blowing snow flag = 1" case. + endif + +! MOISTURE BALANCE +! Save enough information to do a moisture balance. + do i=1,nx + do j=1,ny + +! Save the sublimation in terms of swe depth. + wbal_qsubl(i,j) = Qsubl(i,j) * ro_snow / ro_water + +! Save the saltation in terms of swe depth. + wbal_salt(i,j) = dh_salt(i,j) * ro_snow / ro_water + +! Save the suspension in terms of swe depth. + wbal_susp(i,j) = dh_susp(i,j) * ro_snow / ro_water + +! Save the subgrid redistribution in terms of swe depth. + wbal_subgrid(i,j) = dh_subgrid(i,j) * ro_snow / ro_water + +! Fill summing arrays of the sublimation and transport quantities. + sum_qsubl(i,j) = sum_qsubl(i,j) + wbal_qsubl(i,j) + sum_trans(i,j) = sum_trans(i,j) + wbal_salt(i,j) + & + & wbal_susp(i,j) + wbal_subgrid(i,j) + + enddo + enddo + + do i=1,nx + do j=1,ny + +! Convert any snow-depth adjustments that occurred in SnowTran-3D +! to swe (using the SnowTran-3D constant snow density) so +! that it can be used in SNOWPACK that accounts for the +! time-evolution of snow density. + swe_depth(i,j) = snow_d(i,j) * ro_snow / ro_water + +! Calculate the snow depth using the spatially-distributed snow density +! from the snowpack model. + snow_depth(i,j) = swe_depth(i,j) * & + ro_water / ro_snow_grid(i,j) + + enddo + enddo + + return + end subroutine accum + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine smoother9(nx,ny,snow) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny + real snow(nx,ny) + real snow_tmp(nx,ny) + +! Performs a 9-point smoothing operation. + +! The result at each grid point is a weighted average of the grid +! point and the surrounding 8 points. The center point receives +! a weight of 1.0, the points at each side and above and below +! receive a weight of 0.5, and corner points receive a weight of +! 0.3. All points are multiplied by their weights and summed, +! then divided by the total weight. + +! Do the interior. + do i=2,nx-1 + do j=2,ny-1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j-1) + & + & snow(i,j+1) + snow(i-1,j) + snow(i+1,j)) + 0.3 *& + & (snow(i-1,j-1) + snow(i+1,j+1) + snow(i-1,j+1) +& + & snow(i+1,j-1))) / 4.2 + enddo + enddo + +! Do the sides. + j = 1 + do i=2,nx-1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j+1) + snow(i-1,j) +& + & snow(i+1,j)) + 0.3 * (snow(i+1,j+1) + snow(i-1,j+1))) / 3.1 + enddo + + j = ny + do i=2,nx-1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j-1) + snow(i-1,j) +& + & snow(i+1,j)) + 0.3 * (snow(i+1,j-1) + snow(i-1,j-1))) / 3.1 + enddo + + i = 1 + do j=2,ny-1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j-1) + snow(i,j+1) +& + & snow(i+1,j)) + 0.3 * (snow(i+1,j-1) + snow(i+1,j+1))) / 3.1 + enddo + + i = nx + do j=2,ny-1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j-1) + snow(i,j+1) +& + & snow(i-1,j)) + 0.3 * (snow(i-1,j-1) + snow(i-1,j+1))) / 3.1 + enddo + +! Do the corners. + i = 1 + j = 1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j+1) + snow(i+1,j)) +& + & 0.3 * snow(i+1,j+1)) / 2.3 + + i = nx + j = 1 + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j+1) + snow(i-1,j)) +& + & 0.3 * snow(i-1,j+1)) / 2.3 + + i = 1 + j = ny + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j-1) + snow(i+1,j)) +& + & 0.3 * snow(i+1,j-1)) / 2.3 + + i = nx + j = ny + snow_tmp(i,j) = (snow(i,j) + 0.5 * (snow(i,j-1) + snow(i-1,j)) +& + & 0.3 * snow(i-1,j-1)) / 2.3 + +! Return the smoothed array. + do i=1,nx + do j=1,ny + snow(i,j) = snow_tmp(i,j) + enddo + enddo + + return + end subroutine smoother9 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine suspension(Utau,vonKarman,nx,ny,conc_salt,& + & Qsalt,Qsusp,z_0,h_star,dz,ztop,pi,& + & fall_vel,Ur_const,Up_const,Utau_t,Qsubl,ht_rhobs,& + & tair_grid,rh_grid,Qsusp_u,Qsusp_v,uwind_grid,& + & vwind_grid) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,nzsteps,iz + + real vonKarman,dz,ztop,fall_vel,Ur_const,Up_const + real ht_rhobs,V_susp,V_salt,pi + real U_p,Utau_fallvel,U_r,phistar_Cr,product,conc,z + + real Utau(nx,ny) + real Utau_t(nx,ny) + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + real z_0(nx,ny) + real h_star(nx,ny) + real conc_salt(nx,ny) + real Qsalt(nx,ny) + real Qsusp(nx,ny) + real Qsusp_u(nx,ny) + real Qsusp_v(nx,ny) + real Qsubl(nx,ny) + + real tair_grid(nx,ny) + real rh_grid(nx,ny) + +! Compute the mass concentration of suspended snow according to +! Kind (1992). + + do i=1,nx + do j=1,ny + if (Qsalt(i,j).gt.0.0) then + Utau_fallvel = Utau(i,j) / fall_vel + if (h_star(i,j).eq.z_0(i,j)) h_star(i,j) = 2.0 * z_0(i,j) + U_r = Utau(i,j)/vonKarman * log(h_star(i,j)/z_0(i,j)) + phistar_Cr = Utau(i,j)/U_r * Ur_const + product = phistar_Cr * Utau_fallvel + U_p = Up_const * Utau_t(i,j) + +! Compute the concentration in the saltation layer (kg/m**3). + conc_salt(i,j) = Qsalt(i,j) / (h_star(i,j) * U_p) + + nzsteps = int((ztop - h_star(i,j)) / dz) + + Qsusp(i,j) = 0.0 + Qsubl(i,j) = 0.0 + + do iz=1,nzsteps + z = h_star(i,j) + 0.5 * dz + real(iz - 1) * dz + +! Compute the concentration of the suspended snow at height z. + conc = conc_salt(i,j) * ((product + 1.0) * & + & (z/h_star(i,j))**((-fall_vel)/(vonKarman*Utau(i,j))) - & + & product) + conc = max(conc,0.0) + +! Only do The integration if the concentration is non-zero. + if (conc.gt.0.0) then + +! Compute the sublimation due to suspension. + call getsublim(z,rh_grid(i,j),tair_grid(i,j),Utau(i,j),& + & z_0(i,j),V_susp,V_salt,Utau_t(i,j),ht_rhobs,1.0,pi) + +! Perform the quadrature (summation), without the constants. + if (z.eq.z_0(i,j)) z = 1.2 * z_0(i,j) + Qsusp(i,j) = Qsusp(i,j) + conc * log(z/z_0(i,j)) * dz + Qsubl(i,j) = Qsubl(i,j) + conc * V_susp * dz + + endif + + enddo + +! Finish the quadratures. +! Include the constants for Qsusp. + Qsusp(i,j) = Utau(i,j) / vonKarman * Qsusp(i,j) + +! Include the sublimation contribution due to saltation. + z = h_star(i,j) / 2.0 + call getsublim(z,rh_grid(i,j),tair_grid(i,j),Utau(i,j),& + & z_0(i,j),V_susp,V_salt,Utau_t(i,j),ht_rhobs,0.0,pi) + + Qsubl(i,j) = Qsubl(i,j) +& + & V_salt * conc_salt(i,j) * h_star(i,j) + + else + conc_salt(i,j) = 0.0 + Qsusp(i,j) = 0.0 + Qsubl(i,j) = 0.0 + endif + + enddo + enddo + +! Separate the east-west and the north-south suspended transport +! components; the vector sum should equal Qsusp. + do i=1,nx + do j=1,ny + Qsusp_u(i,j) = Qsusp(i,j) * abs(uwind_grid(i,j)) /& + & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) + Qsusp_v(i,j) = Qsusp(i,j) * abs(vwind_grid(i,j)) /& + & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) + enddo + enddo + + return + end subroutine suspension + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine saltation(Qsalt,deltax,fetch,Utau,Utau_t,nx,ny,& + & ro_air,gravity,vegsnowd_xy,snow_d,& + & Qsalt_max,Qsalt_maxu,Qsalt_maxv,deltay,Qsalt_u,Qsalt_v,& + & index_ue,index_uw,index_vn,index_vs,uwind_grid,& + & vwind_grid,xmu,soft_snow_d,bc_flag) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny + integer k,istart,iend,jstart,jend + + real deltax,deltay,fetch,ro_air,gravity,dUtau,xmu,& + & blowby,bc_flag + + real Qsalt_max(nx,ny) + real Qsalt_maxu(nx,ny) + real Qsalt_maxv(nx,ny) + real Qsalt(nx,ny) + real Qsalt_u(nx,ny) + real Qsalt_v(nx,ny) + real Utau(nx,ny) + real Utau_t(nx,ny) + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + real snow_d(nx,ny) + real soft_snow_d(nx,ny) + real vegsnowd_xy(nx,ny) + + integer index_ue(ny_max,2*nx_max+1) + integer index_uw(ny_max,2*nx_max+1) + integer index_vn(nx_max,2*ny_max+1) + integer index_vs(nx_max,2*ny_max+1) + + real scale_EW,scale_NS + +! The blowby parameter is implemented to account for the erosion +! of the tops of deep snow accumulations. It corrects a +! deficiency in the du*/dx* < 0 formulation. It is a number that +! should range from 0 to 1.0, and represents the fraction of the +! upwind saltation flux that is transfered farther downwind into +! the next grid cell. So, the bigger the number, the less +! peaked the drift accumulation profile is. blowby = 0.0 is the +! original model. I am now using the Tabler surfaces to do the +! same kind of thing, so here I hard-code the parameter as in the +! original model. + blowby = 0.0 + +! Compute the maximum possible saltation flux, assuming that +! an abundance of snow is available at the surface. + do i=1,nx + do j=1,ny + +! For a given wind speed, find Qsalt_max. + Qsalt_max(i,j) = 0.68 * ro_air / gravity * & + & Utau_t(i,j) / Utau(i,j) * (Utau(i,j)**2 - Utau_t(i,j)**2) + Qsalt_max(i,j) = max(Qsalt_max(i,j),0.0) + +! Now weight the max saltation flux for the u and v wind +! components, where the vector sum should equal Qsalt_max. + Qsalt_maxu(i,j) = Qsalt_max(i,j) * abs(uwind_grid(i,j)) / & + & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) + Qsalt_maxv(i,j) = Qsalt_max(i,j) * abs(vwind_grid(i,j)) / & + & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) + enddo + enddo + +! Define an upwind boundary condition. If bc_flag = 1.0 then it is +! assumed that the inflow saltation flux has reached steady state. +! If bc_flag = 0.0 then the saltation flux is assumed to be zero. +! The boundary condition is implemented by initializing the arrays +! to Qsalt_max, and since upwind boundaries are not called in +! the Qsalt computation, they stay in effect for the future +! accumulation/erosion computation. + if (bc_flag.eq.0.0) then + do i=1,nx + do j=1,ny +! Zero incoming flux at the boundaries. + Qsalt_u(i,j) = 0.0 + Qsalt_v(i,j) = 0.0 + enddo + enddo + elseif (bc_flag.eq.1.0) then + do i=1,nx + do j=1,ny +! Steady-state (maximum) incoming flux at the boundaries. + Qsalt_u(i,j) = Qsalt_maxu(i,j) + Qsalt_v(i,j) = Qsalt_maxv(i,j) + enddo + enddo + endif + +! Define the scaling coefficients for Eqn. 9 in L&S 1998. Don't +! let them be greater than 1.0 or you will make more snow than +! there was before. + scale_EW = xmu * deltax / fetch + scale_EW = min(1.0,scale_EW) + scale_NS = xmu * deltay / fetch + scale_NS = min(1.0,scale_NS) + +! Consider WESTERLY winds. + do j=1,ny + do k=1,index_uw(j,1) + istart = index_uw(j,k*2)+1 + iend = index_uw(j,k*2+1) + do i=istart,iend + dUtau = Utau(i,j) - Utau(i-1,j) + if (dUtau.ge.0.0) then + Qsalt_u(i,j) = Qsalt_u(i-1,j) + scale_EW * & + & (Qsalt_maxu(i,j) - Qsalt_u(i-1,j)) + else +! Qsalt_u(i,j) = min(Qsalt_u(i-1,j),Qsalt_maxu(i,j)) + + if (Qsalt_u(i-1,j).lt.Qsalt_maxu(i,j)) then + Qsalt_u(i,j) = Qsalt_u(i-1,j) + else + Qsalt_u(i,j) = & + & max(blowby*Qsalt_u(i-1,j),Qsalt_maxu(i,j)) + endif + + endif + enddo + enddo + enddo + +! Consider EASTERLY winds. + do j=1,ny + do k=1,index_ue(j,1) + iend = index_ue(j,k*2) + istart = index_ue(j,k*2+1)-1 + do i=istart,iend,-1 + dUtau = Utau(i,j) - Utau(i+1,j) + if (dUtau.ge.0.0) then + Qsalt_u(i,j) = Qsalt_u(i+1,j) + scale_EW * & + & (Qsalt_maxu(i,j) - Qsalt_u(i+1,j)) + else +! Qsalt_u(i,j) = min(Qsalt_u(i+1,j),Qsalt_maxu(i,j)) + + if (Qsalt_u(i+1,j).lt.Qsalt_maxu(i,j)) then + Qsalt_u(i,j) = Qsalt_u(i+1,j) + else + Qsalt_u(i,j) = & + & max(blowby*Qsalt_u(i+1,j),Qsalt_maxu(i,j)) + endif + + endif + enddo + enddo + enddo + +! Consider SOUTHERLY winds. + do i=1,nx + do k=1,index_vs(i,1) + jstart = index_vs(i,k*2)+1 + jend = index_vs(i,k*2+1) + do j=jstart,jend + dUtau = Utau(i,j) - Utau(i,j-1) + if (dUtau.ge.0.0) then + Qsalt_v(i,j) = Qsalt_v(i,j-1) + scale_NS * & + & (Qsalt_maxv(i,j) - Qsalt_v(i,j-1)) + else +! Qsalt_v(i,j) = min(Qsalt_v(i,j-1),Qsalt_maxv(i,j)) + + if (Qsalt_v(i,j-1).lt.Qsalt_maxv(i,j)) then + Qsalt_v(i,j) = Qsalt_v(i,j-1) + else + Qsalt_v(i,j) = & + & max(blowby*Qsalt_v(i,j-1),Qsalt_maxv(i,j)) + endif + + endif + enddo + enddo + enddo + +! Consider NORTHERLY winds. + do i=1,nx + do k=1,index_vn(i,1) + jend = index_vn(i,k*2) + jstart = index_vn(i,k*2+1)-1 + do j=jstart,jend,-1 + dUtau = Utau(i,j) - Utau(i,j+1) + if (dUtau.ge.0.0) then + Qsalt_v(i,j) = Qsalt_v(i,j+1) + scale_NS * & + & (Qsalt_maxv(i,j) - Qsalt_v(i,j+1)) + else +! Qsalt_v(i,j) = min(Qsalt_v(i,j+1),Qsalt_maxv(i,j)) + + if (Qsalt_v(i,j+1).lt.Qsalt_maxv(i,j)) then + Qsalt_v(i,j) = Qsalt_v(i,j+1) + else + Qsalt_v(i,j) = & + & max(blowby*Qsalt_v(i,j+1),Qsalt_maxv(i,j)) + endif + + endif + enddo + enddo + enddo + +! Combine the u and v components to yield the total saltation flux +! at each grid cell. + do i=1,nx + do j=1,ny + Qsalt(i,j) = Qsalt_u(i,j) + Qsalt_v(i,j) + enddo + enddo + +! Adjust Qsalt to account for the availablity of snow for transport; +! taking into consideration whether there is snow on the ground, +! the holding depth of the vegetation, etc.. + do i=1,nx + do j=1,ny + if (snow_d(i,j).le.vegsnowd_xy(i,j)) Qsalt(i,j) = 0.0 + if (soft_snow_d(i,j).le.0.0) Qsalt(i,j) = 0.0 + enddo + enddo + + return + end subroutine saltation + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine solveUtau(Utau,ht_windobs,windspd_grid,C_z,vonKarman,& + & gravity,z_0,h_star,h_const,vegsnowd_xy,snow_d,& + & snow_z0,veg_z0,bs_flag,nx,ny,Utau_t,soft_snow_d) + + use snowmodel_inc + !KRA + use LIS_coreMod + use LIS_mpiMod + use snowmodel_lsmMod, only : snowmodel_struc + !KRA + + implicit none + + integer :: ierr ! KRA + + integer i,j,nx,ny + + real bs_flag,guess,sfrac,vonKarman,ht_windobs,C_z,gravity + real h_const,snow_z0,Utautmp,windtmp,wind_max + real threshold,threshold_flag,z_0_tmp + + real Utau(nx,ny) + real Utau_t(nx,ny) + real windspd_grid(nx,ny) + real z_0(nx,ny) + real h_star(nx,ny) + real snow_d(nx,ny) + real soft_snow_d(nx,ny) + real veg_z0(nx,ny) + real vegsnowd_xy(nx,ny) + +! Initially set the blowing snow flag to no blowing snow +! (bs_flag = 0.0). Then, if snow is found to blow in any +! domain grid cell, set the flag to on (bs_flag = 1.0). + bs_flag = 0.0 + +! Build the Utau array. + guess = 0.1 + do i=1,nx + do j=1,ny + +! Determine whether snow is saltating (this influences how Utau +! and z_0 are computed). + if (snow_d(i,j).le.vegsnowd_xy(i,j)) then + +! Saltation will not occur. + sfrac = snow_d(i,j) / max(vegsnowd_xy(i,j),veg_z0(i,j)) + z_0(i,j) = sfrac * snow_z0 + (1.0 - sfrac) * veg_z0(i,j) + z_0_tmp = min(0.25*ht_windobs,z_0(i,j)) + Utau(i,j) = windspd_grid(i,j) * & + & vonKarman / log(ht_windobs/z_0_tmp) + h_star(i,j) = z_0(i,j) * h_const / C_z + elseif (soft_snow_d(i,j).le.0.0) then +! Saltation will not occur. + z_0(i,j) = snow_z0 + Utau(i,j) = windspd_grid(i,j) * & + & vonKarman / log(ht_windobs/z_0(i,j)) + h_star(i,j) = z_0(i,j) + else +! Saltation may occur. Test for that possibility by assuming that +! saltation is present, solving for Utau and z_0, and comparing +! whether Utau exceeds Utau_t. If it does not, set z_0 to that +! of snow and recompute Utau. + +! To help insure that the iteration converges, set the minimum +! wind speed to be 1.0 m/s, and the maximum wind speed to be +! 30 m/s at 10-m height. + windtmp = max(1.0,windspd_grid(i,j)) + wind_max = 30.0 * log(ht_windobs/snow_z0)/log(10.0/snow_z0) + windtmp = min(windtmp,wind_max) + +! For u* over 0.6, use the relation z0 = 0.00734 u* - 0.0022, +! instead of Equation (5) in Liston and Sturm (1998). Note that +! for windspeeds greater than about 35 m/s this will have to be +! modified for the solution algorithm to converge (because the +! roughness length will start to be higher than the obs height!). + threshold = 0.6/vonKarman * log(ht_windobs/0.0022) + if (windtmp.le.threshold) then + threshold_flag = 1.0 + else + threshold_flag = 2.0 + endif + + call solve1(Utautmp,guess,ht_windobs,windtmp,C_z,vonKarman,& + & gravity,threshold_flag) + + if (Utautmp.gt.Utau_t(i,j)) then + +! We have saltation. + Utau(i,j) = Utautmp + z_0(i,j) = C_z * Utau(i,j)**2 / (2.0 * gravity) + h_star(i,j) = h_const * Utau(i,j)**2 / (2.0 * gravity) + bs_flag = 1.0 + else + +! We do not have saltation, but the vegetation is covered by snow. +! Because we have determined that we do not have saltation, make +! sure Utau does not exceed Utau_t. + z_0(i,j) = snow_z0 + Utau(i,j) = windspd_grid(i,j) * & + & vonKarman / log(ht_windobs/z_0(i,j)) + Utau(i,j) = min(Utau(i,j),Utau_t(i,j)) + h_star(i,j) = z_0(i,j) * h_const / C_z + + endif + endif + + enddo + enddo + +! KRA +#if (defined SPMD) +! call co_max(bs_flag) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(bs_flag, snowmodel_struc(1)%bsflag_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + bs_flag = snowmodel_struc(1)%bsflag_glb + ! print *, "final bs_flag: ", bs_flag +#endif +! KRA + + return + end subroutine solveUtau + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine solve1(xnew,guess,z,windtmp,C_z,vonKarman,& + & gravity,threshold_flag) + + implicit none + + integer i,maxiter + + real xnew,guess,z,windtmp,C_z,vonKarman,tol,old,gravity + real fprime,funct,threshold_flag + + tol = 1.0e-3 + maxiter = 20 + old = guess + + if (threshold_flag.eq.1.0) then + + do i=1,maxiter + fprime = - 1.0 + 2.0 / old * windtmp * vonKarman * & + & (log(z) - log(C_z/(2.0*gravity)) - 2.0*log(old))**(-2) + funct = - old + windtmp * vonKarman * & + & (log(z) - log(C_z/(2.0*gravity)) - 2.0*log(old))**(-1) + xnew = old - funct/fprime + if (abs(xnew - old).lt.tol) return + old = xnew + end do + + elseif (threshold_flag.eq.2.0) then + + old = 0.6 + do i=1,maxiter + fprime = - 1.0 + windtmp * vonKarman * & + & 0.00734 / (0.00734 * old - 0.0022) * & + & (log(z) - log(0.00734 * old - 0.0022))**(-2) + funct = - old + windtmp * vonKarman * & + & (log(z) - log(0.00734 * old - 0.0022))**(-1) + xnew = old - funct/fprime + if (abs(xnew - old).lt.tol) return + old = xnew + end do + + endif + + print *,'max iteration exceeded when solving for Utau, Utau=',old + + return + end subroutine solve1 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine getsublim(z,rh,tair,Utau,& + & z_0,V_susp,V_salt,Utau_t,ht_rhobs,flag,pi) + + implicit none + + real pi,ro_ice,xM,R,R_dryair,vonKarman,visc_air,h_s + real xlamdaT,D,ro_sat,rh_offset,sigma + real alfa,rbar_r,xmbar,rbar,u_z,x_r,wbar,flag + real z,rh,tair,Utau,z_0,V_susp,V_salt,Utau_t,ht_rhobs + real V_r,xN_r,xNu,xSh,tmp1,tmp2,top,bottom,V_rsalt + + ro_ice = 917.0 + xM = 18.01 + R = 8313. + R_dryair = 287. + vonKarman = 0.4 + visc_air = 13.e-6 + h_s = 2.838e6 + +! xlamdaT = 0.00063 * tair + 0.0673 + xlamdaT = 0.024 + D = 2.06e-5 * (tair/273.0)**(1.75) +! ro_sat = 0.622 * 10.0**(11.40 - 2353./tair) / (R_dryair * tair) + ro_sat = 0.622 / (R_dryair * tair) * & + & 610.78 * exp(21.875 * (tair - 273.15) / (tair - 7.66)) + +! Assume that the rh varies according to a modification to +! Pomeroy's humidity variation with height equation. + rh_offset = 1.0 - 0.027 * log(ht_rhobs) + sigma = (0.01 * rh - 1.0) * (rh_offset + 0.027 * log(z)) + sigma = min(0.0,sigma) + sigma = max(-1.0,sigma) + + alfa = 4.08 + 12.6 * z + rbar_r = 4.6e-5 * z**(-0.258) + xmbar = 4.0/3.0 * pi * ro_ice * rbar_r**3 * & + & (1.0 + 3.0/alfa + 2.0/alfa**2) + rbar = ((3.0 * xmbar) / (4.0 * pi * ro_ice))**(0.33) + u_z = Utau/vonKarman * log(z/z_0) + x_r = 0.005 * u_z**(1.36) + wbar = 1.1e7 * rbar**(1.8) + + if (flag.eq.1.0) then + +! Compute the sublimation loss rate coefficient for the suspension +! layer. + V_r = wbar + 3.0 * x_r * cos(pi/4.0) + xN_r = 2.0 * rbar * V_r / visc_air + xNu = 1.79 + 0.606 * xN_r**(0.5) + xSh = xNu + tmp1 = (h_s * xM)/(R * tair) - 1.0 + tmp2 = xlamdaT * tair * xNu + top = 2.0 * pi * rbar * sigma + bottom = h_s/tmp2 * tmp1 + 1.0/(D * ro_sat * xSh) + V_susp = (top/bottom)/xmbar + V_salt = 0.0 + + elseif (flag.eq.0.0) then + +! Compute the sublimation loss rate coefficient for the saltation +! layer. + V_rsalt = 0.68 * Utau + 2.3 * Utau_t + xN_r = 2.0 * rbar * V_rsalt / visc_air + xNu = 1.79 + 0.606 * xN_r**(0.5) + xSh = xNu + tmp1 = (h_s * xM)/(R * tair) - 1.0 + tmp2 = xlamdaT * tair * xNu + top = 2.0 * pi * rbar * sigma + bottom = h_s/tmp2 * tmp1 + 1.0/(D * ro_sat * xSh) + V_salt = (top/bottom)/xmbar + V_susp = 0.0 + + endif + + return + end subroutine getsublim + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine getdirection(nx,ny,uwind_grid,vwind_grid,index_ue,& + & index_uw,index_vn,index_vs) + + use snowmodel_inc + implicit none + + integer i,j,nx,ny,npairs + + real sign1,sign2 + + integer index_ue(ny_max,2*nx_max+1) + integer index_uw(ny_max,2*nx_max+1) + integer index_vn(nx_max,2*ny_max+1) + integer index_vs(nx_max,2*ny_max+1) + + real uwind_grid(nx,ny) + real vwind_grid(nx,ny) + +! Index whether the winds are blowing east or west. The first +! column of the index array is the number of pairs of begining +! and ending array index of blocks of wind running in the same +! direction. + +! Sweep looking for WESTERLY winds, looking for positive numbers. + do j=1,ny + + if (uwind_grid(1,j).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.gt.0.0) then + npairs = 1 + index_uw(j,2) = 1 + else + npairs = 0 + endif + do i=2,nx + + if (uwind_grid(i-1,j).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + if (uwind_grid(i,j).le.0.0) then + sign2 = -1.0 + else + sign2 = 1.0 + endif + + if (sign2.ne.sign1) then +! We have a sign change. + if (sign2.gt.0.0) then +! We have gone from negative to positive, indicating the start +! of a new positive group. + npairs = npairs + 1 + index_uw(j,npairs*2) = i + else +! We have gone from positive to negative, indicating the end of +! the group. + index_uw(j,npairs*2+1) = i - 1 + endif + endif + enddo + + if (uwind_grid(nx,j).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.gt.0.0) then + index_uw(j,npairs*2+1) = nx + endif + index_uw(j,1) = npairs + enddo + +! do j=1,ny +! print 30, (index_uw(j,k),k=1,index_uw(j,1)*2+1) +! enddo +! print * +! print * + +! Sweep looking for EASTERLY winds, looking for negative numbers. + do j=1,ny + + if (uwind_grid(1,j).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.lt.0.0) then + npairs = 1 + index_ue(j,2) = 1 + else + npairs = 0 + endif + do i=2,nx + + if (uwind_grid(i-1,j).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + if (uwind_grid(i,j).le.0.0) then + sign2 = -1.0 + else + sign2 = 1.0 + endif + + if (sign2.ne.sign1) then +! We have a sign change. + if (sign2.lt.0.0) then +! We have gone from positive to negative, indicating the start +! of a new negative group. + npairs = npairs + 1 + index_ue(j,npairs*2) = i + else +! We have gone from negative to positive, indicating the end of +! the group. + index_ue(j,npairs*2+1) = i - 1 + endif + endif + enddo + + if (uwind_grid(nx,j).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.lt.0.0) then + index_ue(j,npairs*2+1) = nx + endif + index_ue(j,1) = npairs + enddo + +! do j=1,ny +! print 30, (index_ue(j,k),k=1,index_ue(j,1)*2+1) +! enddo +! print * +! print * + +! Sweep looking for SOUTHERLY winds, looking for positive numbers. + do i=1,nx + + if (vwind_grid(i,1).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.gt.0.0) then + npairs = 1 + index_vs(i,2) = 1 + else + npairs = 0 + endif + do j=2,ny + + if (vwind_grid(i,j-1).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + if (vwind_grid(i,j).le.0.0) then + sign2 = -1.0 + else + sign2 = 1.0 + endif + + if (sign2.ne.sign1) then +! We have a sign change. + if (sign2.gt.0.0) then +! We have gone from negative to positive, indicating the start +! of a new positive group. + npairs = npairs + 1 + index_vs(i,npairs*2) = j + else +! We have gone from positive to negative, indicating the end of +! the group. + index_vs(i,npairs*2+1) = j - 1 + endif + endif + enddo + + if (vwind_grid(i,ny).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.gt.0.0) then + index_vs(i,npairs*2+1) = ny + endif + index_vs(i,1) = npairs + enddo + +! do i=1,nx +! print 30, (index_vs(i,k),k=1,index_vs(i,1)*2+1) +! enddo +! print * +! print * + +! Sweep looking for NORTHERLY winds, looking for negative numbers. + do i=1,nx + + if (vwind_grid(i,1).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.lt.0.0) then + npairs = 1 + index_vn(i,2) = 1 + else + npairs = 0 + endif + do j=2,ny + + if (vwind_grid(i,j-1).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + if (vwind_grid(i,j).le.0.0) then + sign2 = -1.0 + else + sign2 = 1.0 + endif + + if (sign2.ne.sign1) then +! We have a sign change. + if (sign2.lt.0.0) then +! We have gone from positive to negative, indicating the start +! of a new negative group. + npairs = npairs + 1 + index_vn(i,npairs*2) = j + else +! We have gone from negative to positive, indicating the end of +! the group. + index_vn(i,npairs*2+1) = j - 1 + endif + endif + enddo + + if (vwind_grid(i,ny).le.0.0) then + sign1 = -1.0 + else + sign1 = 1.0 + endif + + if (sign1.lt.0.0) then + index_vn(i,npairs*2+1) = ny + endif + index_vn(i,1) = npairs + enddo + +! do i=1,nx +! print 30, (index_vn(i,k),k=1,index_vn(i,1)*2+1) +! enddo +! print * +! print * +! 30 format(20i4) + + return + end subroutine getdirection + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine getnewdepth(nx,ny,deltax,deltay,Qsalt_u,& + & Qsalt_v,dh_salt_u,dh_salt_v,index_ue,index_uw,& + & index_vn,index_vs,ro_snow,dt,vegsnowd_xy,snow_d,& + & soft_snow_d,snow_d_dep,soft_snow_d_dep,subgrid_flag) + +! If subgrid_flag = 1.0, this routine separates the snow +! accumulation and erosion contributions to the snowpack +! evolution so they can be dealt with separately in the +! subgrid_flag = 1.0 approach and routines. + + use snowmodel_inc + implicit none + + integer i,j,nx,ny + integer k,istart,iend,jstart,jend + + real deltax,deltay,ro_snow,dt,dQsalt,snowdmin + real hard_snow_d,weight_u,weight_v,eps + + integer index_ue(ny_max,2*nx_max+1) + integer index_uw(ny_max,2*nx_max+1) + integer index_vn(nx_max,2*ny_max+1) + integer index_vs(nx_max,2*ny_max+1) + + real Qsalt_u(nx,ny) + real Qsalt_v(nx,ny) + + real snow_d(nx,ny) + real soft_snow_d(nx,ny) + real dh_salt_u(nx,ny) + real dh_salt_v(nx,ny) + real vegsnowd_xy(nx,ny) + real snow_d_dep(nx,ny) + real soft_snow_d_dep(nx,ny) + + real subgrid_flag + +! Define an upwind boundary condition for saltation (here I have +! assumed that the transport is in equilibrium). + do i=1,nx + do j=1,ny + dh_salt_u(i,j) = 0.0 + dh_salt_v(i,j) = 0.0 + enddo + enddo + +! Consider WESTERLY winds. + do j=1,ny + do k=1,index_uw(j,1) + istart = index_uw(j,k*2)+1 + iend = index_uw(j,k*2+1) + do i=istart,iend + dQsalt = Qsalt_u(i,j) - Qsalt_u(i-1,j) + dh_salt_u(i,j) = (- dt) / ro_snow * dQsalt / deltax + +! Make adjustments for the case where there is no snow available +! on the ground (or captured within the vegetation) to be +! eroded. + hard_snow_d = snow_d(i,j) - soft_snow_d(i,j) + snowdmin = max(vegsnowd_xy(i,j),hard_snow_d) + if (snow_d(i,j).gt.snowdmin) then + if (snow_d(i,j)+dh_salt_u(i,j).le.snowdmin) then + dh_salt_u(i,j) = snowdmin - snow_d(i,j) + Qsalt_u(i,j) = Qsalt_u(i-1,j) - dh_salt_u(i,j) * & + & ro_snow * deltax / dt + endif + else + Qsalt_u(i,j) = 0.0 + dh_salt_u(i,j) = 0.0 + endif + enddo + enddo + enddo + +! Consider EASTERLY winds. + do j=1,ny + do k=1,index_ue(j,1) + iend = index_ue(j,k*2) + istart = index_ue(j,k*2+1)-1 + do i=istart,iend,-1 + dQsalt = Qsalt_u(i,j) - Qsalt_u(i+1,j) + dh_salt_u(i,j) = (- dt) / ro_snow * dQsalt / deltax + +! Make adjustments for the case where there is no snow available +! on the ground (or captured within the vegetation) to be +! eroded. + hard_snow_d = snow_d(i,j) - soft_snow_d(i,j) + snowdmin = max(vegsnowd_xy(i,j),hard_snow_d) + if (snow_d(i,j).gt.snowdmin) then + if (snow_d(i,j)+dh_salt_u(i,j).le.snowdmin) then + dh_salt_u(i,j) = snowdmin - snow_d(i,j) + Qsalt_u(i,j) = Qsalt_u(i+1,j) - dh_salt_u(i,j) * & + & ro_snow * deltax / dt + endif + else + Qsalt_u(i,j) = 0.0 + dh_salt_u(i,j) = 0.0 + endif + enddo + enddo + enddo + +! Consider SOUTHERLY winds. + do i=1,nx + do k=1,index_vs(i,1) + jstart = index_vs(i,k*2)+1 + jend = index_vs(i,k*2+1) + do j=jstart,jend + dQsalt = Qsalt_v(i,j) - Qsalt_v(i,j-1) + dh_salt_v(i,j) = (- dt) / ro_snow * dQsalt / deltay + +! Make adjustments for the case where there is no snow available +! on the ground (or captured within the vegetation) to be +! eroded. + hard_snow_d = snow_d(i,j) - soft_snow_d(i,j) + snowdmin = max(vegsnowd_xy(i,j),hard_snow_d) + if (snow_d(i,j).gt.snowdmin) then + if (snow_d(i,j)+dh_salt_v(i,j).le.snowdmin) then + dh_salt_v(i,j) = snowdmin - snow_d(i,j) + Qsalt_v(i,j) = Qsalt_v(i,j-1) - dh_salt_v(i,j) * & + & ro_snow * deltay / dt + endif + else + Qsalt_v(i,j) = 0.0 + dh_salt_v(i,j) = 0.0 + endif + enddo + enddo + enddo + +! Consider NORTHERLY winds. + do i=1,nx + do k=1,index_vn(i,1) + jend = index_vn(i,k*2) + jstart = index_vn(i,k*2+1)-1 + do j=jstart,jend,-1 + dQsalt = Qsalt_v(i,j) - Qsalt_v(i,j+1) + dh_salt_v(i,j) = (- dt) / ro_snow * dQsalt / deltay + +! Make adjustments for the case where there is no snow available +! on the ground (or captured within the vegetation) to be +! eroded. + hard_snow_d = snow_d(i,j) - soft_snow_d(i,j) + snowdmin = max(vegsnowd_xy(i,j),hard_snow_d) + if (snow_d(i,j).gt.snowdmin) then + if (snow_d(i,j)+dh_salt_v(i,j).le.snowdmin) then + dh_salt_v(i,j) = snowdmin - snow_d(i,j) + Qsalt_v(i,j) = Qsalt_v(i,j+1) - dh_salt_v(i,j) *& + & ro_snow * deltay / dt + endif + else + Qsalt_v(i,j) = 0.0 + dh_salt_v(i,j) = 0.0 + endif + enddo + enddo + enddo + +! Update the snow depth changes due to saltation transport from the +! the east and west, and north and south. Also correct dh_salt_u +! and dh_salt_v to account for the minimum snow depth. + eps = 1e-6 + do i=1,nx + do j=1,ny + weight_u = abs(dh_salt_u(i,j)) / & + & (abs(dh_salt_u(i,j)) + abs(dh_salt_v(i,j)) + eps) + + weight_v = abs(dh_salt_v(i,j)) / & + & (abs(dh_salt_u(i,j)) + abs(dh_salt_v(i,j)) + eps) + + dh_salt_u(i,j) = weight_u * dh_salt_u(i,j) + dh_salt_v(i,j) = weight_v * dh_salt_v(i,j) + + if (subgrid_flag.eq.0.0) then + snow_d(i,j) = snow_d(i,j) + dh_salt_u(i,j) + dh_salt_v(i,j) + + soft_snow_d(i,j) = soft_snow_d(i,j) + dh_salt_u(i,j) + & + & dh_salt_v(i,j) + + elseif (subgrid_flag.eq.1.0) then + +! Just do the erosion. + snow_d(i,j) = snow_d(i,j) + min(0.0,dh_salt_u(i,j)) + & + & min(0.0,dh_salt_v(i,j)) + + soft_snow_d(i,j) = soft_snow_d(i,j) + & + & min(0.0,dh_salt_u(i,j))+ min(0.0,dh_salt_v(i,j)) + +! And save an array of what was deposited during this time step. + snow_d_dep(i,j) = max(0.0,dh_salt_u(i,j)) + & + & max(0.0,dh_salt_v(i,j)) + + soft_snow_d_dep(i,j) = & + & max(0.0,dh_salt_u(i,j))+ max(0.0,dh_salt_v(i,j)) + endif + + enddo + enddo + + return + end subroutine getnewdepth + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +! subroutine subgrid_1(nx,ny,snow_d, +! & index_ue,index_uw,index_vn,index_vs, +! & tabler_nn,tabler_ss,tabler_ee,tabler_ww, +! & tabler_ne,tabler_se,tabler_sw,tabler_nw,uwind_grid, +! & vwind_grid,tabler_dir) + +! This subroutine forces SnowTran-3D's snow accumluation profiles +! to be bounded by the equilibrium topographic drift catchment +! profiles observed and modeled by Tabler (1975). + +! Tabler, R. D., 1975: Predicting profiles of snowdrifts in +! topographic catchments. Proceedings of the 43rd Annual Western +! Snow Conference, San Diego, California, 87-97. + +! implicit none + +! include 'snowmodel.inc' + +! integer i,j,nx,ny +! integer k,istart,iend,jstart,jend + +! real snow_d_extra,snow_sfc,tabler,tabler_dir + +! integer index_ue(ny_max,2*nx_max+1) +! integer index_uw(ny_max,2*nx_max+1) +! integer index_vn(nx_max,2*ny_max+1) +! integer index_vs(nx_max,2*ny_max+1) + +! real snow_d(nx,ny) +! real snow_d1(nx_max,ny_max) +! real snow_d2(nx_max,ny_max) +! real tabler_nn(nx_max,ny_max) +! real tabler_ss(nx_max,ny_max) +! real tabler_ee(nx_max,ny_max) +! real tabler_ww(nx_max,ny_max) +! real tabler_ne(nx_max,ny_max) +! real tabler_se(nx_max,ny_max) +! real tabler_sw(nx_max,ny_max) +! real tabler_nw(nx_max,ny_max) +! real uwind_grid(nx_max,ny_max) +! real vwind_grid(nx_max,ny_max) + +! real weight_u(nx_max,ny_max) +! real weight_v(nx_max,ny_max) + +! This is just a summary of all of the possibilities. +!! if(winddir(i,j).gt.337.5.or.winddir(i,j).le.22.5)then +!! tabler = tabler_nn(i,j) +!! elseif(winddir(i,j).gt.22.5.and.winddir(i,j).le.67.5)then +!! tabler = tabler_ne(i,j) +!! elseif(winddir(i,j).gt.67.5.and.winddir(i,j).le.112.5)then +!! tabler = tabler_ee(i,j) +!! elseif(winddir(i,j).gt.112.5.and.winddir(i,j).le.157.5)then +!! tabler = tabler_se(i,j) +!! elseif(winddir(i,j).gt.157.5.and.winddir(i,j).le.202.5)then +!! tabler = tabler_ss(i,j) +!! elseif(winddir(i,j).gt.202.5.and.winddir(i,j).le.247.5)then +!! tabler = tabler_sw(i,j) +!! elseif(winddir(i,j).gt.247.5.and.winddir(i,j).le.292.5)then +!! tabler = tabler_ww(i,j) +!! elseif(winddir(i,j).gt.292.5.and.winddir(i,j).le.337.5)then +!! tabler = tabler_nw(i,j) +!! endif + +! Create a copy of the incoming snow depth distribution. Also define +! the u and v weighting functions. +! do j=1,ny +! do i=1,nx +! snow_d1(i,j) = snow_d(i,j) +! snow_d2(i,j) = snow_d(i,j) + +! weight_u(i,j) = abs(uwind_grid(i,j)) / +! & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) +! weight_v(i,j) = abs(vwind_grid(i,j)) / +! & sqrt(uwind_grid(i,j)**2 + vwind_grid(i,j)**2) +! enddo +! enddo + +! Consider WESTERLY winds. +! do j=1,ny +! do k=1,index_uw(j,1) +! istart = index_uw(j,k*2)+1 +! iend = index_uw(j,k*2+1) +! do i=istart,iend + +! if(tabler_dir.gt.337.5.and.tabler_dir.le.360.0.or. +! & tabler_dir.ge.0.0.and.tabler_dir.le.22.5)then +! tabler = tabler_nn(i,j) +! elseif(tabler_dir.gt.157.5.and.tabler_dir.le.202.5)then +! tabler = tabler_ss(i,j) +! elseif(tabler_dir.gt.202.5.and.tabler_dir.le.247.5)then +! tabler = tabler_sw(i,j) +! elseif(tabler_dir.gt.247.5.and.tabler_dir.le.292.5)then +! tabler = tabler_ww(i,j) +! elseif(tabler_dir.gt.292.5.and.tabler_dir.le.337.5)then +! tabler = tabler_nw(i,j) +! endif + +! snow_sfc = tabler + +! if (snow_d1(i,j).gt.snow_sfc) then +! snow_d_extra = (snow_d1(i,j) - snow_sfc) * weight_u(i,j) +! snow_d1(i,j) = snow_d1(i,j) - snow_d_extra +! if (i.lt.nx) then +! snow_d1(i+1,j) = snow_d1(i+1,j) + snow_d_extra +! else +! snow_d1(i,j) = snow_d1(i,j) +! endif +! endif + +! enddo +! enddo +! enddo + +! Consider EASTERLY winds. +! do j=1,ny +! do k=1,index_ue(j,1) +! iend = index_ue(j,k*2) +! istart = index_ue(j,k*2+1)-1 +! do i=istart,iend,-1 + +! if(tabler_dir.gt.337.5.and.tabler_dir.le.360.0.or. +! & tabler_dir.ge.0.0.and.tabler_dir.le.22.5)then +! tabler = tabler_nn(i,j) +! elseif(tabler_dir.gt.22.5.and.tabler_dir.le.67.5)then +! tabler = tabler_ne(i,j) +! elseif(tabler_dir.gt.67.5.and.tabler_dir.le.112.5)then +! tabler = tabler_ee(i,j) +! elseif(tabler_dir.gt.112.5.and.tabler_dir.le.157.5)then +! tabler = tabler_se(i,j) +! elseif(tabler_dir.gt.157.5.and.tabler_dir.le.202.5)then +! tabler = tabler_ss(i,j) +! endif + +! snow_sfc = tabler + +! if (snow_d1(i,j).gt.snow_sfc) then +! snow_d_extra = (snow_d1(i,j) - snow_sfc) * weight_u(i,j) +! snow_d1(i,j) = snow_d1(i,j) - snow_d_extra +! if (i.gt.1) then +! snow_d1(i-1,j) = snow_d1(i-1,j) + snow_d_extra +! else +! snow_d1(i,j) = snow_d1(i,j) +! endif +! endif +! enddo +! enddo +! enddo + +! Consider SOUTHERLY winds. +! do i=1,nx +! do k=1,index_vs(i,1) +! jstart = index_vs(i,k*2)+1 +! jend = index_vs(i,k*2+1) +! do j=jstart,jend + +! if(tabler_dir.gt.67.5.and.tabler_dir.le.112.5)then +! tabler = tabler_ee(i,j) +! elseif(tabler_dir.gt.112.5.and.tabler_dir.le.157.5)then +! tabler = tabler_se(i,j) +! elseif(tabler_dir.gt.157.5.and.tabler_dir.le.202.5)then +! tabler = tabler_ss(i,j) +! elseif(tabler_dir.gt.202.5.and.tabler_dir.le.247.5)then +! tabler = tabler_sw(i,j) +! elseif(tabler_dir.gt.247.5.and.tabler_dir.le.292.5)then +! tabler = tabler_ww(i,j) +! endif + +! snow_sfc = tabler + +! if (snow_d2(i,j).gt.snow_sfc) then +! snow_d_extra = (snow_d2(i,j) - snow_sfc) * weight_v(i,j) +! snow_d2(i,j) = snow_d2(i,j) - snow_d_extra +! if (j.lt.ny) then +! snow_d2(i,j+1) = snow_d2(i,j+1) + snow_d_extra +! else +! snow_d2(i,j) = snow_d2(i,j) +! endif +! endif +! enddo +! enddo +! enddo + +! Consider NORTHERLY winds. +! do i=1,nx +! do k=1,index_vn(i,1) +! jend = index_vn(i,k*2) +! jstart = index_vn(i,k*2+1)-1 +! do j=jstart,jend,-1 + +! if(tabler_dir.gt.337.5.and.tabler_dir.le.360.0.or. +! & tabler_dir.ge.0.0.and.tabler_dir.le.22.5)then +! tabler = tabler_nn(i,j) +! elseif(tabler_dir.gt.22.5.and.tabler_dir.le.67.5)then +! tabler = tabler_ne(i,j) +! elseif(tabler_dir.gt.67.5.and.tabler_dir.le.112.5)then +! tabler = tabler_ee(i,j) +! elseif(tabler_dir.gt.247.5.and.tabler_dir.le.292.5)then +! tabler = tabler_ww(i,j) +! elseif(tabler_dir.gt.292.5.and.tabler_dir.le.337.5)then +! tabler = tabler_nw(i,j) +! endif + +! snow_sfc = tabler + +! if (snow_d2(i,j).gt.snow_sfc) then +! snow_d_extra = (snow_d2(i,j) - snow_sfc) * weight_v(i,j) +! snow_d2(i,j) = snow_d2(i,j) - snow_d_extra +! if (j.gt.1) then +! snow_d2(i,j-1) = snow_d2(i,j-1) + snow_d_extra +! else +! snow_d2(i,j) = snow_d2(i,j) +! endif +! endif + +! enddo +! enddo +! enddo + +! Update the snow depths resulting from these redistributions. +! do j=1,ny +! do i=1,nx +! snow_d(i,j) = snow_d1(i,j) * weight_u(i,j) + +! & snow_d2(i,j) * weight_v(i,j) +! enddo +! enddo + +! Clean up the boundaries. Make the boundary values equal to +! the values just inside the boundaries. +! do i=2,nx-1 +! snow_d(i,1) = snow_d(i,2) +! snow_d(i,ny) = snow_d(i,ny-1) +! enddo +! do j=1,ny +! snow_d(1,j) = snow_d(2,j) +! snow_d(nx,j) = snow_d(nx-1,j) +! enddo + +! return +! end + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine tabler_3d(nx,ny,topo_land,deltax,deltay,& + & tabler_ww,tabler_ee,tabler_ss,& + & tabler_nn,tabler_ne,tabler_se,& + & tabler_sw,tabler_nw,slope_adjust) + +! This subroutine uses Tabler (1975) to define equilibrium profiles +! for the topographic drift catchments, for the case of winds +! from the EAST, WEST, NORTH, and SOUTH, and anywhere inbetween. + + use snowmodel_inc + implicit none + + integer nx,ny,irotate_flag + + real deltax,deltay,slope_adjust + + real topo_land(nx,ny) + + real tabler_nn(nx,ny) + real tabler_ss(nx,ny) + real tabler_ee(nx,ny) + real tabler_ww(nx,ny) + + real tabler_ne(nx,ny) + real tabler_se(nx,ny) + real tabler_sw(nx,ny) + real tabler_nw(nx,ny) + +! Here we generate maximum snow accumulation surfaces for n, ne, e, +! se, s, sw, w, and nw winds. I call these "tabler surfaces". +! +! They are valid for the wind direction ranges: N=337.5-22.5, +! NE=22.5-67.5, E=67.5-112.5, SE=112.5-157.5, S=157.5-202.5, +! SW=202.5-247.5, W=247.5-292.5, and NW=292.5-337.5. +! +! These Tabler Surfaces define a "potential" snow surface that +! represents the maximum possible snow-accumulation depth from winds +! coming from these directions. +! +! Tabler, R. D., 1975: Predicting profiles of snowdrifts in +! topographic catchments. Proceedings of the 43rd Annual Western +! Snow Conference, San Diego, California, 87-97. + +! Consider N winds. + irotate_flag = 1 + call tabler_n(nx,ny,topo_land,tabler_nn,deltay,& + & irotate_flag,slope_adjust) + +! Consider NE winds. + irotate_flag = 2 + call tabler_e(nx,ny,topo_land,tabler_ne,1.41*deltax,& + & irotate_flag,slope_adjust) + +! Consider E winds. + irotate_flag = 1 + call tabler_e(nx,ny,topo_land,tabler_ee,deltax,& + & irotate_flag,slope_adjust) + +! Consider SE winds. + irotate_flag = 2 + call tabler_s(nx,ny,topo_land,tabler_se,1.41*deltay,& + & irotate_flag,slope_adjust) + +! Consider S winds. + irotate_flag = 1 + call tabler_s(nx,ny,topo_land,tabler_ss,deltay,& + & irotate_flag,slope_adjust) + +! Consider SW winds. + irotate_flag = 2 + call tabler_w(nx,ny,topo_land,tabler_sw,1.41*deltax,& + & irotate_flag,slope_adjust) + +! Consider W winds. + irotate_flag = 1 + call tabler_w(nx,ny,topo_land,tabler_ww,deltax,& + & irotate_flag,slope_adjust) + +! Consider NW winds. + irotate_flag = 2 + call tabler_n(nx,ny,topo_land,tabler_nw,1.41*deltay,& + & irotate_flag,slope_adjust) + + return + end subroutine tabler_3d + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine tabler_w(nx,ny,topo_land,tabler_ww,deltax,& + & irotate_flag,slope_adjust) + +! This subroutine uses Tabler (1975) to define equilibrium profiles +! for the topographic drift catchments, for the case of winds +! from the WEST and SOUTHWEST. + +! Tabler, R. D., 1975: Predicting profiles of snowdrifts in +! topographic catchments. Proceedings of the 43rd Annual Western +! Snow Conference, San Diego, California, 87-97. + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,istart,iend,JJ,irotate_flag,nny,nnx,& + & ii,iii,maxlines + real deltax,y,slope_adjust,xmax_slope,dx,test,& + & x,x1,x2,x3,x4,y1,y2,t1,t2,t3,t4,t5 + + real topo_land(nx,ny) + real tabler_ww(nx,ny) + real tabler(nx_max) + real topo_line(nx_max) + real drift_start_topo(nx_max) + integer, parameter :: nx_max_tabler = nx_max*1000 + real topo_1m(nx_max_tabler) + real tabler_1m(nx_max_tabler) + real drift_start_topo_1m(nx_max_tabler) + +! This program: +! 1) takes the coarse model topography and generates 1.0-m grid +! increment topo lines; +! 2) uses those to generate the Tabler surface profiles; and +! 3) extracts the profiles at the coarse model grid cells. + +! Fill the snow array with topo data. + do j=1,ny + do i=1,nx + tabler_ww(i,j) = topo_land(i,j) + enddo + enddo + +! Define the length of the j-looping, depending on whether there +! is any rotation done to get 45 deg winds. + if (irotate_flag.eq.2) then + nny = nx+ny-1 + else + nny = ny + endif + +! Required parameters. + if (irotate_flag.eq.2) then + dx = 1.41 + test = amod(deltax/1.41,dx/1.41) + else + dx = 1.0 + test = amod(deltax,dx) + endif + + xmax_slope = -0.20 + +! This Tabler program has not been made general enough to deal +! with deltax and deltay values that are not evenly divisible +! by 1.0 (or 1.41 for diagonal profiles). + if (abs(test).gt.1.0e10-5) then + print *,'To generate the Tabler surfaces, deltax and deltay' + print *,' must be evenly divisible by 1.0 or 1.41.' + print *,' deltax = ',deltax + stop + endif + +! Define the number of 1-m grid cells in each model grid cell, and +! calculate how many of these are in the entire nx domain. + nnx = nint(deltax/dx) + maxlines = (nx - 1) * nnx + 1 + +! Define the starting and ending points of the line we are going to +! work with. This is done to make sure we are never looking +! outside the data for numbers to work with. + istart = 1 + if (irotate_flag.eq.2) then + iend = maxlines - (32+11+10+11) + else + iend = maxlines - (45+15+15+15) + endif + +! Extract the line we are going to work with. + do j=1,nny + + if (irotate_flag.eq.2) then + do i=1,nx + JJ = j + i - nx + drift_start_topo(i) = 0.0 + if (JJ.le.0) then + tabler(i) = tabler_ww(1-j+nx,1) + topo_line(i) = tabler_ww(1-j+nx,1) + elseif (JJ.gt.ny) then + tabler(i) = tabler(i-1) + topo_line(i) = tabler(i-1) + else + tabler(i) = tabler_ww(i,JJ) + topo_line(i) = tabler_ww(i,JJ) + endif + enddo + else + do i=1,nx + tabler(i) = tabler_ww(i,j) + topo_line(i) = topo_land(i,j) + drift_start_topo(i) = 0.0 + enddo + endif + +! To build the 1.0 m line, use linear interpolation between the +! model topo data. Include the end point. + do i=1,nx-1 + do ii=1,nnx + iii = (i - 1) * nnx + ii + x1 = 0.0 + x = real(ii - 1) * dx + y2 = topo_line(i+1) + y1 = topo_line(i) + topo_1m(iii) = y1 + ((y2 - y1)/deltax) * (x - x1) + enddo + enddo + topo_1m((nx - 1) * nnx + 1) = topo_line(nx) + +! Use this topo array to be the starting point for generating the +! Tabler surfaces. + do i=1,maxlines + tabler_1m(i) = topo_1m(i) + drift_start_topo_1m(i) = 0.0 + enddo + +! Run the Tabler model. + do i=istart,iend + if (irotate_flag.eq.2) then + t1 = tabler_1m(i) + t2 = tabler_1m(i+31) + t3 = tabler_1m(i+31+11) + t4 = tabler_1m(i+31+21) + t5 = tabler_1m(i+31+32) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(i+32) = max(topo_1m(i+32),& + & tabler_1m(i+31) + y * slope_adjust * dx) + else + t1 = tabler_1m(i) + t2 = tabler_1m(i+44) + t3 = tabler_1m(i+44+15) + t4 = tabler_1m(i+44+30) + t5 = tabler_1m(i+44+45) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(i+45) = max(topo_1m(i+45),& + & tabler_1m(i+44) + y * slope_adjust * dx) + endif + enddo + +! Extract the profile at the model grid points. + do i=1,nx + ii = (i - 1) * nnx + 1 + tabler(i) = tabler_1m(ii) + drift_start_topo(i) = drift_start_topo_1m(ii) + enddo + +! Use the 1-D arrays to fill in the 2-D tabler-surface array. + do i=1,nx + if (irotate_flag.eq.2) then + JJ = j + i - nx + if (JJ.ge.1 .and. JJ.le.ny) then + tabler_ww(i,JJ) = tabler(i) + drift_start_topo(i) + endif + else + tabler_ww(i,j) = tabler(i) + drift_start_topo(i) + endif + enddo + + enddo + +! Convert snow_traps back to actual snow depths instead of +! depth plus topography. + do j=1,ny + do i=1,nx + tabler_ww(i,j) = tabler_ww(i,j) - topo_land(i,j) + enddo + enddo + + return + end subroutine tabler_w + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine tabler_e(nx,ny,topo_land,tabler_ee,deltax,& + & irotate_flag,slope_adjust) + +! This subroutine uses Tabler (1975) to define equilibrium profiles +! for the topographic drift catchments, for the case of winds +! from the EAST and NORTHEAST. + +! Tabler, R. D., 1975: Predicting profiles of snowdrifts in +! topographic catchments. Proceedings of the 43rd Annual Western +! Snow Conference, San Diego, California, 87-97. + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,istart,iend,JJ,irotate_flag,nny,nnx,& + & ii,iii,maxlines + real deltax,y,slope_adjust,xmax_slope,dx,test,& + & x,x1,x2,x3,x4,y1,y2,t1,t2,t3,t4,t5 + + real topo_land(nx,ny) + real tabler_ee(nx,ny) + real tabler(nx_max) + real topo_line(nx_max) + real drift_start_topo(nx_max) + + integer, parameter :: nx_max_tabler = nx_max*1000 + real topo_1m(nx_max_tabler) + real tabler_1m(nx_max_tabler) + real drift_start_topo_1m(nx_max_tabler) + +! This program: +! 1) takes the coarse model topography and generates 1.0-m grid +! increment topo lines; +! 2) uses those to generate the Tabler surface profiles; and +! 3) extracts the profiles at the coarse model grid cells. + +! Fill the snow array with topo data. + do j=1,ny + do i=1,nx + tabler_ee(i,j) = topo_land(i,j) + enddo + enddo + +! Define the length of the j-looping, depending on whether there +! is any rotation done to get 45 deg winds. + if (irotate_flag.eq.2) then + nny = nx+ny-1 + else + nny = ny + endif + +! Required parameters. + if (irotate_flag.eq.2) then + dx = 1.41 + test = amod(deltax/1.41,dx/1.41) + else + dx = 1.0 + test = amod(deltax,dx) + endif + + xmax_slope = -0.20 + +! This Tabler program has not been made general enough to deal +! with deltax and deltay values that are not evenly divisible +! by 1.0 (or 1.41 for diagonal profiles). + if (abs(test).gt.1.0e10-5) then + print *,'To generate the Tabler surfaces, deltax and deltay' + print *,' must be evenly divisible by 1.0 or 1.41.' + print *,' deltax = ',deltax + stop + endif + +! Define the number of 1-m grid cells in each model grid cell, and +! calculate how many of these are in the entire nx domain. + nnx = nint(deltax/dx) + maxlines = (nx - 1) * nnx + 1 + +! Define the starting and ending points of the line we are going to +! work with. This is done to make sure we are never looking +! outside the data for numbers to work with. + istart = maxlines + if (irotate_flag.eq.2) then + iend = 1 + (32+11+10+11) + else + iend = 1 + (45+15+15+15) + endif + +! Extract the line we are going to work with. + do j=1,nny + + if (irotate_flag.eq.2) then + do i=1,nx + JJ = j + i - nx + drift_start_topo(i) = 0.0 + if (JJ.le.0) then + tabler(i) = tabler_ee(1-j+nx,1) + topo_line(i) = tabler_ee(1-j+nx,1) + elseif (JJ.gt.ny) then + tabler(i) = tabler(i-1) + topo_line(i) = tabler(i-1) + else + tabler(i) = tabler_ee(i,JJ) + topo_line(i) = tabler_ee(i,JJ) + endif + enddo + else + do i=1,nx + tabler(i) = tabler_ee(i,j) + topo_line(i) = topo_land(i,j) + drift_start_topo(i) = 0.0 + enddo + endif + +! To build the 1.0 m line, use linear interpolation between the +! model topo data. Include the end point. + do i=1,nx-1 + do ii=1,nnx + iii = (i - 1) * nnx + ii + x1 = 0.0 + x = real(ii - 1) * dx + y2 = topo_line(i+1) + y1 = topo_line(i) + topo_1m(iii) = y1 + ((y2 - y1)/deltax) * (x - x1) + enddo + enddo + topo_1m((nx - 1) * nnx + 1) = topo_line(nx) + +! Use this topo array to be the starting point for generating the +! Tabler surfaces. + do i=1,maxlines + tabler_1m(i) = topo_1m(i) + drift_start_topo_1m(i) = 0.0 + enddo + +! Run the Tabler model. + do i=istart,iend,-1 + if (irotate_flag.eq.2) then + t1 = tabler_1m(i) + t2 = tabler_1m(i-31) + t3 = tabler_1m(i-31-11) + t4 = tabler_1m(i-31-21) + t5 = tabler_1m(i-31-32) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(i-32) = max(topo_1m(i-32),& + & tabler_1m(i-31) + y * slope_adjust * dx) + else + t1 = tabler_1m(i) + t2 = tabler_1m(i-44) + t3 = tabler_1m(i-44-15) + t4 = tabler_1m(i-44-30) + t5 = tabler_1m(i-44-45) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(i-45) = max(topo_1m(i-45),& + & tabler_1m(i-44) + y * slope_adjust * dx) + endif + enddo + +! Extract the profile at the model grid points. + do i=1,nx + ii = (i - 1) * nnx + 1 + tabler(i) = tabler_1m(ii) + drift_start_topo(i) = drift_start_topo_1m(ii) + enddo + +! Use the 1-D arrays to fill in the 2-D tabler-surface array. + do i=1,nx + if (irotate_flag.eq.2) then + JJ = j + i - nx + if (JJ.ge.1 .and. JJ.le.ny) then + tabler_ee(i,JJ) = tabler(i) + drift_start_topo(i) + endif + else + tabler_ee(i,j) = tabler(i) + drift_start_topo(i) + endif + enddo + + enddo + +! Convert snow_traps back to actual snow depths instead of +! depth plus topography. + do j=1,ny + do i=1,nx + tabler_ee(i,j) = tabler_ee(i,j) - topo_land(i,j) + enddo + enddo + + return + end subroutine tabler_e + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine tabler_s(nx,ny,topo_land,tabler_ss,deltay,& + & irotate_flag,slope_adjust) + +! This subroutine uses Tabler (1975) to define equilibrium profiles +! for the topographic drift catchments, for the case of winds +! from the SOUTH and SOUTHEAST. + +! Tabler, R. D., 1975: Predicting profiles of snowdrifts in +! topographic catchments. Proceedings of the 43rd Annual Western +! Snow Conference, San Diego, California, 87-97. + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,jstart,jend,II,irotate_flag,nny,nnx,& + & jj,jjj,maxlines + real deltay,y,slope_adjust,xmax_slope,dy,test,& + & x,x1,x2,x3,x4,y1,y2,t1,t2,t3,t4,t5 + + real topo_land(nx,ny) + real tabler_ss(nx,ny) + real tabler(ny_max) + real topo_line(ny_max) + real drift_start_topo(ny_max) + + integer, parameter :: ny_max_tabler=ny_max*1000 + real topo_1m(ny_max_tabler) + real tabler_1m(ny_max_tabler) + real drift_start_topo_1m(ny_max_tabler) + +! This program: +! 1) takes the coarse model topography and generates 1.0-m grid +! increment topo lines; +! 2) uses those to generate the Tabler surface profiles; and +! 3) extracts the profiles at the coarse model grid cells. + +! Fill the snow array with topo data. + do j=1,ny + do i=1,nx + tabler_ss(i,j) = topo_land(i,j) + enddo + enddo + +! Define the length of the i-looping, depending on whether there +! is any rotation done to get 45 deg winds. + if (irotate_flag.eq.2) then + nnx = nx+ny-1 + else + nnx = nx + endif + +! Required parameters. + if (irotate_flag.eq.2) then + dy = 1.41 + test = amod(deltay/1.41,dy/1.41) + else + dy = 1.0 + test = amod(deltay,dy) + endif + + xmax_slope = -0.20 + +! This Tabler program has not been made general enough to deal +! with deltax and deltay values that are not evenly divisible +! by 1.0 (or 1.41 for diagonal profiles). + if (abs(test).gt.1.0e10-5) then + print *,'To generate the Tabler surfaces, deltax and deltay' + print *,' must be evenly divisible by 1.0 or 1.41.' + print *,' deltay = ',deltay + stop + endif + +! Define the number of 1-m grid cells in each model grid cell, and +! calculate how many of these are in the entire nx domain. + nny = nint(deltay/dy) + maxlines = (ny - 1) * nny + 1 + +! Define the starting and ending points of the line we are going to +! work with. This is done to make sure we are never looking +! outside the data for numbers to work with. + jstart = 1 + if (irotate_flag.eq.2) then + jend = maxlines - (32+11+10+11) + else + jend = maxlines - (45+15+15+15) + endif + +! Extract the line we are going to work with. + do i=1,nnx + if (irotate_flag.eq.2) then + do j=1,ny + II = i - j + 1 + drift_start_topo(j) = 0.0 + if (II.le.0) then + tabler(j) = tabler(j-1) + topo_line(j) = tabler(j-1) + elseif (II.gt.nx) then + tabler(j) = tabler_ss(nx,i-nx+1) + topo_line(j) = tabler_ss(nx,i-nx+1) + else + tabler(j) = tabler_ss(II,j) + topo_line(j) = tabler_ss(II,j) + endif + enddo + else + do j=1,ny + tabler(j) = tabler_ss(i,j) + topo_line(j) = topo_land(i,j) + drift_start_topo(j) = 0.0 + enddo + endif + +! To build the 1.0 m line, use linear interpolation between the +! model topo data. Include the end point. + do j=1,ny-1 + do jj=1,nny + jjj = (j - 1) * nny + jj + x1 = 0.0 + x = real(jj - 1) * dy + y2 = topo_line(j+1) + y1 = topo_line(j) + topo_1m(jjj) = y1 + ((y2 - y1)/deltay) * (x - x1) + enddo + enddo + topo_1m((ny - 1) * nny + 1) = topo_line(ny) + +! Use this topo array to be the starting point for generating the +! Tabler surfaces. + do j=1,maxlines + tabler_1m(j) = topo_1m(j) + drift_start_topo_1m(j) = 0.0 + enddo + +! Run the Tabler model. + do j=jstart,jend + if (irotate_flag.eq.2) then + t1 = tabler_1m(j) + t2 = tabler_1m(j+31) + t3 = tabler_1m(j+31+11) + t4 = tabler_1m(j+31+21) + t5 = tabler_1m(j+31+32) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(j+32) = max(topo_1m(j+32),& + & tabler_1m(j+31) + y * slope_adjust * dy) + else + t1 = tabler_1m(j) + t2 = tabler_1m(j+44) + t3 = tabler_1m(j+44+15) + t4 = tabler_1m(j+44+30) + t5 = tabler_1m(j+44+45) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(j+45) = max(topo_1m(j+45),& + & tabler_1m(j+44) + y * slope_adjust * dy) + endif + enddo + +! Extract the profile at the model grid points. + do j=1,ny + jj = (j - 1) * nny + 1 + tabler(j) = tabler_1m(jj) + drift_start_topo(j) = drift_start_topo_1m(jj) + enddo + +! Use the 1-D arrays to fill in the 2-D tabler-surface array. + do j=1,ny + if (irotate_flag.eq.2) then + II = i - j + 1 + if (II.ge.1 .and. II.le.nx) then + tabler_ss(II,j) = tabler(j) + drift_start_topo(j) + endif + else + tabler_ss(i,j) = tabler(j) + drift_start_topo(j) + endif + enddo + + enddo + +! Convert snow_traps back to actual snow depths instead of +! depth plus topography. + do j=1,ny + do i=1,nx + tabler_ss(i,j) = tabler_ss(i,j) - topo_land(i,j) + enddo + enddo + + return + end subroutine tabler_s + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine tabler_n(nx,ny,topo_land,tabler_nn,deltay,& + & irotate_flag,slope_adjust) + +! This subroutine uses Tabler (1975) to define equilibrium profiles +! for the topographic drift catchments, for the case of winds +! from the NORTH and NORTHWEST. + +! Tabler, R. D., 1975: Predicting profiles of snowdrifts in +! topographic catchments. Proceedings of the 43rd Annual Western +! Snow Conference, San Diego, California, 87-97. + + use snowmodel_inc + implicit none + + integer nx,ny,i,j,jstart,jend,II,irotate_flag,nny,nnx,& + & jj,jjj,maxlines + real deltay,y,slope_adjust,xmax_slope,dy,test,& + & x,x1,x2,x3,x4,y1,y2,t1,t2,t3,t4,t5 + + real topo_land(nx,ny) + real tabler_nn(nx,ny) + real tabler(ny_max) + real topo_line(ny_max) + real drift_start_topo(ny_max) + + integer, parameter :: ny_max_tabler = ny_max*1000 + real topo_1m(ny_max_tabler) + real tabler_1m(ny_max_tabler) + real drift_start_topo_1m(ny_max_tabler) + +! This program: +! 1) takes the coarse model topography and generates 1.0-m grid +! increment topo lines; +! 2) uses those to generate the Tabler surface profiles; and +! 3) extracts the profiles at the coarse model grid cells. + +! Fill the snow array with topo data. + do j=1,ny + do i=1,nx + tabler_nn(i,j) = topo_land(i,j) + enddo + enddo + +! Define the length of the i-looping, depending on whether there +! is any rotation done to get 45 deg winds. + if (irotate_flag.eq.2) then + nnx = nx+ny-1 + else + nnx = nx + endif + +! Required parameters. + if (irotate_flag.eq.2) then + dy = 1.41 + test = amod(deltay/1.41,dy/1.41) + else + dy = 1.0 + test = amod(deltay,dy) + endif + + xmax_slope = -0.20 + +! This Tabler program has not been made general enough to deal +! with deltax and deltay values that are not evenly divisible +! by 1.0 (or 1.41 for diagonal profiles). + if (abs(test).gt.1.0e10-5) then + print *,'To generate the Tabler surfaces, deltax and deltay' + print *,' must be evenly divisible by 1.0 or 1.41.' + print *,' deltay = ',deltay + stop + endif + +! Define the number of 1-m grid cells in each model grid cell, and +! calculate how many of these are in the entire nx domain. + nny = nint(deltay/dy) + maxlines = (ny - 1) * nny + 1 + +! Define the starting and ending points of the line we are going to +! work with. This is done to make sure we are never looking +! outside the data for numbers to work with. + jstart = maxlines + if (irotate_flag.eq.2) then + jend = 1 + (32+11+10+11) + else + jend = 1 + (45+15+15+15) + endif + +! Extract the line we are going to work with. + do i=1,nnx + if (irotate_flag.eq.2) then + do j=1,ny + II = i - j + 1 + drift_start_topo(j) = 0.0 + if (II.le.0) then + tabler(j) = tabler(j-1) + topo_line(j) = tabler(j-1) + elseif (II.gt.nx) then + tabler(j) = tabler_nn(nx,i-nx+1) + topo_line(j) = tabler_nn(nx,i-nx+1) + else + tabler(j) = tabler_nn(II,j) + topo_line(j) = tabler_nn(II,j) + endif + enddo + else + do j=1,ny + tabler(j) = tabler_nn(i,j) + topo_line(j) = topo_land(i,j) + drift_start_topo(j) = 0.0 + enddo + endif + +! To build the 1.0 m line, use linear interpolation between the +! model topo data. Include the end point. + do j=1,ny-1 + do jj=1,nny + jjj = (j - 1) * nny + jj + x1 = 0.0 + x = real(jj - 1) * dy + y2 = topo_line(j+1) + y1 = topo_line(j) + topo_1m(jjj) = y1 + ((y2 - y1)/deltay) * (x - x1) + enddo + enddo + topo_1m((ny - 1) * nny + 1) = topo_line(ny) + +! Use this topo array to be the starting point for generating the +! Tabler surfaces. + do j=1,maxlines + tabler_1m(j) = topo_1m(j) + drift_start_topo_1m(j) = 0.0 + enddo + +! Run the Tabler model. + do j=jstart,jend,-1 + if (irotate_flag.eq.2) then + t1 = tabler_1m(j) + t2 = tabler_1m(j-31) + t3 = tabler_1m(j-31-11) + t4 = tabler_1m(j-31-21) + t5 = tabler_1m(j-31-32) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(j-32) = max(topo_1m(j-32),& + & tabler_1m(j-31) + y * slope_adjust * dy) + else + t1 = tabler_1m(j) + t2 = tabler_1m(j-44) + t3 = tabler_1m(j-44-15) + t4 = tabler_1m(j-44-30) + t5 = tabler_1m(j-44-45) + + x1 = (t2 - t1) / 45.0 + x2 = max((t3 - t2) / 15.0,xmax_slope) + x3 = max((t4 - t3) / 15.0,xmax_slope) + x4 = max((t5 - t4) / 15.0,xmax_slope) + + y = 0.25*x1 + 0.55*x2 + 0.15*x3 + 0.05*x4 + + tabler_1m(j-45) = max(topo_1m(j-45),& + & tabler_1m(j-44) + y * slope_adjust * dy) + endif + enddo + +! Extract the profile at the model grid points. + do j=1,ny + jj = (j - 1) * nny + 1 + tabler(j) = tabler_1m(jj) + drift_start_topo(j) = drift_start_topo_1m(jj) + enddo + +! Use the 1-D arrays to fill in the 2-D tabler-surface array. + do j=1,ny + if (irotate_flag.eq.2) then + II = i - j + 1 + if (II.ge.1 .and. II.le.nx) then + tabler_nn(II,j) = tabler(j) + drift_start_topo(j) + endif + else + tabler_nn(i,j) = tabler(j) + drift_start_topo(j) + endif + enddo + + enddo + +! Convert snow_traps back to actual snow depths instead of +! depth plus topography. + do j=1,ny + do i=1,nx + tabler_nn(i,j) = tabler_nn(i,j) - topo_land(i,j) + enddo + enddo + + return + end subroutine tabler_n + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine surface_snow_1(Tair,windspd_2m,prec,ro_soft_snow,& + & Utau_t,ro_soft_snow_old,dt,ro_nsnow) + + implicit none + + real C,alfa,ro_min,ro_max,prec,Tair,ro_nsnow,dt,Tf,& + & Utau_t,ro_soft_snow_old,ro_soft_snow,windspd_2m + +! Define the density rate coefficients. + C = 0.10 + +! Define alfa. + alfa = 0.2 + +! Define the minimum and maximum snow density that should be +! simulated. + ro_min = 50.0 + ro_max = 450.0 + +! Freezing temperature. + Tf = 273.15 + +! Calculate the new snow density. First calculate this under the +! assumption of no wind using the standard SnowModel formulation, +! then calculate the offset for wind speeds > 5 m/s. + if (prec.gt.0.0) then + ro_soft_snow = ro_nsnow + ro_soft_snow = min(ro_soft_snow,ro_max) + ro_soft_snow = max(ro_soft_snow,ro_min) + if (ro_soft_snow.le.300.0) then + Utau_t = 0.10 * exp(0.003 * ro_soft_snow) + else + Utau_t = 0.005 * exp(0.013 * ro_soft_snow) + endif + ro_soft_snow_old = ro_soft_snow + else + call surface_snow_2(ro_soft_snow_old,ro_soft_snow,Utau_t,& + & dt,Tair,windspd_2m,C,ro_max,ro_min,alfa,Tf) + ro_soft_snow_old = ro_soft_snow + endif + + return + end subroutine surface_snow_1 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + subroutine surface_snow_2(ro_soft_snow_old,ro_soft_snow,Utau_t,& + & dt,Tair,windspd_2m,C,ro_max,ro_min,alfa,Tf) + + implicit none + + real Tf,Tsnow,Tair,ro_soft_snow,dt,A1,A2,B,U,C,& + & windspd_2m,Utau_t,ro_soft_snow_old,ro_max,ro_min,alfa + + A1 = 0.0013 + A2 = 0.021 + B = 0.08 + +! Evolve the near-surface snow density under the influence of +! temperature and snow-transporting wind speeds. + +! Assume that the near-surface snow temperature equals the air +! temperature, but is not above the melting point. + Tsnow = min(Tf,Tair) + +! Update the snow density of the soft snow layer. Eliminate the +! wind speed influence for speeds below 5 m/s, but account for it +! if speeds are >= 5 m/s. + if (windspd_2m.ge.5.0) then + U = 5.0 + 15.0 * (1.0 - exp(-(alfa*(windspd_2m - 5.0)))) + else + U = 1.0 + endif + + ro_soft_snow = ro_soft_snow_old + dt * & + & (C * A1 * U * ro_soft_snow_old * & + & exp((- B)*(Tf-Tsnow)) * exp((- A2)*ro_soft_snow_old)) + +! Bound the calculated density. + ro_soft_snow = min(ro_max,ro_soft_snow) + ro_soft_snow = max(ro_min,ro_soft_snow) + +! Calculate the snow threshold friction velocity. + if (ro_soft_snow.le.300.0) then + Utau_t = 0.10 * exp(0.003 * ro_soft_snow) + else + Utau_t = 0.005 * exp(0.013 * ro_soft_snow) + endif + + return + end subroutine surface_snow_2 + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_coldstart.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_coldstart.F90 new file mode 100644 index 000000000..2e5d1aa1f --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_coldstart.F90 @@ -0,0 +1,135 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: SnowModel_coldstart +! \label{SnowModel_coldstart} +! +! !REVISION HISTORY: +! This subroutine is generated with the Model Implementation Toolkit developed +! by Shugong Wang for the NASA Land Information System Version 7. The initial +! specification of the subroutine is defined by Sujay Kumar. +! +! 05 Aug 2022: Kristi Arsenault; Added SnowModel coldstart routine +! +! !INTERFACE: +subroutine SnowModel_coldstart(mtype) + +! USES: + use LIS_coreMod + use LIS_logMod + use LIS_timeMgrMod, only: LIS_date2time + + use SnowModel_lsmMod + use snowmodel_inc + use snowmodel_vars +! +! !DESCRIPTION: +! +! This routine initializes the SnowModel state variables with some +! predefined values constantly for the entire domain. +! +!EOP + implicit none + integer :: mtype + integer :: t, l, n + + do n=1, LIS_rc%nnest + if( trim(LIS_rc%startcode) .eq. "coldstart" ) then + + write(LIS_logunit,*) "[INFO] SnowModel_coldstart -- initializing SnowModel states" + + ! Initialize snow fields + snowmodel_struc(n)%sm(:)%sden = 0. + snowmodel_struc(n)%sm(:)%sublim = 0. + snowmodel_struc(n)%sm(:)%swemelt = 0. + snowmodel_struc(n)%sm(:)%runoff = 0. + + ! Initialize other state fields used + snowmodel_struc(n)%sm(:)%swe_depth = 0. + snowmodel_struc(n)%sm(:)%snow_depth = 0. + snowmodel_struc(n)%sm(:)%snow_d = 0. + snowmodel_struc(n)%sm(:)%canopy_int = 0. + snowmodel_struc(n)%sm(:)%soft_snow_d = 0. + snowmodel_struc(n)%sm(:)%ro_snow_grid = 0. + snowmodel_struc(n)%sm(:)%ro_soft_snow_old = 0. + snowmodel_struc(n)%sm(:)%snow_d_init = 0. + snowmodel_struc(n)%sm(:)%swe_depth_old = 0. + snowmodel_struc(n)%sm(:)%canopy_int_old = 0. + snowmodel_struc(n)%sm(:)%topo = 0. + snowmodel_struc(n)%sm(:)%sum_sprec = 0. + + ! SnowModel "initialize" routine code (from preprocess_code.f90) + do i=1,nx + do j=1,ny + ! Fill the summing arrays. + sum_runoff(i,j) = 0.0 + sum_prec(i,j) = 0.0 + sum_sprec(i,j) = 0.0 + sum_qsubl(i,j) = 0.0 + sum_trans(i,j) = 0.0 + sum_unload(i,j) = 0.0 + sum_Qcs(i,j) = 0.0 + sum_glacmelt(i,j) = 0.0 + sum_swemelt(i,j) = 0.0 + sum_d_canopy_int(i,j) = 0.0 + sum_sfcsublim(i,j) = 0.0 + + ! Define the initial snow-depth distributions. + snow_d_init(i,j) = snow_d_init_const + snow_d(i,j) = snow_d_init(i,j) + snow_depth(i,j) = snow_d_init(i,j) + canopy_int(i,j) = 0.0 + soft_snow_d(i,j) = snow_d(i,j) + ro_snow_grid(i,j) = ro_snow + swe_depth(i,j) = snow_d(i,j) * ro_snow_grid(i,j) / ro_water + ro_soft_snow_old(i,j) = 50.0 + swe_depth_old(i,j) = swe_depth(i,j) + canopy_int_old(i,j) = canopy_int(i,j) + + ! Initialize the multi-layer snowpack arrays. + KK(i,j) = 0 + tslsnowfall(i,j) = tsls_threshold + + enddo + enddo + + do i=1,nx + do j=1,ny + do k=1,nz_max + snod_layer(i,j,k) = 0.0 + swed_layer(i,j,k) = 0.0 + ro_layer(i,j,k) = ro_snow + T_old(i,j,k) = 273.15 + gamma(i,j,k) = 0.138 - 1.01 * (ro_layer(i,j,k)/1000.0) + & + 3.233 * (ro_layer(i,j,k)/1000.0)**2 + diam_layer(i,j,k) = 0.5 / 1000.0 + enddo + enddo + enddo + + if (topoflag.eq.1.0) then + do i=1,nx + do j=1,ny + topo(i,j) = topo_land(i,j) + snow_d(i,j) + enddo + enddo + elseif (topoflag.eq.0.0) then + do i=1,nx + do j=1,ny + topo(i,j) = topo_land(i,j) + enddo + enddo + endif + + endif + enddo + +end subroutine SnowModel_coldstart diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_dynsetup.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_dynsetup.F90 new file mode 100644 index 000000000..8e490c882 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_dynsetup.F90 @@ -0,0 +1,37 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: snowmodel_dynsetup +! \label{snowmodel_dynsetup} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! +! !INTERFACE: +subroutine snowmodel_dynsetup(n) +! !USES: + use LIS_coreMod, only : LIS_rc,LIS_domain, LIS_surface + use LIS_logMod, only : LIS_logunit, LIS_endrun +! use LIS_snowMod, only : LIS_snow_struc +! use LIS_vegDataMod, only : LIS_gfrac, LIS_lai, LIS_roughness + use snowmodel_lsmMod, only : snowmodel_struc + use LIS_timeMgrMod, only : LIS_date2time,LIS_tick +! +! !DESCRIPTION: +! This routine sets up the time-dependent variables in SnowModel. +! +!EOP + + implicit none + integer, intent(in) :: n + + write(LIS_logunit,*) '[INFO] Call to the SnowModel dynamic setup routine ...' + +end subroutine snowmodel_dynsetup diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_f2t.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_f2t.F90 new file mode 100644 index 000000000..6832545ea --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_f2t.F90 @@ -0,0 +1,244 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! !ROUTINE: snowmodel_f2t +! \label{snowmodel_f2t} +! +! !REVISION HISTORY: +! 15 Oct 2002: Sujay Kumar; Initial Code +! 14 Apr 2020: Kristi Arsenault; Added G. Liston's SnowModel +! +! !INTERFACE: +subroutine snowmodel_f2t(n) +! !USES: + use ESMF + use LIS_coreMod, only : LIS_rc, LIS_surface + use LIS_FORC_AttributesMod + use LIS_metforcingMod, only : LIS_FORC_State + use LIS_logMod, only : LIS_logunit, LIS_verify, & + LIS_endrun + use snowmodel_lsmMod + use snowmodel_vars + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n +! +! !DESCRIPTION: +! This routine transfers the LIS provided forcing onto the SnowModel +! model tiles. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \end{description} +! +!EOP + + integer :: t,v,status + integer :: tid + type(ESMF_Field) :: tmpField,q2Field,uField,vField,swdField,lwdField + type(ESMF_Field) :: psurfField,pcpField,snowfField,fhgtField + real,pointer :: tmp(:),q2(:),uwind(:),vwind(:),snowf(:) + real,pointer :: swd(:),lwd(:),psurf(:),pcp(:) + real,pointer :: fheight1(:,:),fheight(:) + integer, pointer :: layer_windht(:), layer_relhumht(:) +! __________________ + + write(LIS_logunit,*) '[INFO] Call to the SnowModel Forcing 2 tile routine ...' + + if ( LIS_FORC_Forc_Hgt%selectOpt.eq.1 ) then + + allocate(fheight1(LIS_FORC_Forc_Hgt%vlevels,LIS_rc%ntiles(n))) + allocate(layer_windht(LIS_rc%ntiles(n))) + allocate(layer_relhumht(LIS_rc%ntiles(n))) + + ! Forcing heights are specified. Find the layers corresponding to the reference heights. + ! If not, use the lowest model layer as the height. + + do v=1,LIS_FORC_Forc_Hgt%vlevels + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Forc_Hgt%varname(v)),& + fhgtField, rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Forc_Hgt') + + call ESMF_FieldGet(fhgtField,localDE=0,farrayPtr=fheight,rc=status) + fheight1(v,:) = fheight(:) + call LIS_verify(status,'snowmodel_f2t: error retrieving fheight') + enddo + + call snowmodel_find_forcing_heights(LIS_FORC_Forc_Hgt%vlevels, LIS_rc%ntiles(n),& + fheight1, snowmodel_struc(n)%ht_rhobs, snowmodel_struc(n)%ht_windobs, & + layer_windht, layer_relhumht) + + if (LIS_rc%ntiles(n).ne.0) then + snowmodel_struc(n)%ht_rhobs = fheight1(layer_relhumht(1),1) + snowmodel_struc(n)%ht_windobs = fheight1(layer_windht(1),1) + endif + + deallocate(fheight1) + deallocate(layer_windht) + deallocate(layer_relhumht) + endif + ! If forcing heights are not specified, then LIS will assume that forcing data + ! corresponds to the reference heights snowmodel.par (tmprh_ht, wind_ht). + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Tair%varname(1)),tmpField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Tair') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Qair%varname(1)),q2Field,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Qair') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Wind_E%varname(1)),uField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Wind_E') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Wind_N%varname(1)),vField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Wind_N') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_SWdown%varname(1)),swdField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting SWdown') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_LWdown%varname(1)),lwdField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting LWdown') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Psurf%varname(1)),psurfField,& + rc=status) + call LIS_verify(status, 'snowmodel_f2t: error getting PSurf') + + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Rainf%varname(1)),pcpField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Rainf') + + if(LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Forc_Hgt%varname(1)),fhgtField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Forc_Hgt') + endif + + if(LIS_FORC_Snowf%selectOpt.eq.1) then + call ESMF_StateGet(LIS_FORC_State(n),(LIS_FORC_Snowf%varname(1)),snowfField,& + rc=status) + call LIS_verify(status,'snowmodel_f2t: error getting Snowf') + endif + + call ESMF_FieldGet(tmpField, localDE=0, farrayPtr=tmp,rc=status) + call LIS_verify(status, 'snowmodel_f2t: error retrieving Tair') + + call ESMF_FieldGet(q2Field,localDE=0, farrayPtr=q2,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving q2') + + call ESMF_FieldGet(swdField,localDE=0, farrayPtr=swd,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving swd') + + call ESMF_FieldGet(lwdField,localDE=0, farrayPtr=lwd,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving lwd') + + call ESMF_FieldGet(uField,localDE=0, farrayPtr=uwind,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving u') + + call ESMF_FieldGet(vField,localDE=0, farrayPtr=vwind,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving v') + + call ESMF_FieldGet(psurfField,localDE=0, farrayPtr=psurf,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving psurf') + + call ESMF_FieldGet(pcpField,localDE=0, farrayPtr=pcp,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving pcp') + + if(LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + call ESMF_FieldGet(fhgtField,localDE=0, farrayPtr=fheight,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving forc_hgt') + endif + + if(LIS_FORC_Snowf%selectOpt.eq.1) then + call ESMF_FieldGet(snowfField,localDE=0, farrayPtr=snowf,rc=status) + call LIS_verify(status,'snowmodel_f2t: error retrieving snowf') + endif + + snowmodel_struc(n)%forc_count = snowmodel_struc(n)%forc_count + 1 + + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + ! Transform tile to the patch + tid = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%tile_id + snowmodel_struc(n)%sm(t)%tair=snowmodel_struc(n)%sm(t)%tair + tmp(tid) + snowmodel_struc(n)%sm(t)%qair=snowmodel_struc(n)%sm(t)%qair + q2(tid) + snowmodel_struc(n)%sm(t)%swdown=snowmodel_struc(n)%sm(t)%swdown + swd(tid) + snowmodel_struc(n)%sm(t)%lwdown=snowmodel_struc(n)%sm(t)%lwdown + lwd(tid) + snowmodel_struc(n)%sm(t)%uwind=snowmodel_struc(n)%sm(t)%uwind + uwind(tid) + snowmodel_struc(n)%sm(t)%vwind=snowmodel_struc(n)%sm(t)%vwind + vwind(tid) + snowmodel_struc(n)%sm(t)%psurf=snowmodel_struc(n)%sm(t)%psurf + psurf(tid) + + if ( LIS_FORC_Forc_Hgt%selectOpt.eq.1) then + snowmodel_struc(n)%sm(t)%fheight=fheight(tid) + endif + + if(pcp(tid).ne.LIS_rc%udef) then + snowmodel_struc(n)%sm(t)%rainf=snowmodel_struc(n)%sm(t)%rainf + pcp(tid) + else + snowmodel_struc(n)%sm(t)%rainf=snowmodel_struc(n)%sm(t)%rainf + 0.0 + endif + + ! If there is snowf add it to precipitation. + ! NOTE: SnowModel has options/code to discriminate between rainf/snowf + ! within MicroMet. + ! Will need to address this issue ... + ! Place options / code in new "sliced out" MicroMet routines ... + if ( LIS_FORC_Snowf%selectOpt.eq.1) then + if(snowf(tid).ne.LIS_rc%udef) then + snowmodel_struc(n)%sm(t)%rainf=snowmodel_struc(n)%sm(t)%rainf + & + snowf(tid) + endif + endif + snowmodel_struc(n)%sm(t)%snowf = snowmodel_struc(n)%sm(t)%snowf+ 0.0 + + enddo + +! if(pcp(100) < 0) then +! print *, "pcp :: ",snowmodel_struc(n)%forc_count, pcp(100) +! endif +! print *, tmp(100), snowmodel_struc(n)%sm(100)%tair +! print *, uwind(100), snowmodel_struc(n)%sm(100)%uwind +! print *, vwind(100), snowmodel_struc(n)%sm(100)%vwind +! print *, psurf(100), snowmodel_struc(n)%sm(100)%psurf +! print *, pcp(100), snowmodel_struc(n)%sm(100)%rainf + +end subroutine snowmodel_f2t + + +subroutine snowmodel_find_forcing_heights(vlevels, ntiles, fheight, & + tmprh_ht, wind_ht, layer_tmprh, layer_wind) + + implicit none + + integer :: vlevels, ntiles + real :: fheight(vlevels, ntiles) + real :: tmprh_ht, wind_ht + integer :: layer_tmprh(ntiles) + integer :: layer_wind(ntiles) + integer :: t,v + +!assume lowest model layer to start with. + layer_tmprh = 1 + layer_wind = 1 + + do t=1,ntiles + do v=1,vlevels + if(fheight(v,t).ge.tmprh_ht) layer_tmprh(t) = v + if(fheight(v,t).ge.wind_ht) layer_wind(t) = v + enddo + enddo + +end subroutine snowmodel_find_forcing_heights diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_finalize.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_finalize.F90 new file mode 100644 index 000000000..7a9ca95b8 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_finalize.F90 @@ -0,0 +1,44 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: snowmodel_finalize +! \label{snowmodel_finalize} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! +! !INTERFACE: +subroutine snowmodel_finalize() +! !USES: + use LIS_logMod, only : LIS_logunit + use snowmodel_lsmMod +! +! !DESCRIPTION: +! +! This routine cleans up the allocated memory structures in SnowModel +! +!EOP + implicit none + + integer :: t + + ! Print a banner when the model run is finished. + write(LIS_logunit,*)& + & 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' + write(LIS_logunit,*)& + & ' The SnowModel Run Has Finished ' + write(LIS_logunit,*)& + & 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' + + +end subroutine snowmodel_finalize + + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_lsmMod.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_lsmMod.F90 new file mode 100644 index 000000000..8df719942 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_lsmMod.F90 @@ -0,0 +1,615 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +module snowmodel_lsmMod +!BOP +! +! !MODULE: snowmodel_lsmMod +! +! !DESCRIPTION: +! +! This module provides the definition of derived data type used to +! control the operation of SnowModel. It also provides the entry +! method for the initialization of SnowModel-specific variables. +! The derived data type {\tt snowmodel\_struc} includes the variables +! that specify the runtime options and other control variables as +! described below: +! +! \begin{description} +! \item[rfile] +! name of the SnowModel restart file +! \item[rformat] +! format of restart file (binary or netcdf) for SnowModel +! \item[vfile] +! name of the static vegetation parameter table +! \item[parfile] +! name of the main input parameter for SnowModel +! \item[count] +! variable to keep track of the number of timesteps before an output +! \item[nsnow] +! number of snow layers +! \item[nvegp] +! number of static vegetation parameters in the table +! \item[inittemp] +! initial soil temperatures for a cold start run +! \item[rstInterval] +! restart writing interval +! \item[ht_rhobs] +! reference height of T and q forcing +! \item[ht_windobs] +! reference height of u and v forcing +! \item[lyrthk] +! thickness of soil layers +! \item[snowmodel] +! SnowModel specific variables +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Added G. Liston's SnowModel +! +! !USES: + use snowmodel_module + use snowmodel_vars + use LIS_constantsMod, only : LIS_CONST_PATH_LEN + implicit none + + PRIVATE +!----------------------------------------------------------------------------- +! !PUBLIC MEMBER FUNCTIONS: +!----------------------------------------------------------------------------- + public :: snowmodel_init +!----------------------------------------------------------------------------- +! !PUBLIC TYPES: +!----------------------------------------------------------------------------- + public :: snowmodel_struc +!EOP + type, public :: snowmodel_type_dec + + ! LIS related parameters: + real :: rstInterval + character(len=LIS_CONST_PATH_LEN) :: rfile + character(20) :: rformat + + ! LIS-SnowModel related parameters: + character(len=LIS_CONST_PATH_LEN) :: parfile + character(len=LIS_CONST_PATH_LEN) :: vfile + real :: ht_windobs + real :: ht_rhobs + integer :: call_sm_preproc + integer :: write_sm_metfields + character(10) :: sm_params_opt + character(10) :: sm_micromet_opt + + integer :: nsnow + real, allocatable :: lyrthk(:) + real, allocatable :: inittemp(:) + real :: initsnowdepth + real :: initsnowequiv + + integer :: forc_count + + real :: ts + integer :: iter + + ! SnowModel parameter - snowmodel.h +! integer :: nx_max +! integer :: ny_max +! integer :: nstns_max +! integer :: nvegtypes +! integer :: max_time_steps +! integer :: max_obs_dates +! integer :: nz_max +! integer :: n_print_vars + + ! SnowModel parameter - snowmodel_vars.h + integer :: max_iter + integer :: nx + integer :: ny + real :: deltax + real :: deltay + + real :: run_micromet + real :: run_enbal + real :: run_snowpack + real :: run_snowtran + + real :: usum_glb + real :: vsum_glb + real :: windspdflg_glb + real :: wslopemax_glb + real :: curvemax_glb + real :: bsflag_glb + + type(snowmodeldec), allocatable :: sm(:) + + end type snowmodel_type_dec + + type(snowmodel_type_dec), allocatable :: snowmodel_struc(:) + SAVE + +contains +!BOP +! +! !ROUTINE: snowmodel_init +! \label{snowmodel_init} +! +! !INTERFACE: + subroutine snowmodel_init(eks) +! !USES: + use ESMF + use LIS_coreMod + use LIS_logMod + use LIS_timeMgrMod, only : LIS_clock, LIS_calendar, & + LIS_update_timestep, LIS_registerAlarm + use LIS_surfaceModelDataMod + use LIS_lsmMod + use snowmodel_inc + use snowmodel_vars +! +! !DESCRIPTION: +! +! This routine creates the datatypes and allocates memory for +! SnowModel-specific variables. It also invokes the routine to +! read the runtime specific options for SnowModel from the +! configuration file. +! +! The routines invoked are: +! \begin{description} +! \item[snowmodel\_readconfig](\ref{snowmodel_readconfig}) \newline +! reads the runtime options for SnowModel +! \end{description} +!EOP + implicit none + integer, intent(in) :: eks + + integer :: n,t + character(3) :: fnest + integer :: status + + type(ESMF_ArraySpec) :: arrspec1 + type(ESMF_Field) :: sweField, snwdField + +! _____________________________________________________ + + allocate(snowmodel_struc(LIS_rc%nnest)) + + ! Read in LIS config entries for SnowModel: + call snowmodel_readconfig() + + do n=1,LIS_rc%nnest + + allocate(snowmodel_struc(n)%sm(LIS_rc%npatch(n,LIS_rc%lsm_index))) + + ! Number of snow layers (e.g., 2, 25) + snowmodel_struc(n)%nsnow = 1 ! Set to 1 for now, can be high as 25 + + ! Call Snowmodel read parameter subroutine to read in + ! primary parameter and input settings to run the model: + + snowmodel_dot_par_fname = trim(snowmodel_struc(n)%parfile) + + if( LIS_localPet==0 ) then + snowmodel_masterproc = .true. + else + snowmodel_masterproc = .false. + endif + + call READPARAM_CODE(& + dt,deltax,deltay,Utau_t_flag,& + subgrid_flag,twolayer_flag,snowmodel_dot_par_fname,& + bc_flag,curve_len_scale,slopewt,curvewt,ht_windobs,& + ht_rhobs,ro_snow,snow_d_init_const,const_veg_flag,& + vegsnowdepth,LIS_rc%lnc(n),LIS_rc%lnr(n),max_iter,met_input_fname,xmn,ymn,& ! KRA: nx,ny + iyear_init,imonth_init,iday_init,xhour_init,undef,ifill,& + iobsint,dn,xlat,i_tair_flag,i_rh_flag,i_wind_flag,& + i_solar_flag,i_prec_flag,isingle_stn_flag,igrads_metfile,& + windspd_min,icond_flag,run_micromet,run_enbal,run_snowpack,& + run_snowtran,topoflag,topoveg_fname,snowtran_output_fname,& + micromet_output_fname,enbal_output_fname,Utau_t_const,& + snowpack_output_fname,print_micromet,print_enbal,& + print_snowpack,print_snowtran,i_longwave_flag,print_user,& + ascii_topoveg,topo_ascii_fname,veg_ascii_fname,& + irun_data_assim,lapse_rate_user_flag,& + iprecip_lapse_rate_user_flag,use_shortwave_obs,& + use_longwave_obs,use_sfc_pressure_obs,calc_subcanopy_met,& + sfc_sublim_flag,gap_frac,cloud_frac_factor,& + albedo_snow_forest,albedo_snow_clearing,albedo_glacier,& + barnes_lg_domain,n_stns_used,tabler_dir,slope_adjust,& + lat_solar_flag,UTC_flag,iveg_ht_flag,ihrestart_flag,& + ihrestart_inc,i_dataassim_loop,tsls_threshold,dz_snow_min,& + print_multilayer,multilayer_snowpack,max_layers,& + multilayer_output_fname,izero_snow_date,curve_lg_scale_flag,& + check_met_data,seaice_run,snowmodel_line_flag,wind_lapse_rate,& + iprecip_scheme,cf_precip_flag,snowfall_frac,print_inc,& + output_path_wo_assim,output_path_wi_assim,Tabler_1_flag,& + Tabler_2_flag,tabler_sfc_path_name,print_var) + + ! Check SnowModel parameter source origins: + if( snowmodel_struc(n)%sm_params_opt == "LDT" ) then + write(LIS_logunit,*) "[INFO] Reading in SnowModel LSM parameters from LDT" + ascii_topoveg = 2.0 ! No file read in by SnowModel; use LDT input + else + write(LIS_logunit,*) "[INFO] Reading in SnowModel LSM parameters from snowmodel.par file " + endif + + ! Check SnowModel Micromet source calls: + if( snowmodel_struc(n)%sm_micromet_opt == "SnowModel" ) then + write(LIS_logunit,*) "[INFO] Calling MicroMet routines within SnowModel " + elseif( snowmodel_struc(n)%sm_micromet_opt == "LIS" ) then + write(LIS_logunit,*) "[INFO] Calling MicroMet routines from LIS metforcing layer " + else + write(LIS_logunit,*) "[ERR] Incorrect option set for " + write(LIS_logunit,*) "[ERR] SnowModel MicroMet input source: " + write(LIS_logunit,*) "[ERR] See documentation in configs/lis.config.adoc " + write(LIS_logunit,*) "[ERR] for option details. " + call LIS_endrun + endif + + ! Check inputs to driving SnowModel: + write(LIS_logunit,*) "[INFO] Reading in SnowModel input options" + write(LIS_logunit,*) ' Run Micromet : ',run_micromet + write(LIS_logunit,*) ' Run EnBal : ',run_enbal + write(LIS_logunit,*) ' Run Snowpack : ',run_snowpack + write(LIS_logunit,*) ' Run Snowtran : ',run_snowtran + write(LIS_logunit,*) ' Run data assimilation: ',irun_data_assim + write(LIS_logunit,*) ' Data assimilation loop: ',i_dataassim_loop + write(LIS_logunit,*) ' Undefined value: ',undef + write(LIS_logunit,*) '' + write(LIS_logunit,*) "[INFO] SnowModel grid information: " + write(LIS_logunit,*) "[INFO] Note: SnowModel typically runs on an" + write(LIS_logunit,*) " equal-area grid, e.g., UTM or Albers Equal Area" + write(LIS_logunit,*) ' Number of x cells in grid: ',nx + write(LIS_logunit,*) ' Number of y cells in grid: ',ny + write(LIS_logunit,*) ' Increment in x direction(m): ',deltax + write(LIS_logunit,*) ' Increment in y direction(m): ',deltay + write(LIS_logunit,*) ' LL_X Location in meters (UTM): ',xmn + write(LIS_logunit,*) ' LL_Y Location in meters (UTM): ',ymn + write(LIS_logunit,*) ' ' + write(LIS_logunit,*) "[INFO] SnowModel date/time information: " + write(LIS_logunit,*) ' Model time step: ',dt + write(LIS_logunit,*) ' Start year of input data: ',iyear_init + write(LIS_logunit,*) ' Start month of input data: ',imonth_init + write(LIS_logunit,*) ' Start day of input data: ',iday_init + write(LIS_logunit,*) ' Start hour of input data: ',xhour_init + write(LIS_logunit,*) ' Maximum iterations: ',max_iter + write(LIS_logunit,*) ' ' + write(LIS_logunit,*) "[INFO] SnowModel veg and topo information: " + write(LIS_logunit,*) ' Topo and veg input file type: ',ascii_topoveg + write(LIS_logunit,*) ' Topo and veg file name: ',trim(topoveg_fname) + write(LIS_logunit,*) ' Constant veg type: ',const_veg_flag + write(LIS_logunit,*) ' Veg height flag: ',iveg_ht_flag + write(LIS_logunit,*) ' ' + write(LIS_logunit,*) '[INFO] SnowModel solar radiation calculations: ' + write(LIS_logunit,*) ' UTC flag(local=0; UTC: GRADS_long=-1,TXT_long=1): ',UTC_flag + write(LIS_logunit,*) ' Latitude solar flag (same as UTC flag options): ',lat_solar_flag + write(LIS_logunit,*) ' Domain center latitude (used when lat_solar_flag=0): ',xlat + ! Input height of wind and rh observations (ENBAL and SNOWTRAN): + write(LIS_logunit,*) '[INFO] Other SnowModel Inputs (ENBAL AND SNOWTRAN)' + write(LIS_logunit,*) ' Height of wind obs: ',ht_windobs + write(LIS_logunit,*) ' Height of rel hum obs: ',ht_rhobs + write(LIS_logunit,*) ' ' + ! Micromet Model setup:: + write(LIS_logunit,*) '[INFO] MICROMET ENTRIES ... ' + write(LIS_logunit,*) ' Tair output : ',i_tair_flag + write(LIS_logunit,*) ' RH output : ',i_rh_flag + write(LIS_logunit,*) ' Wind output : ',i_wind_flag + write(LIS_logunit,*) ' SWrad output: ',i_solar_flag + write(LIS_logunit,*) ' LWdown output: ',i_longwave_flag + write(LIS_logunit,*) ' Prec output : ',i_prec_flag + write(LIS_logunit,*) ' ' + write(LIS_logunit,*) ' Met Input Filename: ',trim(met_input_fname) + write(LIS_logunit,*) ' Run met forcing check: ',check_met_data + write(LIS_logunit,*) ' MicroMet station flag: ',isingle_stn_flag + write(LIS_logunit,*) ' MicroMet GrADS Metfile: ',igrads_metfile + write(LIS_logunit,*) ' Barnes station interp: ',barnes_lg_domain + write(LIS_logunit,*) ' Barnes nearest stations number: ',n_stns_used + write(LIS_logunit,*) ' Radius of influence: ',iobsint + write(LIS_logunit,*) ' Radius of influence - obs interval: ',dn + + write(LIS_logunit,*) ' ' + ! These may be useful and considered: + write(LIS_logunit,*) ' Run grid as 1d vector (not 2d): ', snowmodel_line_flag + + ! Preprocess, MicroMet, SnowTran3D + write(LIS_logunit,*) '[INFO] Wind model curvature entries (MicroMet, SNOWTRAN)' + write(LIS_logunit,*) ' Wind model curvature (len scale): ',curve_len_scale + write(LIS_logunit,*) ' Wind model curve weight: ',curvewt + write(LIS_logunit,*) ' Wind model slope weight: ',slopewt + write(LIS_logunit,*) ' Wind 2nd len scale curve affect: ',curve_lg_scale_flag + + ! MicroMet option for mininum windspeed threshold + write(LIS_logunit,*) ' Min. windspeed threshold: ',windspd_min + + ! Default is 0, but if user wants to change lapse-rate values, + ! they need to do it within micromet_code.f: + write(LIS_logunit,*) ' Monthly lapse rate values: ',lapse_rate_user_flag + + ! Default is 0, but if users want to change precip LR scaling values, + ! they need to do it within micromet_code.f: + write(LIS_logunit,*) ' Precip adjustment factor (precip LR scaling): ',iprecip_lapse_rate_user_flag + + ! Two precip-increase-with-elev schemes; 1-orig, 2-van Pelt scheme: + write(LIS_logunit,*) ' Precip-increase-elev scheme: ',iprecip_scheme + + ! Define rain-snow fraction of precip water equiv (forcing) calculation scheme: + write(LIS_logunit,*) ' Rain-snow fraction WE calculation scheme: ',snowfall_frac + + ! Turn on wind lapse-rate factor: + write(LIS_logunit,*) ' Wind lapse-rate factor: ',wind_lapse_rate + + ! Turn on sub-forest-canopy estimates for wind-speed, solar rad, and LW rad: + write(LIS_logunit,*) ' Calc Sub-forest-canopy estimates: ',calc_subcanopy_met + + ! Define canopy gap fraction (0-1) for solar radiation reaching snow below canopy: + write(LIS_logunit,*) ' Canopy gap fraction: ',gap_frac + + ! Cloud fraction factor can be used to reduce cloud-cover fraction, + ! like in valley locations. + write(LIS_logunit,*) ' Cloud fraction factor: ',cloud_frac_factor + + ! Select whether SW radiation obs will be assimilated: + write(LIS_logunit,*) ' SW radiation obs DA: ',use_shortwave_obs + + ! Select whether LW radiation obs will be assimilated: + write(LIS_logunit,*) ' LW radiation obs DA: ',use_longwave_obs + + ! Select whether sfc pressure obs will be assimilated: + write(LIS_logunit,*) ' Surface pressure obs DA: ',use_sfc_pressure_obs + + ! User-defined precip correction factor, either 2d field applied, or constant factor: + ! default=0, turned off + write(LIS_logunit,*) ' Precipitation correction factor: ',cf_precip_flag + + write(LIS_logunit,*) '** ENDING MICROMET ENTRIES ... ' + + ! EnBAL Model setup:: + write(LIS_logunit,*) ' ' + write(LIS_logunit,*) '[INFO] ENBAL ENTRIES ... ' + + ! Surface energy balance calculation accounting for non-0 conduction term + ! 0-single layer; 1-multilayer snowpack physics + write(LIS_logunit,*) ' Energy balance calc with non-0 cond. term: ', icond_flag + + ! Define albedo for melting snow cover under forest canopy + write(LIS_logunit,*) ' ENBAL: Forest snow melt albedo value: ',albedo_snow_forest + + ! Define albedo for melting snow cover in non-forested areas: + write(LIS_logunit,*) ' ENBAL: Nonforest snow melt albedo value: ',albedo_snow_clearing + + ! Define albedo for glacier surface: + write(LIS_logunit,*) ' ENBAL: Glacier surface albedo value: ',albedo_glacier + + write(LIS_logunit,*) '** ENDING ENBAL ENTRIES ... ' + + write(LIS_logunit,*) ' ' + ! SnowPack Model setup:: + write(LIS_logunit,*) '[INFO] SNOWPACK ENTRIES ... ' + + ! Set static-surface (non-blowing snow) sublimation effect on: + ! If on, Qle from ENBAL is used to add/remove snow via sublimation: + write(LIS_logunit,*) ' SNOWPACK: non-blowing snow sublimation effect: ',sfc_sublim_flag + + ! Turn on multilayer snowpack option: + write(LIS_logunit,*) ' SNOWPACK: multilayer option: ',multilayer_snowpack + + ! Define time since last snowfall to determine if new snow layer gets created: + write(LIS_logunit,*) ' SNOWPACK: time since snowfall for creating new snow layer: ',tsls_threshold + + ! Define the min snow layer thickness (m) for multi-layer snowpack model. + write(LIS_logunit,*) ' SNOWPACK: min snow layer thickness(m): ',dz_snow_min + + ! Set date to reset snowpack to 0 to not allow glacier formation in multi-year runs: + ! To disable setting = 999999 + write(LIS_logunit,*) ' SNOWPACK: date for zeroing out snowpack: ',izero_snow_date + + write(LIS_logunit,*) '** ENDING SNOWPACK ENTRIES ... ' + + write(LIS_logunit,*) ' ' + ! SnowTran-3d Model setup:: + write(LIS_logunit,*) '[INFO] SNOWTRAN3D ENTRIES ... ' + + ! Threshold surface shear velocity as function of AirTemp and Wspd: + write(LIS_logunit,*) ' SNOWTRAN: Surface shear velocity flag (T+Wspd): ',Utau_t_flag + + ! Surface shear velocity threshold (when Utau_t_flag=0): + write(LIS_logunit,*) ' SNOWTRAN: Surface shear velocity threshold: ',Utau_t_const + + ! Flag to turn on the Tabler subgrid algorithm (0-no snow redistribution) + ! Not appropriate for grid increments > 30 m. If turned on, topoflag = 1. + write(LIS_logunit,*) ' SNOWTRAN: Tabler subsgrid snow redistribution option: ',subgrid_flag + + ! When Tabler flag on, user can define dominant wind direction (of 8 directions). + ! Value is set constant over domain area: + write(LIS_logunit,*) ' SNOWTRAN: Tabler constant wind directory: ',tabler_dir + + ! Adjust slopes of Tabler surfaces using 'slope-adjust' parameter, which + ! is multiplied by calc. Tabler equilibrium drift sufrace slope. + write(LIS_logunit,*) ' SNOWTRAN: Tabler slope surface adjustment: ',slope_adjust + + ! Account for two snow-layer movement: + write(LIS_logunit,*) ' SNOWTRAN: Snow-layer movement: ',twolayer_flag + + ! Define upwind boundary to have 0 incoming transport flux: + write(LIS_logunit,*) ' SNOWTRAN: Upwind boundary incoming transport flux: ',bc_flag + + ! Snowtran wo Snowpack -- Provide Snow density: + write(LIS_logunit,*) ' SNOWTRAN: snow density (when Snowpack off): ',ro_snow + + ! Define initial snow-depth distributions: + write(LIS_logunit,*) ' SNOWTRAN: Initial snow-depth distribution: ',snow_d_init_const + + ! Flag to set surface topography to ground topography: + write(LIS_logunit,*) ' SNOWTRAN: Set surface topography to ground topography: ',topoflag + + write(LIS_logunit,*) '** END SNOWTRAN3D ENTRIES ... WILL CHECK WITH OTHER SUBMODELS' + write(LIS_logunit,*) ' ' + + ! SeaIce Model: + write(LIS_logunit,*) '[INFO] SEAICE ENTRIES ... ' + ! Define whether to simulate snow on sea ice: + write(LIS_logunit,*) 'SEAICE: Turn on sea-ice option: ',seaice_run + write(LIS_logunit,*) '** END SEAICE ENTRIES ... ' + + write(LIS_logunit,*) ' ' + write(LIS_logunit,*) '[INFO] Output directory information ' + write(LIS_logunit,*) ' OUTPUT: Output directory: ',trim(output_path_wo_assim) + write(LIS_logunit,*) ' OUTPUT: DA Output directory: ',trim(output_path_wi_assim) + write(LIS_logunit,*) ' OUTPUT: Write individual files(1=yes): ',print_user + ! This option below defines the write output increment, etc., 8 = 3 hourly + write(LIS_logunit,*) ' OUTPUT: Print increment, (times)X(day): ',print_inc + ! Output print options: + write(LIS_logunit,*) '[INFO] SnowModel values averaged over the period' + write(LIS_logunit,*) ' OUTPUT: Tair (degC) : ',print_var(1) + write(LIS_logunit,*) ' OUTPUT: RH (%) : ',print_var(2) + write(LIS_logunit,*) ' OUTPUT: Wind spd (m/s) : ',print_var(3) + write(LIS_logunit,*) ' OUTPUT: Inc solar radiation (W/m2) : ',print_var(4) + write(LIS_logunit,*) ' OUTPUT: Inc LW radiation (W/m2) : ',print_var(5) + write(LIS_logunit,*) ' OUTPUT: Emitted LW rad (W/m2) : ',print_var(6) + write(LIS_logunit,*) ' OUTPUT: albedo (-) : ',print_var(7) + write(LIS_logunit,*) ' OUTPUT: wind direction (deg) : ',print_var(8) + write(LIS_logunit,*) ' OUTPUT: Cloud fraction (ave over period): ',print_var(21) + + write(LIS_logunit,*) '[INFO] SnowModel values summed over period' + write(LIS_logunit,*) ' OUTPUT: Wat eqv precip (m/ts) : ',print_var(9) + write(LIS_logunit,*) ' OUTPUT: Liq precip (m/ts) : ',print_var(10) + write(LIS_logunit,*) ' OUTPUT: Solid precip (m/ts) : ',print_var(11) + write(LIS_logunit,*) ' OUTPUT: SWE melt (m) : ',print_var(12) + write(LIS_logunit,*) ' OUTPUT: Surface sublmiation (m) : ',print_var(13) + write(LIS_logunit,*) ' OUTPUT: Runoff from snowpack base (m/ts): ',print_var(14) + write(LIS_logunit,*) ' OUTPUT: SWE melt from glacier ice (m) : ',print_var(15) + + write(LIS_logunit,*) '[INFO] SnowModel values saved at the end of period' + write(LIS_logunit,*) ' OUTPUT: Snow depth (m) : ',print_var(16) + write(LIS_logunit,*) ' OUTPUT: Snow density (kg/m3) : ',print_var(17) + write(LIS_logunit,*) ' OUTPUT: SWE (m) : ',print_var(18) + write(LIS_logunit,*) ' OUTPUT: Summed snow precip year (m) : ',print_var(19) + write(LIS_logunit,*) ' OUTPUT: Summed SWE melt for year (m) : ',print_var(20) + + ! Output print options: +! write(LIS_logunit,*) ' OUTPUT: Micromet variables: ',print_micromet +! write(LIS_logunit,*) ' OUTPUT: EnBal variables: ',print_enbal +! write(LIS_logunit,*) ' OUTPUT: Snowpack variables: ',print_snowpack +! write(LIS_logunit,*) ' OUTPUT: Snowpack multilayer variables: ',print_multilayer +! write(LIS_logunit,*) ' OUTPUT: SnowTran variables: ',print_snowtran +! write(LIS_logunit,*) ' OUTPUT: SnowTran Tabler1 fields: ',Tabler_1_flag +! write(LIS_logunit,*) ' OUTPUT: SnowTran Tabler2 fields: ',Tabler_2_flag + + ! ------------------------------ + + ! SnowModel Main code calls and options for reading in and + ! preprocessing necessary inputs to the submodel components: + ! All below from the original snomodel_main.f ... + + ! This loop runs the correction/data assimilation adjustment + ! iterations. + if (ihrestart_flag.ge.0) then + if (i_dataassim_loop.lt.0.0) then + i_corr_start = 2 + else + i_corr_start = 1 + endif + else + i_corr_start = 1 + endif + + do icorr_factor_loop=i_corr_start,irun_data_assim+1 + + ! Perform the correction (precipitation and melt) factor + ! calculations. + if (irun_data_assim.eq.1 .and. icorr_factor_loop.eq.2) then + write(LIS_logunit,*) "[WARN] No call to 'DATAASSIM_USER' at this time" + CALL DATAASSIM_USER(LIS_rc%lnc(n),LIS_rc%lnr(n),icorr_factor_index,& ! KRA: nx,ny + corr_factor,max_iter,deltax,deltay,xmn,ymn,nobs_dates,& + print_inc,iday_init,imonth_init,iyear_init,dt,& + output_path_wo_assim,xhour_init) + if (ihrestart_flag.ge.-1) then + write(LIS_logunit,*) "[WARN] No call to 'HRESTART_SAVE_DA' at this time" + CALL HRESTART_SAVE_DA(LIS_rc%lnc(n),LIS_rc%lnr(n),max_iter,corr_factor,& ! KRA: nx,ny + icorr_factor_index,nobs_dates) + endif + endif + + end do + + ! ------------------------------ + + ! Passing the required SnowModel fields to LIS for what LIS requires ... + snowmodel_struc(n)%iter = 0 + + ! Initialize forcing fields: + snowmodel_struc(n)%forc_count = 0 + do t=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + snowmodel_struc(n)%sm(t)%tair = 0 + snowmodel_struc(n)%sm(t)%qair = 0 + snowmodel_struc(n)%sm(t)%swdown = 0 + snowmodel_struc(n)%sm(t)%lwdown = 0 + snowmodel_struc(n)%sm(t)%uwind = 0 + snowmodel_struc(n)%sm(t)%vwind = 0 + snowmodel_struc(n)%sm(t)%psurf = 0 + snowmodel_struc(n)%sm(t)%rainf = 0 + snowmodel_struc(n)%sm(t)%snowf = 0 + enddo + +!------------------------------------------------------------------------ +! Model timestep Alarm +!------------------------------------------------------------------------ + call LIS_update_timestep(LIS_rc, n, snowmodel_struc(n)%ts) + + write(fnest,'(i3.3)') n + call LIS_registerAlarm("SnowModel model alarm "//trim(fnest),& + snowmodel_struc(n)%ts,& + snowmodel_struc(n)%ts) + + call LIS_registerAlarm("SnowModel restart alarm "//trim(fnest),& + snowmodel_struc(n)%ts,& + snowmodel_struc(n)%rstInterval) + + LIS_sfmodel_struc(n)%ts = snowmodel_struc(n)%ts + + +!------------------------------------------------------------------------ +! Create fields for LSM2SUBLSM exchanges +!------------------------------------------------------------------------ + call ESMF_ArraySpecSet(arrspec1,& + rank=1,typekind=ESMF_TYPEKIND_R4,& + rc=status) + call LIS_verify(status, & + 'ESMF_ArraySpecSet failed in snowmodel_init') + + sweField = ESMF_FieldCreate(& + grid=LIS_vecPatch(n,LIS_rc%lsm_index),& + arrayspec=arrspec1, & + name="Total SWE",& + rc=status) + call LIS_verify(status,& + 'ESMF_FieldCreate failed for SWE in snowmodel_init') + + snwdField = ESMF_FieldCreate(& + grid=LIS_vecPatch(n,LIS_rc%lsm_index),& + arrayspec=arrspec1, & + name="Total snowdepth",& + rc=status) + call LIS_verify(status,& + 'ESMF_FieldCreate failed for snowdepth in snowmodel_init') + + call ESMF_StateAdd(LIS_SUBLSM2LSM_State(n,eks),& + (/sweField/),rc=status) + call LIS_verify(status,& + 'ESMF_StateAdd failed for swe in snowmodel_init') + call ESMF_StateAdd(LIS_SUBLSM2LSM_State(n,eks),& + (/snwdField/),rc=status) + call LIS_verify(status,& + 'ESMF_StateAdd failed for snwd in snowmodel_init') + + enddo + + end subroutine snowmodel_init + +end module snowmodel_lsmMod + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_main.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_main.F90 new file mode 100644 index 000000000..2561f231b --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_main.F90 @@ -0,0 +1,750 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: snowmodel_main +! \label{snowmodel_main} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! +! !INTERFACE: +subroutine snowmodel_main(n) +! !USES: + use LIS_coreMod + use LIS_timeMgrMod, only : LIS_isAlarmRinging + use LIS_logMod, only : LIS_logunit, LIS_endrun + use LIS_histDataMod + use LIS_FORC_AttributesMod + use LIS_mpiMod + use LIS_metforcingMod, only : LIS_forc + + use snowmodel_module + use snowmodel_lsmMod + use snowmodel_inc + use snowmodel_vars + use micromet_module + +! +! !DESCRIPTION: +! This is the entry point for calling the SnowModel physics. +! This routine calls the {\tt ENBAL} routine that performs the +! land surface computations, to solve for water and energy equations. +! For documentation of the {\tt ENBAL} and routines from the +! SnowModel, please see: +! ftp://gliston.cira.colostate.edu/SnowModel/code/ +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \end{description} +!EOP + implicit none + + integer, intent(in) :: n + + integer :: t, ierr + integer :: row, col, c, r + double precision :: xmn_part ! center x of local LL starting point + double precision :: ymn_part ! center y of local LL starting point + + integer :: J_day ! model Julian day, actually day-of-year + integer :: nveg + real :: rad2deg + real, allocatable :: sphm_grid(:,:) + + real :: delta_topo + real :: T_lapse_rate, Td_lapse_rate + real :: precip_lapse_rate + real :: forcelev + real :: forest_frac, trans_veg + + ! Vegetation impact on winds: + real :: beta, a + real :: veg_ht, canopy_windwt + +! Define the Stefan Boltzmann constant. + real, parameter :: Stef_Boltz = 5.6696e-8 + + character*3 :: fnest + logical :: isTimeToRunCheck + +! -------------------------------------------- + + write(fnest,'(i3.3)') n + isTimeToRunCheck = LIS_isAlarmRinging(LIS_rc, "SnowModel model alarm "//trim(fnest) ) + + if(isTimeToRunCheck .neqv. .true.) return + + write(LIS_logunit,*) '[INFO] Call to the SnowModel Main routine ...' + + ! Using local parallel subdomain starting index values: + ! LIS_ews_halo_ind(n,LIS_localPet+1) -- defined in LIS_coreMod.F90 ... + xmn_part = xmn + deltax * ( real(LIS_ews_halo_ind(n,LIS_localPet+1)) - 1.0 ) + ymn_part = ymn + deltay * ( real(LIS_nss_halo_ind(n,LIS_localPet+1)) - 1.0 ) + + iter_start = 1 + snowmodel_struc(n)%iter = snowmodel_struc(n)%iter + 1 + iter = snowmodel_struc(n)%iter + + write(LIS_logunit,*) "[INFO] Print Snowmodel iter counter: ",iter + + ! Determine source of calls to MicroMet-based routines: + if( snowmodel_struc(n)%sm_micromet_opt == "LIS" ) then + + ! Calculate what the current simulation date should be. + call get_model_time(iyear_init,imonth_init,iday_init,& + xhour_init,iter,dt,iyear,imonth,iday,xhour,J_day) + + if( LIS_masterproc ) then + write(LIS_logunit,151) iyear,imonth,iday,xhour + endif + 151 format(' [INFO] SNOWMODEL TIME =',& + i5,2i4,f6.1) + + ! _________________________________________________________ + + ! Convert local LIS npatch array to the the SnowModel nx,ny grids + if( LIS_masterproc ) then + write(LIS_logunit,*) "[INFO] Replacing MicroMet grid forcings with LIS forcing " + write(LIS_logunit,*) " main:", LIS_rc%mo, LIS_rc%da, LIS_rc%hr, snowmodel_struc(n)%forc_count + endif + + ! Constants required for wind direction and RH calculations: + rad2deg = 180.0 / (2.0 * acos(0.0)) ! pi = (2.0 * acos(0.0)) + windspd_flag = 0.0 + + allocate( sphm_grid(LIS_rc%lnc(n),LIS_rc%lnr(n)) ) + + do t = 1,LIS_rc%npatch(n,LIS_rc%lsm_index) + col = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col + row = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row + + ! Translate LIS-based metforcing into SnowModel required inputs: + tair_grid(col,row) = snowmodel_struc(n)%sm(t)%tair / snowmodel_struc(n)%forc_count + Qsi_grid(col,row) = snowmodel_struc(n)%sm(t)%swdown / snowmodel_struc(n)%forc_count + Qli_grid(col,row) = snowmodel_struc(n)%sm(t)%lwdown / snowmodel_struc(n)%forc_count + sfc_pressure(col,row) = snowmodel_struc(n)%sm(t)%psurf / snowmodel_struc(n)%forc_count + + ! Total precip (in meters) + prec_grid(col,row) = snowmodel_struc(n)%sm(t)%rainf / snowmodel_struc(n)%forc_count + + ! Convert the precipitation values from mm to m swe. Also, make + ! sure the interpolation has not created any negetive + ! precipitation values. + prec_grid(col,row) = (prec_grid(col,row) / 1000.0) * 3600 * snowmodel_struc(n)%forc_count + prec_grid(col,row) = max(0.0,prec_grid(col,row)) + + ! U- and V-gridded winds: + uwind_grid(col,row) = snowmodel_struc(n)%sm(t)%uwind & + / snowmodel_struc(n)%forc_count + vwind_grid(col,row) = snowmodel_struc(n)%sm(t)%vwind & + / snowmodel_struc(n)%forc_count + + ! Wind speed grid: + windspd_grid(col,row) = sqrt(uwind_grid(col,row)**2 + vwind_grid(col,row)**2) + ! Max windspeed flag: + windspd_flag = max(windspd_flag,windspd_grid(col,row)) ! Handled below in "micromet_wind" call + + ! Wind direction: + ! Some compilers do not allow both u and v to be 0.0 in + ! the atan2 computation. + if( abs(uwind_grid(col,row)).lt.1e-10 ) then + uwind_grid(col,row) = 1e-10 + endif + winddir_grid(col,row) = rad2deg * atan2(uwind_grid(col,row),vwind_grid(col,row)) + if( winddir_grid(col,row).ge.180.0 ) then + winddir_grid(col,row) = winddir_grid(col,row) - 180.0 + else + winddir_grid(col,row) = winddir_grid(col,row) + 180.0 + endif + + ! Specific humidity: + sphm_grid(col,row) = snowmodel_struc(n)%sm(t)%qair / snowmodel_struc(n)%forc_count + + end do + + + ! Call functions to derive additional forcing inputs to SnowModel: + call micromet_relhum( LIS_rc%lnc(n),LIS_rc%lnr(n), & + tair_grid, sphm_grid, sfc_pressure, rh_grid ) + + call micromet_snowfall(LIS_rc%lnc(n),LIS_rc%lnr(n), & + snowfall_frac, prec_grid, tair_grid, sprec) + + deallocate( sphm_grid ) + + ! Calculate the forest lai for each of the five forest types, and + ! for this day of the simulation (the lai varies seasonally for + ! the case of deciduous trees). + call get_lai(J_day,forest_LAI) + + + ! Account for vegetation impacts on SWdown, LWdown, and winds : + do t = 1,LIS_rc%npatch(n,LIS_rc%lsm_index) + col = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col + row = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row + + if( vegtype(col,row).le.5.0 ) then + if( calc_subcanopy_met.eq.1.0 ) then + + nveg = nint(vegtype(col,row)) + + ! [SWdown] Incoming solar radiation veg-modifications: + ! Define the forest-canopy transmissivity. 0.71 provided a + ! best-fit to the observations, when averaged over the two years + ! of hourly data. + trans_veg = exp((- 0.71) * forest_LAI(nveg)) + + ! Account for any gaps in the forest canopy that will allow + ! direct incoming solar radiation to reach the snow surface. + trans_veg = gap_frac * (1.0 - trans_veg) + trans_veg + Qsi_grid(col,row) = trans_veg * Qsi_grid(col,row) + + ! [LWdown] Modify the incoming longwave radiation for the forest canopy. + if( forest_LAI(nveg).lt.0.2 ) then + forest_frac = 0.5 * forest_LAI(nveg) + else + forest_frac = & + min(1.0,0.55 + 0.29 * log(forest_LAI(nveg))) + endif + Qli_grid(col,row) = Qli_grid(col,row) * (1.0 - forest_frac) + & + (Stef_Boltz * Tair_grid(col,row)**4) * forest_frac + + !i [Wind] Further modify the wind speed to account for forest canopies. + ! Define the canopy wind-weighting factor. Assume z=0.6*canopy_ht, + ! and the canopy_ht equals the vegetation snow-holding depth. + beta = 0.9 + veg_ht = vegsnowd_xy(col,row) + a = beta * forest_LAI(nveg) + canopy_windwt = exp((- a)*(1.0 - (0.6*veg_ht)/veg_ht)) + windspd_grid(col,row) = canopy_windwt * windspd_grid(col,row) + + endif + endif + enddo + + ! Need to deterime max windspeed for entire domain: +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(windspd_flag, snowmodel_struc(n)%windspdflg_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + windspd_flag = snowmodel_struc(n)%windspdflg_glb +#endif + +#if 0 + ! Make the topographic calculations required by the wind and solar + ! radiation models. These calculations are not fixed in time + ! because as the snow depth evolves it modifies the "topography". + call topo_data(LIS_rc%lnc(n),LIS_rc%lnr(n),deltax,deltay,topo,& + curvature,terrain_slope,slope_az,curve_len_scale) + + ! Calculate the temperature and dew-point lapse rates to be used in + ! the interpolations. + call get_lapse_rates(imonth,iday,T_lapse_rate,& + Td_lapse_rate,xlat_grid(1,1),lapse_rate_user_flag,& + precip_lapse_rate,iprecip_lapse_rate_user_flag) +#endif + +#if 0 + ! WIND SPEED AND DIRECTION. + if (i_wind_flag.eq.1) then + call micromet_wind( LIS_rc%lnc(n),LIS_rc%lnr(n),deltax,deltay, & + uwind_grid,vwind_grid,slopewt,curvewt,& + curvature,slope_az,terrain_slope,windspd_grid,& + winddir_grid,windspd_flag,winddir_flag,windspd_min,& + vegtype,forest_LAI,calc_subcanopy_met,vegsnowd_xy,& + topo,wind_lapse_rate,curve_len_scale) + else + ! Need to deterime max windspeed for entire domain: +#if (defined SPMD) + call MPI_Barrier(LIS_MPI_COMM, ierr) + call MPI_ALLREDUCE(windspd_flag, snowmodel_struc(n)%windspdflg_glb, 1,& + MPI_REAL, MPI_MAX,& + LIS_mpi_comm, ierr) + windspd_flag = snowmodel_struc(n)%windspdflg_glb +#endif + endif +#endif + +#if 0 + ! SOLAR RADIATION. + if (i_solar_flag.eq.1) then + call solar( LIS_rc%lnc(n),LIS_rc%lnr(n),& + xhour,J_day,topo,rh_grid,Tair_grid,& + xlat_grid,Qsi_grid,slope_az,terrain_slope,dt,vegtype,& + forest_LAI,T_lapse_rate,Td_lapse_rate,& + calc_subcanopy_met,gap_frac,cloud_frac_factor,UTC_flag,& + xlon_grid,cloud_frac_grid) + endif +#endif + +! ------------------------------------------------------------------- + +! *** Read in SnowModel preprocessed forcing, which can be directly +! fed into SnowModel's MicroMet routines: + + elseif( snowmodel_struc(n)%sm_micromet_opt == "SnowModel" .and. & + run_micromet.eq.1.0 ) then + + ! SnowModel calls: Distribute the meteorological station data. + CALL MICROMET_CODE(LIS_rc%lnc(n),LIS_rc%lnr(n),xmn_part,ymn_part,deltax,deltay, & + iyear_init,imonth_init,iday_init,xhour_init,dt,undef,& + ifill,iobsint,dn,iter,curve_len_scale,slopewt,curvewt,& + topo,curvature,terrain_slope,slope_az,Tair_grid,& + rh_grid,uwind_grid,vwind_grid,Qsi_grid,prec_grid,& + i_tair_flag,i_rh_flag,i_wind_flag,i_solar_flag,& + i_prec_flag,isingle_stn_flag,igrads_metfile,& + windspd_grid,winddir_grid,windspd_flag,winddir_flag,& + sprec,windspd_min,Qli_grid,i_longwave_flag,vegtype,& + forest_LAI,iyear,imonth,iday,xhour,corr_factor,& + icorr_factor_index,lapse_rate_user_flag,& + iprecip_lapse_rate_user_flag,use_shortwave_obs,& + use_longwave_obs,use_sfc_pressure_obs,sfc_pressure,& + run_enbal,run_snowpack,calc_subcanopy_met,vegsnowd_xy,& + gap_frac,cloud_frac_factor,barnes_lg_domain,n_stns_used,& + k_stn,xlat_grid,xlon_grid,UTC_flag,icorr_factor_loop,& + snowmodel_line_flag,xg_line,yg_line,irun_data_assim,& + wind_lapse_rate,iprecip_scheme,cf_precip_flag,cf_precip,& + cloud_frac_grid,snowfall_frac,seaice_run,metforce_opt) + + else + write(LIS_logunit,*) "[ERR] Incorrect option set for " + write(LIS_logunit,*) "[ERR] SnowModel MicroMet input source: " + write(LIS_logunit,*) "[ERR] See documentation in configs/lis.config.adoc " + write(LIS_logunit,*) "[ERR] for option details. " + call LIS_endrun + endif + + ! Perform a surface energy balance over the domain. + if (run_enbal.eq.1.0) then + CALL ENBAL_CODE(LIS_rc%lnc(n),LIS_rc%lnr(n),Tair_grid,uwind_grid,sfc_pressure,& + vwind_grid,rh_grid,Tsfc,Qsi_grid,Qli_grid,Qle,Qh,Qe,& + Qc,Qm,e_balance,Qf,snow_d,ht_windobs,icond_flag,& + albedo,snow_z0,veg_z0,vegtype,undef,albedo_snow_forest,& + albedo_snow_clearing,albedo_glacier,snod_layer,T_old,& + gamma,KK) + endif + + ! Evolve the snowpack according to the defined melt and + ! precipitation inputs. + if (run_snowpack.eq.1.0) then + CALL SNOWPACK_CODE(LIS_rc%lnc(n),LIS_rc%lnr(n),Tair_grid,rh_grid,ro_nsnow,& + dt,swe_depth,Tsfc,snow_d,prec_grid,runoff,Qm,rain,& + sprec,iter,w_balance,sum_prec,sum_runoff,xro_snow,& + undef,ro_snow,ro_snow_grid,soft_snow_d,sum_sprec,& + snow_depth,windspd_grid,Qsi_grid,sum_Qcs,canopy_int,& + Qcs,vegtype,forest_LAI,albedo,glacier_melt,& + canopy_unload,sum_unload,sum_glacmelt,run_snowtran,& + swemelt,d_canopy_int,sum_d_canopy_int,snow_d_init,& + sfc_pressure,Qe,sfc_sublim_flag,sum_sfcsublim,& + sum_swemelt,corr_factor,icorr_factor_index,swesublim,& + swe_depth_old,canopy_int_old,KK,max_layers,melt_flag,& + ro_snowmax,tsls_threshold,dz_snow_min,tslsnowfall,& + change_layer,snod_layer,swed_layer,ro_layer,T_old,gamma,& + multilayer_snowpack,seaice_run,seaice_conc,ht_windobs,& + windspd_2m_grid,diam_layer,flux_layer) + endif + + ! Run the blowing-snow model. + if (run_snowtran.eq.1.0) then + CALL SNOWTRAN_CODE(bc_flag,bs_flag,C_z,& + conc_salt,deltax,deltay,dh_salt,dh_salt_u,dh_salt_v,& + dh_susp,dh_susp_u,dh_susp_v,dt,dz_susp,fall_vel,fetch,& + gravity,h_const,h_star,ht_rhobs,ht_windobs,index_ue,& + index_uw,index_vn,index_vs,iter,LIS_rc%lnc(n),LIS_rc%lnr(n),pi,Qsalt,Qsalt_max,& + Qsalt_maxu,Qsalt_maxv,Qsalt_u,Qsalt_v,Qsubl,Qsusp,& + Qsusp_u,Qsusp_v,rh_grid,ro_air,ro_snow,ro_water,snow_d,& + snow_d_init,snow_z0,soft_snow_d,sprec,sum_glacmelt,& + subgrid_flag,wbal_salt,wbal_susp,wbal_qsubl,sum_sprec,& + tabler_ee,tabler_ne,tabler_nn,tabler_nw,tabler_se,& + tabler_ss,tabler_sw,tabler_ww,tair_grid,topo,topo_land,& + topoflag,twolayer_flag,Up_const,Ur_const,Utau,& + Utau_t,uwind_grid,veg_z0,vegsnowd_xy,vegtype,vonKarman,& + vwind_grid,wind_min,winddir_flag,winddir_grid,& + windspd_flag,windspd_grid,xmu,z_0,ztop_susp,max_iter,& + run_enbal,run_snowpack,wbal_subgrid,sum_qsubl,sum_trans,& + swe_depth,snow_depth,ro_snow_grid,sum_prec,sum_runoff,& + sum_Qcs,canopy_int,w_balance,sum_sfcsublim,tabler_dir,& + slope_adjust,Utau_t_const,Utau_t_flag,ro_soft_snow_old,& + ro_soft_snow,ro_nsnow,prec_grid,Qcs,runoff,d_canopy_int,& + glacier_melt,swe_depth_old,swesublim,canopy_unload,& + canopy_int_old,iter_start,multilayer_snowpack,swed_layer,& + KK,snod_layer,ro_layer,curve_lg_scale_flag,curve_wt_lg,& + seaice_run,seaice_conc,tslsnowfall,T_old,tsls_threshold,& + curve_len_scale,Tabler_1_flag,Tabler_2_flag,undef,& + tabler_sfc_path_name,output_path_wo_assim,& + output_path_wi_assim,icorr_factor_loop,windspd_2m_grid,& + Qsubl_depth) + endif + + +#if 0 + ! Save the outputs from the SNOWPACK and SNOWTRAN routines + if (print_user.eq.1.0) then + CALL OUTPUTS_USER(LIS_rc%lnc(n),LIS_rc%lnr(n),iter,Tair_grid,rh_grid,& + uwind_grid,vwind_grid,windspd_grid,winddir_grid,& + Qsi_grid,Qli_grid,prec_grid,Tsfc,Qle,Qh,Qe,Qc,Qm,Qf,& + e_balance,snow_depth,xro_snow,swe_depth,ro_nsnow,& + runoff,rain,sprec,sum_prec,sum_runoff,w_balance,& + snow_d,topo_land,wbal_qsubl,sum_sprec,wbal_salt,& + wbal_susp,ro_snow_grid,sum_Qcs,canopy_int,Qcs,& + iyear,imonth,iday,xhour,undef,deltax,xmn,ymn,& + wbal_subgrid,canopy_unload,sum_qsubl,sum_trans,& + sum_unload,sum_glacmelt,glacier_melt,swemelt,& + sfc_pressure,sum_swemelt,albedo,nrecs_max,& + icorr_factor_loop,swesublim,vegtype,iter_start,& + seaice_run,print_inc,cloud_frac_grid,& + output_path_wo_assim,output_path_wi_assim,print_var,& + print_outvars,Qsubl_depth) + endif +#endif + +!- Write out final 1D variables to LIS output files: + do t = 1,LIS_rc%npatch(n,LIS_rc%lsm_index) + + ! Need to convert the SnowModel nx,ny grids to + ! local LIS npatch array ... + col = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col + row = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row + + !-- Meteorological forcing fields -- + + ! Air temperature (units: K; Tair_grid) + ! Snowmodel units: degrees C (tair); + snowmodel_struc(n)%sm(t)%tair = & + tair_grid(col,row) + + ! Downward radiation components: + snowmodel_struc(n)%sm(t)%swdown = & + Qsi_grid(col,row) + + snowmodel_struc(n)%sm(t)%lwdown = & + Qli_grid(col,row) + + ! U-/V-wind components (units: m/s): + snowmodel_struc(n)%sm(t)%uwind = & + uwind_grid(col,row) + snowmodel_struc(n)%sm(t)%vwind = & + vwind_grid(col,row) + + ! Write out SnowModel metforcing file fields ("native" text file fields): + if( snowmodel_struc(n)%write_sm_metfields == 1 ) then + + call LIS_diagnoseSurfaceOutputVar(n, t,LIS_MOC_TAIRFORC, & + value=snowmodel_struc(n)%sm(t)%tair,& + unit="K",vlevel=1,direction="-",& + surface_type=LIS_rc%lsm_index) + + call LIS_diagnoseSurfaceOutputVar(n,t,LIS_MOC_SWDOWNFORC_SM,& + value=snowmodel_struc(n)%sm(t)%swdown,& + unit="W m-2",vlevel=1,direction="DN",& + surface_type=LIS_rc%lsm_index) + + call LIS_diagnoseSurfaceOutputVar(n,t,LIS_MOC_LWDOWNFORC_SM,& + value=snowmodel_struc(n)%sm(t)%lwdown,& + unit="W m-2",vlevel=1,direction="DN",& + surface_type=LIS_rc%lsm_index) + + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_EWINDFORC_SM, & + value=snowmodel_struc(n)%sm(t)%uwind, & + unit="m s-1", vlevel=1, direction="E", & + surface_type=LIS_rc%lsm_index) + + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_NWINDFORC_SM, & + value=snowmodel_struc(n)%sm(t)%vwind, & + unit="m s-1", vlevel=1, direction="N", & + surface_type=LIS_rc%lsm_index) + + endif + + ! ----------------------------------------- + + ! SWE depth (units: m, SnowModel) + snowmodel_struc(n)%sm(t)%swe_depth = & + swe_depth(col,row) + + call LIS_diagnoseSurfaceOutputVar(n,t,LIS_MOC_SWE_SM, & + value=snowmodel_struc(n)%sm(t)%swe_depth, & + unit="m", vlevel=1, direction="-", & + surface_type=LIS_rc%lsm_index) + +! IF user wants to write out SWE in kg m-2 units (need conversion) +! call LIS_diagnoseSurfaceOutputVar(n,t,LIS_MOC_SWE, & +! value=snowmodel_struc(n)%sm(t)%swe_depth, & +! unit="kg m-2", vlevel=1, direction="-", & +! surface_type=LIS_rc%lsm_index) + + ! Snow depth (units: m) + snowmodel_struc(n)%sm(t)%snow_depth = & + snow_depth(col,row) + call LIS_diagnoseSurfaceOutputVar(n,t,LIS_MOC_SNOWDEPTH_SM, & + value=snowmodel_struc(n)%sm(t)%snow_depth, & + unit="m", vlevel=1, direction="-", & + surface_type = LIS_rc%lsm_index) + + ! Snow density (units: kg m-3): + snowmodel_struc(n)%sm(t)%sden = & + xro_snow(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWDENSITY_SM, & + value = snowmodel_struc(n)%sm(t)%sden, & + unit="kg m-3", vlevel=1, direction="-", & + surface_type = LIS_rc%lsm_index) + + ! SWE melt (units: m, for Snowmodel; units: kg m-2 s-1, for other models). + ! Snow melt (QSM): + snowmodel_struc(n)%sm(t)%swemelt = & + swemelt(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_QSM_SM, & + value = snowmodel_struc(n)%sm(t)%swemelt, & + unit="m", vlevel=1, direction="S2L", & +! unit="kg m-2 s-1", vlevel=1, direction="S2L", & +! Note: "S2L" is "Solid to Liquid" +! (https://www.lmd.jussieu.fr/~polcher/ALMA/convention_output_3.html) + surface_type = LIS_rc%lsm_index) + + ! Snow sublimation (units: m, for Snowmodel; kg m-2 s-1, for other models): + snowmodel_struc(n)%sm(t)%sublim = & + swesublim(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SUBSNOW_SM, & + value = snowmodel_struc(n)%sm(t)%sublim, & + unit="m", vlevel = 1, direction="-", & +! unit="kg m-2 s-1", vlevel = 1, direction="-", & + surface_type = LIS_rc%lsm_index ) + + ! Runoff from base of snowpack + ! (units: m/dt for Snowmodel; otherwise, units: kg m-2 s-1): + snowmodel_struc(n)%sm(t)%runoff = & + runoff(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_QS_SM, & + value = snowmodel_struc(n)%sm(t)%runoff, & + unit="m", vlevel=1, direction="OUT", & +! unit="kg m-2 s-1", vlevel=1, direction="OUT", & + surface_type = LIS_rc%lsm_index) + + ! Total (water-equivalent) precipitation (units: m/time_step, for SnowModel) + snowmodel_struc(n)%sm(t)%totprecip = & + prec_grid(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_TOTALPRECIP_SM, & + value=snowmodel_struc(n)%sm(t)%totprecip, & + unit="m", vlevel=1, direction="DN", & +! unit="kg m-2", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + snowmodel_struc(n)%sm(t)%totprecip = & + prec_grid(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_TOTALPRECIP_SM, & + value=snowmodel_struc(n)%sm(t)%totprecip*1000., & + unit="kg m-2", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + snowmodel_struc(n)%sm(t)%totprecip = & + prec_grid(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_TOTALPRECIP_SM, & + value=snowmodel_struc(n)%sm(t)%totprecip*1000./dt, & + unit="kg m-2 s-1", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + + ! Liquid precipitation portion (units: m/time_step, for SnowModel) + snowmodel_struc(n)%sm(t)%rainf = & + rain(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_RAINF_SM, & + value=snowmodel_struc(n)%sm(t)%rainf, & + unit="m", vlevel=1, direction="DN", & +! unit="kg m-2", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + snowmodel_struc(n)%sm(t)%rainf = & + rain(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_RAINF_SM, & + value=snowmodel_struc(n)%sm(t)%rainf*1000., & + unit="kg m-2", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + snowmodel_struc(n)%sm(t)%rainf = & + rain(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_RAINF_SM, & + value=snowmodel_struc(n)%sm(t)%rainf*1000./dt, & + unit="kg m-2 s-1", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + + ! Solid precipitation portion (units: m/time_step, for SnowModel) + snowmodel_struc(n)%sm(t)%snowf = & + sprec(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWF_SM, & + value=snowmodel_struc(n)%sm(t)%snowf, & + unit="m", vlevel=1, direction="DN", & +! unit="kg m-2", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + snowmodel_struc(n)%sm(t)%snowf = & + sprec(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWF_SM, & + value=snowmodel_struc(n)%sm(t)%snowf*1000., & + unit="kg m-2", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + snowmodel_struc(n)%sm(t)%snowf = & + sprec(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWF_SM, & + value=snowmodel_struc(n)%sm(t)%snowf*1000./dt, & + unit="kg m-2 s-1", vlevel=1, direction="DN", & + surface_type=LIS_rc%lsm_index) + + + ! Albedo (units: -) + snowmodel_struc(n)%sm(t)%albedo = & + albedo(col,row) + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_ALBEDO_SM, & + value=snowmodel_struc(n)%sm(t)%albedo, & + unit="-", vlevel=1, direction="-", & + surface_type=LIS_rc%lsm_index) + + ! Parameter fields: + ! Topographic - elevation (m): + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_ELEVATION_SM, & +! value=snowmodel_struc(n)%sm(t)%smtopo, & + value=topo(col,row), & +! value=topo_land(col,row), & +! value=curvature(col,row), & +! value=slope_az(col,row), & +! value=terrain_slope(col,row), & + unit="m", vlevel=1, direction="-", & + surface_type=LIS_rc%lsm_index) + + ! Vegetation type: + call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_LANDCOVER_SM, & +! value=snowmodel_struc(n)%sm(t)%smvege, & + value=vegtype(col,row), & + unit="-", vlevel=1, direction="-", & + surface_type=LIS_rc%lsm_index) + +! .............................................................. +! +! Writing state values for writing out to restart files: + + snowmodel_struc(n)%sm(t)%snow_d = & + snow_d(col,row) + snowmodel_struc(n)%sm(t)%canopy_int = & + canopy_int(col,row) + snowmodel_struc(n)%sm(t)%soft_snow_d = & + soft_snow_d(col,row) + snowmodel_struc(n)%sm(t)%ro_snow_grid = & + ro_snow_grid(col,row) + snowmodel_struc(n)%sm(t)%ro_soft_snow_old = & + ro_soft_snow_old(col,row) + snowmodel_struc(n)%sm(t)%snow_d_init = & + snow_d_init(col,row) + snowmodel_struc(n)%sm(t)%swe_depth_old = & + swe_depth_old(col,row) + snowmodel_struc(n)%sm(t)%canopy_int_old = & + canopy_int_old(col,row) + snowmodel_struc(n)%sm(t)%topo = & + topo(col,row) + snowmodel_struc(n)%sm(t)%sum_sprec = & + sum_sprec(col,row) + +! +! FIELDS THAT LIS CAN SUPPORT AND MAYBE AVAILABLE BY SNOWMODEL +! BUT ARE NOT WRITTEN OUT ... + ! Latent hear flux +! snowmodel_struc(n)%sm%qe = 40.0 +! call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_QLE, & +! value=snowmodel_struc(n)%sm(t)%qe, & +! vlevel=1,unit="W m-2",direction="UP",surface_type=LIS_rc%lsm_index) + + ! Snowliq (unit=mm ). *** snow-layer liquid water +! do i=1, snowmodel_struc(n)%nsnow +! call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWLIQ, & +! value = NOAHMP36_struc(n)%noahmp36(t)%snowliq(i), & +! unit="mm", vlevel=i, direction="-", & +! surface_type = LIS_rc%lsm_index ) +! enddo + + ! Snowliq (unit=mm ). *** snow-layer ice +! do i=1, snowmodel_struc(n)%nsnow +! call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWICE, & +! value = NOAHMP36_struc(n)%noahmp36(t)%snowce(i), & +! unit="mm", vlevel=i, direction="-", & +! surface_type = LIS_rc%lsm_index ) +! enddo + + ! Snow_temp (unit=K). *** snow layer temperature +! do i=1, NOAHMP36_struc(n)%nsnow +! Test code to reset snow temperature to undefined +! when there is no corresponding snow layer - Mocko +! if ((i + abs(NOAHMP36_struc(n)%noahmp36(t)%isnow)) & +! .le.NOAHMP36_struc(n)%nsnow) then +! snow_temp(i) = LIS_rc%udef +! endif +! call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_SNOWTPROF, & +! value = snow_temp(i), & +! unit="K", vlevel=i, direction="-", & +! surface_type = LIS_rc%lsm_index) +! end do + + ! Snow density for each layer +! ! ro_layer or sdenz .. +! do i=1, NOAHMP36_struc(n)%nsnow +! call LIS_diagnoseSurfaceOutputVar(n, t, LIS_MOC_LAYERSNOWDENSITY, +! value = bdsno,& +! vlevel=i, unit="kg m-3", direction="-", & +! surface_type = LIS_rc%lsm_index) +! enddo +! +! ......................................................................... + + ! Reset forcing variables to 0 and counter: + snowmodel_struc(n)%forc_count = 0 + snowmodel_struc(n)%sm(t)%tair = 0 + snowmodel_struc(n)%sm(t)%qair = 0 + snowmodel_struc(n)%sm(t)%swdown = 0 + snowmodel_struc(n)%sm(t)%lwdown = 0 + snowmodel_struc(n)%sm(t)%uwind = 0 + snowmodel_struc(n)%sm(t)%vwind = 0 + snowmodel_struc(n)%sm(t)%psurf = 0 + snowmodel_struc(n)%sm(t)%rainf = 0 + snowmodel_struc(n)%sm(t)%snowf = 0 + + enddo ! End 1-d tile space loop + + ! For multi-year simulations, sometimes it is desirable to zero + ! out the snow cover arrays on a certain summer date, to prevent + ! glaciers from forming. + + if (imonth.eq.iclear_mn .and. iday.eq.iclear_dy .and.& + xhour.eq.xclear_hr) then + + if (seaice_run.eq.4.0) then + CALL ZERO_SNOW_SEAICE_4(LIS_rc%lnc(n),LIS_rc%lnr(n),snow_depth,ro_snow_grid,& + ro_snow,swe_depth,swe_depth_old,canopy_int_old,KK,& + sum_swemelt,tslsnowfall,snod_layer,swed_layer,& + ro_layer,T_old,sum_sprec,multilayer_snowpack,& + tsls_threshold,iyear,diam_layer,output_path_wo_assim) + else + CALL ZERO_SNOW(LIS_rc%lnc(n),LIS_rc%lnr(n),snow_depth,ro_snow_grid,ro_snow,& + swe_depth,swe_depth_old,canopy_int_old,KK,sum_swemelt,& + tslsnowfall,snod_layer,swed_layer,ro_layer,T_old,& + sum_sprec,multilayer_snowpack,tsls_threshold,& + sum_trans) + endif + + endif + + if( iter == max_iter ) then + write(LIS_logunit,*) "[INFO] Reached max iteration count: ",iter + endif + +end subroutine snowmodel_main diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_module.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_module.F90 new file mode 100644 index 000000000..a874285e0 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_module.F90 @@ -0,0 +1,145 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +module snowmodel_module +!BOP +! +! !MODULE: snowmodel_module +! +! !DESCRIPTION: +! The code in this file provides a description of the +! data structure containing the SnowModel 1-d variables. +! The variables specified in the data structure include: +! +! \begin{description} +! \item[slopetype] +! slope type (integer index) +! \item[nroot] +! Number of root layers, depends on the vegetation type +! \end{description} +! +! !REVISION HISTORY: +! 14 Apr 2020: K. Arsenault; Added G. Liston's SnowModel +! 08 Aug 2022: K. Arsenault; Updated for implementing restart files +! +!EOP + implicit none + + PRIVATE + type, public :: snowmodeldec + + integer :: nroot + integer :: vegt + + real, allocatable :: lyrthk(:) !used only if distributed depths are defined + +!------------------------------------------------------------------------- +! SnowModel State Variables (HRESTART_READ; HRESTART_SAVE) +!------------------------------------------------------------------------- + ! States that can be 0'd out at the start of the next water year + real :: swe_depth ! swed: Snow water equivalent depth (m) + real :: snow_depth ! snod: snow depth (m) + real :: ro_snow_grid ! Snow grid density (kg/m3); initialized as ro_snow + real :: canopy_int ! Canopy interception store (m) + real :: canopy_int_old ! Former canopy interception store (m) + real :: swe_depth_old ! Former SWE depth (m) step + + ! Additional Restart file state list: + real :: soft_snow_d ! Soft snow layer depth (m) + real :: ro_soft_snow_old ! Density of former soft snow layer (kg/m3) + real :: snow_d_init ! Initial snow depth (m), density-layer and subgrid scale snow + real :: topo ! Snow-depth changing grid topography level (m) + real :: sum_sprec ! Summed snowfall (m) + + ! Multilayer states + real :: tslsnowfall ! Initialized with tsls_threshold + real :: snod_layer ! (i,j,k),i=1,nx),j=1,ny),k=1,nz_max) + real :: swed_layer ! (i,j,k),i=1,nx),j=1,ny),k=1,nz_max) + real :: ro_layer ! (i,j,k) = ro_snow, initialized + real :: T_old_layer ! (i,j,k) = 273.15, initialized + real :: KK ! (i,j) = 0; this is the total number of layers set to + +!------------------------------------------------------------------------- +! SnowModel Forcing Variables +!------------------------------------------------------------------------- + real :: tair ! tair_grid: Air temperature (K) + real :: rh ! rh_grid: Relative humidity (%) + real :: windspd ! windspd_grid, wspd: Wind speed (m/2) + real :: winddir ! winddir_grid, wdir: Wind direction (deg, true N) + real :: uwind ! uwind_grid + real :: vwind ! vwind_grid + real :: totprecip ! prec_grid: Water-equivalent precip (m/dt) + real :: rainf ! rpre or rain: Liquid precip, rain (m/dt) + real :: snowf ! spre or sprec: Solid precip, snowfall (m/dt) + real :: swdown ! Qsi_grid, qsin: incoming solar radiation (W/m2) + real :: lwdown ! Qli_grid, qlin: incoming lw radiation (W/m2) + real :: cloud_fraction ! cldf: cloud fraction (grid) (0-1) + real :: qair ! Specific humidity + real :: psurf + real :: fheight + +!------------------------------------------------------------------------- +! SnowModel Parameters +!------------------------------------------------------------------------- + real :: smtopo ! SnowModel topography field + real :: smvege ! SnowModel vegetation class map + +!----------------------------------------------------------------------- +! SnowModel Output variables +!----------------------------------------------------------------------- + ! EBal: + real :: tsfc ! tsfc: Surface (skin) temperature (deg C) + real :: qle ! qlem: Emitted longwave radiation (W/m2) + real :: qh ! Sensible heat flux (W/m2) + real :: qe ! Latent heat flux (W/m2) + real :: qc ! Conductive heat flux (W/m2) + real :: qm ! Melt energy flux (W/m2) + real :: albedo ! Albedo (0-1), albd + real :: e_balance ! Energy balance error (W/m2) + + real :: swnet ! Net shortwave (W/m2) + real :: lwnet ! Net longwave (W/m2) + + ! Snowpack: + real :: sden ! sden, xro_snow: snow density (kg/m3) + real :: runoff ! runoff, roff: runoff from snowpack base (m/dt) + real :: glmt ! glacier_melt, glmt: SWE melt from glacier ice (m) + real :: qcs ! qcs: Canopy sublimation (m/dt) + real :: snowcover + + real :: sublim ! swesublim, ssub: static-surface sublimation (m) + real :: swemelt ! swemelt, smlt: SWE melt (m) + + real :: sumsublim ! Summed static-surface sublimation (m) + real :: sumqcs ! Summed canopy sublim during year (m) + real :: sumprec ! Summed precipitation during year (m) + real :: sumsprec ! sspr, Summed snow precip during year (m) + real :: sumroff ! Summed runoff during the year (m) + real :: sumswemelt ! ssmt, Summed snow-water-equivalent melt (m) + real :: sumunload ! Sum_unload: Summed canopy unloading during the year (m) + real :: w_balance ! wbal: Summed water balance error durign year (m) + +! SnowTran: + real :: snow_d ! Snow depth (m), density-adjusted and used in subgrid-scale snow (HRESTART_READ) + real :: wbal_qsubl + real :: wbal_salt + real :: wbal_susp + real :: wbal_subgrid + real :: sum_qsubl + real :: sum_trans + +! Multi-layer snow fields: + real :: diam_layer ! (i,j,k),i=1,nx),j=1,ny),k=1,nz_max) + real :: flux_layer ! (i,j,k),i=1,nx),j=1,ny),k=1,nz_max) + real :: Told_layer ! (i,j,k),i=1,nx),j=1,ny),k=1,nz_max) + real :: gamma_layer ! (i,j,k),i=1,nx),j=1,ny),k=1,nz_max) + + end type snowmodeldec + +end module snowmodel_module diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_readconfig.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_readconfig.F90 new file mode 100644 index 000000000..bcf1c6887 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_readconfig.F90 @@ -0,0 +1,150 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: snowmodel_readconfig +! \label{snowmodel_readconfig} +! +! !REVISION HISTORY: +! 14 Apr 2020; Kristi Arsenault, Initial Code +! +! !INTERFACE: +subroutine snowmodel_readconfig() +! !USES: + use ESMF + + use LIS_coreMod, only : LIS_rc, LIS_config + use LIS_logMod, only : LIS_logunit, LIS_verify, LIS_endrun + use LIS_timeMgrMod, only : LIS_parseTimeString + use snowmodel_lsmMod, only : snowmodel_struc + +! +! !DESCRIPTION: +! +! This routine reads the options specific to SnowModel +! from the LIS configuration file. +! +!EOP + implicit none + + integer :: rc + integer :: n,i + character*10 :: time + +! LIS-related SnowModel input entries: + + call ESMF_ConfigFindLabel(LIS_config,"SnowModel model timestep:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,time,rc=rc) + call LIS_verify(rc,'SnowModel model timestep: not defined') + + call LIS_parseTimeString(time,snowmodel_struc(n)%ts) + enddo + + if (LIS_rc%startcode== "restart" ) then + call ESMF_ConfigFindLabel(LIS_config,"SnowModel restart file:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%rfile,rc=rc) + call LIS_verify(rc,'SnowModel restart file: not defined') + enddo + endif + call ESMF_ConfigFindLabel(LIS_config,"SnowModel restart output interval:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,time,rc=rc) + call LIS_verify(rc,'SnowModel restart output interval: not defined') + + call LIS_parseTimeString(time, snowmodel_struc(n)%rstInterval) + enddo + + ! set default restart format to netcdf + do n=1,LIS_rc%nnest + snowmodel_struc(n)%rformat = "netcdf" + enddo + ! restart run, read restart file + if( trim(LIS_rc%startcode) == "restart" ) then + Call ESMF_ConfigFindLabel(LIS_config, "SnowModel restart file:", rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, snowmodel_struc(n)%rfile, rc=rc) + call LIS_verify(rc, "SnowModel restart file: not defined") + enddo + + Call ESMF_ConfigFindLabel(LIS_config, "SnowModel restart file format:", rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config, snowmodel_struc(n)%rformat, rc=rc) + call LIS_verify(rc, "SnowModel restart file format: not defined") + enddo + + ! cold start run, read initial state variables +! else + endif + + ! SnowModel-specific parameters: + + call ESMF_ConfigFindLabel(LIS_config,"SnowModel parameter file:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%parfile,rc=rc) + call LIS_verify(rc,'SnowModel parameter file: not defined') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"Write out SnowModel forcing file fields:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%write_sm_metfields,rc=rc) + call LIS_verify(rc,'Write out SnowModel forcing file fields: not defined') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"SnowModel parameters source option:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%sm_params_opt,rc=rc) + call LIS_verify(rc,'SnowModel parameters source option: not defined') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"SnowModel preprocess code option:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%call_sm_preproc,rc=rc) + call LIS_verify(rc,'SnowModel preprocess code option: not defined') + enddo + + call ESMF_ConfigFindLabel(LIS_config,"SnowModel MicroMet input source:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%sm_micromet_opt,rc=rc) + call LIS_verify(rc,'SnowModel MicroMet input source: not defined') + enddo + + + call ESMF_ConfigFindLabel(LIS_config,"SnowModel number of snow layers:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%nsnow,rc=rc) + call LIS_verify(rc,'SnowModel number of snow layers: not defined') + ! May move this allocate statement later .... + allocate(snowmodel_struc(n)%lyrthk(snowmodel_struc(n)%nsnow)) + enddo + + ! Initial values: + call ESMF_ConfigFindLabel(LIS_config,"SnowModel initial snow water equivalent:",rc=rc) + do n=1,LIS_rc%nnest + call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%initsnowequiv,rc=rc) + call LIS_verify(rc,'SnowModel initial snow water equivalent: not defined') + enddo + +! Future expansion to include SnowModel snow layers ... +! Below is an example from soil layer thicknesses ... +! call ESMF_ConfigFindLabel(LIS_config,"SnowModel layer thicknesses: ",rc=rc) +! do n=1,LIS_rc%nnest +! allocate(snowmodel_struc(n)%lyrthk(snowmodel_struc(n)%nsnow)) +! do i = 1,snowmodel_struc(n)%nsnow +! call ESMF_ConfigGetAttribute(LIS_config,snowmodel_struc(n)%lyrthk(i),rc=rc) +! enddo +! call LIS_verify(rc,'SnowModel layer thicknesses: not defined') +! enddo + + + write(LIS_logunit,*) '[INFO] Running SnowModel (Liston):' + +end subroutine snowmodel_readconfig diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_readrst.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_readrst.F90 new file mode 100644 index 000000000..0df43d6d7 --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_readrst.F90 @@ -0,0 +1,240 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: snowmodel_readrst +! \label{snowmodel_readrst} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! 05 Aug 2022: Kristi Arsenault; Updated SnowModel state restart reader +! +! !INTERFACE: +subroutine snowmodel_readrst() +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_masterproc, LIS_surface + use LIS_historyMod, only : LIS_readvar_restart + use LIS_logMod, only : LIS_logunit, LIS_endrun, & + LIS_getNextUnitNumber, & + LIS_releaseUnitNumber, & + LIS_verify + use snowmodel_lsmMod + use snowmodel_inc + use snowmodel_vars +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif +! +! !DESCRIPTION: +! This program reads restart files for SnowModel. This +! includes all relevant water/energy storages and tile information. +! The following is the list of variables specified in the SnowModel +! restart file: +! +! \begin{verbatim} +! nc, nr, ntiles - grid and tile space dimensions +! snow_d - Snow depth (m), density-adjusted and used in subgrid-scale snow +! snow_depth - Snow depth (m) +! canopy_int - Canopy interception store (m) +! soft_snow_d - Soft snow layer depth (m) +! ro_snow_grid - Snow grid density (kg/m3) +! swe_depth - Snow water equivalent depth (m) +! ro_soft_snow_old - Density of former soft snow layer (kg/m3) +! snow_d_init - Initial snow depth (m) +! swe_depth_old - Former SWE depth (m) step +! canopy_int_old - Former canopy interception store (m) +! topo - Snow-depth changing grid topography level (m) +! sum_sprec - Summed snowfall (m) +! \end{verbatim} +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_readvar\_restart](\ref{LIS_readvar_restart}) \newline +! reads a variable from the restart file +! \item[snowmodel\_coldstart](\ref{snowmodel_coldstart}) \newline +! initializes the SnowModel state variables +! \end{description} +!EOP + + implicit none + + integer :: t, l, col, row + integer :: nc, nr, npatch + integer :: n + integer :: ftn + integer :: status + logical :: file_exists + character*20 :: wformat +! ___________________________________ + + write(LIS_logunit,*) '[INFO] Call to the SnowModel Read restart routine ...' + + do n=1, LIS_rc%nnest + wformat = trim(snowmodel_struc(n)%rformat) + + ! Coldstart + if(LIS_rc%startcode .eq. "coldstart") then + call SnowModel_coldstart(LIS_rc%lsm_index) + ! Restart + elseif(LIS_rc%startcode .eq. "restart") then + + ! Check if MicroMet option is set to "SnwoModel"; + ! If so, alert user that this option currently + ! is not supported with reading in LIS restart files: + if( snowmodel_struc(n)%sm_micromet_opt == "SnowModel" ) then + write(LIS_logunit,*) "[ERR] SnowModel restart file read is not currently" + write(LIS_logunit,*) " supported with 'SnowModel' forcing-format option." + call LIS_endrun + endif + + ! check the existance of restart file + inquire(file=snowmodel_struc(n)%rfile, exist=file_exists) + if(.not. file_exists) then + write(LIS_logunit,*) "[ERR] SnowModel restart file ", & + snowmodel_struc(n)%rfile," does not exist " + write(LIS_logunit,*) " Program stopping ..." + call LIS_endrun + endif + write(LIS_logunit,*) "[INFO] SnowModel restart file used: ",& + trim(snowmodel_struc(n)%rfile) + + ! open restart file + if(wformat .eq. "binary") then + ftn = LIS_getNextUnitNumber() + open(ftn, file=snowmodel_struc(n)%rfile, form="unformatted") + read(ftn) nc, nr, npatch ! time, veg class, no. tiles + + ! check for grid space conflict + if((nc .ne. LIS_rc%gnc(n)) .or. (nr .ne. LIS_rc%gnr(n))) then + write(LIS_logunit,*) "[ERR] "//trim(snowmodel_struc(n)%rfile), & + ":: grid space mismatch - SnowModel run halted" + call LIS_endrun + endif + + if(npatch .ne. LIS_rc%glbnpatch_red(n, LIS_rc%lsm_index)) then + write(LIS_logunit,*) "[ERR] SnowModel restart tile space mismatch" + call LIS_endrun + endif + + elseif(wformat .eq. "netcdf") then +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + status = nf90_open(path=snowmodel_struc(n)%rfile, & + mode=NF90_NOWRITE, ncid=ftn) + call LIS_verify(status, "Error opening file "//snowmodel_struc(n)%rfile) +#endif + endif + + ! read(1): Snow depth (m), density-adjusted and used in subgrid-scale snow + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%snow_d, & + varname="SNOWD", & + wformat=wformat) + + ! read(2): Snow depth (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%snow_depth, & + varname="SNOWDEPTH", & + wformat=wformat) + + ! read(3): Canopy interception store (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%canopy_int, & + varname="CANOPYINT", & + wformat=wformat) + + ! read(4): Soft snow layer depth (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%soft_snow_d, & + varname="SOFTSNOWD", & + wformat=wformat) + + ! read(5): Snow grid density (kg/m3) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%ro_snow_grid, & + varname="ROSNOWGRID", & + wformat=wformat) + + ! read(6): SWE depth (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%swe_depth, & + varname="SWEDEPTH", & + wformat=wformat) + + ! read(7): Density of former soft snow layer (kg/m3) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%ro_soft_snow_old, & + varname="ROSOFTSNOWOLD", & + wformat=wformat) + + ! read(8): Initial snow depth, density-layer and subgrid scale snow (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%snow_d_init, & + varname="SNOWDINIT", & + wformat=wformat) + + ! read(9): Former SWE depth, step (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%swe_depth_old, & + varname="SWEDEPTHOLD", & + wformat=wformat) + + ! read(10): Former canopy interception store (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%canopy_int_old, & + varname="CANOPYINTOLD", & + wformat=wformat) + + ! read(11): Snow-depth changing grid topography level (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%topo, & + varname="TOPO", & + wformat=wformat) + + ! read(12): Sum of snowfall, over time (m) + call LIS_readvar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%sum_sprec, & + varname="SUMSPREC", & + wformat=wformat) + + ! Close the restart file + if(wformat .eq. "binary") then + call LIS_releaseUnitNumber(ftn) + elseif(wformat .eq. "netcdf") then +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + status = nf90_close(ftn) + call LIS_verify(status, "Error in nf90_close in SnowModel_readrst") +#endif + endif + + ! Assign the read-in states to the SnowModel local states: + do t = 1,LIS_rc%npatch(n,LIS_rc%lsm_index) + col = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%col + row = LIS_surface(n,LIS_rc%lsm_index)%tile(t)%row + + snow_d(col,row) = snowmodel_struc(n)%sm(t)%snow_d + snow_depth(col,row) = snowmodel_struc(n)%sm(t)%snow_depth + canopy_int(col,row) = snowmodel_struc(n)%sm(t)%canopy_int + soft_snow_d(col,row) = snowmodel_struc(n)%sm(t)%soft_snow_d + ro_snow_grid(col,row) = snowmodel_struc(n)%sm(t)%ro_snow_grid + swe_depth(col,row) = snowmodel_struc(n)%sm(t)%swe_depth + ro_soft_snow_old(col,row) = snowmodel_struc(n)%sm(t)%ro_soft_snow_old + snow_d_init(col,row) = snowmodel_struc(n)%sm(t)%snow_d_init + swe_depth_old(col,row) = snowmodel_struc(n)%sm(t)%swe_depth_old + canopy_int_old(col,row)= snowmodel_struc(n)%sm(t)%canopy_int_old + topo(col,row) = snowmodel_struc(n)%sm(t)%topo + sum_sprec(col,row) = snowmodel_struc(n)%sm(t)%sum_sprec + enddo + + endif + enddo + +end subroutine snowmodel_readrst + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_reset.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_reset.F90 new file mode 100644 index 000000000..8dcdfb4cf --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_reset.F90 @@ -0,0 +1,65 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !ROUTINE: snowmodel_reset +! \label{snowmodel_reset} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! +! !INTERFACE: +subroutine snowmodel_reset() +! !USES: + use LIS_coreMod, only : LIS_rc + use snowmodel_lsmMod + use LIS_surfaceModelDataMod, only : LIS_sfmodel_struc + use LIS_timeMgrMod, only : LIS_clock, LIS_calendar, & + LIS_update_timestep + use LIS_logMod, only : LIS_verify, LIS_logunit + use snowmodel_lsmMod +! +! !DESCRIPTION: +! +! This routine is the reset point for parameters and variables +! required for SnowModel. +! +! The routines invoked are: +! \begin{description} +! \item[snowmodel\_resetvegparms](\ref{snowmodel_resetvegparms}) \newline +! initializes the vegetation-related parameters in SnowModel +! \end{description} +!EOP + implicit none + integer :: i,n + + + do n=1,LIS_rc%nnest + write(LIS_logunit,*) & + '[INFO] SnowModel resetting' + write(LIS_logunit,*) "[INFO] Reset on:", LIS_rc%mo, LIS_rc%da, & + LIS_rc%hr, snowmodel_struc(n)%forc_count + + snowmodel_struc(n)%forc_count = 0 + do i=1,LIS_rc%npatch(n,LIS_rc%lsm_index) + snowmodel_struc(n)%sm(i)%tair = 0 + snowmodel_struc(n)%sm(i)%qair = 0 + snowmodel_struc(n)%sm(i)%swdown = 0 + snowmodel_struc(n)%sm(i)%lwdown = 0 + snowmodel_struc(n)%sm(i)%uwind = 0 + snowmodel_struc(n)%sm(i)%vwind = 0 + snowmodel_struc(n)%sm(i)%psurf = 0 + snowmodel_struc(n)%sm(i)%rainf = 0 +! snowmodel_struc(n)%sm(i)%snowf = 0 + enddo + + enddo + +end subroutine snowmodel_reset diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_setup.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_setup.F90 new file mode 100644 index 000000000..5f99dd55b --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_setup.F90 @@ -0,0 +1,224 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: snowmodel_setup +! \label{snowmodel_setup} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! +! !INTERFACE: +subroutine snowmodel_setup() +! !USES: + use LIS_logMod, only : LIS_verify, LIS_logunit, LIS_endrun + use LIS_coreMod, only : LIS_rc, LIS_surface,& + LIS_localPet, LIS_ews_ind, LIS_ewe_ind,& + LIS_nss_ind, LIS_nse_ind, LIS_ews_halo_ind, LIS_ewe_halo_ind,& + LIS_nss_halo_ind, LIS_nse_halo_ind + use LIS_fileIOMod, only : LIS_read_param + use snowmodel_lsmMod + use snowmodel_module + use snowmodel_inc + use snowmodel_vars +! +! !DESCRIPTION: +! +! This routine is the entry point to set up the parameters +! required for Liston's SnowModel. These include vegetation +! topography, and initialization of state variables in SnowModel. +! +! The routines invoked are: +! \begin{description} +! \item[snowmodel\_setvegparms](\ref{snowmodel_setvegparms}) \newline +! initializes the vegetation-related parameters in SnowModel +! \end{description} +!EOP + + implicit none + integer :: n + integer :: mtype + integer :: t + integer :: col, row + integer :: ews, ewe, nss, nse + double precision :: xmn_part ! center x of local LL starting point + double precision :: ymn_part ! center y of local LL starting point + integer, allocatable :: global_kstn(:,:,:) + real, allocatable :: placeholder(:,:) + +! _______________________________________________________________ + + mtype = LIS_rc%lsm_index + + write(LIS_logunit,*)"[INFO] Reading in SnowModel vegetation and topography (snowmodel_setup)" + + ! Read in spatial SnowModel maps from LDT: + do n=1, LIS_rc%nnest + + ! Allocate memory for place holder for #n nest + allocate(placeholder(LIS_rc%lnc(n), LIS_rc%lnr(n))) + + ews = LIS_ews_halo_ind(n, LIS_localPet+1) + ewe = LIS_ewe_halo_ind(n, LIS_localPet+1) + nss = LIS_nss_halo_ind(n, LIS_localPet+1) + nse = LIS_nse_halo_ind(n, LIS_localPet+1) + + ! Initialize topography and landcover parameters: + snowmodel_struc(n)%sm(:)%smtopo = 0. + snowmodel_struc(n)%sm(:)%smvege = 0. + + ! Assign LDT-based landcover and topographic maps : + if( snowmodel_struc(n)%sm_params_opt == "LDT" ) then + write(LIS_logunit,*) "[INFO] Reading in SnowModel LSM parameters from LDT" + ascii_topoveg = 2.0 ! No file read in by SnowModel; use LDT input + else + write(LIS_logunit,*) "[INFO] Reading in SnowModel LSM parameters from snowmodel.par file " + endif + + if( ascii_topoveg == 2.0 ) then + write(LIS_logunit,*) "SnowModel: Reading parameter SMTOPO from: ",& + trim(LIS_rc%paramfile(n)) + call LIS_read_param(n, "SMTOPO", placeholder) + do t = 1, LIS_rc%npatch(n, mtype) + col = LIS_surface(n, mtype)%tile(t)%col + row = LIS_surface(n, mtype)%tile(t)%row + snowmodel_struc(n)%sm(t)%smtopo = placeholder(col, row) + ! Assign LDT-version of SnowModel topo map to topo_land ... + topo_land(col,row) = placeholder(col, row) + enddo + + write(LIS_logunit,*) "SnowModel: Reading parameter SMVEG from: ",& + trim(LIS_rc%paramfile(n)) + call LIS_read_param(n, "SMVEG", placeholder) + do t = 1, LIS_rc%npatch(n, mtype) + col = LIS_surface(n, mtype)%tile(t)%col + row = LIS_surface(n, mtype)%tile(t)%row + snowmodel_struc(n)%sm(t)%smvege = placeholder(col, row) + ! Assign LDT-version of SnowModel veg map to vegtype ... + vegtype(col,row) = placeholder(col, row) + enddo + + endif + + enddo + +! call snowmodel_setvegparms(LIS_rc%lsm_index) + + ! ------------------------------ + + ! SnowModel Main code calls and options for reading in and + ! preprocessing necessary inputs to the submodel components: + ! All below from the original snowmodel_main.f ... + + do n=1,LIS_rc%nnest + + write(LIS_logunit,*) "[INFO] SnowModel 'main' calls for preprocessing inputs" + + ! Using local parallel subdomain starting index values: + ! LIS_ews_halo_ind(n,LIS_localPet+1) -- defined in LIS_coreMod.F90 ... + xmn_part = xmn + deltax * ( real(LIS_ews_halo_ind(n,LIS_localPet+1)) - 1.0 ) + ymn_part = ymn + deltay * ( real(LIS_nss_halo_ind(n,LIS_localPet+1)) - 1.0 ) + + ! This loop runs the correction/data assimilation adjustment + ! iterations. + if (ihrestart_flag.ge.0) then + if (i_dataassim_loop.lt.0.0) then + i_corr_start = 2 + else + i_corr_start = 1 + endif + else + i_corr_start = 1 + endif + + do icorr_factor_loop=i_corr_start,irun_data_assim+1 + + ! Perform a variety of preprocessing and model setup steps, like + ! read in topography and vegetation arrays, open input and output + ! files, etc. + + if( snowmodel_struc(n)%call_sm_preproc == 1 ) then + + write(LIS_logunit,*) "[INFO] Calling original 'preprocess_code' routine " + + CALL PREPROCESS_CODE(topoveg_fname,const_veg_flag,& + vegtype,veg_z0,vegsnowdepth,fetch,xmu,C_z,h_const,& + wind_min,Up_const,dz_susp,ztop_susp,fall_vel,Ur_const,& + ro_water,ro_air,gravity,vonKarman,pi,twopio360,snow_z0,& + LIS_rc%lnc(n),LIS_rc%lnr(n),sum_sprec,sum_qsubl,sum_trans,sum_unload,topo,& ! KRA: nx,ny + topo_land,snow_d,topoflag,snow_d_init,snow_d_init_const,& + soft_snow_d,met_input_fname,igrads_metfile,deltax,deltay,& + snowtran_output_fname,micromet_output_fname,& + enbal_output_fname,snowpack_output_fname,print_micromet,& + print_enbal,print_snowpack,print_snowtran,run_micromet,& + run_enbal,run_snowpack,run_snowtran,ro_snow_grid,swe_depth,& + sum_runoff,sum_prec,ro_snow,twolayer_flag,sum_Qcs,& + canopy_int,ascii_topoveg,topo_ascii_fname,icorr_factor_loop,& + veg_ascii_fname,undef,isingle_stn_flag,max_iter,& + i_tair_flag,i_rh_flag,i_wind_flag,i_prec_flag,sum_glacmelt,& + snow_depth,sum_d_canopy_int,corr_factor,icorr_factor_index,& + sum_sfcsublim,barnes_lg_domain,n_stns_used,k_stn,xmn_part,ymn_part,& !KRA: xmn, ymn + ro_soft_snow_old,sum_swemelt,xlat,lat_solar_flag,xlat_grid,& + xlon_grid,UTC_flag,dt,swe_depth_old,canopy_int_old,& + vegsnowd_xy,iveg_ht_flag,ihrestart_flag,i_dataassim_loop,& + multilayer_snowpack,max_layers,multilayer_output_fname,& + print_multilayer,KK,tslsnowfall,tsls_threshold,& + irun_data_assim,izero_snow_date,iclear_mn,iclear_dy,& + xclear_hr,snod_layer,swed_layer,ro_layer,T_old,gamma,& + icond_flag,curve_lg_scale_flag,curve_wt_lg,check_met_data,& + seaice_run,snowmodel_line_flag,xg_line,yg_line,print_user,& + cf_precip_flag,cf_precip,print_inc,xhour_init,Tabler_1_flag,& + Tabler_2_flag,iyear_init,imonth_init,iday_init,print_var,& + output_path_wo_assim,output_path_wi_assim,nrecs_max,& + tabler_sfc_path_name,print_outvars,diam_layer) + + + ! Generate kstn arrays for MicroMet inputs (on SnowModel side): + if( snowmodel_struc(n)%sm_micromet_opt == "SnowModel" ) then + + allocate( global_kstn(LIS_rc%gnc(n),LIS_rc%gnr(n),9) ) + global_kstn = 0 + + ! If the large-domain barnes oi scheme is used, generate the + ! nearest-station indexing array. + if (barnes_lg_domain.eq.1.0) then + if (n_stns_used.gt.9 .or. n_stns_used.lt.1) then + print *,'invalid n_stns_used value' + stop + endif +! Original call from preprocess.f (which is commented now in that routine): +! call get_nearest_stns_1(nx,ny,xmn,ymn,deltax,deltay, & +! n_stns_used,k_stn,snowmodel_line_flag,xg_line,yg_line) +! Updated here to represent entire SnowModel run domain: + call get_nearest_stns_1( LIS_rc%gnc(n),LIS_rc%gnr(n),& + xmn, ymn, deltax, deltay,& + n_stns_used, global_kstn, & + snowmodel_line_flag, xg_line, yg_line) + + k_stn(:,:,:) = global_kstn(ews:ewe,nss:nse,:) + endif + deallocate(global_kstn) + + elseif( snowmodel_struc(n)%sm_micromet_opt == "LIS" ) then + call get_nearest_stns_1( LIS_rc%lnc(n),LIS_rc%lnr(n),& + xmn_part, ymn_part, deltax, deltay,& + n_stns_used, k_stn, & + snowmodel_line_flag, xg_line, yg_line) + + endif ! MM option: Snowmodel or LIS + endif + end do + + end do ! Nest loop + + +end subroutine snowmodel_setup + diff --git a/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_writerst.F90 b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_writerst.F90 new file mode 100644 index 000000000..6261eeabe --- /dev/null +++ b/lis/surfacemodels/land/subLSM/snowmodel/snowmodel_writerst.F90 @@ -0,0 +1,344 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +#include "LIS_misc.h" +!BOP +! +! !ROUTINE: snowmodel_writerst +! \label{snowmodel_writerst} +! +! !REVISION HISTORY: +! 14 Apr 2020: Kristi Arsenault; Add G. Liston's SnowModel +! 05 Aug 2022: Kristi Arsenault; Updated SnowModel state restart writer +! +! !INTERFACE: +subroutine snowmodel_writerst(n) +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_masterproc + use LIS_timeMgrMod, only : LIS_isAlarmRinging + use LIS_logMod, only : LIS_logunit, LIS_getNextUnitNumber, & + LIS_releaseUnitNumber, LIS_verify + use LIS_fileIOMod, only : LIS_create_output_directory, & + LIS_create_restart_filename + use snowmodel_lsmMod + use LIS_constantsMod, only : LIS_CONST_PATH_LEN +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + + + implicit none +! !ARGUMENTS: + integer, intent(in) :: n +! +! !DESCRIPTION: +! This program writes restart files for SnowModel. +! This includes all relevant water/energy storage and tile information. +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_create\_output\_directory](\ref{LIS_create_output_directory}) \newline +! creates a timestamped directory for the restart files +! \item[LIS\_create\_restart\_filename](\ref{LIS_create_restart_filename}) \newline +! generates a timestamped restart filename +! \item[snowmodel\_dump\_restart](\ref{snowmodel_dump_restart}) \newline +! writes the SnowModel variables into the restart file +! \end{description} +!EOP + character(len=LIS_CONST_PATH_LEN) :: filen + logical :: alarmCheck + integer :: ftn + integer :: status + character*20 :: wformat + character*3 :: fnest + + write(fnest,'(i3.3)') n + ! set restart alarm + alarmCheck = LIS_isAlarmRinging(LIS_rc,"SnowModel restart alarm "//trim(fnest)) + + write(LIS_logunit,*) '[INFO] Call to the SnowModel write restart routine ...' + + ! set restart file format (read from LIS configration file_ + wformat = trim(snowmodel_struc(n)%rformat) + + if(alarmCheck .or. (LIS_rc%endtime ==1)) then + if (LIS_masterproc) Then + call LIS_create_output_directory("SURFACEMODEL") + call LIS_create_restart_filename(n, filen, "SURFACEMODEL", & + "SNOWMODEL",wformat=wformat) + if(wformat .eq. "binary") then + ftn = LIS_getNextUnitNumber() + open(ftn,file=filen,status="unknown", form="unformatted") + elseif(wformat .eq. "netcdf") then +#if (defined USE_NETCDF4) + status = nf90_create(path=filen, cmode=nf90_hdf5, ncid = ftn) + call LIS_verify(status, & + "Error in nf90_open in snowmodel_writerst") +#endif +#if (defined USE_NETCDF3) + status = nf90_create(Path = filen, cmode = nf90_clobber, ncid = ftn) + call LIS_verify(status, & + "Error in nf90_open in snowmodel_writerst") +#endif + endif + endif + + ! Call routine to write out the model states to the file: + call SnowModel_dump_restart(n, ftn, wformat) + + if (LIS_masterproc) then + if(wformat .eq. "binary") then + call LIS_releaseUnitNumber(ftn) + elseif(wformat .eq. "netcdf") then +#if (defined USE_NETCDF3 || defined USE_NETCDF4) + status = nf90_close(ftn) + call LIS_verify(status, & + "Error in nf90_close in snowmodel_writerst") +#endif + endif + write(LIS_logunit,*)& + "[INFO] SnowModel archive restart written: ",trim(filen) + endif + endif +end subroutine snowmodel_writerst + +!BOP +! +! !ROUTINE: SnowModel_dump_restart +! \label{SnowModel_dump_restart} +! +! !REVISION HISTORY: +! This subroutine is generated with the Model Implementation Toolkit developed +! by Shugong Wang for the NASA Land Information System Version 7. The initial +! specification of the subroutine is defined by Sujay Kumar. +! +! 05 Aug 2022: Kristi Arsenault; Updated SnowModel state restart writer +! +! !INTERFACE: +subroutine SnowModel_dump_restart(n, ftn, wformat) + +! !USES: + use LIS_coreMod, only : LIS_rc, LIS_masterproc + use LIS_logMod, only : LIS_logunit + use LIS_historyMod + use snowmodel_lsmMod + + implicit none + + integer, intent(in) :: ftn + integer, intent(in) :: n + character(len=*), intent(in) :: wformat +! +! !DESCRIPTION: +! This routine gathers the necessary restart variables and performs +! the actual write statements to create the restart files. +! +! The arguments are: +! \begin{description} +! \item[n] +! index of the nest +! \item[ftn] +! unit number for the restart file +! \item[wformat] +! restart file format (binary/netcdf) +! \end{description} +! +! The following is the list of variables written in the SnowModel +! restart file: +! +! \begin{verbatim} +! nc, nr, ntiles - grid and tile space dimensions +! snow_d - Snow depth (m), density-adjusted and used in subgrid-scale snow +! snow_depth - Snow depth (m) +! canopy_int - Canopy interception store (m) +! soft_snow_d - Soft snow layer depth (m) +! ro_snow_grid - Snow grid density (kg/m3) +! swe_depth - Snow water equivalent depth (m) +! ro_soft_snow_old - Density of former soft snow layer (kg/m3) +! snow_d_init - Initial snow depth (m) +! swe_depth_old - Former SWE depth (m) step +! canopy_int_old - Former canopy interception store (m) +! topo - Snow-depth changing grid topography level (m) +! sum_sprec - Summed snowfall (m) +! \end{verbatim} +! +! The routines invoked are: +! \begin{description} +! \item[LIS\_writeGlobalHeader\_restart](\ref{LIS_writeGlobalHeader_restart})\\ +! writes the global header information +! \item[LIS\_writeHeader\_restart](\ref{LIS_writeHeader_restart})\\ +! writes the header information for a variable +! \item[LIS\_closeHeader\_restart](\ref{LIS_closeHeader_restart})\\ +! close the header +! \item[LIS\_writevar\_restart](\ref{LIS_writevar_restart})\\ +! writes a variable to the restart file +! \end{description} +! +!EOP + + integer :: l, t + real :: tmptilen(LIS_rc%npatch(n, LIS_rc%lsm_index)) + integer :: dimID(11) + + integer :: snow_d_ID ! 1 + integer :: snow_depth_ID ! 2 + integer :: canopy_int_ID ! 3 + integer :: softsnow_d_ID ! 4 + integer :: ro_snowgrid_ID ! 5 + integer :: swe_depth_ID ! 6 + integer :: ro_softsnow_old_ID ! 7 + integer :: snow_d_init_ID ! 8 + integer :: swe_depth_old_ID ! 9 + integer :: canopy_int_old_ID ! 10 + integer :: topo_ID ! 11 + integer :: sum_sprec_ID ! 12 + + +!- Write the header of the restart file + call LIS_writeGlobalHeader_restart(ftn, n, LIS_rc%lsm_index, & + "SNOWMODEL", & + dim1=snowmodel_struc(n)%nsnow, & ! Set as one for now + dimID=dimID, & + output_format = trim(wformat)) + + !TODO: replace -99999 and 99999 with correct values for valid_min and valid_max + +!- SnowModel states, based on preprocess_code: HRESTART_SAVE routine + + ! write header for Snow depth (m), density-adjusted and used in subgrid-scale snow (1) + call LIS_writeHeader_restart(ftn, n, dimID, snow_d_ID, "SNOWD", & + "Snow depth, density-adjusted and used in SnowTran subgrid-scale snow", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- snow depth (2) + call LIS_writeHeader_restart(ftn, n, dimID, snow_depth_ID, "SNOWDEPTH", & + "Snow depth", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- canopy interception store (3) + call LIS_writeHeader_restart(ftn, n, dimID, canopy_int_ID, "CANOPYINT", & + "Canopy interception storage term", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- soft snow depth layer (4) + call LIS_writeHeader_restart(ftn, n, dimID, softsnow_d_ID, "SOFTSNOWD", & + "Soft snow layer depth", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- snow grid density (5) + call LIS_writeHeader_restart(ftn, n, dimID, ro_snowgrid_ID, "ROSNOWGRID", & + "Snow grid density", & + "kg/m3", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- swe depth (6) + call LIS_writeHeader_restart(ftn, n, dimID, swe_depth_ID, "SWEDEPTH", & + "Snow water equivalent depth", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- density of former soft snow layer (7) + call LIS_writeHeader_restart(ftn, n, dimID, ro_softsnow_old_ID, "ROSOFTSNOWOLD", & + "Density of former soft snow layer", & + "kg/m3", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- Initial snow depth, density-layer and subgrid scale snow (8) + call LIS_writeHeader_restart(ftn, n, dimID, snow_d_init_ID, "SNOWDINIT", & + "Initial snow depth, density-layer and subgrid scale snow", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- former SWE depth step (9) + call LIS_writeHeader_restart(ftn, n, dimID, swe_depth_old_ID, "SWEDEPTHOLD", & + "Former SWE depth step", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- Former canopy interception store (10) + call LIS_writeHeader_restart(ftn, n, dimID, canopy_int_old_ID, "CANOPYINTOLD", & + "Former canopy interception store", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- Snow-depth changing grid topography level (11) + call LIS_writeHeader_restart(ftn, n, dimID, topo_ID, "TOPO", & + "Snow-depth changing grid topography level", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! write the header for state variable -- summed snowfall (12) + call LIS_writeHeader_restart(ftn, n, dimID, sum_sprec_ID, "SUMSPREC", & + "Sum of (frozen) snow precipitation", & + "m", vlevels=1, valid_min=-99999.0, valid_max=99999.0) + + ! close header of restart file + call LIS_closeHeader_restart(ftn, n, LIS_rc%lsm_index, dimID, snowmodel_struc(n)%rstInterval) + + +!- Write state variables into restart file: + + ! (1) Snow depth (m), density-adjusted and used in subgrid-scale snow + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%snow_d, & + varid=snow_d_ID, dim=1, wformat=wformat) + + ! (2) Snow depth (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%snow_depth, & + varid=snow_depth_ID, dim=1, wformat=wformat) + + ! (3) Canopy interception store (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%canopy_int, & + varid=canopy_int_ID, dim=1, wformat=wformat) + + ! (4) Soft snow depth layer (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%soft_snow_d, & + varid=softsnow_d_ID, dim=1, wformat=wformat) + + ! (5) Snowdepth grid density (kg/m3) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%ro_snow_grid, & + varid=ro_snowgrid_ID, dim=1, wformat=wformat) + + ! (6) SWE depth (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%swe_depth, & + varid=swe_depth_ID, dim=1, wformat=wformat) + + ! (7) Former soft snow density step (kg/m3) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%ro_soft_snow_old, & + varid=ro_softsnow_old_ID, dim=1, wformat=wformat) + + ! (8) Snowdepth init (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%snow_d_init, & + varid=snow_d_init_ID, dim=1, wformat=wformat) + + ! (9) Former SWE depth (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%swe_depth_old, & + varid=swe_depth_old_ID, dim=1, wformat=wformat) + + ! (10) Former canopy interception storage (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%canopy_int_old, & + varid=canopy_int_old_ID, dim=1, wformat=wformat) + + ! (11) Topographic grid (with snowdepth included) (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%topo, & + varid=topo_ID, dim=1, wformat=wformat) + + ! (12) Sum of snowfall (m) + call LIS_writevar_restart(ftn, n, LIS_rc%lsm_index, & + snowmodel_struc(n)%sm%sum_sprec, & + varid=sum_sprec_ID, dim=1, wformat=wformat) + + +end subroutine SnowModel_dump_restart + + + diff --git a/lis/surfacemodels/land/summa.1.0/summa1_dynsetup.F90 b/lis/surfacemodels/land/summa.1.0/summa1_dynsetup.F90 index fe47502c9..fbad0802a 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_dynsetup.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_f2t.F90 b/lis/surfacemodels/land/summa.1.0/summa1_f2t.F90 index b1ad31ab4..ee8a2638b 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_f2t.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_finalize.F90 b/lis/surfacemodels/land/summa.1.0/summa1_finalize.F90 index 043ef98ed..5b7af2484 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_finalize.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_lsmMod.F90 b/lis/surfacemodels/land/summa.1.0/summa1_lsmMod.F90 index f72c39283..20c3ec0e9 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_lsmMod.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_main.F90 b/lis/surfacemodels/land/summa.1.0/summa1_main.F90 index 86838b9d8..0ec10ac74 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_main.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_module.F90 b/lis/surfacemodels/land/summa.1.0/summa1_module.F90 index 2d3c927cb..92edfec9a 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_module.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_readcrd.F90 b/lis/surfacemodels/land/summa.1.0/summa1_readcrd.F90 index 66d77674b..d48f4b061 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_readcrd.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_readrst.F90 b/lis/surfacemodels/land/summa.1.0/summa1_readrst.F90 index 2dd4f4816..44563a97e 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_readrst.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_setup.F90 b/lis/surfacemodels/land/summa.1.0/summa1_setup.F90 index a14f9c1f7..a196a0522 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_setup.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/summa.1.0/summa1_writerst.F90 b/lis/surfacemodels/land/summa.1.0/summa1_writerst.F90 index c7852e971..c81fe3679 100644 --- a/lis/surfacemodels/land/summa.1.0/summa1_writerst.F90 +++ b/lis/surfacemodels/land/summa.1.0/summa1_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/0Intro_template.txt b/lis/surfacemodels/land/template/0Intro_template.txt index ed6d9dd01..e08787dde 100644 --- a/lis/surfacemodels/land/template/0Intro_template.txt +++ b/lis/surfacemodels/land/template/0Intro_template.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_dynsetup.F90 b/lis/surfacemodels/land/template/template_dynsetup.F90 index 2b6a9462e..4ca6f14f3 100644 --- a/lis/surfacemodels/land/template/template_dynsetup.F90 +++ b/lis/surfacemodels/land/template/template_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_f2t.F90 b/lis/surfacemodels/land/template/template_f2t.F90 index 4a2de5b6f..7e04c4970 100644 --- a/lis/surfacemodels/land/template/template_f2t.F90 +++ b/lis/surfacemodels/land/template/template_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_finalize.F90 b/lis/surfacemodels/land/template/template_finalize.F90 index 92cdd9e68..5edcf0914 100644 --- a/lis/surfacemodels/land/template/template_finalize.F90 +++ b/lis/surfacemodels/land/template/template_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_getrunoffs.F90 b/lis/surfacemodels/land/template/template_getrunoffs.F90 index 8f1ac1c9c..82bd6f0aa 100644 --- a/lis/surfacemodels/land/template/template_getrunoffs.F90 +++ b/lis/surfacemodels/land/template/template_getrunoffs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_lsmMod.F90 b/lis/surfacemodels/land/template/template_lsmMod.F90 index 175d9ec06..94215fde9 100644 --- a/lis/surfacemodels/land/template/template_lsmMod.F90 +++ b/lis/surfacemodels/land/template/template_lsmMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_main.F90 b/lis/surfacemodels/land/template/template_main.F90 index 0c7e9e003..124626783 100644 --- a/lis/surfacemodels/land/template/template_main.F90 +++ b/lis/surfacemodels/land/template/template_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_module.F90 b/lis/surfacemodels/land/template/template_module.F90 index 9485cfd1a..cb22f4ee8 100755 --- a/lis/surfacemodels/land/template/template_module.F90 +++ b/lis/surfacemodels/land/template/template_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_readcrd.F90 b/lis/surfacemodels/land/template/template_readcrd.F90 index 089ca8e0f..db59377af 100644 --- a/lis/surfacemodels/land/template/template_readcrd.F90 +++ b/lis/surfacemodels/land/template/template_readcrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_readrst.F90 b/lis/surfacemodels/land/template/template_readrst.F90 index cdd0b1b70..02ae709e6 100644 --- a/lis/surfacemodels/land/template/template_readrst.F90 +++ b/lis/surfacemodels/land/template/template_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_reset.F90 b/lis/surfacemodels/land/template/template_reset.F90 index ff09be980..ace14ac97 100644 --- a/lis/surfacemodels/land/template/template_reset.F90 +++ b/lis/surfacemodels/land/template/template_reset.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_setup.F90 b/lis/surfacemodels/land/template/template_setup.F90 index c97db8742..d31873d89 100644 --- a/lis/surfacemodels/land/template/template_setup.F90 +++ b/lis/surfacemodels/land/template/template_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/template/template_writerst.F90 b/lis/surfacemodels/land/template/template_writerst.F90 index 787cd199c..66779e321 100644 --- a/lis/surfacemodels/land/template/template_writerst.F90 +++ b/lis/surfacemodels/land/template/template_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.1/0Intro_vic411.txt b/lis/surfacemodels/land/vic.4.1.1/0Intro_vic411.txt index f26c61e7c..f93966e9d 100644 --- a/lis/surfacemodels/land/vic.4.1.1/0Intro_vic411.txt +++ b/lis/surfacemodels/land/vic.4.1.1/0Intro_vic411.txt @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.1/finalize_vic411.c b/lis/surfacemodels/land/vic.4.1.1/finalize_vic411.c index f8c27e604..d9415522e 100644 --- a/lis/surfacemodels/land/vic.4.1.1/finalize_vic411.c +++ b/lis/surfacemodels/land/vic.4.1.1/finalize_vic411.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.1/vic411_read_vegparam.c b/lis/surfacemodels/land/vic.4.1.1/physics/vic411_read_vegparam.c similarity index 76% rename from lis/surfacemodels/land/vic.4.1.1/vic411_read_vegparam.c rename to lis/surfacemodels/land/vic.4.1.1/physics/vic411_read_vegparam.c index c89ba26df..a87371872 100644 --- a/lis/surfacemodels/land/vic.4.1.1/vic411_read_vegparam.c +++ b/lis/surfacemodels/land/vic.4.1.1/physics/vic411_read_vegparam.c @@ -1,25 +1,13 @@ -//-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- -// NASA Goddard Space Flight Center -// Land Information System Framework (LISF) -// Version 7.4 -// -// Copyright (c) 2022 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration. -// All Rights Reserved. -//-------------------------END NOTICE -- DO NOT EDIT----------------------- - #include #include -#include "vic411_vicNl.h" +#include #include static char vcid[] = "$Id: vic411_read_vegparam.c,v 4.5.2.11 2009/10/01 21:12:16 vicadmin Exp $"; -// shugong: if cannot find entry for the gridid+vegetation class, return 0, other return 1 -int vic411_read_vegparam(FILE *vegparam, - int gridcel, - int Nveg_type, - int lis_veg_class, - vic411_veg_con_struct *lis_temp) + +vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, + int gridcel, + int Nveg_type) /********************************************************************** vic411_read_vegparam.c Keith Cherkauer and Dag Lohmann 1997 @@ -58,7 +46,7 @@ int vic411_read_vegparam(FILE *vegparam, **********************************************************************/ { - void vic411_ttrim1( char *string ); + void vic411_ttrim( char *string ); extern vic411_veg_lib_struct *vic411_veg_lib; extern vic411_option_struct vic411_options; #if LINK_DEBUG @@ -80,18 +68,6 @@ int vic411_read_vegparam(FILE *vegparam, char *token; char *vegarr[500]; size_t length; - int vic411_flag; - vic411_flag = 0; // defualt: not found - // added by Shugong Wang. - /* vic_veg_clas is defined to save the vegetation class in vegetation parameter file (called real vegetation class after). - temp is a vic411_veg_con_struct. Firstly, the real vegetation class will be read in and save in the veg_class of temp. Then, - vic411_read_vegparam will find the index number of the real vegetation class in vegetation parameter library (vic411_veg_lib). - In the end, the veg_class of temp will be replced with the index number. In other word, the vegetation class in vic411_veg_con_struct - will not be the real vegetatoin class. In stead, it will be the corresponding index number in vegetatoin parameter library. - - In this function (vic411_read_vegparam), lis_veg_class is real vegetation class. In order to update the LAI and related values in - vic411_veg_lib correctly, lis_veg_class should be compared with the real vegetation class (vic_veg_class) */ - int vic_veg_class; if(vic411_options.GLOBAL_LAI) skip=2; else skip=1; @@ -121,7 +97,7 @@ int vic411_read_vegparam(FILE *vegparam, exit(99); } if(vegetat_type_num >= MAX_VEG) { - sprintf(ErrStr,"Vegetation parameter file wants more vegetation tiles in grid cell %i (%i) than are allowed by MAX_VEG (%i) [NOTE: bare soil class is assumed]. Edit vicNl_def.h and recompile.",gridcel,vegetat_type_num+1,MAX_VEG); + sprintf(ErrStr,"Vegetation parameter file wants more vegetation tiles in grid cell %i (%i) than are allowed by MAX_VEG (%i) [NOTE: bare soil class is assumed]. Edit vic411_vicNl_def.h and recompile.",gridcel,vegetat_type_num+1,MAX_VEG); vic411_nrerror(ErrStr); } @@ -146,7 +122,7 @@ int vic411_read_vegparam(FILE *vegparam, vic411_nrerror(ErrStr); } strcpy(tmpline, line); - vic411_ttrim1( tmpline ); + vic411_ttrim( tmpline ); token = strtok (tmpline, delimiters); /* token => veg_class, move 'line' pointer to next field */ Nfields = 0; vegarr[Nfields] = calloc( 500, sizeof(char)); @@ -174,20 +150,15 @@ int vic411_read_vegparam(FILE *vegparam, temp[i].LAKE = 0; temp[i].veg_class = atoi( vegarr[0] ); - /* added by Shugong Wang */ - vic_veg_class = temp[i].veg_class; // this is the real vegetation class in vegetation parameter file. - temp[i].Cv = atof( vegarr[1] ); depth_sum = 0; sum = 0.; - /* the following VIC code read root zoon information from vegetation parameter file*/ for(j=0;jzone_depth[j] = temp[i].zone_depth[j]; - lis_temp->zone_fract[j] = temp[i].zone_fract[j]; - } - } - - if(vic411_options.BLOWING) { j = 2 * vic411_options.ROOT_ZONES; temp[i].sigma_slope = atof( vegarr[2 + j] ); @@ -238,16 +194,14 @@ int vic411_read_vegparam(FILE *vegparam, vic411_nrerror(ErrStr); } else - { temp[i].veg_class = veg_class; - } temp[0].Cv_sum += temp[i].Cv; for(k=0; k #include -#include +#include "vic411_vicNl.h" #include -static char vcid[] = "$Id: vic411_read_vegparam.c,v 4.5.2.11 2009/10/01 21:12:16 vicadmin Exp $"; - -vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, - int gridcel, - int Nveg_type) +static char vcid[] = "$Id: vic411_read_vegparam_lis.c,v 4.5.2.11 2009/10/01 21:12:16 vicadmin Exp $"; +// shugong: if cannot find entry for the gridid+vegetation class, return 0, other return 1 +int vic411_read_vegparam_lis(FILE *vegparam, + int gridcel, + int Nveg_type, + int lis_veg_class, + vic411_veg_con_struct *lis_temp) /********************************************************************** vic411_read_vegparam.c Keith Cherkauer and Dag Lohmann 1997 @@ -46,7 +58,7 @@ vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, **********************************************************************/ { - void vic411_ttrim( char *string ); + void vic411_ttrim1( char *string ); extern vic411_veg_lib_struct *vic411_veg_lib; extern vic411_option_struct vic411_options; #if LINK_DEBUG @@ -68,6 +80,18 @@ vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, char *token; char *vegarr[500]; size_t length; + int vic411_flag; + vic411_flag = 0; // defualt: not found + // added by Shugong Wang. + /* vic_veg_clas is defined to save the vegetation class in vegetation parameter file (called real vegetation class after). + temp is a vic411_veg_con_struct. Firstly, the real vegetation class will be read in and save in the veg_class of temp. Then, + vic411_read_vegparam will find the index number of the real vegetation class in vegetation parameter library (vic411_veg_lib). + In the end, the veg_class of temp will be replced with the index number. In other word, the vegetation class in vic411_veg_con_struct + will not be the real vegetatoin class. In stead, it will be the corresponding index number in vegetatoin parameter library. + + In this function (vic411_read_vegparam), lis_veg_class is real vegetation class. In order to update the LAI and related values in + vic411_veg_lib correctly, lis_veg_class should be compared with the real vegetation class (vic_veg_class) */ + int vic_veg_class; if(vic411_options.GLOBAL_LAI) skip=2; else skip=1; @@ -97,7 +121,7 @@ vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, exit(99); } if(vegetat_type_num >= MAX_VEG) { - sprintf(ErrStr,"Vegetation parameter file wants more vegetation tiles in grid cell %i (%i) than are allowed by MAX_VEG (%i) [NOTE: bare soil class is assumed]. Edit vic411_vicNl_def.h and recompile.",gridcel,vegetat_type_num+1,MAX_VEG); + sprintf(ErrStr,"Vegetation parameter file wants more vegetation tiles in grid cell %i (%i) than are allowed by MAX_VEG (%i) [NOTE: bare soil class is assumed]. Edit vicNl_def.h and recompile.",gridcel,vegetat_type_num+1,MAX_VEG); vic411_nrerror(ErrStr); } @@ -122,7 +146,7 @@ vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, vic411_nrerror(ErrStr); } strcpy(tmpline, line); - vic411_ttrim( tmpline ); + vic411_ttrim1( tmpline ); token = strtok (tmpline, delimiters); /* token => veg_class, move 'line' pointer to next field */ Nfields = 0; vegarr[Nfields] = calloc( 500, sizeof(char)); @@ -150,15 +174,20 @@ vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, temp[i].LAKE = 0; temp[i].veg_class = atoi( vegarr[0] ); + /* added by Shugong Wang */ + vic_veg_class = temp[i].veg_class; // this is the real vegetation class in vegetation parameter file. + temp[i].Cv = atof( vegarr[1] ); depth_sum = 0; sum = 0.; + /* the following VIC code read root zoon information from vegetation parameter file*/ for(j=0;jzone_depth[j] = temp[i].zone_depth[j]; + lis_temp->zone_fract[j] = temp[i].zone_fract[j]; + } + } + + if(vic411_options.BLOWING) { j = 2 * vic411_options.ROOT_ZONES; temp[i].sigma_slope = atof( vegarr[2 + j] ); @@ -194,14 +238,16 @@ vic411_veg_con_struct *vic411_read_vegparam(FILE *vegparam, vic411_nrerror(ErrStr); } else + { temp[i].veg_class = veg_class; + } temp[0].Cv_sum += temp[i].Cv; for(k=0; k #include "ftn.h" +extern void write_atmosdata(atmos_data_struct *, int); + //BOP // // !ROUTINE: vic412_write_atmos diff --git a/lis/surfacemodels/land/vic.4.1.2.l/vic412_write_state.c b/lis/surfacemodels/land/vic.4.1.2.l/vic412_write_state.c index 3a57c3e89..8213dedaf 100755 --- a/lis/surfacemodels/land/vic.4.1.2.l/vic412_write_state.c +++ b/lis/surfacemodels/land/vic.4.1.2.l/vic412_write_state.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -13,6 +13,9 @@ #include "ftn.h" #define VIC_BASED 0 /** VIC based vegetation tiling Added by Shugong Wang on 05/01/2012 **/ #define LIS_BASED 1 /** LIS based vegetation tiling Added by Shugong Wang on 05/01/2012 **/ + +extern void pack_model_state(dist_prcp_struct *, global_param_struct *, int, int, filep_struct *, soil_con_struct *, char *, int *, float *, int *); + //BOP // // !ROUTINE: vic412_write_state diff --git a/lis/surfacemodels/land/vic.4.1.2.l/vic412_writerst.F90 b/lis/surfacemodels/land/vic.4.1.2.l/vic412_writerst.F90 index 60ad481a8..7a11a7377 100755 --- a/lis/surfacemodels/land/vic.4.1.2.l/vic412_writerst.F90 +++ b/lis/surfacemodels/land/vic.4.1.2.l/vic412_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.2.l/write_atmosdata.c b/lis/surfacemodels/land/vic.4.1.2.l/write_atmosdata.c index 83a078e75..abd750e0a 100755 --- a/lis/surfacemodels/land/vic.4.1.2.l/write_atmosdata.c +++ b/lis/surfacemodels/land/vic.4.1.2.l/write_atmosdata.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.2.l/write_bin_atmosdata.c b/lis/surfacemodels/land/vic.4.1.2.l/write_bin_atmosdata.c index c64a36e9c..7449478dd 100755 --- a/lis/surfacemodels/land/vic.4.1.2.l/write_bin_atmosdata.c +++ b/lis/surfacemodels/land/vic.4.1.2.l/write_bin_atmosdata.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.2.l/write_lakecon.c b/lis/surfacemodels/land/vic.4.1.2.l/write_lakecon.c index c84b345aa..c019d8bc0 100755 --- a/lis/surfacemodels/land/vic.4.1.2.l/write_lakecon.c +++ b/lis/surfacemodels/land/vic.4.1.2.l/write_lakecon.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/land/vic.4.1.2.l/write_prcp.c b/lis/surfacemodels/land/vic.4.1.2.l/write_prcp.c index 9c86871e5..469f17be4 100755 --- a/lis/surfacemodels/land/vic.4.1.2.l/write_prcp.c +++ b/lis/surfacemodels/land/vic.4.1.2.l/write_prcp.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/readtemplateOpenWatercrd.F90 b/lis/surfacemodels/openwater/template/readtemplateOpenWatercrd.F90 index f681712b4..ff0926ece 100644 --- a/lis/surfacemodels/openwater/template/readtemplateOpenWatercrd.F90 +++ b/lis/surfacemodels/openwater/template/readtemplateOpenWatercrd.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -47,6 +47,6 @@ subroutine readtemplateOpenWatercrd() call LIS_parseTimeString(time,templateOpenWater_struc(n)%ts) enddo - write(LIS_logunit,*)'Running Template Open water Option:' + write(LIS_logunit,*)'[INFO] Running Template Open water Option:' end subroutine readtemplateOpenWatercrd diff --git a/lis/surfacemodels/openwater/template/templateOpenWaterMod.F90 b/lis/surfacemodels/openwater/template/templateOpenWaterMod.F90 index 99797fcc9..a711b8678 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWaterMod.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWaterMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_dynsetup.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_dynsetup.F90 index c85a9afcf..cc8847e85 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_dynsetup.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_dynsetup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_f2t.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_f2t.F90 index 2aceefaaf..907bb3122 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_f2t.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_f2t.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_finalize.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_finalize.F90 index 31e36d5fe..1bbbc7da7 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_finalize.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_finalize.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_main.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_main.F90 index a86211a59..f89b5f8d5 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_main.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_module.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_module.F90 index 4828170e1..9b7de68a1 100755 --- a/lis/surfacemodels/openwater/template/templateOpenWater_module.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_readrst.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_readrst.F90 index 9fad61d69..093bf003c 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_readrst.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_readrst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_setup.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_setup.F90 index 0e9db2044..07673df5b 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_setup.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_setup.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/surfacemodels/openwater/template/templateOpenWater_writerst.F90 b/lis/surfacemodels/openwater/template/templateOpenWater_writerst.F90 index bf89aef0a..021187d09 100644 --- a/lis/surfacemodels/openwater/template/templateOpenWater_writerst.F90 +++ b/lis/surfacemodels/openwater/template/templateOpenWater_writerst.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/NOAHMP36_OUTPUT_LIST.TBL.dyn.full b/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/NOAHMP36_OUTPUT_LIST.TBL.dyn.full new file mode 100755 index 000000000..924c0f29d --- /dev/null +++ b/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/NOAHMP36_OUTPUT_LIST.TBL.dyn.full @@ -0,0 +1,218 @@ +#short_name select? units signconv timeavg? min/max? std? vert.levels grib_id grib_scalefactor longname +# 0 == Instantaneous output +# 1 == Time averaged output +# 2 == Instantaneous and Time averaged output +# 3 == Accumulated output + +#Energy balance components +Swnet: 0 W/m2 DN 1 0 0 1 111 10 # Net shortwave radiation (W/m2) +Lwnet: 0 W/m2 DN 1 0 0 1 112 10 # Net longwave radiation (W/m2) +Qle: 0 W/m2 UP 1 0 0 1 121 10 # Latent heat flux (W/m2) +Qh: 0 W/m2 UP 1 0 0 1 122 10 # Sensible heat flux (W/m2) +Qg: 0 W/m2 DN 1 0 0 1 155 10 # Ground heat flux (W/m2) +Qf: 0 W/m2 S2L 1 0 0 1 229 10 # Energy of fusion (W/m2) +Qv: 0 W/m2 S2V 1 0 0 1 198 10 # Energy of sublimation (W/m2) +Qa: 0 W/m2 DN 1 0 0 1 136 10 # Advective energy (W/m2) +Qtau: 0 N/m2 DN 1 0 0 1 172 10 # Momentum flux (N/m2) +DelSurfHeat: 0 J/m2 INC 1 0 0 1 137 10 # Change in surface heat storage (J/m2) +DelColdCont: 0 J/m2 INC 1 0 0 1 138 10 # Change in snow cold content (J/m2) +BR: 0 - - 1 0 1 1 256 10 # Bowen ratio (-) +EF: 0 - - 1 0 1 1 256 10 # Evaporative fraction (-) +Rnet: 0 W/m2 DN 1 0 1 1 256 10 # Total net radiation (W/m2) + +#Water balance components +Snowf: 0 kg/m2s DN 1 0 0 1 161 10000 # Snowfall rate (kg/m2s) +Rainf: 0 kg/m2s DN 1 0 0 1 162 10000 # Rainfall rate (kg/m2s) +RainfConv: 0 kg/m2s DN 1 0 0 1 63 10000 # Convective rainfall rate (kg/m2s) +TotalPrecip: 1 kg/m2s DN 1 0 0 1 61 10000 # Total precipitation rate (kg/m2s) +Evap: 1 kg/m2s UP 1 0 0 1 57 10000 # Total evapotranspiration (kg/m2s) +Qs: 1 kg/m2s OUT 1 0 0 1 235 10000 # Surface runoff (kg/m2s) +Qrec: 0 kg/m2s IN 1 0 0 1 163 10000 # Recharge (kg/m2s) +Qsb: 1 kg/m2s OUT 1 0 0 1 234 10000 # Subsurface runoff (kg/m2s) +Qsm: 0 kg/m2s S2L 1 0 0 1 99 10000 # Snowmelt (kg/m2s) +Qfz: 0 kg/m2s L2S 1 0 0 1 130 10000 # Refreezing of water in the snowpack (kg/m2s) +Qst: 0 kg/m2s - 1 0 0 1 131 10000 # Snow throughfall (kg/m2s) +DelSoilMoist: 0 kg/m2 INC 1 0 0 1 132 10000 # Change in soil moisture (kg/m2) +DelSWE: 0 kg/m2 INC 1 0 0 1 133 1000 # Change in snow water equivalent (kg/m2) +DelSurfStor: 0 kg/m2 INC 1 0 0 1 134 1000 # Change in surface water storage (kg/m2) +DelIntercept: 0 kg/m2 INC 1 0 0 1 135 1000 # Change in interception storage (kg/m2) +RHMin: 0 - - 1 0 0 1 52 10 # Minimum 2-meter relative humidity (-) +Ch: 0 - - 1 0 0 1 208 10 # Surface exchange coefficient for heat +Cm: 0 - - 1 0 0 1 252 10 # Surface exchange coefficient for momentum + +#Surface state variables +SnowT: 0 K - 1 0 0 1 165 10 # Snow surface temperature (K) +VegT: 0 K - 1 0 0 1 146 10 # Vegetation canopy temperature (K) +BareSoilT: 0 K - 1 0 0 1 147 10 # Temperature of bare soil (K) +AvgSurfT: 0 K - 1 0 0 1 148 10 # Average surface temperature (K) +RadT: 0 K - 1 0 0 1 149 10 # Surface radiative temperature (K) +Albedo: 0 - - 1 0 0 1 84 100 # Surface albedo (-) +SWE: 1 kg/m2 - 1 0 0 1 65 1000 # Snow Water Equivalent (kg/m2) +SWEVeg: 0 kg/m2 - 1 0 0 1 139 1000 # SWE intercepted by vegetation (kg/m2) +SurfStor: 0 kg/m2 - 1 0 0 1 150 1000 # Surface water storage (kg/m2) + +#Subsurface state variables +SoilMoist: 1 m3/m3 - 2 0 0 4 86 1000 # Average layer soil moisture (kg/m2) +SoilTemp: 0 K - 1 0 0 4 85 1000 # Average layer soil temperature (K) +SmLiqFrac: 0 - - 1 0 0 4 160 100 # Average layer fraction of liquid moisture (-) +SmFrozFrac: 0 - - 1 0 0 4 140 100 # Average layer fraction of frozen moisture (-) +SoilWet: 0 - - 1 0 0 1 144 100 # Total soil wetness (-) +RelSMC: 0 m3/m3 - 1 0 0 4 141 1000 # Relative soil moisture (-) +RootTemp: 0 K - 1 0 0 1 142 1000 # Root zone temperature (K) + +#Evaporation components +PotEvap: 0 kg/m2s UP 1 0 0 1 145 1 # Potential evapotranspiration (kg/m2s) +ECanop: 0 kg/m2s UP 1 0 0 1 200 1 # Interception evaporation (kg/m2s) +TVeg: 0 kg/m2s UP 1 0 0 1 210 1 # Vegetation transpiration (kg/m2s) +ESoil: 0 kg/m2s UP 1 0 0 1 199 1 # Bare soil evaporation (kg/m2s) +EWater: 0 kg/m2s UP 1 0 0 1 197 1 # Open water evaporation (kg/m2s) +RootMoist: 0 kg/m2 - 2 0 0 1 171 1 # Root zone soil moisture (kg/m2) +CanopInt: 0 kg/m2 - 1 0 0 1 223 1000 # Total canopy water storage (kg/m2) +EvapSnow: 0 kg/m2s - 1 0 0 1 173 1000 # Snow evaporation (kg/m2s) +SubSnow: 0 kg/m2s - 1 0 0 1 198 1000 # Snow sublimation (kg/m2s) +SubSurf: 0 kg/m2s - 1 0 0 1 143 1000 # Sublimation of the snow free area (kg/m2s) +ACond: 0 m/s - 1 0 0 1 179 100000 # Aerodynamic conductance (m/s) +CCond: 0 m/s - 1 0 0 1 181 100000 # Canopy conductance (m/s) +SoilET: 0 kg/m2 - 1 0 0 1 256 1 # Soil evaporation (kg/m2s) +AResist: 0 s/m - 1 0 0 1 256 1 # Aerodynamic resistance (s/m) + +#Other hydrologic variables +WaterTableD: 0 m - 1 0 0 1 174 1 # Water table depth (m) +TWS: 0 mm - 1 0 0 1 175 1 # Terrestrial Water Storage (mm) +GWS: 0 mm - 1 0 0 1 176 1 # Ground Water Storage (mm) +WT: 0 mm - 1 0 0 1 177 1 # Noah-MP WT variable (mm) + +#Cold season processes +Snowcover: 0 - - 1 0 0 1 238 100 # Snow cover (-) +SAlbedo: 0 - - 0 0 0 1 184 1000 # Albedo of the snow-covered area (-) +SnowTProf: 0 K - 0 0 0 1 239 1000 # Temperature of the snow pack (K) +SnowDepth: 0 m - 1 0 0 1 66 1000 # Snow depth (m) +SLiqFrac: 0 - - 0 0 0 1 185 1000 # Fraction of SWE in the liquid phase (-) + +#Variables to compared against remote sensed data +LWup: 0 W/m2 UP 1 0 0 1 212 1 # Longwave radiation up from the surface (W/m2) + +#Carbon variables +GPP: 0 g/m2s IN 1 0 0 1 256 1 # Gross Primary Production +NPP: 0 g/m2s IN 1 0 0 1 256 1 # Net Primary Production +NEE: 0 g/m2s IN 1 0 0 1 256 1 # Net Ecosystem Exchange +AutoResp: 0 kg/m2s2 UP 1 0 0 1 256 1 # Autotrophic respiration +HeteroResp: 0 kg/m2s2 UP 1 0 0 1 256 1 # Heterotrophic respiration +LeafResp: 0 kg/m2s2 UP 1 0 0 1 256 1 # Leaf respiration +TotSoilCarb: 0 kg/m2 - 1 0 0 1 256 1 # Total soil carbon +TotLivBiom: 0 kg/m2 - 1 0 0 1 256 1 # Total living biomass + +#Forcings +Wind_f: 1 m/s - 1 0 0 1 32 10 # Near surface wind (m/s) +Rainf_f: 1 kg/m2s DN 1 0 0 1 162 1000 # Average rainfall rate +Snowf_f: 0 kg/m2s DN 1 0 0 1 161 1000 # Average snowfall rate +CRainf_f: 0 kg/m2s DN 1 0 0 1 63 1000 # Average convective rainfall rate +Tair_f: 1 K - 1 0 0 1 11 10 # Near surface air temperature +Qair_f: 1 kg/kg - 1 0 0 1 51 1000 # Near surface specific humidity +Psurf_f: 1 Pa - 1 0 0 1 1 10 # Surface pressure +SWdown_f: 1 W/m2 DN 1 0 0 1 204 10 # Surface incident shortwave radiation +LWdown_f: 1 W/m2 DN 1 0 0 1 205 10 # Surface incident longwave radiation +PARDR_f: 0 W/m2 DN 1 0 0 1 256 10 # Surface incident PAR direct +PARDF_f: 0 W/m2 DN 1 0 0 1 256 10 # Surface incident PAR diffuse + +#Additional forcings +DirectSW_f: 0 W/m2 - 1 0 0 1 166 10 # Surface direct incident shortwave radiation +DiffuseSW_f: 0 W/m2 - 1 0 0 1 167 10 # Surface diffuse incident shortwave radiation +NWind_f: 0 m/s N 1 0 0 1 34 10 # Northward wind +EWind_f: 0 m/s E 1 0 0 1 33 10 # Eastward wind +FHeight_f: 0 m - 1 0 0 1 256 10 # Height of forcing variables +Ch_f: 0 - - 1 0 0 1 208 10 # Surface exchange coefficient for heat +Cm_f: 0 - - 1 0 0 1 252 10 # Surface exchange coefficient for momentum +Emiss_f: 0 - - 1 0 0 1 256 10 # Surface emissivity +MixRatio_f: 0 kg/kg - 1 0 0 1 53 10 # Surface mixing ratio +CosZenith_f: 0 - - 1 0 0 1 256 10 # Cosine of zenith angle +Albedo_f: 0 - - 1 0 0 1 84 10 # Surface albedo +CAPE_f: 0 J/kg - 1 0 0 1 157 10 # Convective Available Potential Energy +Z0brd: 0 m - 1 0 0 1 256 1 # Z0brd +T2diag: 0 K - 1 0 0 1 256 1 # Diagnostic t2 +Q2diag: 0 kg/kg - 1 0 0 1 256 1 # Diagnostic q2 +Snowflag_f: 0 - - 1 0 0 1 256 1 # Snowflag +Density_f: 0 kg/m3 - 1 0 0 1 256 1 # Atmospheric density +VaporPress_f: 0 - - 1 0 0 1 256 1 # Vapor pressure +VaporPressDeficit_f: 0 - - 1 0 0 1 256 1 # Vapor pressure deficit + +#Parameters +Landmask: 0 - - 0 0 0 1 81 1 # Land mask (0 - Water, 1 - Land) +Landcover: 0 - - 0 0 0 1 225 1 # Land cover +Soiltype: 0 - - 0 0 0 1 224 1 # Soil type +SandFrac: 0 - - 0 0 0 1 256 1 # Sand fraction +ClayFrac: 0 - - 0 0 0 1 256 1 # Clay fraction +SiltFrac: 0 - - 0 0 0 1 256 1 # Silt fraction +Porosity: 0 - - 0 0 0 1 240 1 # Porosity +Soilcolor: 0 - - 0 0 0 1 256 1 # Soil color +Elevation: 0 m - 0 0 0 1 196 10 # Elevation +Slope: 0 - - 0 0 0 1 222 10 # Slope +LAI: 0 - - 1 0 0 1 182 100 # LAI +SAI: 0 - - 1 0 0 1 256 100 # SAI +Snfralbedo: 0 - - 0 0 0 1 184 100 # Snow fraction albedo +Mxsnalbedo: 0 - - 0 0 0 1 159 100 # Maximum snow albedo +Greenness: 0 - - 1 0 0 1 87 100 # Greenness +Roughness: 0 m - 0 0 0 1 83 10 # Roughness +Tempbot: 0 K - 0 0 0 1 256 10 # Bottom soil temperature + +#Routing +Streamflow: 1 m3/s - 1 0 0 1 256 10 # Streamflow +RiverStor: 0 m3 - 1 0 0 1 256 10 # River storage +RiverDepth: 0 m - 1 0 0 1 256 10 # River depth +RiverVelocity: 0 m/s - 1 0 0 1 256 10 # River velocity +FloodQ: 0 m3/s - 1 0 0 1 256 10 # Flood discharge +FloodEvap: 0 m3 - 1 0 0 1 256 10 # Flood evaporation +FloodStor: 0 m3 - 1 0 0 1 256 10 # Flood storage +FloodDepth: 0 m - 1 0 0 1 256 10 # Flood depth +FloodVelocity: 0 m/s - 1 0 0 1 256 10 # Flood velocity +FloodedFrac: 0 - - 1 0 0 1 256 10 # Flooded fraction +FloodedArea: 0 m2 - 1 0 0 1 256 10 # Flooded area +SurfElev: 0 m - 1 0 0 1 256 10 # Surface elevation +RunoffStor: 0 m3 - 1 0 0 1 256 10 # Runoff storage +BaseflowStor: 0 m3 - 1 0 0 1 256 10 # Baseflow storage + +#Irrigation +Irrigated water: 1 kg/m2s - 1 0 0 1 256 10 # Irrigation amount + +#NoahMP +SnowIce: 0 mm - 1 0 0 3 85 1000 # snow ice contents in layers +SnowLiq: 0 mm - 1 0 0 3 85 1000 # snow water contents in layers +VegCanopT: 0 K - 1 0 0 1 146 10 # Vegetation canopy temperature (K) +CanopVP: 0 Pa - 1 0 0 1 146 10 # Canopy air vapor pressure +CanopWetFrac: 0 - - 1 0 0 1 146 10 # Canopy wet fraction +CanopIntLiq: 0 mm - 1 0 0 1 146 10 # Canopy intercepted liquid water +SnowAge: 0 - - 1 0 0 1 146 10 # snow age factor +AvgGrndT: 0 K - 1 0 0 1 148 10 # Average surface temperature (K) +ActSnowNL: 0 - - 1 0 0 1 148 10 # actual number of snow layers +LeafMass: 0 g/m2 - 1 0 0 1 148 10 # leaf mass +RootMass: 0 g/m2 - 1 0 0 1 148 10 # stem mass +StemMass: 0 g/m2 - 1 0 0 1 148 10 # wood mass +WoodMass: 0 g/m2 - 1 0 0 1 148 10 # mass of wood including woody roots [g/m2] +DeepSoilCarbon: 0 g/m2 - 1 0 0 1 148 10 # stable carbon in deep soil [g/m2] +ShallowSoilCarbon: 0 g/m2 - 1 0 0 1 148 10 # short-lived carbon in shallow soil [g/m2] +RechToGW: 0 m - 1 0 0 1 148 10 # recharge to water table when groundwater is deep +RechFromGW: 0 m - 1 0 0 1 148 10 # recharge from water table when groundwater shallow +SwReflect: 0 W/m2 UP 1 0 0 1 111 10 # Net shortwave radiation (W/m2) +VegT2m: 0 K - 1 0 0 1 146 10 # Vegetation temperature at 2m height (K) +QairT2m: 0 kg/kg - 1 0 0 1 51 1000 # 2-m over vegetation specific humidity +APAR: 0 W/m2 IN 1 0 0 1 111 10 # absorbed PAR energy by canopy (W/m2) +SAV: 0 W/m2 IN 1 0 0 1 111 10 # solar radiation absorbed by vegetation (W/m2) +SAG: 0 W/m2 IN 1 0 0 1 111 10 # solar radiation absorbed by ground (W/m2) +PSCO2: 0 umol/m2s IN 1 0 0 1 111 10 # total photosynthesis of CO2 (umol/m2s) +RsSunlit: 0 s/m - 0 0 0 1 238 100 # sunlit stomatal resistance +RsShaded: 0 s/m - 0 0 0 1 238 100 # shaded stomatal resistance +BCanoGapFrac: 0 - - 0 0 0 1 238 100 # between-canopy gap fraction for beam +WCanoGapFrac: 0 - - 0 0 0 1 238 100 # within-canopy gap fraction for beam +ChVeg: 0 s/m - 1 0 0 1 208 10 # Surface heat exchange coeff. over vegetated fraction +ChBare: 0 s/m - 1 0 0 1 208 10 # Surface heat exchange coeff. over bare soil fraction +QhCano: 0 W/m2 UP 1 0 0 1 122 10 # canopy sensible heat flux (W/m2) +QhBare: 0 W/m2 UP 1 0 0 1 122 10 # bare soil sensible heat flux (W/m2) +EvapHBare: 0 W/m2 UP 1 0 0 1 122 10 # bare soil evaporation heat (W/m2) +EvapHGrnd: 0 W/m2 UP 1 0 0 1 122 10 # ground evaporation heat (W/m2) +GrndHBare: 0 W/m2 UP 1 0 0 1 122 10 # bare ground heat flux (W/m2) +GrndHVeg: 0 W/m2 UP 1 0 0 1 122 10 # vegetated ground heat flux (W/m2) +ChLeaf: 0 s/m - 1 0 0 1 208 10 # Surface exchange coefficient for heat over leaf +ChV2: 0 s/m - 1 0 0 1 208 10 # sensible heat exchange coef. over vegetated fraction +ChB2: 0 s/m - 1 0 0 1 208 10 # sensible heat exchange coeff. over bare ground +fpice: 0 - - 1 0 0 1 208 10 # snow fraction in precipitation + diff --git a/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/README b/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/README new file mode 100644 index 000000000..304b65a33 --- /dev/null +++ b/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/README @@ -0,0 +1,25 @@ +Noah-MP.4.0.1 SMAP Assimilation with Relocated CDF + +This case demonstrates EnKF-based assimilation of NASA SMAP data into +Noah-MP.4.0.1 LSM using relocated CDFs + +It uses: +* MERRA2 +* Retrospective run mode +* Noah-MP.4.0.1 LSM +* Regional domain over Europe +* Time period from 1 June 2020 to 1 Jan 2022. + +This directory contains: +* This README file +* The lis.config file used for this test case +* The NOAHMP36_OUTPUT_LIST.TBL.dyn.full file used by lis.config to select + the output variables. + +Note that lis.config should be edited to make sure the locations of the +parameter and forcing files are specified correctly. + +To run this testcase: +* Compile LIS +* Run the LIS executable using the lis.config file and the testcase input + data. diff --git a/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/lis.config b/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/lis.config new file mode 100755 index 000000000..ea1a74cb1 --- /dev/null +++ b/lis/testcases/dataassim/SMAP_sm_pclimo_transfer/lis.config @@ -0,0 +1,260 @@ +#Overall driver options +Running mode: retrospective +Map projection of the LIS domain: "lambert" # latlon # MN: why latlon should be lambert +Number of nests: 1 +Number of surface model types: 1 +Surface model types: LSM +Surface model output interval: 6hr +Land surface model: "Noah-MP.4.0.1" +Number of met forcing sources: 1 +Blending method for forcings: overlay +Met forcing sources: "MERRA2" # "COAMPSout" +Met forcing chosen ensemble member: 1 +Topographic correction method (met forcing): "none" +Enable spatial downscaling of precipitation: 0 +Spatial upscaling method (met forcing): average +Spatial interpolation method (met forcing): bilinear +Temporal interpolation method (met forcing): linear + +#Runtime options +Forcing variables list file: ./forcing_variables.txt +Output methodology: "2d gridspace" +Output model restart files: 1 +Output data format: netcdf +Output naming style: "3 level hierarchy" +Start mode: restart #coldstart +Starting year: 2020 #2015 ##2000 +Starting month: 05 #03 ##01 +Starting day: 31 #01 ##01 +Starting hour: 23 #0 +Starting minute: 45 #0 +Starting second: 0 +Ending year: 2022 #2015 +Ending month: 01 #03 +Ending day: 01 #01 +Ending hour: 0 +Ending minute: 0 +Ending second: 0 +Undefined value: -9999 +Output directory: "output.da.cdf.transfer.diff.forcing" +Diagnostic output file: "output.da.cdf.transfer.diff.forcing/logs/lislog" +Number of ensembles per tile: 12 + +#The following options are used for subgrid tiling based on vegetation +Maximum number of surface type tiles per grid: 1 +Minimum cutoff percentage (surface type tiles): 0.05 +Maximum number of soil texture tiles per grid: 1 +Minimum cutoff percentage (soil texture tiles): 0.05 +Maximum number of soil fraction tiles per grid: 1 +Minimum cutoff percentage (soil fraction tiles): 0.05 +Maximum number of elevation bands per grid: 1 +Minimum cutoff percentage (elevation bands): 0.05 +Maximum number of slope bands per grid: 1 +Minimum cutoff percentage (slope bands): 0.05 +Maximum number of aspect bands per grid: 1 +Minimum cutoff percentage (aspect bands): 0.05 + +#Processor layout +#Should match the total number of processors used +Number of processors along x: 256 #28 # 16 +Number of processors along y: 1 #16 +Halo size along x: 0 +Halo size along y: 0 + +#Sub-models +Routing model: "none" +Radiative transfer model: none +Number of application models: 0 + +#HYMAP router +HYMAP routing model time step: 15mn +HYMAP routing model output interval: 1da +HYMAP routing model restart interval: 1mo +HYMAP run in ensemble mode: 0 +# method: enter 1 - kinematic; 2 - diffusive +# linear reservoir flag: enter 1 - use; or 2 - do not use linear reservoirs +# evaporation option: enter 1 - compute; or 2 - do not compute evapotation in floodplains +HYMAP routing method: kinematic +HYMAP routing model linear reservoir flag: 1 +HYMAP routing model evaporation option: 2 +HYMAP routing model restart file: LIS_RST_HYMAP_router_201701312345.d01.bin +HYMAP routing model start mode: restart +HYMAP routing LIS output directory: HYMAPTEST + +#---------------------DATA ASSIMILATION ---------------------------------- +#Data Assimilation Options +Number of data assimilation instances: 1 + +Data assimilation algorithm: "EnKF" +Data assimilation set: "SMAP(NASA) soil moisture with CDF Transfer" # "SMAP(NASA) soil moisture" +Number of state variables: 4 +Data assimilation use a trained forward model: 0 +Data assimilation trained forward model output file: none +Data assimilation exclude analysis increments: 0 +Data assimilation output interval for diagnostics: "1da" +Data assimilation number of observation types: 1 +Data assimilation output ensemble spread: 1 +Data assimilation output processed observations: 1 +Data assimilation output innovations: 1 + +Data assimilation scaling strategy: "CDF matching" +Data assimilation observation domain file: ../procLSM_test2/lis_input.noahmp401.EU.nc + +Bias estimation algorithm: "none" +Bias estimation attributes file: "none" +Bias estimation restart output frequency: +Bias estimation start mode: +Bias estimation restart file: + +#Perturbation options +Perturbations start mode: "restart" #"coldstart" +Perturbations restart output interval: "1mo" +#Perturbations restart filename: output.da.cdf.transfer.diff.forcing/DAPERT/202005/LIS_DAPERT_202005312345.d01.bin # "none" +Perturbations restart filename: rst/LIS_DAPERT_202005312345.d01.bin # "none" + +Apply perturbation bias correction: 1 + +Forcing perturbation algorithm: "GMAO scheme" +Forcing perturbation frequency: "1hr" +Forcing attributes file: ../../attribs/forcing_attribs.txt +Forcing perturbation attributes file: ../../attribs/forcing_pertattribs.txt + +State perturbation algorithm: "GMAO scheme" +State perturbation frequency: "6hr" +State attributes file: ../../attribs/noah_sm_attribs.txt +State perturbation attributes file: ../../attribs/noah_sm_pertattribs.txt + +Observation perturbation algorithm: "GMAO scheme" +Observation perturbation frequency: "6hr" +Observation attributes file: ../../attribs/smap_attribs.txt +Observation perturbation attributes file: ../../attribs/smap_pertattribs.txt + +# SMAP DATA ENTRIES: +SMAP(NASA) soil moisture data designation: SPL3SMP +SMAP(NASA) soil moisture data directory: ../input/RS_DATA/SMAP/SPL3SMP.007 +SMAP(NASA) soil moisture use scaled standard deviation model: 0 +SMAP(NASA) soil moisture apply SMAP QC flags: 1 +SMAP(NASA) model CDF file: # ../DA_proc_LSM/OUTPUT.strat.p.climo.15bins/cdf_noahmp401.nc # ../DA_proc_LSM/OUTPUT/cdf_noahmp401.nc +SMAP(NASA) observation CDF file: # ../DA_proc_SMAP/OUTPUT.strat.p.climo.15bins/cdf_smapobs.nc #../DA_proc_SMAP/OUTPUT/cdf_smapobs.nc +SMAP(NASA) soil moisture number of bins in the CDF: 100 +SMAP(NASA) soil moisture use scaled standard deviation model: 0 +SMAP(NASA) CDF read option: 0 +SMAP(NASA) soil moisture Composite Release ID: "R17" + + +#----------------------- Soil moisture CDF transfer ------------- +Use CDF transfer for soil moisture data assimilation: 1 # defualt =0 +Reference domain model CDF file: ref_model_cdf_forcing_diff/stratified_cdf_noahmp401.nc # ref_model_cdf/stratified_cdf_noahmp401.nc +Reference domain obs CDF file: ref_obs_cdf_forcing_diff/stratified_cdf_smapobs.nc # ref_obs_cdf/stratified_cdf_smapobs.nc +#Number of bins in the soil moisture CDF: 100 +Reference domain precipitation climatology data source: Precip.climo.us.nldas2/LVT_MEAN_FINAL.202201010000.d01.nc #Precip.climo.us.merra/LVT_MEAN_FINAL.202201010000.d01.nc +Target domain precipitation climatology data source: Precip.climo.eu.merra/LVT_MEAN_FINAL.202201010000.d01.nc +#---------------------------------------------------------------- + +GLASS LAI data directory: ../GLASSLAIdata + +Irrigation scheme: "none" +Irrigation output interval: "1da" +Irrigation threshold: 0.5 +Irrigation GVF parameter 1: 0.0 +Irrigation GVF parameter 2: 0.4 + +# UMD-landcover and "CROPMAP" crop types (Leff et al. 2004): +Sprinkler irrigation max root depth file: ../input/LS_PARAMETERS/irrigation/conus_modis/maxrootdepth32.txt +#------------------------DOMAIN SPECIFICATION-------------------------- + +#The following options list the choice of parameter maps to be used +LIS domain and parameter data file: ../procLSM_test2/lis_input.noahmp401.EU.nc +Landmask data source: LDT +Landcover data source: LDT +Soil texture data source: LDT +Soil fraction data source: none +Soil color data source: none +Elevation data source: LDT +Slope data source: LDT +Aspect data source: LDT +Curvature data source: none +LAI data source: none +SAI data source: none +Albedo data source: LDT +Max snow albedo data source: LDT +Greenness data source: LDT +Roughness data source: none +Porosity data source: none +Ksat data source: none +B parameter data source: none +Quartz data source: none +Emissivity data source: none + +#--------------------------------FORCINGS---------------------------------- + +MERRA2 forcing directory: ../input/MET_FORCING/MERRA2 +MERRA2 use lowest model level forcing: 1 +MERRA2 use 2m wind fields: 0 +MERRA2 use corrected total precipitation: 1 + +IMERG forcing directory: ../input/MET_FORCING/IMERG +IMERG product: 'final' +IMERG version: V06B + +COAMPS output forcing directory: ../../COAMPS/EU/COAMPS_forcing # ../../COAMPS/COAMPS_forcing # input/MET_FORCING/COAMPS_OUT/bak +COAMPS nest id: 1 # 1 # 1: 45 km ; 2: 15km + +#-----------------------LAND SURFACE MODELS-------------------------- + + +Noah-MP.4.0.1 model timestep: 15mn +Noah-MP.4.0.1 restart output interval: 1mo +#Noah-MP.4.0.1 restart file: output.da.cdf.transfer.diff.forcing/SURFACEMODEL/202005/LIS_RST_NOAHMP401_202005312345.d01.nc +Noah-MP.4.0.1 restart file: rst/LIS_RST_NOAHMP401_202005312345.d01.nc + +#Noah-MP.4.0.1 restart file: ../DA_ensrst/LIS_EnRST_NOAH36_201502282345.d01.nc +Noah-MP.4.0.1 restart file format: netcdf +Noah-MP.4.0.1 soil parameter table: ../input/LS_PARAMETERS/noahmp401_parms/SOILPARM.TBL +Noah-MP.4.0.1 general parameter table: ../input/LS_PARAMETERS/noahmp401_parms/GENPARM.TBL +Noah-MP.4.0.1 MP parameter table: ../input/LS_PARAMETERS/noahmp401_parms/MPTABLE.TBL +Noah-MP.4.0.1 number of soil layers: 4 +Noah-MP.4.0.1 thickness of soil layers: 0.1 0.3 0.6 1.0 +Noah-MP.4.0.1 dynamic vegetation option: 4 # Up to 10 different options +Noah-MP.4.0.1 canopy stomatal resistance option: 1 # 1=Ball-Berry; 2=Jarvis +Noah-MP.4.0.1 soil moisture factor for stomatal resistance: 1 # 1=Noah; 2=CLM; 3=SSiB +Noah-MP.4.0.1 runoff and groundwater option: 1 # 1=SIMGM; 2=SIMTOP; 3=Schaake96; 4=BATS; 5=Miguez-Macho&Fan +Noah-MP.4.0.1 surface layer drag coefficient option: 1 # 1=M-O; 2=Chen97 +Noah-MP.4.0.1 supercooled liquid water option: 1 # 1=NY06; 2=Koren99 +Noah-MP.4.0.1 frozen soil permeability option: 1 # 1=NY06; 2=Koren99 +Noah-MP.4.0.1 radiation transfer option: 3 # 1=gap=F(3D;cosz); 2=gap=0; 3=gap=1-Fveg +Noah-MP.4.0.1 snow surface albedo option: 2 # 1=BATS; 2=CLASS +Noah-MP.4.0.1 rainfall & snowfall option: 1 # 1=Jordan91; 2=BATS; 3=Noah +Noah-MP.4.0.1 lower boundary of soil temperature option: 2 # 1=zero-flux; 2=Noah +Noah-MP.4.0.1 snow&soil temperature time scheme option: 1 # 1=semi-implicit; 2=fully implicit; 3=FSNO for TS +Noah-MP.4.0.1 glacier option: 1 # 1=include phase change; 2=slab ice (Noah) +Noah-MP.4.0.1 surface resistance option: 1 # 1=Sakaguchi and Zeng 2009; 2=Sellers (1992); 3=adjusted Sellers; 4=option1 for non-snow and rsurf_snow for snow +Noah-MP.4.0.1 soil configuration option: 1 # 1=input dominant soil texture; 2=input soil texture varies that varies with depth; 3=soil composition and pedotransfer; 4=input soil properties +Noah-MP.4.0.1 soil pedotransfer function option: 1 # 1=Saxton and Rawls (2006) (used when soil_opt=3) +Noah-MP.4.0.1 crop model option: 0 # 0=No crop model; 1=Liu et al. 2016; 2=Gecros +Noah-MP.4.0.1 urban physics option: 0 # 0=No; 1=Single-layer; 2=Multi-layer BEP scheme; 3=Multi-layer BEM scheme +Noah-MP.4.0.1 reference height of temperature and humidity: 10.0 +Noah-MP.4.0.1 initial surface skin temperature: 288.0 +Noah-MP.4.0.1 initial snow water equivalent: 0.0 +Noah-MP.4.0.1 initial snow depth: 0.0 +Noah-MP.4.0.1 initial total canopy surface water: 0.0 +Noah-MP.4.0.1 initial soil temperatures: 288.0 288.0 288.0 288.0 +Noah-MP.4.0.1 initial total soil moistures: 0.20 0.20 0.20 0.20 +Noah-MP.4.0.1 initial leaf area index: 0.5 +Noah-MP.4.0.1 initial water table depth: 2.5 +Noah-MP.4.0.1 initial water in the aquifer: 4900.0 +Noah-MP.4.0.1 initial water in aquifer and saturated soil: 4900.0 + + +#---------------------------MODEL OUTPUT CONFIGURATION----------------------- +#Specify the list of ALMA variables that need to be featured in the +#LSM model output +Output start year: +Output start month: +Output start day: +Output start hour: +Output start minutes: +Output start seconds: + +Model output attributes file: './NOAHMP36_OUTPUT_LIST.TBL.dyn.full' + diff --git a/lis/testcases/dataassim/smos_nrt_nn_l2sm/lis.config b/lis/testcases/dataassim/smos_nrt_nn_l2sm/lis.config index 735d1126b..3853d8ffb 100644 --- a/lis/testcases/dataassim/smos_nrt_nn_l2sm/lis.config +++ b/lis/testcases/dataassim/smos_nrt_nn_l2sm/lis.config @@ -190,7 +190,7 @@ AGRMET GALWEM SPD10M background error scale length (m): 100000. AGRMET GALWEM SPD10M background error variance: 0.35 AGRMET GALWEM SPD10M station observation error variance: 2.52 -AGRMET GALWEM nominal resolution (km): 17 # 17 or 10; for now, just use 17 +AGRMET GALWEM nominal resolution (km): 17 # 17 or 10; for now, just use 17 # 10-km AGRMET GFS Precip background error scale length (m): 75000. @@ -235,6 +235,8 @@ AGRMET skip superstatQC : 0 AGRMET WWMCA GRIB1 read option: 0 AGRMET PPT Background bias correction option: 0 +AGRMET precip obs file format: 1 +AGRMET sfc obs file format: 1 #-----------------------LAND SURFACE MODELS-------------------------- Noah.3.9 model timestep: 15mn Noah.3.9 restart output interval: 1mo diff --git a/lis/testcases/metforcing/afwa-cod/compute_cod_based_clouds.F90 b/lis/testcases/metforcing/afwa-cod/compute_cod_based_clouds.F90 index 916fc05de..a59bfaa51 100644 --- a/lis/testcases/metforcing/afwa-cod/compute_cod_based_clouds.F90 +++ b/lis/testcases/metforcing/afwa-cod/compute_cod_based_clouds.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/metforcing/afwa-cod/compute_type_based_clouds.F90 b/lis/testcases/metforcing/afwa-cod/compute_type_based_clouds.F90 index 07ff6b96e..6fc7d0217 100644 --- a/lis/testcases/metforcing/afwa-cod/compute_type_based_clouds.F90 +++ b/lis/testcases/metforcing/afwa-cod/compute_type_based_clouds.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/metforcing/afwa-cod/readagrmetforcing.F90 b/lis/testcases/metforcing/afwa-cod/readagrmetforcing.F90 index 8df4440d2..14dbc295d 100644 --- a/lis/testcases/metforcing/afwa-cod/readagrmetforcing.F90 +++ b/lis/testcases/metforcing/afwa-cod/readagrmetforcing.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_galwem.F90 b/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_galwem.F90 index 73f72176a..81c14471d 100644 --- a/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_galwem.F90 +++ b/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_precip_galwem.F90 b/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_precip_galwem.F90 index 68e2edaf4..d256fd0b6 100644 --- a/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_precip_galwem.F90 +++ b/lis/testcases/metforcing/afwa-galwem/AGRMET_fldbld_precip_galwem.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/metforcing/merra2/read_CONSTANT_lc.F90 b/lis/testcases/metforcing/merra2/read_CONSTANT_lc.F90 index 5858118ac..826b8c4de 100644 --- a/lis/testcases/metforcing/merra2/read_CONSTANT_lc.F90 +++ b/lis/testcases/metforcing/merra2/read_CONSTANT_lc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/metforcing/merra2/read_merra2.F90.dbg b/lis/testcases/metforcing/merra2/read_merra2.F90.dbg index f85dc974a..f83cdf198 100644 --- a/lis/testcases/metforcing/merra2/read_merra2.F90.dbg +++ b/lis/testcases/metforcing/merra2/read_merra2.F90.dbg @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/misc/history/template_main.F90 b/lis/testcases/misc/history/template_main.F90 index c8b6eecc9..4c7600a63 100644 --- a/lis/testcases/misc/history/template_main.F90 +++ b/lis/testcases/misc/history/template_main.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/testcases/surfacemodels/land/geowrsi.2/wget_testcasefiles_portal.sh b/lis/testcases/surfacemodels/land/geowrsi.2/wget_testcasefiles_portal.sh index b5ce3d554..483f84bde 100755 --- a/lis/testcases/surfacemodels/land/geowrsi.2/wget_testcasefiles_portal.sh +++ b/lis/testcases/surfacemodels/land/geowrsi.2/wget_testcasefiles_portal.sh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/eis_visualization_portal/eis-fire/index.html b/lis/utils/eis_visualization_portal/eis-fire/index.html index a4c1b1ee9..954ac7f7d 100644 --- a/lis/utils/eis_visualization_portal/eis-fire/index.html +++ b/lis/utils/eis_visualization_portal/eis-fire/index.html @@ -1,4 +1,15 @@ + diff --git a/lis/utils/eis_visualization_portal/eis-freshwater/timeseries_streamflow.html b/lis/utils/eis_visualization_portal/eis-freshwater/timeseries_streamflow.html index 9d88adb92..ceee0e052 100644 --- a/lis/utils/eis_visualization_portal/eis-freshwater/timeseries_streamflow.html +++ b/lis/utils/eis_visualization_portal/eis-freshwater/timeseries_streamflow.html @@ -1,4 +1,15 @@ + diff --git a/lis/utils/eis_visualization_portal/eis-sealevel/index.html b/lis/utils/eis_visualization_portal/eis-sealevel/index.html index 16c9c5114..2cb2792cd 100644 --- a/lis/utils/eis_visualization_portal/eis-sealevel/index.html +++ b/lis/utils/eis_visualization_portal/eis-sealevel/index.html @@ -1,4 +1,15 @@ + diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/css/about.css b/lis/utils/eis_visualization_portal/eis-toplanding/css/about.css index 20585f196..83c09362d 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/css/about.css +++ b/lis/utils/eis_visualization_portal/eis-toplanding/css/about.css @@ -1,4 +1,15 @@ /* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 + + Copyright (c) 2024 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. +-------------------------END NOTICE -- DO NOT EDIT----------------------- +*/ +/* CSS Styles */ diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.css b/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.css index e25547766..94f191a82 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.css +++ b/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.css @@ -1,3 +1,14 @@ +/* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 + + Copyright (c) 2024 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. +-------------------------END NOTICE -- DO NOT EDIT----------------------- +*/ /*! CSS Styles */ diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.min.css b/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.min.css index 82f0cef66..b747b42a2 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.min.css +++ b/lis/utils/eis_visualization_portal/eis-toplanding/css/agency.min.css @@ -1,3 +1,14 @@ +/* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 + + Copyright (c) 2024 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. +-------------------------END NOTICE -- DO NOT EDIT----------------------- +*/ /*! Main CSS styles */ body { @@ -1185,4 +1196,4 @@ ul.social-buttons li a { } ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons li a:hover { background-color: #fed136 -} \ No newline at end of file +} diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/css/style.css b/lis/utils/eis_visualization_portal/eis-toplanding/css/style.css index aab5b31be..fa2b37bee 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/css/style.css +++ b/lis/utils/eis_visualization_portal/eis-toplanding/css/style.css @@ -1,3 +1,14 @@ +/* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 + + Copyright (c) 2024 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. +-------------------------END NOTICE -- DO NOT EDIT----------------------- +*/ .sd-selection:before { height: 200px; @@ -309,4 +320,4 @@ body { content: "\f09e"; font-family: FontAwesome; padding-right: .2em -} \ No newline at end of file +} diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/css/styles.css b/lis/utils/eis_visualization_portal/eis-toplanding/css/styles.css index 274e6f3b2..552dbb282 100755 --- a/lis/utils/eis_visualization_portal/eis-toplanding/css/styles.css +++ b/lis/utils/eis_visualization_portal/eis-toplanding/css/styles.css @@ -1,4 +1,15 @@ /* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 + + Copyright (c) 2024 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. +-------------------------END NOTICE -- DO NOT EDIT----------------------- +*/ +/* CSS Styles diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/index.html b/lis/utils/eis_visualization_portal/eis-toplanding/index.html index ed2200913..262934fe8 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/index.html +++ b/lis/utils/eis_visualization_portal/eis-toplanding/index.html @@ -1,4 +1,15 @@ + diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.js b/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.js index 9667027ff..38e70714c 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.js +++ b/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.js @@ -1,3 +1,14 @@ +/* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 + + Copyright (c) 2024 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. +-------------------------END NOTICE -- DO NOT EDIT----------------------- +*/ (function($) { "use strict"; // Start of use strict diff --git a/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.min.js b/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.min.js index b8847aa0d..8dd52c9df 100644 --- a/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.min.js +++ b/lis/utils/eis_visualization_portal/eis-toplanding/js/agency.min.js @@ -1,5 +1,16 @@ /*! JavaScript */ +/* +-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- + NASA Goddard Space Flight Center + Land Information System Framework (LISF) + Version 7.5 -!function(e){"use strict";e('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function(){if(location.pathname.replace(/^\//,"")==this.pathname.replace(/^\//,"")&&location.hostname==this.hostname){var a=e(this.hash);if((a=a.length?a:e("[name="+this.hash.slice(1)+"]")).length)return e("html, body").animate({scrollTop:a.offset().top-54},1e3,"easeInOutExpo"),!1}}),e(".js-scroll-trigger").click(function(){e(".navbar-collapse").collapse("hide")}),e("body").scrollspy({target:"#mainNav",offset:56});function a(){100 $ret_code_pipe } # ________________________________________________________________ -# Main script +# +# Main part of the script # ________________________________________________________________ -# process command line arguments +# Process command line arguments ret_code=0 while getopts y:m:c:d: flag @@ -154,6 +155,7 @@ do ;; esac done + if [[ -z "$year" ]] || [[ -z "$mon" ]] || [[ -z "$configfile" ]] || [[ -z "$download" ]]; then echo "`basename ${0}`: usage: [-y year] [-m month ] [-c FULL_PATH/config_file] [-d download (Y/N)]" exit 1 @@ -163,14 +165,15 @@ echo "Month: $mon"; echo "Configfile: $configfile"; echo -# Read config file and extract information - +# Read config file and extract information: export NODE_NAME=`uname -n` if [[ $NODE_NAME =~ discover* ]] || [[ $NODE_NAME =~ borg* ]]; then cfsv2datadir=`grep fcst_download_dir $configfile | cut -d':' -f2 | tr -d "[:space:]"`"/Oper_TS/" else cfsv2datadir=`grep fcst_download_dir $configfile | cut -d':' -f2 | tr -d "[:space:]"` fi + +# Patch file info: patchfile=`grep supplementarydir $configfile | cut -d':' -f2 | tr -d "[:space:]"`"/bcsd_fcst/patch_files/patch_files_list.txt" patchdir=`grep supplementarydir $configfile | cut -d':' -f2 | tr -d "[:space:]"`"/bcsd_fcst/patch_files/" export LISFDIR=`grep LISFDIR $configfile | cut -d':' -f2 | tr -d "[:space:]"` @@ -222,11 +225,19 @@ ulimit -s unlimited fi yearmo=${year}${mon} cd ${cfsv2datadir} - echo ${year} - mkdir -p ${year} - cd ${year} - # open CFSv2 missing/corrupted file info log + echo " -- Run year :: "${year} +# - Need to account for Dec/Jan crossover + if [ ${mon} -eq "01" ]; then + year2=$((year-1)) + else + year2=${year} + fi + echo " -- Making and changing directory to target year for downloads -- "${year2} + mkdir -p ${year2} + cd ${year2} + + # Open CFSv2 missing/corrupted file info log SCRDIR=${E2ESDIR}/scratch/${yearmo}/ mkdir -p -m 775 ${SCRDIR}/ CFSV2_LOG=${SCRDIR}/CFSv2_missing_corrupted_files @@ -262,7 +273,6 @@ if [ ${mon} -eq "01" ]; then # "jan01" : ['1217', '1222', '1227'] echo "January ..." prevmon=12 - year2=$((year-1)) day1=17 day2=22 day3=27 @@ -271,7 +281,6 @@ elif [ ${mon} -eq "02" ]; then # "feb01" : ['0121', '0126', '0131'] echo "February ..." prevmon=01 - year2=${year} day1=21 day2=26 day3=31 @@ -280,7 +289,6 @@ elif [ ${mon} -eq "03" ]; then # "mar01" : ['0215', '0220', '0225'] echo "March ..." prevmon=02 - year2=${year} day1=15 day2=20 day3=25 @@ -289,7 +297,6 @@ elif [ ${mon} -eq "04" ]; then # "apr01" : ['0317', '0322', '0327'] echo "April ..." prevmon=03 - year2=${year} day1=17 day2=22 day3=27 @@ -298,7 +305,6 @@ elif [ ${mon} -eq "05" ]; then # "may01" : ['0416', '0421', '0426'] echo "May ..." prevmon=04 - year2=${year} day1=16 day2=21 day3=26 @@ -307,7 +313,6 @@ elif [ ${mon} -eq "06" ]; then # "jun01" : ['0521', '0526', '0531'] echo "June ..." prevmon=05 - year2=${year} day1=21 day2=26 day3=31 @@ -316,7 +321,6 @@ elif [ ${mon} -eq "07" ]; then # "jul01" : ['0620', '0625', '0630'] echo "July ..." prevmon=06 - year2=${year} day1=20 day2=25 day3=30 @@ -325,7 +329,6 @@ elif [ ${mon} -eq "08" ]; then # "aug01" : ['0720', '0725', '0730'] echo "August ..." prevmon=07 - year2=${year} day1=20 day2=25 day3=30 @@ -334,7 +337,6 @@ elif [ ${mon} -eq "09" ]; then # "sep01" : ['0819', '0824', '0829'] echo "September ..." prevmon=08 - year2=${year} day1=19 day2=24 day3=29 @@ -343,7 +345,6 @@ elif [ ${mon} -eq "10" ]; then # "oct01" : ['0918', '0923', '0928'] echo "October ..." prevmon=09 - year2=${year} day1=18 day2=23 day3=28 @@ -352,7 +353,6 @@ elif [ ${mon} -eq "11" ]; then # "nov01" : ['1018', '1023', '1028'] echo "November ..." prevmon=10 - year2=${year} day1=18 day2=23 day3=28 @@ -361,11 +361,11 @@ elif [ ${mon} -eq "12" ]; then # "dec01" : ['1117', '1122', '1127'] echo "December ..." prevmon=11 - year2=${year} day1=17 day2=22 day3=27 fi + echo "Previous mon,days 1-2-3 :: "${prevmon}", "${day1}"-"${day2}"-"${day3} echo " " echo "==================================================================================================" diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/bcsd_function.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/bcsd_function.py index 629b223ae..c80aba421 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/bcsd_function.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/bcsd_function.py @@ -5,9 +5,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/convert_forecast_data_to_netcdf.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/convert_forecast_data_to_netcdf.py index 4a5c9743e..810f242a2 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/convert_forecast_data_to_netcdf.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/convert_forecast_data_to_netcdf.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_f.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_f.py index fd2b7bf08..a4778bbc0 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_f.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_f.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_h.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_h.py index fca553721..af36ad435 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_h.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/nmme_reorg_h.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -15,6 +15,7 @@ #This module reorganizes #NMME preciptation forecasts #Date: May 06, 2021 +# Update: KR Arsenault; Feb-2024; CFSv2 Jan/Feb update """ from datetime import datetime @@ -129,10 +130,23 @@ def write_3d_netcdf(infile, var, varname, description, source, \ INFILE = INFILE_TEMP.format(NMME_DOWNLOAD_DIR, MODEL, MODEL, MON[MM], SYR1, EYR1) XPREC[0:29,:,:,:,:] = read_nc_files(INFILE, 'prec')[:, 0:LEAD_MON, 0:ENS_NUM, :, :] - SYR2 = 2011 - EYR2 = 2021 - INFILE = INFILE_TEMP.format(NMME_DOWNLOAD_DIR, MODEL, MODEL, MON[MM], SYR2, EYR2) - XPREC[29:40,:,:,:,:] = read_nc_files(INFILE, 'prec')[:, 0:LEAD_MON, 0:ENS_NUM, :, :] + if MON[MM] == 'Jan' or MON[MM] == 'Feb': + SYR2 = 2011 + EYR2 = 2011 + INFILE = INFILE_TEMP.format(NMME_DOWNLOAD_DIR, MODEL, MODEL, MON[MM], SYR2, EYR2) + XPREC[29,:,:,:,:] = read_nc_files(INFILE, 'prec')[:, 0:LEAD_MON, 0:ENS_NUM, :, :] + + SYR3 = 2011 + EYR3 = 2021 + INFILE = INFILE_TEMP.format(NMME_DOWNLOAD_DIR, MODEL, MODEL, MON[MM], SYR3, EYR3) + XPREC[30:40,:,:,:,:] = read_nc_files(INFILE, 'prec')[:, 0:LEAD_MON, 0:ENS_NUM, :, :] + + else: + SYR2 = 2011 + EYR2 = 2021 + INFILE = INFILE_TEMP.format(NMME_DOWNLOAD_DIR, MODEL, MODEL, MON[MM], SYR2, EYR2) + XPREC[29:40,:,:,:,:] = read_nc_files(INFILE, 'prec')[:, 0:LEAD_MON, 0:ENS_NUM, :, :] + elif NMME_MODEL == 'GEOSv2': MODEL = 'NASA-GEOSS2S' if MM == 0: diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/process_forecast_data.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/process_forecast_data.py index 0f535825b..190a868d8 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/process_forecast_data.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/bcsd_library/process_forecast_data.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/check_preprocess_forecast_files.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/check_preprocess_forecast_files.py index 20a6c0b10..fb5e32244 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/check_preprocess_forecast_files.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/check_preprocess_forecast_files.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_01.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_01.py index 4b31b8e29..697fc6243 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_01.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_01.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_03.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_03.py index b6b9995ef..b098180d2 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_03.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_03.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_04.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_04.py index f22c5e5d8..d5d68dfb5 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_04.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_04.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_05.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_05.py index 9af39fd04..660120d42 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_05.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_05.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_06.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_06.py index 32a225787..6c873a69c 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_06.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_06.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_07.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_07.py index 0bd91c1f1..b00a7cc8e 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_07.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_07.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_08.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_08.py index 97e343a89..211d86476 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_08.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_08.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_09.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_09.py index 276779d90..6724114e8 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_09.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_09.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_10.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_10.py index 9647afd73..97979eda6 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_10.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_10.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_11.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_11.py index fc3ec4413..bf2cb14a5 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_11.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_11.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_12.py b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_12.py index 6cb802a3b..e56073165 100644 --- a/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_12.py +++ b/lis/utils/usaf/s2s/s2s_modules/bcsd_fcst/forecast_task_12.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/ldt_ics/generate_ldtconfig_files_ensrst_nrt.py b/lis/utils/usaf/s2s/s2s_modules/ldt_ics/generate_ldtconfig_files_ensrst_nrt.py index b119275b4..482f7a84f 100644 --- a/lis/utils/usaf/s2s/s2s_modules/ldt_ics/generate_ldtconfig_files_ensrst_nrt.py +++ b/lis/utils/usaf/s2s/s2s_modules/ldt_ics/generate_ldtconfig_files_ensrst_nrt.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/lis_darun/generate_lisda_config_nrt.py b/lis/utils/usaf/s2s/s2s_modules/lis_darun/generate_lisda_config_nrt.py index 2bc46aa49..3481acb7e 100644 --- a/lis/utils/usaf/s2s/s2s_modules/lis_darun/generate_lisda_config_nrt.py +++ b/lis/utils/usaf/s2s/s2s_modules/lis_darun/generate_lisda_config_nrt.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/lis_fcst/generate_lis_config_scriptfiles_fcst.py b/lis/utils/usaf/s2s/s2s_modules/lis_fcst/generate_lis_config_scriptfiles_fcst.py index c9555a052..561d7bb1f 100644 --- a/lis/utils/usaf/s2s/s2s_modules/lis_fcst/generate_lis_config_scriptfiles_fcst.py +++ b/lis/utils/usaf/s2s/s2s_modules/lis_fcst/generate_lis_config_scriptfiles_fcst.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2smetric/convert_s2s_anom_cf.py b/lis/utils/usaf/s2s/s2s_modules/s2smetric/convert_s2s_anom_cf.py index 81fbeefcd..820168093 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2smetric/convert_s2s_anom_cf.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2smetric/convert_s2s_anom_cf.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2smetric/make_s2s_median_metric_geotiff.py b/lis/utils/usaf/s2s/s2s_modules/s2smetric/make_s2s_median_metric_geotiff.py index 20c3b0977..9f7066490 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2smetric/make_s2s_median_metric_geotiff.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2smetric/make_s2s_median_metric_geotiff.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2smetric/merge_s2s_anom_cf.py b/lis/utils/usaf/s2s/s2s_modules/s2smetric/merge_s2s_anom_cf.py index 464f24b08..62db7cb09 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2smetric/merge_s2s_anom_cf.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2smetric/merge_s2s_anom_cf.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py index 8a2ee8be0..a90ffa6d5 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_anom_verify.py @@ -1,9 +1,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_hybas.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_hybas.py index 7525ccd58..d717d99ed 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_hybas.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_hybas.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_mena.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_mena.py index 8ad0d6657..e5386afa8 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_mena.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_mena.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_s2smetrics.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_s2smetrics.py index 14d1d2ea0..417844626 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_s2smetrics.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_s2smetrics.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_streamflow_anom.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_streamflow_anom.py index 9fed34f9c..3529abffb 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_streamflow_anom.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_streamflow_anom.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_utils.py b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_utils.py index d35e17a53..d4fb256bf 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_utils.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2splots/plot_utils.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2spost/daily_s2spost_nc.py b/lis/utils/usaf/s2s/s2s_modules/s2spost/daily_s2spost_nc.py index 7f8dc0e52..481d45535 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2spost/daily_s2spost_nc.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2spost/daily_s2spost_nc.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2spost/monthly_s2spost_nc.py b/lis/utils/usaf/s2s/s2s_modules/s2spost/monthly_s2spost_nc.py index 97be650d1..4bc67e4a1 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2spost/monthly_s2spost_nc.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2spost/monthly_s2spost_nc.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_1month.py b/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_1month.py index f503aee49..9324d20f1 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_1month.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_1month.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_9months.py b/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_9months.py index 81f3da990..3e85ed680 100644 --- a/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_9months.py +++ b/lis/utils/usaf/s2s/s2s_modules/s2spost/run_s2spost_9months.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/s2s/s2s_modules/shared/utils.py b/lis/utils/usaf/s2s/s2s_modules/shared/utils.py index aab68a57a..562a1bd62 100644 --- a/lis/utils/usaf/s2s/s2s_modules/shared/utils.py +++ b/lis/utils/usaf/s2s/s2s_modules/shared/utils.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lis/utils/usaf/surf2lisnc_3_17km_4pt.py b/lis/utils/usaf/surf2lisnc_3_17km_4pt.py index 263fc635e..46f981dfd 100755 --- a/lis/utils/usaf/surf2lisnc_3_17km_4pt.py +++ b/lis/utils/usaf/surf2lisnc_3_17km_4pt.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/arch/Config.pl b/lvt/arch/Config.pl index 166737848..43e7b04b9 100755 --- a/lvt/arch/Config.pl +++ b/lvt/arch/Config.pl @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -116,7 +116,7 @@ } elsif($sys_arch eq "Darwin_gfortran" || $sys_arch eq "linux_gfortran") { $sys_opt = "-g -Wall -Wcharacter-truncation"; - $sys_opt .= " -Wconversion-extra -Wextra -Wpedantic -Wrealloc-lhs"; + $sys_opt .= " -Wconversion-extra -Wextra -Wrealloc-lhs"; $sys_opt .= " -Wrealloc-lhs-all"; # Run-time options $sys_opt .= " -ffpe-trap=invalid,zero,overflow"; diff --git a/lvt/compile b/lvt/compile index 7601ad546..62251d96b 100755 --- a/lvt/compile +++ b/lvt/compile @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/configs/lvt.config.adoc b/lvt/configs/lvt.config.adoc index 0676ebcf7..0c3f15a93 100644 --- a/lvt/configs/lvt.config.adoc +++ b/lvt/configs/lvt.config.adoc @@ -118,6 +118,7 @@ LVT output methodology: "2d gridspace" | "`ANSA SWE`" | ANSA SWE retrievals | "`CPC precipitation`" | CPC unified precipitation product | "`GPM IMERG`" | IMERG precipitation data product +| "`GPM IMERG Monthly`" | IMERG-Monthly precipitation product | "`USGS streamflow`" | USGS streamflow observations | "`Naturalized streamflow`" | Naturalized streamflow estimates | "`FLUXNET MTE`" | Gridded FLUXNET MTE data from MPI @@ -164,6 +165,7 @@ LVT output methodology: "2d gridspace" | "`THySM`" | Thermal Hydraulic disaggregation of Soil Moisture | "`MCD15A2H LAI`" | MODIS MCD15A2H LAI data | "`GRUN runoff`" | GRUN runoff data +| "`COAMPSout`" | COAMPS forcing data | "`OPL E SMAP soil moisture retrieval`" | Operational enhanced SMAP soil moisture retrieval data |=== @@ -1275,6 +1277,21 @@ IMERG version: V06B IMERG product: final .... +==== GPM IMERG Monthly precipitation data + +`IMERG monthly data directory:` specifies the location of the GPM IMERG Monthly precipitation product + +`IMERG monthly version:` specifies the version of the GPM IMERG Monthly precipitation product. Most current version is V07A. + +`IMERG monthly product:` specifies the GPM IMERG Monthly precipitation product. Current option is: final. (early and late will be added later) + +.Example _lvt.config_ entry +.... +IMERG monthly data directory: input/IMERGF_V07A_Monthly +IMERG monthly version: V07A +IMERG monthly product: final +.... + ==== ESA CCI soil moisture data `ESA CCI soil moisture data directory:` specifies the location of the ESA CCI soil moisture data @@ -2325,10 +2342,32 @@ THySM data directory: ../THySM .Example _lvt.config_ entry .... + MCD15A2H data directory: ./MCD15A2H.006/2019 .... [[ssec-optue]] + +==== COAMPS forcing data + +`COAMPS output forcing directory:` specifies the location of the COAMPS output forcing data directory. + +.Example _lvt.config_ entry +.... +COAMPS output forcing directory: ../COAMPS/EU/COAMPS_forcing +.... + +`COAMPS nest id:` specifies the nest id. + +COAMPS forcing usually provides forcing for 2 nests. The first nest +is 15km resolution and the second nest is a smaller sub-domain with +a resolution of 5km. + +.Example _lvt.config_ entry +.... +COAMPS nest id: 1 +.... + === OptUE processing options This section of the config file specifies the details of the optimization and uncertainty estimation processing options, and the specicialized options to analyze outputs from the Optimization/Uncertainy Estimation algorithms. @@ -2655,3 +2694,23 @@ Number of fields in the LIS output: 11 .... Number of vertical levels in the LIS output: 4 .... + +`LIS output number of soil moisture layers:` specifies the number of soil moisture layers used in the LIS output. This is optional and defaults to 0. + +`LIS output soil moisture layer thickness:` specifies the number of soil moisture layers used in the LIS output. These values will be written to the NetCDF as global attributes and should match those used in the LIS configuration file to define the LSM soil moisture layer thicknesses. If the number of soil moisture layers is omitted or set to 0, this entry is not read and soil moisture layer thicknesses are not written to the NetCDF global attributes. + +.Example _lvt.config_ entry +.... +LIS output number of soil moisture layers: 4 +LIS output soil moisture layer thickness: 0.1 0.3 0.6 1.0 +.... + +`LIS output number of soil temperature layers:` specifies the thicknesses of soil moisture layers in the LIS output. This is optional and defaults to 0. + +`LIS output soil temperature layer thickness:` specifies the thicknesses of soil temperature layers in the LIS output. These values will be written to the NetCDF as global attributes and should match those used in the LIS configuration file to define the LSM soil temperature layer thicknesses. If the number of soil temperature layers is omitted or set to 0, this entry is not read and soil temperature layer thicknesses are not written to the NetCDF global attributes. + +.Example _lvt.config_ entry +.... +LIS output number of soil temperature layers: 4 +LIS output soil temperature layer thickness: 0.1 0.3 0.6 1.0 +.... diff --git a/lvt/configure b/lvt/configure index 604747d0a..b9b5197b2 100755 --- a/lvt/configure +++ b/lvt/configure @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/FTable.c b/lvt/core/FTable.c index 32c1e02d5..016fbc30a 100644 --- a/lvt/core/FTable.c +++ b/lvt/core/FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/FTable.h b/lvt/core/FTable.h index 7e88eae1d..976dde057 100644 --- a/lvt/core/FTable.h +++ b/lvt/core/FTable.h @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_CIMod.F90 b/lvt/core/LVT_CIMod.F90 index 2e1f54a4b..81f46f8e4 100644 --- a/lvt/core/LVT_CIMod.F90 +++ b/lvt/core/LVT_CIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_DAMod.F90 b/lvt/core/LVT_DAMod.F90 index 7cd2937a3..af4d94736 100644 --- a/lvt/core/LVT_DAMod.F90 +++ b/lvt/core/LVT_DAMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_DataStreamsMod.F90 b/lvt/core/LVT_DataStreamsMod.F90 index 2bef51639..511434a37 100644 --- a/lvt/core/LVT_DataStreamsMod.F90 +++ b/lvt/core/LVT_DataStreamsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_InformationContentMod.F90 b/lvt/core/LVT_InformationContentMod.F90 index 18b76133d..9cc09f9c9 100644 --- a/lvt/core/LVT_InformationContentMod.F90 +++ b/lvt/core/LVT_InformationContentMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_LISoutputHandlerMod.F90 b/lvt/core/LVT_LISoutputHandlerMod.F90 index 35d0d6d6d..d454f0c09 100644 --- a/lvt/core/LVT_LISoutputHandlerMod.F90 +++ b/lvt/core/LVT_LISoutputHandlerMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_LISpostMod.F90 b/lvt/core/LVT_LISpostMod.F90 index ea9fbbb80..42563c37d 100644 --- a/lvt/core/LVT_LISpostMod.F90 +++ b/lvt/core/LVT_LISpostMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -62,6 +62,8 @@ module LVT_LISpostMod integer :: npes integer :: nfields integer :: nlevels + integer :: nsoilmoistlayers, nsoiltemplayers + real, pointer :: soilmoistlyrthk(:), soiltemplyrthk(:) end type lispost_type_dec type(lispost_type_dec) :: LVT_LISpost @@ -87,7 +89,7 @@ subroutine LVT_initialize_LISpost() ! !EOP - integer :: rc + integer :: i, rc call ESMF_ConfigGetAttribute(LVT_config,LVT_LISpost%npes,& label="Number of processors used in the LIS output generation:",rc=rc) @@ -98,6 +100,36 @@ subroutine LVT_initialize_LISpost() call ESMF_ConfigGetAttribute(LVT_config,LVT_LISpost%nlevels,& label="Number of vertical levels in the LIS output:",rc=rc) call LVT_verify(rc,'Number of vertical levels in the LIS output: option not specified in the config file') + call ESMF_ConfigGetAttribute(LVT_config, LVT_LISpost%nsoilmoistlayers, & + label="LIS output number of soil moisture layers:", default=0, rc=rc) + call ESMF_ConfigGetAttribute(LVT_config, LVT_LISpost%nsoiltemplayers, & + label="LIS output number of soil temperature layers:", default=0, rc=rc) + + if (LVT_LISpost%nsoilmoistlayers .gt. 0) then + allocate(LVT_LISpost%soilmoistlyrthk(LVT_LISpost%nsoilmoistlayers)) + + call ESMF_ConfigFindLabel(LVT_config, "LIS output soil moisture layer thickness:", rc=rc) + call LVT_verify(rc, 'LIS output soil moisture layer thickness: option not specified in the config file') + + do i=1, LVT_LISpost%nsoilmoistlayers + call ESMF_ConfigGetAttribute(LVT_config,LVT_LISpost%soilmoistlyrthk(i), rc=rc) + call LVT_verify(rc, 'The number of soil moisture layers indicated in the & + config file is greater than the number of thickness values provided') + enddo + endif + + if (LVT_LISpost%nsoiltemplayers .gt. 0) then + allocate(LVT_LISpost%soiltemplyrthk(LVT_LISpost%nsoiltemplayers)) + + call ESMF_ConfigFindLabel(LVT_config, "LIS output soil temperature layer thickness:", rc=rc) + call LVT_verify(rc, 'LIS output soil temperature layer thickness: option not specified in the config file') + + do i=1, LVT_LISpost%nsoilmoistlayers + call ESMF_ConfigGetAttribute(LVT_config,LVT_LISpost%soiltemplyrthk(i), rc=rc) + call LVT_verify(rc, 'The number of soil temperature layers indicated in the & + config file is greater than the number of thickness values provided') + enddo + endif end subroutine LVT_initialize_LISpost @@ -271,12 +303,24 @@ subroutine LVT_process_LISoutput 'nf90_def_att for lat failed in LVT_LISpostMod') ! Global attributes -! call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"NUM_SOIL_LAYERS", & -! nsoillayers),& -! 'nf90_put_att for title failed in LVT_LISpostMod') -! call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"SOIL_LAYER_THICKNESSES", & -! lyrthk),& -! 'nf90_put_att for title failed in LVT_LISpostMod') + if (LVT_LISpost%nsoilmoistlayers .gt. 0) then + call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"NUM_SOIL_MOIST_LAYERS", & + LVT_LISpost%nsoilmoistlayers),& + 'nf90_put_att for NUM_SOIL_MOIST_LAYERS failed in LVT_LISpostMod') + call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"SOIL_MOIST_LAYER_THICKNESSES", & + LVT_LISpost%soilmoistlyrthk),& + 'nf90_put_att for SOIL_MOIST_LAYER_THICKNESSES failed in LVT_LISpostMod') + endif + + if (LVT_LISpost%nsoiltemplayers .gt. 0) then + call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"NUM_SOIL_TEMP_LAYERS", & + LVT_LISpost%nsoiltemplayers),& + 'nf90_put_att for NUM_SOIL_TEMP_LAYERS failed in LVT_LISpostMod') + call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"SOIL_TEMP_LAYER_THICKNESSES", & + LVT_LISpost%soiltemplyrthk),& + 'nf90_put_att for SOIL_TEMP_LAYER_THICKNESSES failed in LVT_LISpostMod') + endif + call LVT_verify(nf90_put_att(ftn_nc,NF90_GLOBAL,"title", & "LIS land surface model output"),& 'nf90_put_att for title failed in LVT_LISpostMod') diff --git a/lvt/core/LVT_LMLCMod.F90 b/lvt/core/LVT_LMLCMod.F90 index 5fac9e0a1..a104ff950 100644 --- a/lvt/core/LVT_LMLCMod.F90 +++ b/lvt/core/LVT_LMLCMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_NumericalRecipesMod.F90 b/lvt/core/LVT_NumericalRecipesMod.F90 index fe8484a37..3f0d28729 100644 --- a/lvt/core/LVT_NumericalRecipesMod.F90 +++ b/lvt/core/LVT_NumericalRecipesMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_PRIV_gridMod.F90 b/lvt/core/LVT_PRIV_gridMod.F90 index 921457404..9a3f70bca 100644 --- a/lvt/core/LVT_PRIV_gridMod.F90 +++ b/lvt/core/LVT_PRIV_gridMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_PRIV_rcMod.F90 b/lvt/core/LVT_PRIV_rcMod.F90 index ccd6736dc..46aa432ee 100644 --- a/lvt/core/LVT_PRIV_rcMod.F90 +++ b/lvt/core/LVT_PRIV_rcMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_PRIV_tileMod.F90 b/lvt/core/LVT_PRIV_tileMod.F90 index 3d476109e..65c6804f1 100644 --- a/lvt/core/LVT_PRIV_tileMod.F90 +++ b/lvt/core/LVT_PRIV_tileMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_SortingMod.F90 b/lvt/core/LVT_SortingMod.F90 index eb7c3c8d7..122d1c767 100644 --- a/lvt/core/LVT_SortingMod.F90 +++ b/lvt/core/LVT_SortingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_StratStatsMod.F90 b/lvt/core/LVT_StratStatsMod.F90 index ef36b554a..5c6f08c66 100644 --- a/lvt/core/LVT_StratStatsMod.F90 +++ b/lvt/core/LVT_StratStatsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_String_Utility.F90 b/lvt/core/LVT_String_Utility.F90 index 7c7d036b7..d80c7122f 100644 --- a/lvt/core/LVT_String_Utility.F90 +++ b/lvt/core/LVT_String_Utility.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_TSMod.F90 b/lvt/core/LVT_TSMod.F90 index 2b734d80f..3dc3d3f21 100644 --- a/lvt/core/LVT_TSMod.F90 +++ b/lvt/core/LVT_TSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_constantsMod.F90 b/lvt/core/LVT_constantsMod.F90 index f4886595b..0ed99fcb9 100644 --- a/lvt/core/LVT_constantsMod.F90 +++ b/lvt/core/LVT_constantsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_coreMod.F90 b/lvt/core/LVT_coreMod.F90 index 31502c6c9..f31908fea 100644 --- a/lvt/core/LVT_coreMod.F90 +++ b/lvt/core/LVT_coreMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_create_subdirs.c b/lvt/core/LVT_create_subdirs.c index 368f1af39..a9e33adf7 100644 --- a/lvt/core/LVT_create_subdirs.c +++ b/lvt/core/LVT_create_subdirs.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_domainMod.F90 b/lvt/core/LVT_domainMod.F90 index dd1561101..cb22789f2 100644 --- a/lvt/core/LVT_domainMod.F90 +++ b/lvt/core/LVT_domainMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_domain_FTable.c b/lvt/core/LVT_domain_FTable.c index fe6a9f1cf..066ad9691 100644 --- a/lvt/core/LVT_domain_FTable.c +++ b/lvt/core/LVT_domain_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_fileIOMod.F90 b/lvt/core/LVT_fileIOMod.F90 index d2d027072..57ec665c0 100644 --- a/lvt/core/LVT_fileIOMod.F90 +++ b/lvt/core/LVT_fileIOMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_getADCIndex.F90 b/lvt/core/LVT_getADCIndex.F90 index a5f0fd7e7..dba476c1a 100644 --- a/lvt/core/LVT_getADCIndex.F90 +++ b/lvt/core/LVT_getADCIndex.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_getSeasonalCycleIndex.F90 b/lvt/core/LVT_getSeasonalCycleIndex.F90 index 2818da97b..4434923e4 100644 --- a/lvt/core/LVT_getSeasonalCycleIndex.F90 +++ b/lvt/core/LVT_getSeasonalCycleIndex.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_histDataMod.F90 b/lvt/core/LVT_histDataMod.F90 index 28f1fe089..ca20525b2 100644 --- a/lvt/core/LVT_histDataMod.F90 +++ b/lvt/core/LVT_histDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_historyMod.F90 b/lvt/core/LVT_historyMod.F90 index f5c29d384..1cb312e47 100644 --- a/lvt/core/LVT_historyMod.F90 +++ b/lvt/core/LVT_historyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_logMod.F90 b/lvt/core/LVT_logMod.F90 index bca5a1e15..01cdc2cfd 100644 --- a/lvt/core/LVT_logMod.F90 +++ b/lvt/core/LVT_logMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_mapSurfaceModelType.F90 b/lvt/core/LVT_mapSurfaceModelType.F90 index 69fbf4635..69f1767a9 100644 --- a/lvt/core/LVT_mapSurfaceModelType.F90 +++ b/lvt/core/LVT_mapSurfaceModelType.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_metric_FTable.c b/lvt/core/LVT_metric_FTable.c index b37c486e7..46f0fcb53 100644 --- a/lvt/core/LVT_metric_FTable.c +++ b/lvt/core/LVT_metric_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_mpDecomp.c b/lvt/core/LVT_mpDecomp.c index 066acf831..afde6a35e 100644 --- a/lvt/core/LVT_mpDecomp.c +++ b/lvt/core/LVT_mpDecomp.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_mpiMod.F90 b/lvt/core/LVT_mpiMod.F90 index 5b3f4b656..0ee6e1c2e 100644 --- a/lvt/core/LVT_mpiMod.F90 +++ b/lvt/core/LVT_mpiMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_navgemMod.F90 b/lvt/core/LVT_navgemMod.F90 index fc8a40d45..bfc052939 100644 --- a/lvt/core/LVT_navgemMod.F90 +++ b/lvt/core/LVT_navgemMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_obs_FTable.c b/lvt/core/LVT_obs_FTable.c index 7a6c053e5..4b86af378 100644 --- a/lvt/core/LVT_obs_FTable.c +++ b/lvt/core/LVT_obs_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_optUEMod.F90 b/lvt/core/LVT_optUEMod.F90 index b5f73bd55..91f104365 100644 --- a/lvt/core/LVT_optUEMod.F90 +++ b/lvt/core/LVT_optUEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_readConfig.F90 b/lvt/core/LVT_readConfig.F90 index c1e11dfe7..49a1d4465 100644 --- a/lvt/core/LVT_readConfig.F90 +++ b/lvt/core/LVT_readConfig.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_readMetricsAttributes.F90 b/lvt/core/LVT_readMetricsAttributes.F90 index c99c166bd..0ceb5b094 100644 --- a/lvt/core/LVT_readMetricsAttributes.F90 +++ b/lvt/core/LVT_readMetricsAttributes.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_runmode_FTable.c b/lvt/core/LVT_runmode_FTable.c index 7e77c2c94..f100105db 100644 --- a/lvt/core/LVT_runmode_FTable.c +++ b/lvt/core/LVT_runmode_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_soilsMod.F90 b/lvt/core/LVT_soilsMod.F90 index c2c678233..c8a02606f 100644 --- a/lvt/core/LVT_soilsMod.F90 +++ b/lvt/core/LVT_soilsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_statsDataMod.F90 b/lvt/core/LVT_statsDataMod.F90 index b1a7c4cf6..ceb72557e 100644 --- a/lvt/core/LVT_statsDataMod.F90 +++ b/lvt/core/LVT_statsDataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_statsMod.F90 b/lvt/core/LVT_statsMod.F90 index bf4165bd0..7b21e433b 100644 --- a/lvt/core/LVT_statsMod.F90 +++ b/lvt/core/LVT_statsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_timeMgrMod.F90 b/lvt/core/LVT_timeMgrMod.F90 index d007d7e86..dc1c8dbc6 100644 --- a/lvt/core/LVT_timeMgrMod.F90 +++ b/lvt/core/LVT_timeMgrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_topoMod.F90 b/lvt/core/LVT_topoMod.F90 index 60531a8f9..f287308d9 100644 --- a/lvt/core/LVT_topoMod.F90 +++ b/lvt/core/LVT_topoMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_trainingMod.F90 b/lvt/core/LVT_trainingMod.F90 index 978be77d8..6b634dd71 100644 --- a/lvt/core/LVT_trainingMod.F90 +++ b/lvt/core/LVT_trainingMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/LVT_training_FTable.c b/lvt/core/LVT_training_FTable.c index 6641e0eb2..c4b3998bc 100644 --- a/lvt/core/LVT_training_FTable.c +++ b/lvt/core/LVT_training_FTable.c @@ -1,9 +1,9 @@ //-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- // NASA Goddard Space Flight Center // Land Information System Framework (LISF) -// Version 7.4 +// Version 7.5 // -// Copyright (c) 2022 United States Government as represented by the +// Copyright (c) 2024 United States Government as represented by the // Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. //-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/bak/LVT_DataStream1Mod.F90 b/lvt/core/bak/LVT_DataStream1Mod.F90 index 9a5062b58..eef3006b7 100644 --- a/lvt/core/bak/LVT_DataStream1Mod.F90 +++ b/lvt/core/bak/LVT_DataStream1Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/core/bak/LVT_DataStream2Mod.F90 b/lvt/core/bak/LVT_DataStream2Mod.F90 index 0a3b6468c..0fc690257 100644 --- a/lvt/core/bak/LVT_DataStream2Mod.F90 +++ b/lvt/core/bak/LVT_DataStream2Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/3B42V7/TRMM3B42V7_dataMod.F90 b/lvt/datastreams/3B42V7/TRMM3B42V7_dataMod.F90 index c2b83740a..b7096810c 100644 --- a/lvt/datastreams/3B42V7/TRMM3B42V7_dataMod.F90 +++ b/lvt/datastreams/3B42V7/TRMM3B42V7_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/3B42V7/readTRMM3B42V7data.F90 b/lvt/datastreams/3B42V7/readTRMM3B42V7data.F90 index 399e277cc..89757947e 100644 --- a/lvt/datastreams/3B42V7/readTRMM3B42V7data.F90 +++ b/lvt/datastreams/3B42V7/readTRMM3B42V7data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/AGRMET/AGRMET_dataMod.F90 b/lvt/datastreams/AGRMET/AGRMET_dataMod.F90 index c199edf61..6f194afde 100644 --- a/lvt/datastreams/AGRMET/AGRMET_dataMod.F90 +++ b/lvt/datastreams/AGRMET/AGRMET_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/AGRMET/readAGRMETdata.F90 b/lvt/datastreams/AGRMET/readAGRMETdata.F90 index 64a677796..98b157b4a 100644 --- a/lvt/datastreams/AGRMET/readAGRMETdata.F90 +++ b/lvt/datastreams/AGRMET/readAGRMETdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -61,6 +61,8 @@ subroutine readAGRMETdata(source) ! This greatly reduces run-time. ! 13 Nov 2017: Eric Kemp (SSAI). Added specific humidity forcing. ! 02 Nov 2018: Eric Kemp (SSAI). Added support for n1280e domain. +! 02 Jan 2023: Mahdi Navari. Modified to read instantaneous forcing variable. +! 04 Jan 2023: Mahdi Navari. Added surface pressure and wind forcing. ! !EOP @@ -144,6 +146,15 @@ subroutine readAGRMETdata(source) qair(agrmetdata(source)%nc*agrmetdata(source)%nr) ! EMK Specific humidity integer :: & nqair(agrmetdata(source)%nc*agrmetdata(source)%nr) + real :: & + psurf(agrmetdata(source)%nc*agrmetdata(source)%nr) ! MN surface pressure + integer :: & + npsurf(agrmetdata(source)%nc*agrmetdata(source)%nr) + real :: & + wind(agrmetdata(source)%nc*agrmetdata(source)%nr) ! MN wind speed + integer :: & + nwind(agrmetdata(source)%nc*agrmetdata(source)%nr) + logical*1 :: & lb(agrmetdata(source)%nc*agrmetdata(source)%nr) @@ -152,12 +163,16 @@ subroutine readAGRMETdata(source) integer :: swe_topt, snod_topt integer :: sm_topt,st_topt integer :: qair_topt ! EMK + integer :: psurf_topt ! MN + integer :: wind_topt ! MN integer :: swd_index, lwd_index,rainf_index, tair_index integer :: qle_index, qh_index, qg_index integer :: swe_index, snod_index integer :: sm_index, st_index integer :: qair_index ! EMK + integer :: psurf_index ! MN + integer :: wind_index ! MN real :: varfield(LVT_rc%lnc,LVT_rc%lnr) integer :: yr1, mo1, da1,hr1,mn1,ss1 @@ -181,10 +196,11 @@ subroutine readAGRMETdata(source) nr = agrmetdata(source)%nr !These are hardcoded for now. 1-instantaneous, 7-timeavged - swd_topt = 7 - lwd_topt = 7 +! MN I have changed the topt from 7 to 1 then LVT can read them. + swd_topt = 1 !7 + lwd_topt = 1 !7 rainf_topt =133 - tair_topt = 7 + tair_topt = 1 !7 qle_topt = 7 qh_topt = 7 qg_topt = 7 @@ -192,7 +208,9 @@ subroutine readAGRMETdata(source) snod_topt = 1 sm_topt = 7 st_topt = 7 - qair_topt = 7 ! EMK + qair_topt = 1 !7 ! EMK + psurf_topt = 1 !7 ! MN + wind_topt = 1 !7 ! MN !gribids swd_index = 145 @@ -208,12 +226,14 @@ subroutine readAGRMETdata(source) st_index = 85 ! tskin_index = 148 qair_index = 51 ! EMK + psurf_index = 1 ! MN + wind_index = 209 !180 ! MN yr1 = LVT_rc%dyr(source) mo1 = LVT_rc%dmo(source) da1 = LVT_rc%dda(source) hr1 = LVT_rc%dhr(source) - mn1 = 0 + mn1 = LVT_rc%dmn(source) ss1 = 0 swd = 0 @@ -263,6 +283,10 @@ subroutine readAGRMETdata(source) qair = 0 ! EMK nqair = 0 ! EMK + psurf = 0 !MN + npsurf = 0 !MN + wind = 0 !MN + nwind = 0 !MN call ESMF_TimeSet(time1,yy=yr1, mm=mo1, dd=da1, & h=hr1,m=mn1,s=ss1,calendar=LVT_calendar, rc=status) @@ -283,7 +307,7 @@ subroutine readAGRMETdata(source) call LVT_verify(status) call create_agrmetdata_filename(source, & - yr2, mo2, da2, hr2, filename) + yr2, mo2, da2, hr2, mn2, filename) inquire(file=trim(filename),exist=file_exists) @@ -556,6 +580,34 @@ subroutine readAGRMETdata(source) enddo enddo + ! MN...Support surface pressure + elseif(pid.eq.psurf_index.and.tid.eq.psurf_topt) then + + call grib_get(igrib,"values",var,iret) + call LVT_verify(iret,'grib_get failed for values in readAgrmetdata') + do r=1,nr + do c=1,nc + if(var(c+(r-1)*nc).ne.9999.0) then + psurf(c+(r-1)*nc) = psurf(c+(r-1)*nc)+var(c+(r-1)*nc) + npsurf(c+(r-1)*nc) = npsurf(c+(r-1)*nc)+1 + endif + enddo + enddo + + ! MN...Support wind + elseif(pid.eq.wind_index.and.tid.eq.wind_topt) then + + call grib_get(igrib,"values",var,iret) + call LVT_verify(iret,'grib_get failed for values in readAgrmetdata') + do r=1,nr + do c=1,nc + if(var(c+(r-1)*nc).ne.9999.0) then + wind(c+(r-1)*nc) = wind(c+(r-1)*nc)+var(c+(r-1)*nc) + nwind(c+(r-1)*nc) = nwind(c+(r-1)*nc)+1 + endif + enddo + enddo + endif call grib_release(igrib,iret) @@ -634,6 +686,16 @@ subroutine readAGRMETdata(source) call LVT_logSingleDataStreamVar(LVT_MOC_qairforc,source,varfield,vlevel=1,& units="kg/kg") + ! MN...Support surface pressure + call interp_agrmetvar(source,nc,nr, psurf, npsurf, varfield) + call LVT_logSingleDataStreamVar(LVT_MOC_PSURFFORC,source,varfield,vlevel=1,& + units="Pa") + + ! MN...Support wind + call interp_agrmetvar(source,nc,nr, wind, nwind, varfield) + call LVT_logSingleDataStreamVar(LVT_MOC_WINDFORC,source,varfield,vlevel=1,& + units="m/s") + end subroutine readAGRMETdata !BOP @@ -724,7 +786,8 @@ end subroutine interp_agrmetvar ! \label{create_agrmetdata_filename} ! ! !INTERFACE: -subroutine create_agrmetdata_filename(source, yr, mo, da, hr, filename) +subroutine create_agrmetdata_filename(source, yr, mo, da, hr, mn, & + filename) ! !USES: use AGRMET_dataMod use LVT_logMod, only: LVT_endrun, LVT_logunit @@ -733,12 +796,13 @@ subroutine create_agrmetdata_filename(source, yr, mo, da, hr, filename) ! !INPUT PARAMETERS: ! - integer, intent(in) :: source - integer :: yr - integer :: mo - integer :: da - integer :: hr - character(len=*) :: filename + integer, intent(in) :: source + integer, intent(in) :: yr + integer, intent(in) :: mo + integer, intent(in) :: da + integer, intent(in) :: hr + integer, intent(in) :: mn + character(len=*), intent(out) :: filename ! ! !DESCRIPTION: @@ -752,6 +816,7 @@ subroutine create_agrmetdata_filename(source, yr, mo, da, hr, filename) ! \item[mo] month of data ! \item[da] day of data ! \item[hr] hour of data +! \item[mn] minute of data ! \item[filename] Name of the AGRMET file ! \end{description} ! @@ -765,11 +830,13 @@ subroutine create_agrmetdata_filename(source, yr, mo, da, hr, filename) character*2 :: fmo character*2 :: fda character*2 :: fhr + character*2 :: fmn write(unit=fyr, fmt='(i4.4)') yr write(unit=fmo, fmt='(i2.2)') mo write(unit=fda, fmt='(i2.2)') da write(unit=fhr, fmt='(i2.2)') hr + write(unit=fmn, fmt='(i2.2)') mn if (trim(agrmetdata(source)%gridname) == "GLOBAL") then ! Old 0.25 deg deterministic run @@ -780,7 +847,9 @@ subroutine create_agrmetdata_filename(source, yr, mo, da, hr, filename) '_DC.'//trim(agrmetdata(source)%data_category)//'_GP.LIS_GR'//& '.C0P25DEG_AR.'//trim(agrmetdata(source)%area_of_data)//& '_PA.03-HR-SUM_DD.'//& - trim(fyr)//trim(fmo)//trim(fda)//'_DT.'//trim(fhr)//'00_DF.GR1' + !trim(fyr)//trim(fmo)//trim(fda)//'_DT.'//trim(fhr)//'00_DF.GR1' + trim(fyr)//trim(fmo)//trim(fda)//'_DT.'//trim(fhr)// & + trim(fmn)//'_DF.GR1' else if (trim(agrmetdata(source)%gridname) == "n1280e") then ! In-house Bratseth run matching GALWEM n1280e domain filename = trim(agrmetdata(source)%odir)//'/'//trim(fyr)//trim(fmo)//trim(fda)//'/'& @@ -790,8 +859,9 @@ subroutine create_agrmetdata_filename(source, yr, mo, da, hr, filename) '_DC.'//trim(agrmetdata(source)%data_category)//'_GP.LIS_GR'//& '.C0P09DEG_AR.'//trim(agrmetdata(source)%area_of_data)//& '_PA.03-HR-SUM_DD.'//& - trim(fyr)//trim(fmo)//trim(fda)//'_DT.'//trim(fhr)//'00_DF.GR1' - + !trim(fyr)//trim(fmo)//trim(fda)//'_DT.'//trim(fhr)//'00_DF.GR1' + trim(fyr)//trim(fmo)//trim(fda)//'_DT.'//trim(fhr)// & + trim(fmn)//'_DF.GR1' else write(LVT_logunit,*) & '[ERR] Internal error, unknown AGRMET data gridname ', & diff --git a/lvt/datastreams/ALEXI/ALEXI_obsMod.F90 b/lvt/datastreams/ALEXI/ALEXI_obsMod.F90 index 3f33a8707..bf858a738 100644 --- a/lvt/datastreams/ALEXI/ALEXI_obsMod.F90 +++ b/lvt/datastreams/ALEXI/ALEXI_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ALEXI/readALEXIObs.F90 b/lvt/datastreams/ALEXI/readALEXIObs.F90 index 83a8392fb..40a207c76 100644 --- a/lvt/datastreams/ALEXI/readALEXIObs.F90 +++ b/lvt/datastreams/ALEXI/readALEXIObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ALEXIesi/ALEXIesi_obsMod.F90 b/lvt/datastreams/ALEXIesi/ALEXIesi_obsMod.F90 index 120265f04..974d61068 100644 --- a/lvt/datastreams/ALEXIesi/ALEXIesi_obsMod.F90 +++ b/lvt/datastreams/ALEXIesi/ALEXIesi_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ALEXIesi/readALEXIesiObs.F90 b/lvt/datastreams/ALEXIesi/readALEXIesiObs.F90 index 27c2acf39..ec6e1e112 100644 --- a/lvt/datastreams/ALEXIesi/readALEXIesiObs.F90 +++ b/lvt/datastreams/ALEXIesi/readALEXIesiObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ANSA_SNWD/ANSASNWD_obsMod.F90 b/lvt/datastreams/ANSA_SNWD/ANSASNWD_obsMod.F90 index 4ff7c0627..4bb3553c5 100644 --- a/lvt/datastreams/ANSA_SNWD/ANSASNWD_obsMod.F90 +++ b/lvt/datastreams/ANSA_SNWD/ANSASNWD_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ANSA_SNWD/readANSASNWDobs.F90 b/lvt/datastreams/ANSA_SNWD/readANSASNWDobs.F90 index 5a67eba9c..928e2deaf 100644 --- a/lvt/datastreams/ANSA_SNWD/readANSASNWDobs.F90 +++ b/lvt/datastreams/ANSA_SNWD/readANSASNWDobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ANSA_SWE/ANSASWE_obsMod.F90 b/lvt/datastreams/ANSA_SWE/ANSASWE_obsMod.F90 index 8c75fc38c..95827ecfe 100644 --- a/lvt/datastreams/ANSA_SWE/ANSASWE_obsMod.F90 +++ b/lvt/datastreams/ANSA_SWE/ANSASWE_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ANSA_SWE/readANSASWEobs.F90 b/lvt/datastreams/ANSA_SWE/readANSASWEobs.F90 index 2207d0d87..4de7ea1cf 100644 --- a/lvt/datastreams/ANSA_SWE/readANSASWEobs.F90 +++ b/lvt/datastreams/ANSA_SWE/readANSASWEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/APHRO_PRCP/APHROPRCP_obsMod.F90 b/lvt/datastreams/APHRO_PRCP/APHROPRCP_obsMod.F90 index c0637d3a1..fec87d3ac 100644 --- a/lvt/datastreams/APHRO_PRCP/APHROPRCP_obsMod.F90 +++ b/lvt/datastreams/APHRO_PRCP/APHROPRCP_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/APHRO_PRCP/readAPHROPRCPObs.F90 b/lvt/datastreams/APHRO_PRCP/readAPHROPRCPObs.F90 index 4777803c1..de09b015d 100644 --- a/lvt/datastreams/APHRO_PRCP/readAPHROPRCPObs.F90 +++ b/lvt/datastreams/APHRO_PRCP/readAPHROPRCPObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ARM/ARM_obsMod.F90 b/lvt/datastreams/ARM/ARM_obsMod.F90 index 4fdfdb056..868b6eeb0 100644 --- a/lvt/datastreams/ARM/ARM_obsMod.F90 +++ b/lvt/datastreams/ARM/ARM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ARM/readARMObs.F90 b/lvt/datastreams/ARM/readARMObs.F90 index a3f4a53e4..93b8b5a6c 100644 --- a/lvt/datastreams/ARM/readARMObs.F90 +++ b/lvt/datastreams/ARM/readARMObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ARSsm/ARSsm_obsMod.F90 b/lvt/datastreams/ARSsm/ARSsm_obsMod.F90 index 710994d5c..2d1194f3d 100644 --- a/lvt/datastreams/ARSsm/ARSsm_obsMod.F90 +++ b/lvt/datastreams/ARSsm/ARSsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ARSsm/readARSsmobs.F90 b/lvt/datastreams/ARSsm/readARSsmobs.F90 index 01d1057f0..02bd003a1 100644 --- a/lvt/datastreams/ARSsm/readARSsmobs.F90 +++ b/lvt/datastreams/ARSsm/readARSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ASO_SWE/ASOSWE_obsMod.F90 b/lvt/datastreams/ASO_SWE/ASOSWE_obsMod.F90 index 66ccad988..8feae093d 100755 --- a/lvt/datastreams/ASO_SWE/ASOSWE_obsMod.F90 +++ b/lvt/datastreams/ASO_SWE/ASOSWE_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ASO_SWE/readASOSWEobs.F90 b/lvt/datastreams/ASO_SWE/readASOSWEobs.F90 index 4ef527c3a..56e280271 100755 --- a/lvt/datastreams/ASO_SWE/readASOSWEobs.F90 +++ b/lvt/datastreams/ASO_SWE/readASOSWEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/Ameriflux/Ameriflux_obsMod.F90 b/lvt/datastreams/Ameriflux/Ameriflux_obsMod.F90 index 6d38d0342..544e75cf2 100644 --- a/lvt/datastreams/Ameriflux/Ameriflux_obsMod.F90 +++ b/lvt/datastreams/Ameriflux/Ameriflux_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/Ameriflux/readAmerifluxObs.F90 b/lvt/datastreams/Ameriflux/readAmerifluxObs.F90 index 74dfc4b1c..720308d4c 100644 --- a/lvt/datastreams/Ameriflux/readAmerifluxObs.F90 +++ b/lvt/datastreams/Ameriflux/readAmerifluxObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CEOP/CEOP_obsMod.F90 b/lvt/datastreams/CEOP/CEOP_obsMod.F90 index fa07162ff..92603ac94 100644 --- a/lvt/datastreams/CEOP/CEOP_obsMod.F90 +++ b/lvt/datastreams/CEOP/CEOP_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CEOP/readCEOP.F90 b/lvt/datastreams/CEOP/readCEOP.F90 index c62887d5e..ec9e9e64b 100644 --- a/lvt/datastreams/CEOP/readCEOP.F90 +++ b/lvt/datastreams/CEOP/readCEOP.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CHIRPSv2/CHIRPSv2_dataMod.F90 b/lvt/datastreams/CHIRPSv2/CHIRPSv2_dataMod.F90 index cf541652a..b10990e76 100644 --- a/lvt/datastreams/CHIRPSv2/CHIRPSv2_dataMod.F90 +++ b/lvt/datastreams/CHIRPSv2/CHIRPSv2_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CHIRPSv2/readCHIRPSv2data.F90 b/lvt/datastreams/CHIRPSv2/readCHIRPSv2data.F90 index ca68b1c56..660843a2b 100644 --- a/lvt/datastreams/CHIRPSv2/readCHIRPSv2data.F90 +++ b/lvt/datastreams/CHIRPSv2/readCHIRPSv2data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CMC_SNWD/CMCSNWD_obsMod.F90 b/lvt/datastreams/CMC_SNWD/CMCSNWD_obsMod.F90 index 9b0e626d3..f16c731db 100644 --- a/lvt/datastreams/CMC_SNWD/CMCSNWD_obsMod.F90 +++ b/lvt/datastreams/CMC_SNWD/CMCSNWD_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CMC_SNWD/readCMC_SNWDObs.F90 b/lvt/datastreams/CMC_SNWD/readCMC_SNWDObs.F90 index 8b3611fb3..bc4ae5a29 100644 --- a/lvt/datastreams/CMC_SNWD/readCMC_SNWDObs.F90 +++ b/lvt/datastreams/CMC_SNWD/readCMC_SNWDObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CMORPH/CMORPH_dataMod.F90 b/lvt/datastreams/CMORPH/CMORPH_dataMod.F90 index de9f91329..55b253622 100644 --- a/lvt/datastreams/CMORPH/CMORPH_dataMod.F90 +++ b/lvt/datastreams/CMORPH/CMORPH_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CMORPH/readCMORPHdata.F90 b/lvt/datastreams/CMORPH/readCMORPHdata.F90 index 3a687b673..df1334862 100644 --- a/lvt/datastreams/CMORPH/readCMORPHdata.F90 +++ b/lvt/datastreams/CMORPH/readCMORPHdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/COAMPSout/COAMPSout_dataMod.F90 b/lvt/datastreams/COAMPSout/COAMPSout_dataMod.F90 new file mode 100644 index 000000000..ce5253775 --- /dev/null +++ b/lvt/datastreams/COAMPSout/COAMPSout_dataMod.F90 @@ -0,0 +1,91 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +!BOP +! +! !MODULE: COAMPSout_dataMod +! \label(COAMPSout_dataMod) +! +! !INTERFACE: +module COAMPSout_dataMod + + ! Imports + use ESMF + + ! Defaults + implicit none + private + + ! REVISION HISTORY: + ! 09 Dec 2022: Mahdi Navari; Initial Specification in LVT + + ! Public routines + public :: COAMPSout_datainit + + ! Public types + public :: COAMPSoutdata + + type, public :: COAMPSoutdatadec + character*100 :: odir + integer :: COAMPSnest_id + real*8 :: changetime1 + real*8 :: changetime2 + real, allocatable :: rlat(:) + real, allocatable :: rlon(:) + integer :: nc + integer :: nr + type(ESMF_TimeInterval) :: ts + end type COAMPSoutdatadec + + type(COAMPSoutdatadec), allocatable :: COAMPSoutdata(:) + +contains + + !--------------------------------------------------------------------------- + subroutine COAMPSout_datainit(i) + + ! Imports + use LVT_coreMod + use LVT_logMod + use LVT_histDataMod + use LVT_timeMgrMod + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: i + + ! Local variables + integer :: status + !real :: gridDesci(50) + !integer :: updoy, yr1,mo1,da1,hr1,mn1,ss1 + !real :: upgmt + !character*10 :: time + !integer :: ts + + if(.not.allocated(COAMPSoutdata)) then + allocate(COAMPSoutdata(LVT_rc%nDataStreams)) + endif + + ! Get top level COAMPSout data directory + call ESMF_ConfigGetAttribute(LVT_Config, COAMPSoutdata(i)%odir, & + label='COAMPS output forcing directory:', rc=status) + call LVT_verify(status, 'COAMPS output forcing directory: not defined') + call ESMF_ConfigGetAttribute(LVT_Config, COAMPSoutdata(i)%COAMPSnest_id, & + label='COAMPS nest id:', rc=status) + call LVT_verify(status, 'COAMPS nest id: not defined') + + call ESMF_TimeIntervalSet(COAMPSoutdata(i)%ts, s = 3600, & + rc=status) + call LVT_verify(status) + + end subroutine COAMPSout_datainit + +end module COAMPSout_dataMod diff --git a/lvt/datastreams/COAMPSout/readCOAMPSoutdata.F90 b/lvt/datastreams/COAMPSout/readCOAMPSoutdata.F90 new file mode 100644 index 000000000..dc800575b --- /dev/null +++ b/lvt/datastreams/COAMPSout/readCOAMPSoutdata.F90 @@ -0,0 +1,333 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- + +#include "LVT_misc.h" + +!------------------------------------------------------------------------------ +! !REVISION HISTORY: +! 09 Dec 2022: Mahdi Navari; Initial Specification in LVT + +subroutine readCOAMPSoutdata(source) + +! Imports + use ESMF + use COAMPSout_dataMod + use LVT_coreMod + use LVT_histDataMod + use LVT_logMod + use LVT_timeMgrMod + +#if(defined USE_NETCDF3 || defined USE_NETCDF4) + use netcdf +#endif + +! Defaults + implicit none + +! Arguments + integer,intent(in) :: source + +! !DESCRIPTION: +! Opens and reads 1-hourly COAMPS output forcing. + +!EOP + +! Local variables + character*100 :: fname + integer :: fcsthr, yr, mo, da, hr, mn, ss + integer :: c,r,gindex + integer :: ftn, ios + logical :: file_exists, rainc_exists + integer :: t2Id, q2Id, swdownId, glwId + integer :: u10Id, v10Id, psfcId, rainncId + integer :: raincID + real :: gvar(LVT_rc%lnc,LVT_rc%lnr,1) + real :: t2(LVT_rc%lnc,LVT_rc%lnr) + real :: q2(LVT_rc%lnc,LVT_rc%lnr) + real :: swdown(LVT_rc%lnc,LVT_rc%lnr) + real :: glw(LVT_rc%lnc,LVT_rc%lnr) + real :: u10(LVT_rc%lnc,LVT_rc%lnr) + real :: v10(LVT_rc%lnc,LVT_rc%lnr) + real :: psfc(LVT_rc%lnc,LVT_rc%lnr) + real :: rainnc(LVT_rc%lnc,LVT_rc%lnr) + real :: rainc(LVT_rc%lnc,LVT_rc%lnr) + real :: t2scal,q2scal,u10scal,v10scal,swdscal,glwscal + real :: psfcscal,rainncscal + real :: t2offset,q2offset,u10offset,v10offset + real :: psfcoffset,rainncoffset,swdoffset,glwoffset + integer :: status + +gvar = 0.0 +t2 = 0.0 +q2 = 0.0 +swdown = 0.0 +glw = 0.0 +u10 = 0.0 +v10 = 0.0 +psfc = 0.0 +rainnc = 0.0 +rainc = 0.0 + +! read hourly forcing data +yr = LVT_rc%dyr(source) +mo = LVT_rc%dmo(source) +da = LVT_rc%dda(source) +hr = LVT_rc%dhr(source) +mn = 0 +ss = 0 + +fcsthr = (hr/6)*6 +call COAMPSoutfile(fname,COAMPSoutdata(source)%odir,COAMPSoutdata(source)%COAMPSnest_id,fcsthr,& + yr,mo,da,hr,mn,ss) + +#if ( defined USE_NETCDF3 || defined USE_NETCDF4 ) + inquire (file=trim(fname), exist=file_exists) + if (file_exists) then + !ferror = 1 + call LVT_verify(nf90_open(path=trim(fname),mode=NF90_NOWRITE, & + ncid = ftn), 'nf90_open failed in read_COAMPSout') + write(LVT_logunit,*) '[INFO] Reading COAMPSout ',trim(fname) + call LVT_verify(nf90_inq_varid(ftn,'air_temp_2m',t2Id),& + 'nf90_inq_varid failed for air_temp_2m in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,t2Id,"scale_factor",t2scal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,t2Id,"add_offset",t2offset),& + 'nf90_get_att failed for nf90_get_att') + + call LVT_verify(nf90_inq_varid(ftn,'spec_hum_2m',q2Id),& + 'nf90_inq_varid failed for spec_hum_2m in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,q2Id,"scale_factor",q2scal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,q2Id,"add_offset",q2offset),& + 'nf90_get_att failed for nf90_get_att') + + !call LVT_verify(nf90_inq_varid(ftn,'sw_rad_down',swdownId),& + ! 'nf90_inq_varid failed for sw_rad_down in read_COAMPSout') + ios = nf90_inq_varid(ftn,'sw_rad_down',swdownId) + if ( ios /= 0) then + ios = nf90_inq_varid(ftn,'sw_flux_dn',swdownId) + endif + call LVT_verify(ios,'nf90_inq_varid failed for sw_rad_down or sw_flux_dn in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,swdownId,"scale_factor",swdscal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,swdownId,"add_offset",swdoffset),& + 'nf90_get_att failed for nf90_get_att') + + !call LVT_verify(nf90_inq_varid(ftn,'lw_rad_down',glwId),& + ! 'nf90_inq_varid failed for lw_rad_down in read_COAMPSout') + ios = nf90_inq_varid(ftn,'lw_rad_down',glwId) + if ( ios /= 0) then + ios = nf90_inq_varid(ftn,'lw_flux_dn',glwId) + endif + call LVT_verify(ios,'nf90_inq_varid failed for lw_rad_down or lw_flux_dn in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,glwId,"scale_factor",glwscal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,glwId,"add_offset",glwoffset),& + 'nf90_get_att failed for nf90_get_att') + + call LVT_verify(nf90_inq_varid(ftn,'wind_10m_x',u10Id),& + 'nf90_inq_varid failed for wind_10m_x in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,u10Id,"scale_factor",u10scal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,u10Id,"add_offset",u10offset),& + 'nf90_get_att failed for nf90_get_att') + + call LVT_verify(nf90_inq_varid(ftn,'wind_10m_y',v10Id),& + 'nf90_inq_varid failed for wind_10m_y in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,v10Id,"scale_factor",v10scal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,v10Id,"add_offset",v10offset),& + 'nf90_get_att failed for nf90_get_att') + + call LVT_verify(nf90_inq_varid(ftn,'surf_atm_pres',psfcId),& + 'nf90_inq_varid failed for surf_atm_pres in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,psfcId,"scale_factor",psfcscal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,psfcId,"add_offset",psfcoffset),& + 'nf90_get_att failed for nf90_get_att') + + call LVT_verify(nf90_inq_varid(ftn,'ttl_prcp',rainncId),& + 'nf90_inq_varid failed for ttl_prcp in read_COAMPSout') + call LVT_verify(nf90_get_att(ftn,rainncId,"scale_factor",rainncscal),& + 'nf90_get_att failed for nf90_get_att') + call LVT_verify(nf90_get_att(ftn,rainncId,"add_offset",rainncoffset),& + 'nf90_get_att failed for nf90_get_att') + + rainc_exists = .false. + rainc = 0.0 ! initialize to 0 + call LVT_verify(nf90_get_var(ftn,t2id,gvar),& + 'nf90_get_var failed for t2 in read_COAMPSout') + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + t2(c,r) = gvar(c,r,1)*t2scal+t2offset + endif + enddo + enddo + + call LVT_verify(nf90_get_var(ftn,q2id,gvar),& + 'nf90_get_var failed for q2 in read_COAMPSout') + + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + q2(c,r) = gvar(c,r,1)*q2scal+q2offset + endif + enddo + enddo + + call LVT_verify(nf90_get_var(ftn,swdownid,gvar),& + 'nf90_get_var failed for swdown in read_COAMPSout') + + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + swdown(c,r) = gvar(c,r,1)*swdscal+swdoffset + endif + enddo + enddo + + call LVT_verify(nf90_get_var(ftn,glwid,gvar),& + 'nf90_get_var failed for glw in read_COAMPSout') + + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + glw(c,r) = gvar(c,r,1)*glwscal+glwoffset + endif + enddo + enddo + + call LVT_verify(nf90_get_var(ftn,u10id,gvar),& + 'nf90_get_var failed for u10 in read_COAMPSout') + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + u10(c,r) = gvar(c,r,1)*u10scal+u10offset + endif + enddo + enddo + + call LVT_verify(nf90_get_var(ftn,v10id,gvar),& + 'nf90_get_var failed for v10 in read_COAMPSout') + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + v10(c,r) = gvar(c,r,1)*v10scal+v10offset + endif + enddo + enddo + + call LVT_verify(nf90_get_var(ftn,psfcid,gvar),& + 'nf90_get_var failed for psfc in read_COAMPSout') + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + psfc(c,r) = gvar(c,r,1)*psfcscal+psfcoffset + endif + enddo + enddo + call LVT_verify(nf90_get_var(ftn,rainncid,gvar),& + 'nf90_get_var failed for rainnc in read_COAMPSout') + do r=1,LVT_rc%lnr + do c=1,LVT_rc%lnc + if(gvar(c,r,1).gt.-32768) then + rainnc(c,r) = gvar(c,r,1)*rainncscal+rainncoffset + endif + enddo + enddo + + call LVT_verify(nf90_close(ftn), & + 'failed to close file in read_COAMPSout') + write(LVT_logunit,*) '[INFO] Successfully processed ',trim(fname) + + call LVT_logSingleDataStreamVar(LVT_MOC_swdownforc,source,swdown,vlevel=1,units="W/m2") + + call LVT_logSingleDataStreamVar(LVT_MOC_lwdownforc,source,glw,vlevel=1,units="W/m2") + + call LVT_logSingleDataStreamVar(LVT_MOC_totalprecip,source,rainnc,vlevel=1,units="kg/m2") + + call LVT_logSingleDataStreamVar(LVT_MOC_tairforc,source,t2,vlevel=1,units="K") + + call LVT_logSingleDataStreamVar(LVT_MOC_qairforc,source,q2,vlevel=1,& + units="kg/kg") + + call LVT_logSingleDataStreamVar(LVT_MOC_PSURFFORC,source,psfc, & + vlevel=1,units="Pa") + + call LVT_logSingleDataStreamVar(LVT_MOC_NWINDFORC,source,v10, & + vlevel=1,units="m/s") + + call LVT_logSingleDataStreamVar(LVT_MOC_EWINDFORC,source,u10, & + vlevel=1,units="m/s") + + else + write(LVT_logunit,*) '[ERR] Forcing file '//trim(fname)//' not found' + endif +#else + write(LVT_logunit,*) '[ERR] read_COAMPSout requires NetCDF' + write(LVT_logunit,*) '[ERR] please recompile LIS' + call LVT_endrun +#endif + + +end subroutine readCOAMPSoutdata + +!------------------------------------------------------------------------------ + +!------------------------------------------------------------------------------ +!BOP +! !ROUTINE: COAMPSoutfile +! \label{COAMPSoutfile} +! +! !INTERFACE: + subroutine COAMPSoutfile(filename,coampsdir,nest,fcsthr,& + yr,mo,da,hr,mn,ss) + + implicit none +! !ARGUMENTS: + character(len=*), intent(out) :: filename + character(len=*), intent(in) :: coampsdir + integer, intent(in) :: nest + integer, intent(in) :: fcsthr + integer, intent(in) :: yr,mo,da,hr,mn,ss + +! !DESCRIPTION: +! +!EOP + + integer :: hr1 + character*10 :: ftime1 + character*1 :: fnest + character*4 :: fyr + character*2 :: fmo + character*2 :: fda + character*2 :: fhr,fhr1 + character*2 :: fmn + character*2 :: fss + + hr1 = hr - fcsthr + write(unit=ftime1, fmt='(i4.4,i2.2,i2.2,i2.2)') yr,mo,da,hr + write(unit=fnest,fmt='(i1.1)') nest + write(unit=fyr,fmt='(i4.4)') yr + write(unit=fmo,fmt='(i2.2)') mo + write(unit=fda,fmt='(i2.2)') da + write(unit=fhr,fmt='(i2.2)') hr1 + write(unit=fhr1,fmt='(i2.2)') fcsthr + write(unit=fmn,fmt='(i2.2)') mn + write(unit=fss,fmt='(i2.2)') ss + + filename = trim(coampsdir)//'/'//& + trim(fyr)//trim(fmo)//trim(fda)//trim(fhr1)//& + '/coamps_'//trim(fnest)//'_'//trim(fyr)//trim(fmo)//& + trim(fda)//trim(fhr1)//'_00'//trim(fhr)//'0000.nc' + + end subroutine COAMPSoutfile + diff --git a/lvt/datastreams/CPC_PRCP/CPCPRCP_obsMod.F90 b/lvt/datastreams/CPC_PRCP/CPCPRCP_obsMod.F90 index 55527bd71..f05b58180 100644 --- a/lvt/datastreams/CPC_PRCP/CPCPRCP_obsMod.F90 +++ b/lvt/datastreams/CPC_PRCP/CPCPRCP_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/CPC_PRCP/readCPCPRCPObs.F90 b/lvt/datastreams/CPC_PRCP/readCPCPRCPObs.F90 index 300dadfc1..03b2698d9 100644 --- a/lvt/datastreams/CPC_PRCP/readCPCPRCPObs.F90 +++ b/lvt/datastreams/CPC_PRCP/readCPCPRCPObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/Daymet/Daymet_obsMod.F90 b/lvt/datastreams/Daymet/Daymet_obsMod.F90 index c1896258a..0c8486ef2 100644 --- a/lvt/datastreams/Daymet/Daymet_obsMod.F90 +++ b/lvt/datastreams/Daymet/Daymet_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/Daymet/readDaymetObs.F90 b/lvt/datastreams/Daymet/readDaymetObs.F90 index e8cb0db41..c270973e2 100644 --- a/lvt/datastreams/Daymet/readDaymetObs.F90 +++ b/lvt/datastreams/Daymet/readDaymetObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ECMWFforc/ECMWFforc_dataMod.F90 b/lvt/datastreams/ECMWFforc/ECMWFforc_dataMod.F90 index 237d852b8..9a33c06f1 100755 --- a/lvt/datastreams/ECMWFforc/ECMWFforc_dataMod.F90 +++ b/lvt/datastreams/ECMWFforc/ECMWFforc_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ECMWFforc/readECMWFforcdata.F90 b/lvt/datastreams/ECMWFforc/readECMWFforcdata.F90 index 57897573e..41a368715 100755 --- a/lvt/datastreams/ECMWFforc/readECMWFforcdata.F90 +++ b/lvt/datastreams/ECMWFforc/readECMWFforcdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ERA5/ERA5obsMod.F90 b/lvt/datastreams/ERA5/ERA5obsMod.F90 index 16e97d06e..dda3718c9 100644 --- a/lvt/datastreams/ERA5/ERA5obsMod.F90 +++ b/lvt/datastreams/ERA5/ERA5obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ERA5/readERA5obs.F90 b/lvt/datastreams/ERA5/readERA5obs.F90 index 058d8f6a7..52f487f7e 100644 --- a/lvt/datastreams/ERA5/readERA5obs.F90 +++ b/lvt/datastreams/ERA5/readERA5obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ERAinterimLand/ERAinterimLandobsMod.F90 b/lvt/datastreams/ERAinterimLand/ERAinterimLandobsMod.F90 index 4b043b9e2..f84f8ff39 100644 --- a/lvt/datastreams/ERAinterimLand/ERAinterimLandobsMod.F90 +++ b/lvt/datastreams/ERAinterimLand/ERAinterimLandobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ERAinterimLand/readERAinterimLandobs.F90 b/lvt/datastreams/ERAinterimLand/readERAinterimLandobs.F90 index 4b082d009..557b3e5d6 100644 --- a/lvt/datastreams/ERAinterimLand/readERAinterimLandobs.F90 +++ b/lvt/datastreams/ERAinterimLand/readERAinterimLandobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ESACCI_sm/ESACCIsm_obsMod.F90 b/lvt/datastreams/ESACCI_sm/ESACCIsm_obsMod.F90 index dbdb075b6..2e965e923 100644 --- a/lvt/datastreams/ESACCI_sm/ESACCIsm_obsMod.F90 +++ b/lvt/datastreams/ESACCI_sm/ESACCIsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ESACCI_sm/readESACCIsmObs.F90 b/lvt/datastreams/ESACCI_sm/readESACCIsmObs.F90 index a00fc3d58..6cd03d1ef 100644 --- a/lvt/datastreams/ESACCI_sm/readESACCIsmObs.F90 +++ b/lvt/datastreams/ESACCI_sm/readESACCIsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXCOM/FLUXCOM_obsMod.F90 b/lvt/datastreams/FLUXCOM/FLUXCOM_obsMod.F90 index 3eee50eac..8ea39f761 100755 --- a/lvt/datastreams/FLUXCOM/FLUXCOM_obsMod.F90 +++ b/lvt/datastreams/FLUXCOM/FLUXCOM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXCOM/readFLUXCOMobs.F90 b/lvt/datastreams/FLUXCOM/readFLUXCOMobs.F90 index 41a0a9ef4..3c720de58 100755 --- a/lvt/datastreams/FLUXCOM/readFLUXCOMobs.F90 +++ b/lvt/datastreams/FLUXCOM/readFLUXCOMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXNET2015/FLUXNET2015_obsMod.F90 b/lvt/datastreams/FLUXNET2015/FLUXNET2015_obsMod.F90 index eaea90d75..f15d0b1bb 100644 --- a/lvt/datastreams/FLUXNET2015/FLUXNET2015_obsMod.F90 +++ b/lvt/datastreams/FLUXNET2015/FLUXNET2015_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXNET2015/readFLUXNET2015Obs.F90 b/lvt/datastreams/FLUXNET2015/readFLUXNET2015Obs.F90 index e1f4d58f3..989c0d3a9 100644 --- a/lvt/datastreams/FLUXNET2015/readFLUXNET2015Obs.F90 +++ b/lvt/datastreams/FLUXNET2015/readFLUXNET2015Obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXNET2015_NC/FLUXNET2015NC_obsMod.F90 b/lvt/datastreams/FLUXNET2015_NC/FLUXNET2015NC_obsMod.F90 index 5f9d0577b..cef5784bb 100644 --- a/lvt/datastreams/FLUXNET2015_NC/FLUXNET2015NC_obsMod.F90 +++ b/lvt/datastreams/FLUXNET2015_NC/FLUXNET2015NC_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXNET2015_NC/readFLUXNET2015NCObs.F90 b/lvt/datastreams/FLUXNET2015_NC/readFLUXNET2015NCObs.F90 index 5e122d6ec..43d639e42 100644 --- a/lvt/datastreams/FLUXNET2015_NC/readFLUXNET2015NCObs.F90 +++ b/lvt/datastreams/FLUXNET2015_NC/readFLUXNET2015NCObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXNETmte/FLUXNETmte_obsMod.F90 b/lvt/datastreams/FLUXNETmte/FLUXNETmte_obsMod.F90 index 3087dcf11..5a7af3cce 100644 --- a/lvt/datastreams/FLUXNETmte/FLUXNETmte_obsMod.F90 +++ b/lvt/datastreams/FLUXNETmte/FLUXNETmte_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FLUXNETmte/readFLUXNETmteObs.F90 b/lvt/datastreams/FLUXNETmte/readFLUXNETmteObs.F90 index b247261a4..6c52184ba 100644 --- a/lvt/datastreams/FLUXNETmte/readFLUXNETmteObs.F90 +++ b/lvt/datastreams/FLUXNETmte/readFLUXNETmteObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FMI_SWE/FMISWE_obsMod.F90 b/lvt/datastreams/FMI_SWE/FMISWE_obsMod.F90 index 9e10b2028..dfdb8b1e3 100644 --- a/lvt/datastreams/FMI_SWE/FMISWE_obsMod.F90 +++ b/lvt/datastreams/FMI_SWE/FMISWE_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FMI_SWE/readFMISWEobs.F90 b/lvt/datastreams/FMI_SWE/readFMISWEobs.F90 index 4f6e54a8a..f6b8e1581 100644 --- a/lvt/datastreams/FMI_SWE/readFMISWEobs.F90 +++ b/lvt/datastreams/FMI_SWE/readFMISWEobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FluxSat_GPP/FluxSat_obsMod.F90 b/lvt/datastreams/FluxSat_GPP/FluxSat_obsMod.F90 index ab083c869..b6af291c2 100755 --- a/lvt/datastreams/FluxSat_GPP/FluxSat_obsMod.F90 +++ b/lvt/datastreams/FluxSat_GPP/FluxSat_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/FluxSat_GPP/readFluxSatobs.F90 b/lvt/datastreams/FluxSat_GPP/readFluxSatobs.F90 index 3ed6d6412..ba689dbd2 100755 --- a/lvt/datastreams/FluxSat_GPP/readFluxSatobs.F90 +++ b/lvt/datastreams/FluxSat_GPP/readFluxSatobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 b/lvt/datastreams/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 index 7caa5e12e..f84f4ddf1 100644 --- a/lvt/datastreams/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 +++ b/lvt/datastreams/GCOMW_AMSR2L3sm/GCOMW_AMSR2L3sm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 b/lvt/datastreams/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 index d99452105..c4088247b 100644 --- a/lvt/datastreams/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 +++ b/lvt/datastreams/GCOMW_AMSR2L3sm/readGCOMW_AMSR2L3smObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 b/lvt/datastreams/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 index 56c01752a..0bf43d9e1 100644 --- a/lvt/datastreams/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 +++ b/lvt/datastreams/GCOMW_AMSR2L3snd/GCOMW_AMSR2L3snd_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 b/lvt/datastreams/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 index e5f918d72..12e84c79c 100644 --- a/lvt/datastreams/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 +++ b/lvt/datastreams/GCOMW_AMSR2L3snd/readGCOMW_AMSR2L3sndObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GDASforc/GDASforc_dataMod.F90 b/lvt/datastreams/GDASforc/GDASforc_dataMod.F90 index 4a83c9a12..678acbf66 100755 --- a/lvt/datastreams/GDASforc/GDASforc_dataMod.F90 +++ b/lvt/datastreams/GDASforc/GDASforc_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GDASforc/readGDASforcdata.F90 b/lvt/datastreams/GDASforc/readGDASforcdata.F90 index ad40faaef..47aee19b3 100755 --- a/lvt/datastreams/GDASforc/readGDASforcdata.F90 +++ b/lvt/datastreams/GDASforc/readGDASforcdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GHCN/GHCN_obsMod.F90 b/lvt/datastreams/GHCN/GHCN_obsMod.F90 index 87a14d13b..95286bae2 100644 --- a/lvt/datastreams/GHCN/GHCN_obsMod.F90 +++ b/lvt/datastreams/GHCN/GHCN_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GHCN/readGHCNObs.F90 b/lvt/datastreams/GHCN/readGHCNObs.F90 index 141bc2866..ff21561b3 100644 --- a/lvt/datastreams/GHCN/readGHCNObs.F90 +++ b/lvt/datastreams/GHCN/readGHCNObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GIMMS_AVHRR_NDVI/GIMMSAVHRR_NDVIobsMod.F90 b/lvt/datastreams/GIMMS_AVHRR_NDVI/GIMMSAVHRR_NDVIobsMod.F90 index 39bdde526..1c997acb2 100644 --- a/lvt/datastreams/GIMMS_AVHRR_NDVI/GIMMSAVHRR_NDVIobsMod.F90 +++ b/lvt/datastreams/GIMMS_AVHRR_NDVI/GIMMSAVHRR_NDVIobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GIMMS_AVHRR_NDVI/readGIMMSAVHRR_NDVIObs.F90 b/lvt/datastreams/GIMMS_AVHRR_NDVI/readGIMMSAVHRR_NDVIObs.F90 index 34a261375..1afc3a595 100644 --- a/lvt/datastreams/GIMMS_AVHRR_NDVI/readGIMMSAVHRR_NDVIObs.F90 +++ b/lvt/datastreams/GIMMS_AVHRR_NDVI/readGIMMSAVHRR_NDVIObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GIMMS_MODIS_NDVI/GIMMSMODIS_NDVIobsMod.F90 b/lvt/datastreams/GIMMS_MODIS_NDVI/GIMMSMODIS_NDVIobsMod.F90 index 8c56ce60a..0c6159efd 100644 --- a/lvt/datastreams/GIMMS_MODIS_NDVI/GIMMSMODIS_NDVIobsMod.F90 +++ b/lvt/datastreams/GIMMS_MODIS_NDVI/GIMMSMODIS_NDVIobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GIMMS_MODIS_NDVI/readGIMMSMODIS_NDVIObs.F90 b/lvt/datastreams/GIMMS_MODIS_NDVI/readGIMMSMODIS_NDVIObs.F90 index 29b838738..861f08900 100644 --- a/lvt/datastreams/GIMMS_MODIS_NDVI/readGIMMSMODIS_NDVIObs.F90 +++ b/lvt/datastreams/GIMMS_MODIS_NDVI/readGIMMSMODIS_NDVIObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLASSalbedo/GLASSalbedo_Mod.F90 b/lvt/datastreams/GLASSalbedo/GLASSalbedo_Mod.F90 index 05e60dbf5..feccd0d47 100755 --- a/lvt/datastreams/GLASSalbedo/GLASSalbedo_Mod.F90 +++ b/lvt/datastreams/GLASSalbedo/GLASSalbedo_Mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLASSalbedo/readGLASSalbedoObs.F90 b/lvt/datastreams/GLASSalbedo/readGLASSalbedoObs.F90 index e7689b733..8569fa273 100755 --- a/lvt/datastreams/GLASSalbedo/readGLASSalbedoObs.F90 +++ b/lvt/datastreams/GLASSalbedo/readGLASSalbedoObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLASSlai/GLASSlai_obsMod.F90 b/lvt/datastreams/GLASSlai/GLASSlai_obsMod.F90 index b56c0a887..d36b86034 100644 --- a/lvt/datastreams/GLASSlai/GLASSlai_obsMod.F90 +++ b/lvt/datastreams/GLASSlai/GLASSlai_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLASSlai/readGLASSlaiObs.F90 b/lvt/datastreams/GLASSlai/readGLASSlaiObs.F90 index ec83fcd37..fb86ded6b 100644 --- a/lvt/datastreams/GLASSlai/readGLASSlaiObs.F90 +++ b/lvt/datastreams/GLASSlai/readGLASSlaiObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLDAS1/GLDAS1obsMod.F90 b/lvt/datastreams/GLDAS1/GLDAS1obsMod.F90 index 9c8db9087..0e9ab163e 100644 --- a/lvt/datastreams/GLDAS1/GLDAS1obsMod.F90 +++ b/lvt/datastreams/GLDAS1/GLDAS1obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLDAS1/readGLDAS1obs.F90 b/lvt/datastreams/GLDAS1/readGLDAS1obs.F90 index 41ec94bce..bb5899c50 100644 --- a/lvt/datastreams/GLDAS1/readGLDAS1obs.F90 +++ b/lvt/datastreams/GLDAS1/readGLDAS1obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLDAS2/GLDAS2obsMod.F90 b/lvt/datastreams/GLDAS2/GLDAS2obsMod.F90 index 1aa4ab95c..24902b149 100644 --- a/lvt/datastreams/GLDAS2/GLDAS2obsMod.F90 +++ b/lvt/datastreams/GLDAS2/GLDAS2obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLDAS2/readGLDAS2obs.F90 b/lvt/datastreams/GLDAS2/readGLDAS2obs.F90 index 385f2965b..4a704aae6 100644 --- a/lvt/datastreams/GLDAS2/readGLDAS2obs.F90 +++ b/lvt/datastreams/GLDAS2/readGLDAS2obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLEAM/GLEAM_obsMod.F90 b/lvt/datastreams/GLEAM/GLEAM_obsMod.F90 index 0df666d84..52442910a 100644 --- a/lvt/datastreams/GLEAM/GLEAM_obsMod.F90 +++ b/lvt/datastreams/GLEAM/GLEAM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLEAM/readGLEAMObs.F90 b/lvt/datastreams/GLEAM/readGLEAMObs.F90 index 99ed217cc..b7c83daa1 100644 --- a/lvt/datastreams/GLEAM/readGLEAMObs.F90 +++ b/lvt/datastreams/GLEAM/readGLEAMObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLERL_HydroData/GLERL_dataMod.F90 b/lvt/datastreams/GLERL_HydroData/GLERL_dataMod.F90 index 251d4a24f..6677a57f9 100644 --- a/lvt/datastreams/GLERL_HydroData/GLERL_dataMod.F90 +++ b/lvt/datastreams/GLERL_HydroData/GLERL_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GLERL_HydroData/readGLERLobs.F90 b/lvt/datastreams/GLERL_HydroData/readGLERLobs.F90 index a52a1e906..2e835f5ab 100644 --- a/lvt/datastreams/GLERL_HydroData/readGLERLobs.F90 +++ b/lvt/datastreams/GLERL_HydroData/readGLERLobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GOES_LST/GOES_LSTobsMod.F90 b/lvt/datastreams/GOES_LST/GOES_LSTobsMod.F90 index 8fccdd16d..5268a4385 100644 --- a/lvt/datastreams/GOES_LST/GOES_LSTobsMod.F90 +++ b/lvt/datastreams/GOES_LST/GOES_LSTobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GOES_LST/readGOES_LSTObs.F90 b/lvt/datastreams/GOES_LST/readGOES_LSTObs.F90 index 2a2fe2c9f..a84de441f 100644 --- a/lvt/datastreams/GOES_LST/readGOES_LSTObs.F90 +++ b/lvt/datastreams/GOES_LST/readGOES_LSTObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GOME2_SIF/GOME2_SIFobsMod.F90 b/lvt/datastreams/GOME2_SIF/GOME2_SIFobsMod.F90 index 04a464b79..bf8972728 100644 --- a/lvt/datastreams/GOME2_SIF/GOME2_SIFobsMod.F90 +++ b/lvt/datastreams/GOME2_SIF/GOME2_SIFobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GOME2_SIF/readGOME2_SIFObs.F90 b/lvt/datastreams/GOME2_SIF/readGOME2_SIFObs.F90 index 27aeb0611..e6bd1eb28 100644 --- a/lvt/datastreams/GOME2_SIF/readGOME2_SIFObs.F90 +++ b/lvt/datastreams/GOME2_SIF/readGOME2_SIFObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GRACE/GRACE_obsMod.F90 b/lvt/datastreams/GRACE/GRACE_obsMod.F90 index 7cae3fd51..aee5663c6 100644 --- a/lvt/datastreams/GRACE/GRACE_obsMod.F90 +++ b/lvt/datastreams/GRACE/GRACE_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GRACE/readGRACEObs.F90 b/lvt/datastreams/GRACE/readGRACEObs.F90 index 1a81ce130..83fffed4a 100644 --- a/lvt/datastreams/GRACE/readGRACEObs.F90 +++ b/lvt/datastreams/GRACE/readGRACEObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GRDC/GRDC_obsMod.F90 b/lvt/datastreams/GRDC/GRDC_obsMod.F90 index 62581749d..583a09250 100644 --- a/lvt/datastreams/GRDC/GRDC_obsMod.F90 +++ b/lvt/datastreams/GRDC/GRDC_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GRDC/readGRDCobs.F90 b/lvt/datastreams/GRDC/readGRDCobs.F90 index 710bf8768..92ef9e220 100644 --- a/lvt/datastreams/GRDC/readGRDCobs.F90 +++ b/lvt/datastreams/GRDC/readGRDCobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GRUNrunoff/GRUNrunoff_obsMod.F90 b/lvt/datastreams/GRUNrunoff/GRUNrunoff_obsMod.F90 index 69c403387..12e3387a9 100644 --- a/lvt/datastreams/GRUNrunoff/GRUNrunoff_obsMod.F90 +++ b/lvt/datastreams/GRUNrunoff/GRUNrunoff_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GRUNrunoff/readGRUNrunoffobs.F90 b/lvt/datastreams/GRUNrunoff/readGRUNrunoffobs.F90 index b598f7582..75cbb04ff 100644 --- a/lvt/datastreams/GRUNrunoff/readGRUNrunoffobs.F90 +++ b/lvt/datastreams/GRUNrunoff/readGRUNrunoffobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GlobSnow/GlobSnow_obsMod.F90 b/lvt/datastreams/GlobSnow/GlobSnow_obsMod.F90 index 5b5fe0163..969762d92 100644 --- a/lvt/datastreams/GlobSnow/GlobSnow_obsMod.F90 +++ b/lvt/datastreams/GlobSnow/GlobSnow_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/GlobSnow/readGlobSnowObs.F90 b/lvt/datastreams/GlobSnow/readGlobSnowObs.F90 index 636ef3b79..7dc10c50a 100644 --- a/lvt/datastreams/GlobSnow/readGlobSnowObs.F90 +++ b/lvt/datastreams/GlobSnow/readGlobSnowObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/HAR/HAR_dataMod.F90 b/lvt/datastreams/HAR/HAR_dataMod.F90 index e68ed2142..51967756e 100755 --- a/lvt/datastreams/HAR/HAR_dataMod.F90 +++ b/lvt/datastreams/HAR/HAR_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/HAR/readHARdata.F90 b/lvt/datastreams/HAR/readHARdata.F90 index b1a714072..1711bfbb8 100755 --- a/lvt/datastreams/HAR/readHARdata.F90 +++ b/lvt/datastreams/HAR/readHARdata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/IMD_PRCP/IMDPRCP_obsMod.F90 b/lvt/datastreams/IMD_PRCP/IMDPRCP_obsMod.F90 index ea30f84c8..d5c9ef3ce 100644 --- a/lvt/datastreams/IMD_PRCP/IMDPRCP_obsMod.F90 +++ b/lvt/datastreams/IMD_PRCP/IMDPRCP_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/IMD_PRCP/readIMDPRCPObs.F90 b/lvt/datastreams/IMD_PRCP/readIMDPRCPObs.F90 index 72b0d69d7..203abbef2 100644 --- a/lvt/datastreams/IMD_PRCP/readIMDPRCPObs.F90 +++ b/lvt/datastreams/IMD_PRCP/readIMDPRCPObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/IMERG/IMERG_dataMod.F90 b/lvt/datastreams/IMERG/IMERG_dataMod.F90 index 80fa515c9..4af34c156 100644 --- a/lvt/datastreams/IMERG/IMERG_dataMod.F90 +++ b/lvt/datastreams/IMERG/IMERG_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/IMERG/readIMERGdata.F90 b/lvt/datastreams/IMERG/readIMERGdata.F90 index ba5c14ea5..127a9c96b 100644 --- a/lvt/datastreams/IMERG/readIMERGdata.F90 +++ b/lvt/datastreams/IMERG/readIMERGdata.F90 @@ -1,15 +1,15 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- #include "LVT_misc.h" !------------------------------------------------------------------------------ -!NOTE: Currently only V05B IMERG data are supported. +!NOTE: Supports V06x and V07x subroutine readIMERGdata(source) ! Imports @@ -71,16 +71,21 @@ subroutine readIMERGdata(source) call ESMF_TimeSet(time1,yy=yr1, mm=mo1, dd=da1, & h=hr1,m=mn1,s=ss1,calendar=LVT_calendar,rc=status) call LVT_verify(status) - ! If it is 00Z, use previous day's time level - if (mod(currtime,86400.0).eq.0) then - call ESMF_TimeIntervalSet(lis_ts, s = 86400, & - rc=status) - call LVT_verify(status) - else - call ESMF_TimeIntervalSet(lis_ts, s = 0, & - rc=status) - call LVT_verify(status) - end if + !! If it is 00Z, use previous day's time level + !if (mod(currtime,86400.0).eq.0) then + ! call ESMF_TimeIntervalSet(lis_ts, s = 86400, & + ! rc=status) + ! call LVT_verify(status) + !else + ! call ESMF_TimeIntervalSet(lis_ts, s = 0, & + ! rc=status) + ! call LVT_verify(status) + !end if + ! Use previous IMERG file (IMERG accumulates forward in time) + call ESMF_TimeIntervalSet(lis_ts, s = 1800, & + rc=status) + call LVT_verify(status) + time2 = time1 - lis_ts call ESMF_TimeGet(time2,yy=yr2, mm=mo2, dd=da2, & h=hr2,m=mn2,s=ss2,calendar=LVT_calendar, & @@ -88,14 +93,18 @@ subroutine readIMERGdata(source) call LVT_verify(status) if (alarmCheck) then + !call create_IMERG_filename(imergdata(source)%odir, & + ! yr1,mo1,da1,hr1,mn1,filename,imergdata(source)%imergver) call create_IMERG_filename(imergdata(source)%odir, & - yr1,mo1,da1,hr1,mn1,filename,imergdata(source)%imergver) + yr2,mo2,da2,hr2,mn2,filename,imergdata(source)%imergver, & + imergdata(source)%imergprd) inquire(file=trim(filename),exist=file_exists) if(file_exists) then write(LVT_logunit,*) '[INFO] Reading IMERG data ',trim(filename) call read_imerghdf(filename, imergdata(source)%nc, & - imergdata(source)%nr, prcp_in, ireaderr) + imergdata(source)%nr, imergdata(source)%imergver, & + prcp_in, ireaderr) if(ireaderr .eq. 0) then ! Use budget-bilinear interpolation if IMERG data are at ! coarser resolution than the analysis grid; otherwise, use @@ -163,7 +172,8 @@ subroutine readIMERGdata(source) do r=1,LVT_rc%lnr do c=1,LVT_rc%lnc if(prcp_final(c,r).ge.0) then - prcp_final(c,r) = prcp_final(c,r)*86400.0 !kg/m2 + !prcp_final(c,r) = prcp_final(c,r)*86400.0 !kg/m2 + prcp_final(c,r) = prcp_final(c,r)*1800. ! kg/m2 for 30 minutes else prcp_final(c,r) = LVT_rc%udef endif @@ -173,7 +183,7 @@ subroutine readIMERGdata(source) vlevel=1,units='kg/m2') end subroutine readIMERGdata !------------------------------------------------------------------------------ -subroutine read_imerghdf(filename, col, row, precipout, ireaderr) +subroutine read_imerghdf(filename, col, row, version, precipout, ireaderr) #if(defined USE_HDF5) use HDF5 #endif @@ -188,11 +198,15 @@ subroutine read_imerghdf(filename, col, row, precipout, ireaderr) character(len=*), intent(in) :: filename integer, intent(in) :: col, row + character*10, intent(in) :: version integer, intent(out) :: ireaderr real, intent(out) :: precipout(col,row) !Local variables integer :: xsize, ysize - character(len=40) :: dsetname='/Grid/precipitationCal' + !character(len=40) :: dsetname='/Grid/precipitationCal' + character(len=40) :: dsetname + character(len=40) :: dsetname6='/Grid/precipitationCal' ! V06x + character(len=40) :: dsetname7='/Grid/precipitation' ! V07x real :: precipin(row,col) logical :: bIsError integer :: istatus,i @@ -224,6 +238,16 @@ subroutine read_imerghdf(filename, col, row, precipout, ireaderr) return endif !open dataset + if (index(trim(version), "V06") .ne. 0) then + dsetname = dsetname6 + else if (index(trim(version), "V07") .ne. 0) then + dsetname = dsetname7 + else + write(LVT_logunit,*)'[ERR] Invalid IMERG version number!' + write(LVT_logunit,*)'[ERR] Expected V06x or V07x!' + write(LVT_logunit,*)'[ERR] Received ', trim(version) + stop + end if call h5dopen_f(fileid,dsetname,dsetid,istatus) if(istatus.ne.0) then bIsError=.true. @@ -271,7 +295,7 @@ subroutine read_imerghdf(filename, col, row, precipout, ireaderr) end subroutine read_imerghdf !------------------------------------------------------------------------------ subroutine create_IMERG_filename(odir, & - yr,mo,da,hr,mn,filename,imVer) + yr,mo,da,hr,mn,filename,imVer, imergprd) use IMERG_dataMod use LVT_logMod @@ -279,7 +303,7 @@ subroutine create_IMERG_filename(odir, & implicit none ! Arguments - character(len=*), intent(in) :: odir, imVer + character(len=*), intent(in) :: odir, imVer, imergprd integer, intent(in) :: yr, mo, da, hr, mn character(len=*), intent(out) :: filename @@ -309,13 +333,13 @@ subroutine create_IMERG_filename(odir, & write(cmnadd, '(I2.2)') umnadd write(cmnday, '(I4.4)')umnday - if(imergdata(1)%imergprd == 'early') then + if(imergprd == 'early') then fstem = '/3B-HHR-E.MS.MRG.3IMERG.' fext = '.RT-H5' - elseif(imergdata(1)%imergprd == 'late') then + elseif(imergprd == 'late') then fstem = '/3B-HHR-L.MS.MRG.3IMERG.' fext = '.RT-H5' - elseif(imergdata(1)%imergprd == 'final') then + elseif(imergprd == 'final') then fstem = '/3B-HHR.MS.MRG.3IMERG.' fext = '.HDF5' else diff --git a/lvt/datastreams/IMERG_monthly/IMERG_monthly_dataMod.F90 b/lvt/datastreams/IMERG_monthly/IMERG_monthly_dataMod.F90 new file mode 100644 index 000000000..e4d007120 --- /dev/null +++ b/lvt/datastreams/IMERG_monthly/IMERG_monthly_dataMod.F90 @@ -0,0 +1,170 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- +! +! NOTE: Currently only V07A IMERG Final Run data are supported +module IMERG_monthly_dataMod + + ! Defaults + implicit none + private + + ! Public routines + public :: IMERG_monthly_datainit + + ! Public types + public :: imergmonthlydata + + type, public :: imergmonthlydatadec + character*100 :: odir + character*10 :: imergver, imergprd + real :: datares + real, allocatable :: rlat(:) + real, allocatable :: rlon(:) + + ! This is only used with upscale averaging + integer, allocatable :: n11(:) + + ! These are only used with budget interpolation + integer, allocatable :: n112(:,:) + integer, allocatable :: n122(:,:) + integer, allocatable :: n212(:,:) + integer, allocatable :: n222(:,:) + real, allocatable :: w112(:,:) + real, allocatable :: w122(:,:) + real, allocatable :: w212(:,:) + real, allocatable :: w222(:,:) + + integer :: nc + integer :: nr + end type imergmonthlydatadec + + type(imergmonthlydatadec), allocatable :: imergmonthlydata(:) + +contains + + subroutine IMERG_monthly_datainit(i) + + ! Imports + use ESMF + use LVT_coreMod, only: LVT_rc, LVT_config, LVT_isAtAFinerResolution + use LVT_logMod, only: LVT_logunit, LVT_verify, LVT_endrun + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: i + + ! Local variables + integer :: status + real :: gridDesci(50) + + ! External routines + external :: conserv_interp_input + external :: upscaleByAveraging_input + + if (.not. allocated(imergmonthlydata)) then + allocate(imergmonthlydata(LVT_rc%nDataStreams)) + endif + + ! Get top level IMERG data directory + call ESMF_ConfigGetAttribute(LVT_Config, imergmonthlydata(i)%odir, & + label='IMERG monthly data directory:', rc=status) + call LVT_verify(status, 'IMERG monthly data directory: not defined') + + ! Get IMERG product + call ESMF_ConfigFindLabel(LVT_config,"IMERG monthly product:", & + rc=status) + call LVT_verify(status, 'IMERG monthly product: not defined') + call ESMF_ConfigGetAttribute(LVT_config, & + imergmonthlydata(i)%imergprd, rc=status) + if (imergmonthlydata(i)%imergprd .ne. 'final') then + write(LVT_logunit,*)'[ERR] Invalid IMERG monthly product specified' + write(LVT_logunit,*)"[ERR] Currently only 'final' is supported" + call LVT_endrun() + end if + + ! Get IMERG version + call ESMF_ConfigFindLabel(LVT_config, "IMERG monthly version:", & + rc=status) + call LVT_verify(status, 'IMERG monthly version: not defined') + call ESMF_ConfigGetAttribute(LVT_config, & + imergmonthlydata(i)%imergver, rc=status) + if (imergmonthlydata(i)%imergver .ne. 'V07A') then + write(LVT_logunit,*)'[ERR] Invalid IMERG monthly version specified' + write(LVT_logunit,*)"[ERR] Currently only 'V07A' is supported" + call LVT_endrun() + end if + + ! Allocate arrays on LVT grid + allocate(imergmonthlydata(i)%rlat(LVT_rc%lnc*LVT_rc%lnr)) + allocate(imergmonthlydata(i)%rlon(LVT_rc%lnc*LVT_rc%lnr)) + + ! Set IMERG grid and map projection information. + gridDesci(:) = 0 + gridDesci(1) = 0 ! Lat/lon + gridDesci(2) = 3600 ! Points along latitude circle + gridDesci(3) = 1800 ! Points along longitude circle + gridDesci(4) = -89.95 ! Latitude of first grid point + gridDesci(5) = -179.95 ! Longitude of first grid point + gridDesci(6) = 128 + gridDesci(7) = 89.95 ! Latitude of last grid point + gridDesci(8) = 179.95 ! Longitude of last grid point + gridDesci(9) = 0.1 ! Longitudinal direction increment + gridDesci(10) = 0.1 ! Latitude direction increment + gridDesci(20) = 64 + + ! Set up interpolation data + imergmonthlydata(i)%datares = 0.1 + imergmonthlydata(i)%nc = 3600 + imergmonthlydata(i)%nr = 1800 + + ! Use budget-bilinear interpolation if IMERG resolution (0.1 deg) + ! is coarser than the analysis grid. Use upscale averaging if + ! IMERG is finer than the analysis grid. + if (LVT_isAtAFinerResolution(imergmonthlydata(i)%datares)) then + + ! Used only with budget interpolation + allocate(imergmonthlydata(i)%n112(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%n122(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%n212(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%n222(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%w112(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%w122(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%w212(LVT_rc%lnc*LVT_rc%lnr,25)) + allocate(imergmonthlydata(i)%w222(LVT_rc%lnc*LVT_rc%lnr,25)) + imergmonthlydata(i)%n112 = 0 + imergmonthlydata(i)%n122 = 0 + imergmonthlydata(i)%n212 = 0 + imergmonthlydata(i)%n222 = 0 + imergmonthlydata(i)%w112 = 0 + imergmonthlydata(i)%w122 = 0 + imergmonthlydata(i)%w212 = 0 + imergmonthlydata(i)%w222 = 0 + call conserv_interp_input(gridDesci, LVT_rc%gridDesc, & + LVT_rc%lnc*LVT_rc%lnr, & + imergmonthlydata(i)%rlat, imergmonthlydata(i)%rlon, & + imergmonthlydata(i)%n112, imergmonthlydata(i)%n122, & + imergmonthlydata(i)%n212, imergmonthlydata(i)%n222, & + imergmonthlydata(i)%w112, imergmonthlydata(i)%w122, & + imergmonthlydata(i)%w212, imergmonthlydata(i)%w222) + else + + ! Used only with upscale averaging + allocate(imergmonthlydata(i)%n11(imergmonthlydata(i)%nc * & + imergmonthlydata(i)%nr)) + imergmonthlydata(i)%n11 = 0 + call upscaleByAveraging_input(gridDesci, LVT_rc%gridDesc,& + imergmonthlydata(i)%nc*imergmonthlydata(i)%nr, & + LVT_rc%lnc*LVT_rc%lnr, & + imergmonthlydata(i)%n11) + end if + end subroutine IMERG_monthly_datainit +end module IMERG_monthly_dataMod diff --git a/lvt/datastreams/IMERG_monthly/readIMERGmonthlydata.F90 b/lvt/datastreams/IMERG_monthly/readIMERGmonthlydata.F90 new file mode 100644 index 000000000..e1d04e85f --- /dev/null +++ b/lvt/datastreams/IMERG_monthly/readIMERGmonthlydata.F90 @@ -0,0 +1,332 @@ +!-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +! NASA Goddard Space Flight Center +! Land Information System Framework (LISF) +! Version 7.5 +! +! Copyright (c) 2024 United States Government as represented by the +! Administrator of the National Aeronautics and Space Administration. +! All Rights Reserved. +!-------------------------END NOTICE -- DO NOT EDIT----------------------- + +#include "LVT_misc.h" + +!NOTE: Currently only V07A IMERG Final Run monthly data are supported. +subroutine readIMERGmonthlydata(source) + + ! Imports + use ESMF + use IMERG_monthly_dataMod, only: imergmonthlydata + use LVT_coreMod, only: LVT_rc, LVT_isAtAFinerResolution + use LVT_histDataMod, only: LVT_logSingleDataStreamVar, & + LVT_MOC_totalprecip + use LVT_logMod, only: LVT_verify, LVT_logunit + use LVT_timeMgrMod, only: LVT_calendar + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: source + + ! Local variables + character*255 :: filename + logical :: file_exists + real :: prcp_in(imergmonthlydata(source)%nc, & + imergmonthlydata(source)%nr) + real :: prcp_in1(imergmonthlydata(source)%nc * & + imergmonthlydata(source)%nr) + logical*1 :: lb(imergmonthlydata(source)%nc * & + imergmonthlydata(source)%nr) + logical*1 :: lo(LVT_rc%lnc*LVT_rc%lnr) + real :: prcp(LVT_rc%lnc*LVT_rc%lnr) + real :: prcp_final(LVT_rc%lnc, LVT_rc%lnr) + integer :: t, c, r + integer :: iret, ireaderr + real :: currTime + logical :: alarmCheck + integer :: yr1, mo1, da1, hr1, mn1, ss1 + integer :: yr2, mo2, da2, hr2, mn2, ss2 + type(ESMF_Time) :: time1 + type(ESMF_Time) :: time2 + type(ESMF_TimeInterval) :: lis_ts + integer :: status + integer :: days_in_month + + ! External routines + external :: create_IMERG_monthly_filename + external :: read_imergmonthly_hdf + external :: conserv_interp + external :: upscaleByAveraging + + ! Initialize variables + prcp = LVT_rc%udef + prcp_final = LVT_rc%udef + currTime = float(LVT_rc%dhr(source))*3600 + & + 60*LVT_rc%dmn(source) + LVT_rc%dss(source) + + ! Read IMERG at beginning of the month + alarmCheck = .false. + if (LVT_rc%dda(source) == 1 .and. & + LVT_rc%dhr(source) == 0 .and. & + LVT_rc%dmn(source) == 0 .and. & + LVT_rc%dss(source) == 0) alarmCheck = .true. + + yr1 = LVT_rc%dyr(source) + mo1 = LVT_rc%dmo(source) + da1 = LVT_rc%dda(source) + hr1 = LVT_rc%dhr(source) + mn1 = LVT_rc%dmn(source) + ss1 = 0 + call ESMF_TimeSet(time1, yy=yr1, mm=mo1, dd=da1, & + h=hr1, m=mn1, s=ss1, calendar=LVT_calendar, rc=status) + call LVT_verify(status) + + ! Use previous month file. + call ESMF_TimeIntervalSet(lis_ts, mm=1, calendar=LVT_calendar, & + rc=status) + call LVT_verify(status) + time2 = time1 - lis_ts + call ESMF_TimeGet(time2, yy=yr2, mm=mo2, dd=da2, & + h=hr2, m=mn2, s=ss2, calendar=LVT_calendar, & + rc=status) + call LVT_verify(status) + + if (alarmCheck) then + call create_IMERG_monthly_filename(source, yr2, mo2, filename) + inquire(file=trim(filename), exist=file_exists) + + if (file_exists) then + write(LVT_logunit,*) '[INFO] Reading IMERG data ',trim(filename) + call read_imergmonthly_hdf(filename, & + imergmonthlydata(source)%nc, & + imergmonthlydata(source)%nr, prcp_in, ireaderr) + if (ireaderr .eq. 0) then + + ! Use budget-bilinear interpolation if IMERG data are at + ! coarser resolution than the analysis grid; otherwise, use + ! upscale averaging. + prcp_in1 = LVT_rc%udef + lb = .false. + t = 1 + do r = 1, imergmonthlydata(source)%nr + do c = 1,imergmonthlydata(source)%nc + prcp_in1(t) = prcp_in(c,r) + if (prcp_in1(t) .ge. 0) then + lb(t) = .true. + end if + t = t + 1 + end do ! c + end do ! r + + if (LVT_isAtAFinerResolution( & + imergmonthlydata(source)%datares)) then + call conserv_interp(LVT_rc%gridDesc, lb, prcp_in1, & + lo, prcp, & + (imergmonthlydata(source)%nc * & + imergmonthlydata(source)%nr), & + (LVT_rc%lnc*LVT_rc%lnr), & + imergmonthlydata(source)%rlat, & + imergmonthlydata(source)%rlon, & + imergmonthlydata(source)%w112, & + imergmonthlydata(source)%w122, & + imergmonthlydata(source)%w212, & + imergmonthlydata(source)%w222, & + imergmonthlydata(source)%n112, & + imergmonthlydata(source)%n122, & + imergmonthlydata(source)%n212, & + imergmonthlydata(source)%n222, & + LVT_rc%udef, iret) + else + call upscaleByAveraging( & + (imergmonthlydata(source)%nc * & + imergmonthlydata(source)%nr), & + (LVT_rc%lnc*LVT_rc%lnr), LVT_rc%udef, & + imergmonthlydata(source)%n11, lb, & + prcp_in1, lo, prcp) + endif + write(LVT_logunit,*) '[INFO] Finished processing ', & + trim(filename) + else + write(LVT_logunit,*) '[ERR] Read error with IMERG file ', & + trim(filename) + prcp = LVT_rc%udef + endif + else + write(LVT_logunit,*) '[ERR] Missing IMERG file ', trim(filename) + prcp = LVT_rc%udef + end if ! file_exists + + do r = 1, LVT_rc%lnr + do c = 1, LVT_rc%lnc + prcp_final(c,r) = prcp(c+(r-1)*LVT_rc%lnc) + end do ! c + end do ! r + end if ! alarmCheck + + ! Convert mm/hr to kg/m2s. + do r = 1, LVT_rc%lnr + do c = 1, LVT_rc%lnc + if (prcp_final(c,r) .ge. 0) then + prcp_final(c,r) = prcp_final(c,r) / 3600. + else + prcp_final(c,r) = LVT_rc%udef + end if + end do ! c + end do ! r + call LVT_logSingleDataStreamVar(LVT_MOC_totalprecip, source, & + prcp_final, vlevel=1, units='kg/m2s') + + ! Now convert from kg/m2s to kg/m2. Need to calculate length of + ! month in seconds. + lis_ts = time1 - time2 + call ESMF_TimeIntervalGet(lis_ts, d=days_in_month, rc=status) + call LVT_verify(status) + do r = 1, LVT_rc%lnr + do c = 1, LVT_rc%lnc + if (prcp_final(c,r) >= 0) then + prcp_final(c,r) = & + prcp_final(c,r) * days_in_month * 86400 ! kg/m2 + else + prcp_final(c,r) = LVT_rc%udef + endif + enddo ! c + enddo ! r + call LVT_logSingleDataStreamVar(LVT_MOC_totalprecip, source, & + prcp_final, vlevel=1, units='kg/m2') + +end subroutine readIMERGmonthlydata + +subroutine read_imergmonthly_hdf(filename, col, row, precipout, ireaderr) + + ! Imports + use LVT_coreMod, only: LVT_rc + use LVT_logMod, only: LVT_logunit + +#if (defined USE_HDF5) + use HDF5 +#endif + + ! Defaults + implicit none + + ! Arguments + character(len=*), intent(in) :: filename + integer, intent(in) :: col, row + integer, intent(out) :: ireaderr + real, intent(out) :: precipout(col,row) + + ! Local variables + integer :: xsize, ysize + character(len=40) :: dsetname = '/Grid/precipitation' + real :: precipin(row,col) + integer :: istatus + integer :: i, j +#if (defined USE_HDF5) + integer(HSIZE_T), dimension(2) :: dims + integer(HID_T) :: fileid, dsetid +#endif + + precipin = LVT_rc%udef + precipout = LVT_rc%udef + +#if (defined USE_HDF5) + xsize = col + ysize = row + dims(1) = xsize + dims(2) = ysize + + ireaderr = 0 + + ! Open Fortran interface + call h5open_f(istatus) + if (istatus .ne. 0) then + write(LVT_logunit,*) 'Error opening HDF5 fortran interface' + ireaderr = istatus + return + end if + + ! Open HDF5 file + call h5fopen_f(filename, H5F_ACC_RDONLY_F, fileid, istatus) + if (istatus .ne. 0) then + write(LVT_logunit,*) 'Error opening IMERG file', trim(filename) + ireaderr = istatus + call h5close_f(istatus) ! Close HDF5 interface + return + end if + + ! Open precip dataset + call h5dopen_f(fileid, dsetname, dsetid, istatus) + if (istatus .ne. 0) then + write(LVT_logunit,*) 'Error opening IMERG dataset', trim(dsetname) + ireaderr = istatus + call h5fclose_f(fileid, istatus) ! Close HDF5 file + call h5close_f(istatus) ! Close HDF5 interface + return + end if + + ! Read dataset + call h5dread_f(dsetid, H5T_NATIVE_REAL, precipin, dims, istatus) + if (istatus .ne. 0) then + write(LVT_logunit,*) 'Error reading IMERG dataset', trim(dsetname) + ireaderr = istatus + call h5dclose_f(dsetid, istatus) ! Close dataset + call h5fclose_f(fileid, istatus) ! Close HDF5 file + call h5close_f(istatus) ! Close HDF5 interface + return + end if + + ! Put the real(1:,1:) on the precipout(0:,0:) + ! precipin is (ysize,xsize) starting at (lon=-179.9,lat=-89.9) + precipout(1:xsize,1:ysize) = transpose(precipin) + + ! Clean up. Since the data have already been copied, we will assume + ! any HDF5 errors from this point will have no impact on the data, and + ! therefore we will ignore the status codes. + call h5dclose_f(dsetid, istatus) ! Close HDF5 dataset + call h5fclose_f(fileid, istatus) ! Close HDF5 file + call h5close_f(istatus) ! Close HDF5 interface + +#endif + +end subroutine read_imergmonthly_hdf + +subroutine create_IMERG_monthly_filename(source, yr, mo, filename) + + ! Imports + use IMERG_monthly_dataMod, only: imergmonthlydata + use LVT_logMod, only: LVT_logunit, LVT_endrun + + ! Defaults + implicit none + + ! Arguments + integer, intent(in) :: source, yr, mo + character(len=*), intent(out) :: filename + + ! Local variables + character*4 :: cyr + character*2 :: cmo + character*100 :: fstem, fext + character*255 :: odir + character*4 :: imVer + + write(cyr, '(I4.4)') yr + write(cmo, '(I2.2)') mo + odir = trim(imergmonthlydata(source)%odir) + imVer = imergmonthlydata(source)%imergver + + ! FIXME: Add support for Early and Late Runs + if (imergmonthlydata(source)%imergprd == 'final') then + fstem = '/3B-MO.MS.MRG.3IMERG.' + fext = '.HDF5' + else + write(LVT_logunit,*) "[ERR] Invalid IMERG product option was chosen." + write(LVT_logunit,*) "[ERR] Please choose either 'final'." + call LVT_endrun() + endif + + filename = trim(odir) // "/" // cyr // trim(fstem) // & + cyr // cmo // "01-S000000-E235959." // cmo // "." // & + trim(imVer) // fext + +end subroutine create_IMERG_monthly_filename diff --git a/lvt/datastreams/ISCCP_Tskin/ISCCP_TskinobsMod.F90 b/lvt/datastreams/ISCCP_Tskin/ISCCP_TskinobsMod.F90 index 1ee6031ad..3e7b362bb 100644 --- a/lvt/datastreams/ISCCP_Tskin/ISCCP_TskinobsMod.F90 +++ b/lvt/datastreams/ISCCP_Tskin/ISCCP_TskinobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ISCCP_Tskin/readISCCP_TskinObs.F90 b/lvt/datastreams/ISCCP_Tskin/readISCCP_TskinObs.F90 index ce907cf74..98ce3aef9 100644 --- a/lvt/datastreams/ISCCP_Tskin/readISCCP_TskinObs.F90 +++ b/lvt/datastreams/ISCCP_Tskin/readISCCP_TskinObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ISMN/ISMN_obsMod.F90 b/lvt/datastreams/ISMN/ISMN_obsMod.F90 index a614c5c92..de468e1fc 100644 --- a/lvt/datastreams/ISMN/ISMN_obsMod.F90 +++ b/lvt/datastreams/ISMN/ISMN_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/ISMN/readISMNObs.F90 b/lvt/datastreams/ISMN/readISMNObs.F90 index 3a3565226..f1a073b20 100644 --- a/lvt/datastreams/ISMN/readISMNObs.F90 +++ b/lvt/datastreams/ISMN/readISMNObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/JULES2Ddata/JULES2D_obsMod.F90 b/lvt/datastreams/JULES2Ddata/JULES2D_obsMod.F90 index 4a2ccd0a3..5ddec6720 100755 --- a/lvt/datastreams/JULES2Ddata/JULES2D_obsMod.F90 +++ b/lvt/datastreams/JULES2Ddata/JULES2D_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/JULES2Ddata/readJULES2Dobs.F90 b/lvt/datastreams/JULES2Ddata/readJULES2Dobs.F90 index 4bc5305c0..3e04c85f3 100755 --- a/lvt/datastreams/JULES2Ddata/readJULES2Dobs.F90 +++ b/lvt/datastreams/JULES2Ddata/readJULES2Dobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/JULESdata/JULES_obsMod.F90 b/lvt/datastreams/JULESdata/JULES_obsMod.F90 index b02a81262..c19983762 100644 --- a/lvt/datastreams/JULESdata/JULES_obsMod.F90 +++ b/lvt/datastreams/JULESdata/JULES_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/JULESdata/readJULESobs.F90 b/lvt/datastreams/JULESdata/readJULESobs.F90 index cbdc2d95a..ff6898783 100644 --- a/lvt/datastreams/JULESdata/readJULESobs.F90 +++ b/lvt/datastreams/JULESdata/readJULESobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LIS6out/LIS6outputMod.F90 b/lvt/datastreams/LIS6out/LIS6outputMod.F90 index 085739fda..3df6a379c 100644 --- a/lvt/datastreams/LIS6out/LIS6outputMod.F90 +++ b/lvt/datastreams/LIS6out/LIS6outputMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LIS6out/readLIS6output.F90 b/lvt/datastreams/LIS6out/readLIS6output.F90 index 392604089..b1bd39fdd 100644 --- a/lvt/datastreams/LIS6out/readLIS6output.F90 +++ b/lvt/datastreams/LIS6out/readLIS6output.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LISDAdiag/LISDAdiagOutputMod.F90 b/lvt/datastreams/LISDAdiag/LISDAdiagOutputMod.F90 index 02593fd7d..d5728ac07 100644 --- a/lvt/datastreams/LISDAdiag/LISDAdiagOutputMod.F90 +++ b/lvt/datastreams/LISDAdiag/LISDAdiagOutputMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LISDAdiag/readLISDAdiagOutput.F90 b/lvt/datastreams/LISDAdiag/readLISDAdiagOutput.F90 index e3258a52c..3d6eee860 100644 --- a/lvt/datastreams/LISDAdiag/readLISDAdiagOutput.F90 +++ b/lvt/datastreams/LISDAdiag/readLISDAdiagOutput.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LISDAobs/LISda_obsMod.F90 b/lvt/datastreams/LISDAobs/LISda_obsMod.F90 index fd5829c93..fc5992227 100644 --- a/lvt/datastreams/LISDAobs/LISda_obsMod.F90 +++ b/lvt/datastreams/LISDAobs/LISda_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LISDAobs/readLISdaAsObs.F90 b/lvt/datastreams/LISDAobs/readLISdaAsObs.F90 index 9bbd5bafe..dd78e1e9e 100644 --- a/lvt/datastreams/LISDAobs/readLISdaAsObs.F90 +++ b/lvt/datastreams/LISDAobs/readLISdaAsObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LISout/LISoutputMod.F90 b/lvt/datastreams/LISout/LISoutputMod.F90 index af7f541f0..7e5054db9 100644 --- a/lvt/datastreams/LISout/LISoutputMod.F90 +++ b/lvt/datastreams/LISout/LISoutputMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LISout/readLISoutput.F90 b/lvt/datastreams/LISout/readLISoutput.F90 index 465725d46..4a9a2b4e4 100644 --- a/lvt/datastreams/LISout/readLISoutput.F90 +++ b/lvt/datastreams/LISout/readLISoutput.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LPRM_AMSRE_sm/LPRM_AMSREsm_obsMod.F90 b/lvt/datastreams/LPRM_AMSRE_sm/LPRM_AMSREsm_obsMod.F90 index 8b6b893b1..bdaa9eb86 100644 --- a/lvt/datastreams/LPRM_AMSRE_sm/LPRM_AMSREsm_obsMod.F90 +++ b/lvt/datastreams/LPRM_AMSRE_sm/LPRM_AMSREsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LPRM_AMSRE_sm/readLPRM_AMSREsmObs.F90 b/lvt/datastreams/LPRM_AMSRE_sm/readLPRM_AMSREsmObs.F90 index d5742c402..abca44501 100644 --- a/lvt/datastreams/LPRM_AMSRE_sm/readLPRM_AMSREsmObs.F90 +++ b/lvt/datastreams/LPRM_AMSRE_sm/readLPRM_AMSREsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LPRMvod/LPRM_vodobsMod.F90 b/lvt/datastreams/LPRMvod/LPRM_vodobsMod.F90 index 0c49ec379..31a4afe02 100644 --- a/lvt/datastreams/LPRMvod/LPRM_vodobsMod.F90 +++ b/lvt/datastreams/LPRMvod/LPRM_vodobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LPRMvod/readLPRMvodobs.F90 b/lvt/datastreams/LPRMvod/readLPRMvodobs.F90 index 38257792f..6e69a2696 100644 --- a/lvt/datastreams/LPRMvod/readLPRMvodobs.F90 +++ b/lvt/datastreams/LPRMvod/readLPRMvodobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LSWG_Tb/LSWG_Tb_obsMod.F90 b/lvt/datastreams/LSWG_Tb/LSWG_Tb_obsMod.F90 index f30ca1515..a07bad8ef 100755 --- a/lvt/datastreams/LSWG_Tb/LSWG_Tb_obsMod.F90 +++ b/lvt/datastreams/LSWG_Tb/LSWG_Tb_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LSWG_Tb/read_LSWG_Tb_Obs.F90 b/lvt/datastreams/LSWG_Tb/read_LSWG_Tb_Obs.F90 index 83ebb2aa3..7ab8e33fe 100755 --- a/lvt/datastreams/LSWG_Tb/read_LSWG_Tb_Obs.F90 +++ b/lvt/datastreams/LSWG_Tb/read_LSWG_Tb_Obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LVTbenchmarkOUT/LVTbenchmarkOUT_obsMod.F90 b/lvt/datastreams/LVTbenchmarkOUT/LVTbenchmarkOUT_obsMod.F90 index cc5d4c6d8..f5e2ca562 100644 --- a/lvt/datastreams/LVTbenchmarkOUT/LVTbenchmarkOUT_obsMod.F90 +++ b/lvt/datastreams/LVTbenchmarkOUT/LVTbenchmarkOUT_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LVTbenchmarkOUT/readLVTbenchmarkOUTobs.F90 b/lvt/datastreams/LVTbenchmarkOUT/readLVTbenchmarkOUTobs.F90 index 40ecd85d9..b3873daa8 100644 --- a/lvt/datastreams/LVTbenchmarkOUT/readLVTbenchmarkOUTobs.F90 +++ b/lvt/datastreams/LVTbenchmarkOUT/readLVTbenchmarkOUTobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LVTpercentile/LVTpercentile_obsMod.F90 b/lvt/datastreams/LVTpercentile/LVTpercentile_obsMod.F90 index 593fea45f..5f5c49f55 100644 --- a/lvt/datastreams/LVTpercentile/LVTpercentile_obsMod.F90 +++ b/lvt/datastreams/LVTpercentile/LVTpercentile_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/LVTpercentile/readLVTpercentileAsObs.F90 b/lvt/datastreams/LVTpercentile/readLVTpercentileAsObs.F90 index 61f33a265..42f28addb 100644 --- a/lvt/datastreams/LVTpercentile/readLVTpercentileAsObs.F90 +++ b/lvt/datastreams/LVTpercentile/readLVTpercentileAsObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MCD15A2H/MCD15A2H_obsMod.F90 b/lvt/datastreams/MCD15A2H/MCD15A2H_obsMod.F90 index 9e545230d..2ad2977ed 100755 --- a/lvt/datastreams/MCD15A2H/MCD15A2H_obsMod.F90 +++ b/lvt/datastreams/MCD15A2H/MCD15A2H_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MCD15A2H/readMCD15A2Hobs.F90 b/lvt/datastreams/MCD15A2H/readMCD15A2Hobs.F90 index ec1179d23..ebf8eba9a 100755 --- a/lvt/datastreams/MCD15A2H/readMCD15A2Hobs.F90 +++ b/lvt/datastreams/MCD15A2H/readMCD15A2Hobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MERRA-Land/MERRAlandObsMod.F90 b/lvt/datastreams/MERRA-Land/MERRAlandObsMod.F90 index 08c54f340..6a3f1c3ca 100644 --- a/lvt/datastreams/MERRA-Land/MERRAlandObsMod.F90 +++ b/lvt/datastreams/MERRA-Land/MERRAlandObsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MERRA-Land/readMERRAlandObs.F90 b/lvt/datastreams/MERRA-Land/readMERRAlandObs.F90 index 8be497ebc..e6f794e42 100644 --- a/lvt/datastreams/MERRA-Land/readMERRAlandObs.F90 +++ b/lvt/datastreams/MERRA-Land/readMERRAlandObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MERRA2/MERRA2obsMod.F90 b/lvt/datastreams/MERRA2/MERRA2obsMod.F90 index 241586f21..a335a0fb5 100644 --- a/lvt/datastreams/MERRA2/MERRA2obsMod.F90 +++ b/lvt/datastreams/MERRA2/MERRA2obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MERRA2/readMERRA2obs.F90 b/lvt/datastreams/MERRA2/readMERRA2obs.F90 index dc529d745..1cad8ce73 100644 --- a/lvt/datastreams/MERRA2/readMERRA2obs.F90 +++ b/lvt/datastreams/MERRA2/readMERRA2obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MERRA2asm/MERRA2asmobsMod.F90 b/lvt/datastreams/MERRA2asm/MERRA2asmobsMod.F90 index dc72f32c3..26c67618f 100644 --- a/lvt/datastreams/MERRA2asm/MERRA2asmobsMod.F90 +++ b/lvt/datastreams/MERRA2asm/MERRA2asmobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MERRA2asm/readMERRA2asmobs.F90 b/lvt/datastreams/MERRA2asm/readMERRA2asmobs.F90 index 3d998bb80..54b2eec95 100644 --- a/lvt/datastreams/MERRA2asm/readMERRA2asmobs.F90 +++ b/lvt/datastreams/MERRA2asm/readMERRA2asmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MOD10A1/MOD10A1_obsMod.F90 b/lvt/datastreams/MOD10A1/MOD10A1_obsMod.F90 index d6fcc4d39..e67eef6f5 100644 --- a/lvt/datastreams/MOD10A1/MOD10A1_obsMod.F90 +++ b/lvt/datastreams/MOD10A1/MOD10A1_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MOD10A1/readMOD10A1obs.F90 b/lvt/datastreams/MOD10A1/readMOD10A1obs.F90 index 339b9d760..f345439c7 100644 --- a/lvt/datastreams/MOD10A1/readMOD10A1obs.F90 +++ b/lvt/datastreams/MOD10A1/readMOD10A1obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MOD10A1V6/MOD10A1V6_obsMod.F90 b/lvt/datastreams/MOD10A1V6/MOD10A1V6_obsMod.F90 index 9001f39d4..1144b82f5 100644 --- a/lvt/datastreams/MOD10A1V6/MOD10A1V6_obsMod.F90 +++ b/lvt/datastreams/MOD10A1V6/MOD10A1V6_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MOD10A1V6/readMOD10A1V6obs.F90 b/lvt/datastreams/MOD10A1V6/readMOD10A1V6obs.F90 index 32e80c43b..3cf69059f 100644 --- a/lvt/datastreams/MOD10A1V6/readMOD10A1V6obs.F90 +++ b/lvt/datastreams/MOD10A1V6/readMOD10A1V6obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MOD16A2/MOD16A2_obsMod.F90 b/lvt/datastreams/MOD16A2/MOD16A2_obsMod.F90 index 5ab9060d9..0d0bb726d 100644 --- a/lvt/datastreams/MOD16A2/MOD16A2_obsMod.F90 +++ b/lvt/datastreams/MOD16A2/MOD16A2_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MOD16A2/readMOD16A2Obs.F90 b/lvt/datastreams/MOD16A2/readMOD16A2Obs.F90 index 027e76661..8bf51db08 100644 --- a/lvt/datastreams/MOD16A2/readMOD16A2Obs.F90 +++ b/lvt/datastreams/MOD16A2/readMOD16A2Obs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MODIS_LST/MODIS_LSTobsMod.F90 b/lvt/datastreams/MODIS_LST/MODIS_LSTobsMod.F90 index 49900a390..46c0e1547 100644 --- a/lvt/datastreams/MODIS_LST/MODIS_LSTobsMod.F90 +++ b/lvt/datastreams/MODIS_LST/MODIS_LSTobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MODIS_LST/readMODIS_LSTObs.F90 b/lvt/datastreams/MODIS_LST/readMODIS_LSTObs.F90 index 4a1ebbb66..c00ddac2f 100644 --- a/lvt/datastreams/MODIS_LST/readMODIS_LSTObs.F90 +++ b/lvt/datastreams/MODIS_LST/readMODIS_LSTObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MODISsportLAI/MODISsportLAIobsMod.F90 b/lvt/datastreams/MODISsportLAI/MODISsportLAIobsMod.F90 index edf90f7be..7a51e6df6 100755 --- a/lvt/datastreams/MODISsportLAI/MODISsportLAIobsMod.F90 +++ b/lvt/datastreams/MODISsportLAI/MODISsportLAIobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MODISsportLAI/readMODISsportLAIObs.F90 b/lvt/datastreams/MODISsportLAI/readMODISsportLAIObs.F90 index be9a9abed..f49addb17 100755 --- a/lvt/datastreams/MODISsportLAI/readMODISsportLAIObs.F90 +++ b/lvt/datastreams/MODISsportLAI/readMODISsportLAIObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MODSCAG/MODSCAG_obsMod.F90 b/lvt/datastreams/MODSCAG/MODSCAG_obsMod.F90 index 694fb04c2..7331ad449 100755 --- a/lvt/datastreams/MODSCAG/MODSCAG_obsMod.F90 +++ b/lvt/datastreams/MODSCAG/MODSCAG_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/MODSCAG/readMODSCAGobs.F90 b/lvt/datastreams/MODSCAG/readMODSCAGobs.F90 index 219cdd306..11882d35c 100755 --- a/lvt/datastreams/MODSCAG/readMODSCAGobs.F90 +++ b/lvt/datastreams/MODSCAG/readMODSCAGobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 b/lvt/datastreams/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 index baed1c883..6299b7953 100644 --- a/lvt/datastreams/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 +++ b/lvt/datastreams/NASA_AMSRE_sm/NASA_AMSREsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 b/lvt/datastreams/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 index a04a437a9..f7681b55b 100644 --- a/lvt/datastreams/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 +++ b/lvt/datastreams/NASA_AMSRE_sm/readNASA_AMSREsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/NASMD/NASMD_obsMod.F90 b/lvt/datastreams/NASMD/NASMD_obsMod.F90 index 615464ddb..3c5610d0f 100644 --- a/lvt/datastreams/NASMD/NASMD_obsMod.F90 +++ b/lvt/datastreams/NASMD/NASMD_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/NASMD/readNASMDObs.F90 b/lvt/datastreams/NASMD/readNASMDObs.F90 index ea45da9db..0f5bf09a0 100644 --- a/lvt/datastreams/NASMD/readNASMDObs.F90 +++ b/lvt/datastreams/NASMD/readNASMDObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/NLDAS2/NLDAS2_dataMod.F90 b/lvt/datastreams/NLDAS2/NLDAS2_dataMod.F90 index 3c61dd598..2474ba850 100644 --- a/lvt/datastreams/NLDAS2/NLDAS2_dataMod.F90 +++ b/lvt/datastreams/NLDAS2/NLDAS2_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/NLDAS2/readNLDAS2data.F90 b/lvt/datastreams/NLDAS2/readNLDAS2data.F90 index 7bd6c4a43..9f4002cb2 100644 --- a/lvt/datastreams/NLDAS2/readNLDAS2data.F90 +++ b/lvt/datastreams/NLDAS2/readNLDAS2data.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/Natural_streamflow/NatSF_obsMod.F90 b/lvt/datastreams/Natural_streamflow/NatSF_obsMod.F90 index f7fc93e0f..d5a86da33 100644 --- a/lvt/datastreams/Natural_streamflow/NatSF_obsMod.F90 +++ b/lvt/datastreams/Natural_streamflow/NatSF_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/Natural_streamflow/readNatSFObs.F90 b/lvt/datastreams/Natural_streamflow/readNatSFObs.F90 index cbdaa83c0..3d1842156 100644 --- a/lvt/datastreams/Natural_streamflow/readNatSFObs.F90 +++ b/lvt/datastreams/Natural_streamflow/readNatSFObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/OCO2_SIF/OCO2_SIFobsMod.F90 b/lvt/datastreams/OCO2_SIF/OCO2_SIFobsMod.F90 index 59e2d9456..a0ea8e959 100755 --- a/lvt/datastreams/OCO2_SIF/OCO2_SIFobsMod.F90 +++ b/lvt/datastreams/OCO2_SIF/OCO2_SIFobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/OCO2_SIF/readOCO2_SIFObs.F90 b/lvt/datastreams/OCO2_SIF/readOCO2_SIFObs.F90 index 1f60c55b3..19036722b 100755 --- a/lvt/datastreams/OCO2_SIF/readOCO2_SIFObs.F90 +++ b/lvt/datastreams/OCO2_SIF/readOCO2_SIFObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/OzFlux/OzFlux_obsMod.F90 b/lvt/datastreams/OzFlux/OzFlux_obsMod.F90 index 61e7ad9e7..9bcb6133f 100644 --- a/lvt/datastreams/OzFlux/OzFlux_obsMod.F90 +++ b/lvt/datastreams/OzFlux/OzFlux_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/OzFlux/readOzFluxObs.F90 b/lvt/datastreams/OzFlux/readOzFluxObs.F90 index f3cbacd92..cf26cb542 100644 --- a/lvt/datastreams/OzFlux/readOzFluxObs.F90 +++ b/lvt/datastreams/OzFlux/readOzFluxObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/PBOH2O/PBOH2O_obsMod.F90 b/lvt/datastreams/PBOH2O/PBOH2O_obsMod.F90 index e5e399383..2d1860a25 100644 --- a/lvt/datastreams/PBOH2O/PBOH2O_obsMod.F90 +++ b/lvt/datastreams/PBOH2O/PBOH2O_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/PBOH2O/readPBOH2Oobs.F90 b/lvt/datastreams/PBOH2O/readPBOH2Oobs.F90 index d8df3e084..6ec710f4d 100644 --- a/lvt/datastreams/PBOH2O/readPBOH2Oobs.F90 +++ b/lvt/datastreams/PBOH2O/readPBOH2Oobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SCAN/SCAN_obsMod.F90 b/lvt/datastreams/SCAN/SCAN_obsMod.F90 index f1cc8781a..dc9a8fa07 100644 --- a/lvt/datastreams/SCAN/SCAN_obsMod.F90 +++ b/lvt/datastreams/SCAN/SCAN_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SCAN/readSCANObs.F90 b/lvt/datastreams/SCAN/readSCANObs.F90 index 42319f67a..70691de66 100644 --- a/lvt/datastreams/SCAN/readSCANObs.F90 +++ b/lvt/datastreams/SCAN/readSCANObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SCANGMAO/SCANGMAO_obsMod.F90 b/lvt/datastreams/SCANGMAO/SCANGMAO_obsMod.F90 index bcac5ae84..68c73d060 100644 --- a/lvt/datastreams/SCANGMAO/SCANGMAO_obsMod.F90 +++ b/lvt/datastreams/SCANGMAO/SCANGMAO_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SCANGMAO/readSCANGMAOObs.F90 b/lvt/datastreams/SCANGMAO/readSCANGMAOObs.F90 index 35cfd4f47..8b031df3e 100644 --- a/lvt/datastreams/SCANGMAO/readSCANGMAOObs.F90 +++ b/lvt/datastreams/SCANGMAO/readSCANGMAOObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPTB/SMAP_TBobsMod.F90 b/lvt/datastreams/SMAPTB/SMAP_TBobsMod.F90 index 5da0a9e67..d38434a87 100644 --- a/lvt/datastreams/SMAPTB/SMAP_TBobsMod.F90 +++ b/lvt/datastreams/SMAPTB/SMAP_TBobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPTB/readSMAPTBobs.F90 b/lvt/datastreams/SMAPTB/readSMAPTBobs.F90 index 861f57431..34a7c7cd0 100644 --- a/lvt/datastreams/SMAPTB/readSMAPTBobs.F90 +++ b/lvt/datastreams/SMAPTB/readSMAPTBobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAP_E_OPL/SMAPEOPL_SM_obsMod.F90 b/lvt/datastreams/SMAP_E_OPL/SMAPEOPL_SM_obsMod.F90 index eb10c2d94..bdf04c1ff 100644 --- a/lvt/datastreams/SMAP_E_OPL/SMAPEOPL_SM_obsMod.F90 +++ b/lvt/datastreams/SMAP_E_OPL/SMAPEOPL_SM_obsMod.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAP_E_OPL/readSMAPEOPL_SMObs.F90 b/lvt/datastreams/SMAP_E_OPL/readSMAPEOPL_SMObs.F90 index c0a0621f5..201af9d40 100644 --- a/lvt/datastreams/SMAP_E_OPL/readSMAPEOPL_SMObs.F90 +++ b/lvt/datastreams/SMAP_E_OPL/readSMAPEOPL_SMObs.F90 @@ -3,7 +3,7 @@ ! Land Information System Framework (LISF) ! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAP_L3TB/SMAP_L3TBMod.F90 b/lvt/datastreams/SMAP_L3TB/SMAP_L3TBMod.F90 index 877365487..069f9025a 100755 --- a/lvt/datastreams/SMAP_L3TB/SMAP_L3TBMod.F90 +++ b/lvt/datastreams/SMAP_L3TB/SMAP_L3TBMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAP_L3TB/readSMAP_L3TB.F90 b/lvt/datastreams/SMAP_L3TB/readSMAP_L3TB.F90 index de05747d8..7f24835ae 100755 --- a/lvt/datastreams/SMAP_L3TB/readSMAP_L3TB.F90 +++ b/lvt/datastreams/SMAP_L3TB/readSMAP_L3TB.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPsm/SMAP_smobsMod.F90 b/lvt/datastreams/SMAPsm/SMAP_smobsMod.F90 index 3ac631fa9..7c86f12db 100644 --- a/lvt/datastreams/SMAPsm/SMAP_smobsMod.F90 +++ b/lvt/datastreams/SMAPsm/SMAP_smobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPsm/readSMAPsmobs.F90 b/lvt/datastreams/SMAPsm/readSMAPsmobs.F90 index 5288491d2..8d3c7573f 100644 --- a/lvt/datastreams/SMAPsm/readSMAPsmobs.F90 +++ b/lvt/datastreams/SMAPsm/readSMAPsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPvod/SMAP_vodobsMod.F90 b/lvt/datastreams/SMAPvod/SMAP_vodobsMod.F90 index 357e2bb2c..c328a991a 100644 --- a/lvt/datastreams/SMAPvod/SMAP_vodobsMod.F90 +++ b/lvt/datastreams/SMAPvod/SMAP_vodobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPvod/readSMAPvodobs.F90 b/lvt/datastreams/SMAPvod/readSMAPvodobs.F90 index dbcb3b59c..968195969 100644 --- a/lvt/datastreams/SMAPvod/readSMAPvodobs.F90 +++ b/lvt/datastreams/SMAPvod/readSMAPvodobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPvwc/SMAP_vwcobsMod.F90 b/lvt/datastreams/SMAPvwc/SMAP_vwcobsMod.F90 index 2f7406148..39fcbef6e 100644 --- a/lvt/datastreams/SMAPvwc/SMAP_vwcobsMod.F90 +++ b/lvt/datastreams/SMAPvwc/SMAP_vwcobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMAPvwc/readSMAPvwcobs.F90 b/lvt/datastreams/SMAPvwc/readSMAPvwcobs.F90 index ab535db76..f4a8f5894 100644 --- a/lvt/datastreams/SMAPvwc/readSMAPvwcobs.F90 +++ b/lvt/datastreams/SMAPvwc/readSMAPvwcobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOPS/SMOPSsm_obsMod.F90 b/lvt/datastreams/SMOPS/SMOPSsm_obsMod.F90 index 7135422fd..a9de6ebe2 100644 --- a/lvt/datastreams/SMOPS/SMOPSsm_obsMod.F90 +++ b/lvt/datastreams/SMOPS/SMOPSsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOPS/readSMOPSsmObs.F90 b/lvt/datastreams/SMOPS/readSMOPSsmObs.F90 index 5f8c1a8c5..987fd6131 100755 --- a/lvt/datastreams/SMOPS/readSMOPSsmObs.F90 +++ b/lvt/datastreams/SMOPS/readSMOPSsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOSREX/SMOSREX_obsMod.F90 b/lvt/datastreams/SMOSREX/SMOSREX_obsMod.F90 index 2488695ac..ba7dade4c 100644 --- a/lvt/datastreams/SMOSREX/SMOSREX_obsMod.F90 +++ b/lvt/datastreams/SMOSREX/SMOSREX_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOSREX/readSMOSREXObs.F90 b/lvt/datastreams/SMOSREX/readSMOSREXObs.F90 index 9f743febb..ba38b4c4c 100644 --- a/lvt/datastreams/SMOSREX/readSMOSREXObs.F90 +++ b/lvt/datastreams/SMOSREX/readSMOSREXObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_CATDS_L3sm/SMOSCATDS_smobsMod.F90 b/lvt/datastreams/SMOS_CATDS_L3sm/SMOSCATDS_smobsMod.F90 index 54b86bdb1..52ad1e584 100644 --- a/lvt/datastreams/SMOS_CATDS_L3sm/SMOSCATDS_smobsMod.F90 +++ b/lvt/datastreams/SMOS_CATDS_L3sm/SMOSCATDS_smobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_CATDS_L3sm/readSMOSCATDSsmobs.F90 b/lvt/datastreams/SMOS_CATDS_L3sm/readSMOSCATDSsmobs.F90 index 1e11cb27d..3c5b06903 100644 --- a/lvt/datastreams/SMOS_CATDS_L3sm/readSMOSCATDSsmobs.F90 +++ b/lvt/datastreams/SMOS_CATDS_L3sm/readSMOSCATDSsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_L1TB/SMOSL1TB_obsMod.F90 b/lvt/datastreams/SMOS_L1TB/SMOSL1TB_obsMod.F90 index fdd3557d2..fc739de09 100644 --- a/lvt/datastreams/SMOS_L1TB/SMOSL1TB_obsMod.F90 +++ b/lvt/datastreams/SMOS_L1TB/SMOSL1TB_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_L1TB/readSMOSL1TBObs.F90 b/lvt/datastreams/SMOS_L1TB/readSMOSL1TBObs.F90 index 892751c2b..7afb970ce 100644 --- a/lvt/datastreams/SMOS_L1TB/readSMOSL1TBObs.F90 +++ b/lvt/datastreams/SMOS_L1TB/readSMOSL1TBObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_L2sm/SMOSL2sm_obsMod.F90 b/lvt/datastreams/SMOS_L2sm/SMOSL2sm_obsMod.F90 index 19f793412..c77e5a9bb 100644 --- a/lvt/datastreams/SMOS_L2sm/SMOSL2sm_obsMod.F90 +++ b/lvt/datastreams/SMOS_L2sm/SMOSL2sm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_L2sm/readSMOSL2smObs.F90 b/lvt/datastreams/SMOS_L2sm/readSMOSL2smObs.F90 index 6449cc425..978234f61 100644 --- a/lvt/datastreams/SMOS_L2sm/readSMOSL2smObs.F90 +++ b/lvt/datastreams/SMOS_L2sm/readSMOSL2smObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_NESDIS/SMOSNESDIS_smobsMod.F90 b/lvt/datastreams/SMOS_NESDIS/SMOSNESDIS_smobsMod.F90 index 309d59a97..4416cbd32 100644 --- a/lvt/datastreams/SMOS_NESDIS/SMOSNESDIS_smobsMod.F90 +++ b/lvt/datastreams/SMOS_NESDIS/SMOSNESDIS_smobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SMOS_NESDIS/readSMOSNESDISsmobs.F90 b/lvt/datastreams/SMOS_NESDIS/readSMOSNESDISsmobs.F90 index 47d13bc08..c4b2916a9 100644 --- a/lvt/datastreams/SMOS_NESDIS/readSMOSNESDISsmobs.F90 +++ b/lvt/datastreams/SMOS_NESDIS/readSMOSNESDISsmobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNODAS/SNODAS_obsMod.F90 b/lvt/datastreams/SNODAS/SNODAS_obsMod.F90 index 87b8a1b4c..958986132 100644 --- a/lvt/datastreams/SNODAS/SNODAS_obsMod.F90 +++ b/lvt/datastreams/SNODAS/SNODAS_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNODAS/readSNODASObs.F90 b/lvt/datastreams/SNODAS/readSNODASObs.F90 index d75dbf2ac..a6fe9aa94 100644 --- a/lvt/datastreams/SNODAS/readSNODASObs.F90 +++ b/lvt/datastreams/SNODAS/readSNODASObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNODEP/SNODEP_obsMod.F90 b/lvt/datastreams/SNODEP/SNODEP_obsMod.F90 index 40fdf7cfe..74ae92755 100644 --- a/lvt/datastreams/SNODEP/SNODEP_obsMod.F90 +++ b/lvt/datastreams/SNODEP/SNODEP_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNODEP/readSNODEPobs.F90 b/lvt/datastreams/SNODEP/readSNODEPobs.F90 index 8c1d324e1..86257887b 100644 --- a/lvt/datastreams/SNODEP/readSNODEPobs.F90 +++ b/lvt/datastreams/SNODEP/readSNODEPobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNODEPmetobs/SNODEP_metobsMod.F90 b/lvt/datastreams/SNODEPmetobs/SNODEP_metobsMod.F90 index 11366491c..68dd63217 100644 --- a/lvt/datastreams/SNODEPmetobs/SNODEP_metobsMod.F90 +++ b/lvt/datastreams/SNODEPmetobs/SNODEP_metobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNODEPmetobs/readSNODEPmetobs.F90 b/lvt/datastreams/SNODEPmetobs/readSNODEPmetobs.F90 index 64cab849d..59d47ebcf 100644 --- a/lvt/datastreams/SNODEPmetobs/readSNODEPmetobs.F90 +++ b/lvt/datastreams/SNODEPmetobs/readSNODEPmetobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNOTEL/SNOTEL_obsMod.F90 b/lvt/datastreams/SNOTEL/SNOTEL_obsMod.F90 index 3dced2324..8a1eb9c95 100644 --- a/lvt/datastreams/SNOTEL/SNOTEL_obsMod.F90 +++ b/lvt/datastreams/SNOTEL/SNOTEL_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SNOTEL/readSNOTELObs.F90 b/lvt/datastreams/SNOTEL/readSNOTELObs.F90 index b32e27d19..e920ae9a5 100644 --- a/lvt/datastreams/SNOTEL/readSNOTELObs.F90 +++ b/lvt/datastreams/SNOTEL/readSNOTELObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SSEBop/SSEBop_obsMod.F90 b/lvt/datastreams/SSEBop/SSEBop_obsMod.F90 index 9f65e5001..1f8be924d 100644 --- a/lvt/datastreams/SSEBop/SSEBop_obsMod.F90 +++ b/lvt/datastreams/SSEBop/SSEBop_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SSEBop/readSSEBopObs.F90 b/lvt/datastreams/SSEBop/readSSEBopObs.F90 index aaf4d32cf..ea409a189 100644 --- a/lvt/datastreams/SSEBop/readSSEBopObs.F90 +++ b/lvt/datastreams/SSEBop/readSSEBopObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SURFRAD/SURFRAD_obsMod.F90 b/lvt/datastreams/SURFRAD/SURFRAD_obsMod.F90 index 230d1e46a..44bfee3c5 100644 --- a/lvt/datastreams/SURFRAD/SURFRAD_obsMod.F90 +++ b/lvt/datastreams/SURFRAD/SURFRAD_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/SURFRAD/readSURFRADObs.F90 b/lvt/datastreams/SURFRAD/readSURFRADObs.F90 index ccfc328e4..a9c3f5e6c 100644 --- a/lvt/datastreams/SURFRAD/readSURFRADObs.F90 +++ b/lvt/datastreams/SURFRAD/readSURFRADObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/THySM/THySM_obsMod.F90 b/lvt/datastreams/THySM/THySM_obsMod.F90 index b649f5a61..fc1b38b8a 100644 --- a/lvt/datastreams/THySM/THySM_obsMod.F90 +++ b/lvt/datastreams/THySM/THySM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/THySM/readTHySMobs.F90 b/lvt/datastreams/THySM/readTHySMobs.F90 index 11c29a665..81dc64a37 100644 --- a/lvt/datastreams/THySM/readTHySMobs.F90 +++ b/lvt/datastreams/THySM/readTHySMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UASMAP/UASMAP_obsMod.F90 b/lvt/datastreams/UASMAP/UASMAP_obsMod.F90 index b7a27a35d..f355c5866 100644 --- a/lvt/datastreams/UASMAP/UASMAP_obsMod.F90 +++ b/lvt/datastreams/UASMAP/UASMAP_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UASMAP/readUASMAPobs.F90 b/lvt/datastreams/UASMAP/readUASMAPobs.F90 index ad7461c26..5da0c2b8b 100644 --- a/lvt/datastreams/UASMAP/readUASMAPobs.F90 +++ b/lvt/datastreams/UASMAP/readUASMAPobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UA_SNOW/UASNOW_obsMod.F90 b/lvt/datastreams/UA_SNOW/UASNOW_obsMod.F90 index ead041c54..31f80cf9e 100755 --- a/lvt/datastreams/UA_SNOW/UASNOW_obsMod.F90 +++ b/lvt/datastreams/UA_SNOW/UASNOW_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UA_SNOW/readUASNOWObs.F90 b/lvt/datastreams/UA_SNOW/readUASNOWObs.F90 index 37ef3f1a3..537a46012 100755 --- a/lvt/datastreams/UA_SNOW/readUASNOWObs.F90 +++ b/lvt/datastreams/UA_SNOW/readUASNOWObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UCLA_SWE_reanal/UCLASWEreanal_dataMod.F90 b/lvt/datastreams/UCLA_SWE_reanal/UCLASWEreanal_dataMod.F90 index d97660fbb..4eeb544fc 100644 --- a/lvt/datastreams/UCLA_SWE_reanal/UCLASWEreanal_dataMod.F90 +++ b/lvt/datastreams/UCLA_SWE_reanal/UCLASWEreanal_dataMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UCLA_SWE_reanal/readUCLASWEreanal.F90 b/lvt/datastreams/UCLA_SWE_reanal/readUCLASWEreanal.F90 index a8756c98d..855221143 100644 --- a/lvt/datastreams/UCLA_SWE_reanal/readUCLASWEreanal.F90 +++ b/lvt/datastreams/UCLA_SWE_reanal/readUCLASWEreanal.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USCRNsm/USCRNsm_obsMod.F90 b/lvt/datastreams/USCRNsm/USCRNsm_obsMod.F90 index abc100235..16aa9b9b6 100644 --- a/lvt/datastreams/USCRNsm/USCRNsm_obsMod.F90 +++ b/lvt/datastreams/USCRNsm/USCRNsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USCRNsm/readUSCRNsmObs.F90 b/lvt/datastreams/USCRNsm/readUSCRNsmObs.F90 index b12fe0ece..501e996be 100644 --- a/lvt/datastreams/USCRNsm/readUSCRNsmObs.F90 +++ b/lvt/datastreams/USCRNsm/readUSCRNsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USDM/USDM_obsMod.F90 b/lvt/datastreams/USDM/USDM_obsMod.F90 index 5e574f70b..79c0dd40c 100644 --- a/lvt/datastreams/USDM/USDM_obsMod.F90 +++ b/lvt/datastreams/USDM/USDM_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USDM/readUSDMobs.F90 b/lvt/datastreams/USDM/readUSDMobs.F90 index 66db3d3b7..75378ea8d 100644 --- a/lvt/datastreams/USDM/readUSDMobs.F90 +++ b/lvt/datastreams/USDM/readUSDMobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USGS_GWwell/USGSGWwell_obsMod.F90 b/lvt/datastreams/USGS_GWwell/USGSGWwell_obsMod.F90 index 3e3a900f1..7d76a0ebf 100644 --- a/lvt/datastreams/USGS_GWwell/USGSGWwell_obsMod.F90 +++ b/lvt/datastreams/USGS_GWwell/USGSGWwell_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USGS_GWwell/readUSGSGWwellobs.F90 b/lvt/datastreams/USGS_GWwell/readUSGSGWwellobs.F90 index 561515943..16ca41f50 100644 --- a/lvt/datastreams/USGS_GWwell/readUSGSGWwellobs.F90 +++ b/lvt/datastreams/USGS_GWwell/readUSGSGWwellobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USGS_streamflow/USGSSF_obsMod.F90 b/lvt/datastreams/USGS_streamflow/USGSSF_obsMod.F90 index 82b27fec2..433e399ff 100644 --- a/lvt/datastreams/USGS_streamflow/USGSSF_obsMod.F90 +++ b/lvt/datastreams/USGS_streamflow/USGSSF_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USGS_streamflow/readUSGSSFObs.F90 b/lvt/datastreams/USGS_streamflow/readUSGSSFObs.F90 index 138f632c9..02c40fa4c 100644 --- a/lvt/datastreams/USGS_streamflow/readUSGSSFObs.F90 +++ b/lvt/datastreams/USGS_streamflow/readUSGSSFObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USGS_streamflow_gridded/USGSSFgrid_obsMod.F90 b/lvt/datastreams/USGS_streamflow_gridded/USGSSFgrid_obsMod.F90 index 5e4ecb443..353d4529d 100644 --- a/lvt/datastreams/USGS_streamflow_gridded/USGSSFgrid_obsMod.F90 +++ b/lvt/datastreams/USGS_streamflow_gridded/USGSSFgrid_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/USGS_streamflow_gridded/readUSGSSFgridObs.F90 b/lvt/datastreams/USGS_streamflow_gridded/readUSGSSFgridObs.F90 index 551afc66d..78220cb66 100644 --- a/lvt/datastreams/USGS_streamflow_gridded/readUSGSSFgridObs.F90 +++ b/lvt/datastreams/USGS_streamflow_gridded/readUSGSSFgridObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UWET/UWET_obsMod.F90 b/lvt/datastreams/UWET/UWET_obsMod.F90 index ac60cb942..9f884b68b 100644 --- a/lvt/datastreams/UWET/UWET_obsMod.F90 +++ b/lvt/datastreams/UWET/UWET_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/UWET/readUWETObs.F90 b/lvt/datastreams/UWET/readUWETObs.F90 index e1eed31bd..6531e3b8f 100644 --- a/lvt/datastreams/UWET/readUWETObs.F90 +++ b/lvt/datastreams/UWET/readUWETObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/WGPBMR/WGPBMRobsMod.F90 b/lvt/datastreams/WGPBMR/WGPBMRobsMod.F90 index 6c9870736..cbb58d2c3 100644 --- a/lvt/datastreams/WGPBMR/WGPBMRobsMod.F90 +++ b/lvt/datastreams/WGPBMR/WGPBMRobsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/WGPBMR/readWGPBMRObs.F90 b/lvt/datastreams/WGPBMR/readWGPBMRObs.F90 index eb7353ce5..a4e8ae464 100644 --- a/lvt/datastreams/WGPBMR/readWGPBMRObs.F90 +++ b/lvt/datastreams/WGPBMR/readWGPBMRObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/WGSWRC/WGSWRC_obsMod.F90 b/lvt/datastreams/WGSWRC/WGSWRC_obsMod.F90 index 9ca6a689e..df3c6b77c 100644 --- a/lvt/datastreams/WGSWRC/WGSWRC_obsMod.F90 +++ b/lvt/datastreams/WGSWRC/WGSWRC_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/WGSWRC/readWGSWRCobs.F90 b/lvt/datastreams/WGSWRC/readWGSWRCobs.F90 index dac99c2f7..d803b81d8 100644 --- a/lvt/datastreams/WGSWRC/readWGSWRCobs.F90 +++ b/lvt/datastreams/WGSWRC/readWGSWRCobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/jasmin/JASMINsm_obsMod.F90 b/lvt/datastreams/jasmin/JASMINsm_obsMod.F90 index 11e31a701..4b9872949 100644 --- a/lvt/datastreams/jasmin/JASMINsm_obsMod.F90 +++ b/lvt/datastreams/jasmin/JASMINsm_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/jasmin/readJASMINsmObs.F90 b/lvt/datastreams/jasmin/readJASMINsmObs.F90 index 40516a780..a052bd5c2 100644 --- a/lvt/datastreams/jasmin/readJASMINsmObs.F90 +++ b/lvt/datastreams/jasmin/readJASMINsmObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/simGRACE/readsimGRACEObs.F90 b/lvt/datastreams/simGRACE/readsimGRACEObs.F90 index 0a7ec3dfc..2850d6c43 100644 --- a/lvt/datastreams/simGRACE/readsimGRACEObs.F90 +++ b/lvt/datastreams/simGRACE/readsimGRACEObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/simGRACE/simGRACE_obsMod.F90 b/lvt/datastreams/simGRACE/simGRACE_obsMod.F90 index a4ca13984..25d0b0940 100644 --- a/lvt/datastreams/simGRACE/simGRACE_obsMod.F90 +++ b/lvt/datastreams/simGRACE/simGRACE_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/template/readtemplateObs.F90 b/lvt/datastreams/template/readtemplateObs.F90 index bdfeeb267..8eb175012 100644 --- a/lvt/datastreams/template/readtemplateObs.F90 +++ b/lvt/datastreams/template/readtemplateObs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/datastreams/template/template_obsMod.F90 b/lvt/datastreams/template/template_obsMod.F90 index 48000e0c4..95882303f 100644 --- a/lvt/datastreams/template/template_obsMod.F90 +++ b/lvt/datastreams/template/template_obsMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/domains/UTM/readinput_UTM.F90 b/lvt/domains/UTM/readinput_UTM.F90 index b7d50a486..bea531244 100644 --- a/lvt/domains/UTM/readinput_UTM.F90 +++ b/lvt/domains/UTM/readinput_UTM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/domains/lambert/readinput_lambert.F90 b/lvt/domains/lambert/readinput_lambert.F90 index d5a5ed364..913aaef00 100644 --- a/lvt/domains/lambert/readinput_lambert.F90 +++ b/lvt/domains/lambert/readinput_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/domains/latlon/readinput_latlon.F90 b/lvt/domains/latlon/readinput_latlon.F90 index c886056f3..ed0bd2d77 100644 --- a/lvt/domains/latlon/readinput_latlon.F90 +++ b/lvt/domains/latlon/readinput_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/UTM_utils.F90 b/lvt/interp/UTM_utils.F90 index 9f3d55e21..11a07d791 100755 --- a/lvt/interp/UTM_utils.F90 +++ b/lvt/interp/UTM_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/bilinear_interp.F90 b/lvt/interp/bilinear_interp.F90 index 021621ef8..4936568d6 100644 --- a/lvt/interp/bilinear_interp.F90 +++ b/lvt/interp/bilinear_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/bilinear_interp_input.F90 b/lvt/interp/bilinear_interp_input.F90 index 38ffaab00..f9675d4bc 100644 --- a/lvt/interp/bilinear_interp_input.F90 +++ b/lvt/interp/bilinear_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/breakpt_module.F90 b/lvt/interp/breakpt_module.F90 index db5cfca4d..1e687cc86 100644 --- a/lvt/interp/breakpt_module.F90 +++ b/lvt/interp/breakpt_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord.F90 b/lvt/interp/compute_earth_coord.F90 index d64477330..a54d0aa13 100644 --- a/lvt/interp/compute_earth_coord.F90 +++ b/lvt/interp/compute_earth_coord.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_UTM.F90 b/lvt/interp/compute_earth_coord_UTM.F90 index cefa79e6a..a2d549438 100644 --- a/lvt/interp/compute_earth_coord_UTM.F90 +++ b/lvt/interp/compute_earth_coord_UTM.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_ease.F90 b/lvt/interp/compute_earth_coord_ease.F90 index 49cb4737e..7980c0262 100644 --- a/lvt/interp/compute_earth_coord_ease.F90 +++ b/lvt/interp/compute_earth_coord_ease.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_gauss.F90 b/lvt/interp/compute_earth_coord_gauss.F90 index 151a805ec..3b85e3779 100644 --- a/lvt/interp/compute_earth_coord_gauss.F90 +++ b/lvt/interp/compute_earth_coord_gauss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_hrap.F90 b/lvt/interp/compute_earth_coord_hrap.F90 index efb8a316c..92215d135 100644 --- a/lvt/interp/compute_earth_coord_hrap.F90 +++ b/lvt/interp/compute_earth_coord_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_lambert.F90 b/lvt/interp/compute_earth_coord_lambert.F90 index 6f56268fc..4f535d6b2 100644 --- a/lvt/interp/compute_earth_coord_lambert.F90 +++ b/lvt/interp/compute_earth_coord_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_latlon.F90 b/lvt/interp/compute_earth_coord_latlon.F90 index c07897557..74b5f10ee 100644 --- a/lvt/interp/compute_earth_coord_latlon.F90 +++ b/lvt/interp/compute_earth_coord_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_latlon_ll.F90 b/lvt/interp/compute_earth_coord_latlon_ll.F90 index b1a130c04..0983b2928 100644 --- a/lvt/interp/compute_earth_coord_latlon_ll.F90 +++ b/lvt/interp/compute_earth_coord_latlon_ll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_latlon_ur.F90 b/lvt/interp/compute_earth_coord_latlon_ur.F90 index 373361c83..b008f7c7d 100644 --- a/lvt/interp/compute_earth_coord_latlon_ur.F90 +++ b/lvt/interp/compute_earth_coord_latlon_ur.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_ll.F90 b/lvt/interp/compute_earth_coord_ll.F90 index 9a1d0796f..ef99eb7a3 100644 --- a/lvt/interp/compute_earth_coord_ll.F90 +++ b/lvt/interp/compute_earth_coord_ll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_merc.F90 b/lvt/interp/compute_earth_coord_merc.F90 index f76ba8562..0a784223e 100644 --- a/lvt/interp/compute_earth_coord_merc.F90 +++ b/lvt/interp/compute_earth_coord_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_polar.F90 b/lvt/interp/compute_earth_coord_polar.F90 index c599d0808..a36ad02d9 100644 --- a/lvt/interp/compute_earth_coord_polar.F90 +++ b/lvt/interp/compute_earth_coord_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_earth_coord_ur.F90 b/lvt/interp/compute_earth_coord_ur.F90 index 32746d58d..2e716dda7 100644 --- a/lvt/interp/compute_earth_coord_ur.F90 +++ b/lvt/interp/compute_earth_coord_ur.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord.F90 b/lvt/interp/compute_grid_coord.F90 index 07d4dc473..00d2d2eb1 100644 --- a/lvt/interp/compute_grid_coord.F90 +++ b/lvt/interp/compute_grid_coord.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_ease.F90 b/lvt/interp/compute_grid_coord_ease.F90 index 637db923a..0027ce505 100644 --- a/lvt/interp/compute_grid_coord_ease.F90 +++ b/lvt/interp/compute_grid_coord_ease.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_gauss.F90 b/lvt/interp/compute_grid_coord_gauss.F90 index a6bf78dff..1a5c7c94a 100644 --- a/lvt/interp/compute_grid_coord_gauss.F90 +++ b/lvt/interp/compute_grid_coord_gauss.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_hrap.F90 b/lvt/interp/compute_grid_coord_hrap.F90 index 892ab48ae..23ea81447 100644 --- a/lvt/interp/compute_grid_coord_hrap.F90 +++ b/lvt/interp/compute_grid_coord_hrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_lambert.F90 b/lvt/interp/compute_grid_coord_lambert.F90 index 47769572b..d6e16c8cd 100644 --- a/lvt/interp/compute_grid_coord_lambert.F90 +++ b/lvt/interp/compute_grid_coord_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_latlon.F90 b/lvt/interp/compute_grid_coord_latlon.F90 index 6854f32b9..8a4c9e50a 100644 --- a/lvt/interp/compute_grid_coord_latlon.F90 +++ b/lvt/interp/compute_grid_coord_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_merc.F90 b/lvt/interp/compute_grid_coord_merc.F90 index 841a221ca..5744e2a40 100644 --- a/lvt/interp/compute_grid_coord_merc.F90 +++ b/lvt/interp/compute_grid_coord_merc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_grid_coord_polar.F90 b/lvt/interp/compute_grid_coord_polar.F90 index cf851e277..73116747a 100644 --- a/lvt/interp/compute_grid_coord_polar.F90 +++ b/lvt/interp/compute_grid_coord_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_stnwts.F90 b/lvt/interp/compute_stnwts.F90 index 51f541a4b..54fc5ebd6 100644 --- a/lvt/interp/compute_stnwts.F90 +++ b/lvt/interp/compute_stnwts.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/compute_vinterp_weights.F90 b/lvt/interp/compute_vinterp_weights.F90 index 5b9067395..09daafaa1 100644 --- a/lvt/interp/compute_vinterp_weights.F90 +++ b/lvt/interp/compute_vinterp_weights.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/conserv_interp.F90 b/lvt/interp/conserv_interp.F90 index 3f4847dc1..129013f23 100644 --- a/lvt/interp/conserv_interp.F90 +++ b/lvt/interp/conserv_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/conserv_interp_input.F90 b/lvt/interp/conserv_interp_input.F90 index c94b4d934..6381b85cc 100644 --- a/lvt/interp/conserv_interp_input.F90 +++ b/lvt/interp/conserv_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/ezlh_convert.F90 b/lvt/interp/ezlh_convert.F90 index 3176d8c28..56b617705 100755 --- a/lvt/interp/ezlh_convert.F90 +++ b/lvt/interp/ezlh_convert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/ezlh_inverse.F90 b/lvt/interp/ezlh_inverse.F90 index bc1765ffa..7b685d711 100755 --- a/lvt/interp/ezlh_inverse.F90 +++ b/lvt/interp/ezlh_inverse.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/gaussian_mod.F90 b/lvt/interp/gaussian_mod.F90 index 5ce6f3f8e..c09308cd6 100644 --- a/lvt/interp/gaussian_mod.F90 +++ b/lvt/interp/gaussian_mod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/gaussian_routines.F90 b/lvt/interp/gaussian_routines.F90 index 50caf12ad..0222e5a7d 100644 --- a/lvt/interp/gaussian_routines.F90 +++ b/lvt/interp/gaussian_routines.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/gausslat.F90 b/lvt/interp/gausslat.F90 index 2cf20fc9a..16ce6b639 100644 --- a/lvt/interp/gausslat.F90 +++ b/lvt/interp/gausslat.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/get_fieldpos.F90 b/lvt/interp/get_fieldpos.F90 index 7e56d18bb..8730f8697 100644 --- a/lvt/interp/get_fieldpos.F90 +++ b/lvt/interp/get_fieldpos.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/hrapToLatLon.F90 b/lvt/interp/hrapToLatLon.F90 index e8582887e..945b58dc7 100644 --- a/lvt/interp/hrapToLatLon.F90 +++ b/lvt/interp/hrapToLatLon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/idw_module.F90 b/lvt/interp/idw_module.F90 index 72e789e15..8eb4123a5 100644 --- a/lvt/interp/idw_module.F90 +++ b/lvt/interp/idw_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/interp_stndata.F90 b/lvt/interp/interp_stndata.F90 index 461b110e5..9df10f2cc 100644 --- a/lvt/interp/interp_stndata.F90 +++ b/lvt/interp/interp_stndata.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/latlonTohrap.F90 b/lvt/interp/latlonTohrap.F90 index 9145872e2..cedc672a8 100644 --- a/lvt/interp/latlonTohrap.F90 +++ b/lvt/interp/latlonTohrap.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/latlonTopolar.F90 b/lvt/interp/latlonTopolar.F90 index c0e26a297..5bb9f68de 100644 --- a/lvt/interp/latlonTopolar.F90 +++ b/lvt/interp/latlonTopolar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/lltops.F90 b/lvt/interp/lltops.F90 index c579e375c..f960ddeec 100644 --- a/lvt/interp/lltops.F90 +++ b/lvt/interp/lltops.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/map_utils.F90 b/lvt/interp/map_utils.F90 index 65477cd24..e54080e81 100644 --- a/lvt/interp/map_utils.F90 +++ b/lvt/interp/map_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/mqb_module.F90 b/lvt/interp/mqb_module.F90 index dbe17038a..0cb3f7392 100644 --- a/lvt/interp/mqb_module.F90 +++ b/lvt/interp/mqb_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/neighbor_interp.F90 b/lvt/interp/neighbor_interp.F90 index f5bf12888..cabf19e99 100644 --- a/lvt/interp/neighbor_interp.F90 +++ b/lvt/interp/neighbor_interp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/neighbor_interp_input.F90 b/lvt/interp/neighbor_interp_input.F90 index 1809760ad..314c44a34 100644 --- a/lvt/interp/neighbor_interp_input.F90 +++ b/lvt/interp/neighbor_interp_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/normalize_stnwts.F90 b/lvt/interp/normalize_stnwts.F90 index 6fdd0d643..0668fabde 100644 --- a/lvt/interp/normalize_stnwts.F90 +++ b/lvt/interp/normalize_stnwts.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/polarToLatLon.F90 b/lvt/interp/polarToLatLon.F90 index 62c41af6c..91918bc16 100644 --- a/lvt/interp/polarToLatLon.F90 +++ b/lvt/interp/polarToLatLon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/polfixs.F90 b/lvt/interp/polfixs.F90 index 49bb15a44..c378fc476 100644 --- a/lvt/interp/polfixs.F90 +++ b/lvt/interp/polfixs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/pstoll.F90 b/lvt/interp/pstoll.F90 index 0a8818363..165f0cd44 100644 --- a/lvt/interp/pstoll.F90 +++ b/lvt/interp/pstoll.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/stninterp_module.F90 b/lvt/interp/stninterp_module.F90 index 6b4fb45d4..9295773a4 100644 --- a/lvt/interp/stninterp_module.F90 +++ b/lvt/interp/stninterp_module.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/upscaleByAveraging.F90 b/lvt/interp/upscaleByAveraging.F90 index 58f454a2f..b81bfade3 100644 --- a/lvt/interp/upscaleByAveraging.F90 +++ b/lvt/interp/upscaleByAveraging.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/upscaleByAveraging_input.F90 b/lvt/interp/upscaleByAveraging_input.F90 index bac9b7380..f8b6d2181 100644 --- a/lvt/interp/upscaleByAveraging_input.F90 +++ b/lvt/interp/upscaleByAveraging_input.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/upscaleByAveraging_input_with_latlon.F90 b/lvt/interp/upscaleByAveraging_input_with_latlon.F90 index bdcc1c526..b2e1cf0e3 100644 --- a/lvt/interp/upscaleByAveraging_input_with_latlon.F90 +++ b/lvt/interp/upscaleByAveraging_input_with_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/upscaleByMode.F90 b/lvt/interp/upscaleByMode.F90 index c15ef30a6..6fd8f62ac 100644 --- a/lvt/interp/upscaleByMode.F90 +++ b/lvt/interp/upscaleByMode.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/interp/vinterp.F90 b/lvt/interp/vinterp.F90 index 593ed3fcf..f54428c91 100644 --- a/lvt/interp/vinterp.F90 +++ b/lvt/interp/vinterp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/main/LVTmain.F90 b/lvt/main/LVTmain.F90 index 152c384d6..7b089f433 100644 --- a/lvt/main/LVTmain.F90 +++ b/lvt/main/LVTmain.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/make/Filepath b/lvt/make/Filepath index 428769ab1..a1e42cc42 100644 --- a/lvt/make/Filepath +++ b/lvt/make/Filepath @@ -1,7 +1 @@ -dirs := . ../main ../core ../metrics ../plugins ../interp ../lib/bil ../domains/UTM ../domains/lambert ../domains/latlon ../datastreams/template ../datastreams/LISout ../datastreams/LISDAobs ../datastreams/ISCCP_Tskin ../datastreams/CEOP ../datastreams/SCAN ../datastreams/SCANGMAO ../datastreams/NASMD ../datastreams/GHCN ../datastreams/SNOTEL ../datastreams/SURFRAD ../datastreams/WGPBMR ../datastreams/LSWG_Tb ../datastreams/FMI_SWE ../datastreams/FMI_SNWD ../datastreams/CMC_SNWD ../datastreams/SNODAS ../datastreams/NASA_AMSRE_sm ../datastreams/LPRM_AMSRE_sm ../datastreams/AMMA ../datastreams/Ameriflux ../datastreams/ARM ../datastreams/SMOSREX ../datastreams/AGRMET ../datastreams/GlobSnow ../datastreams/SNODEPmetobs ../datastreams/SNODEP ../datastreams/MOD10A1 ../datastreams/MODSCAG ../datastreams/MOD10A1V6 ../datastreams/ANSA_SNWD ../datastreams/ANSA_SWE ../datastreams/CPC_PRCP ../datastreams/USGS_streamflow_gridded ../datastreams/USGS_streamflow ../datastreams/Natural_streamflow ../datastreams/ISMN ../datastreams/FLUXNETmte ../datastreams/FLUXNET2015 ../datastreams/FLUXNET2015_NC ../datastreams/MOD16A2 ../datastreams/UWET ../datastreams/ARSsm ../datastreams/NLDAS2 ../datastreams/ALEXI ../datastreams/ALEXIesi ../datastreams/GRACE ../datastreams/simGRACE ../datastreams/USGS_GWwell ../datastreams/PBOH2O ../datastreams/SMOS_L2sm ../datastreams/SMOS_NESDIS ../datastreams/SMOS_L1TB ../datastreams/SMOS_CATDS_L3sm ../datastreams/GCOMW_AMSR2L3sm ../datastreams/GCOMW_AMSR2L3snd ../datastreams/SMOPS ../datastreams/MODIS_LST ../datastreams/GLERL_HydroData ../datastreams/JULESdata ../datastreams/JULES2Ddata ../datastreams/ESACCI_sm ../datastreams/GIMMS_AVHRR_NDVI ../datastreams/GIMMS_MODIS_NDVI ../datastreams/GLDAS1 ../datastreams/GLDAS2 ../datastreams/MERRA2 ../datastreams/MERRA2asm ../datastreams/MERRA-Land ../datastreams/SSEBop ../datastreams/GRDC ../datastreams/GOES_LST ../datastreams/ERAinterimLand ../datastreams/SMAPsm ../datastreams/SMAPvod ../datastreams/LPRMvod ../datastreams/SMAPvwc ../datastreams/SMAP_L3TB ../datastreams/SMAPTB ../datastreams/GOME2_SIF ../datastreams/LVTbenchmarkOUT ../datastreams/LIS6out ../datastreams/LISDAdiag ../datastreams/Daymet ../datastreams/CMORPH ../datastreams/CHIRPSv2 ../datastreams/3B42V7 ../datastreams/USCRNsm ../datastreams/GLEAM ../datastreams/USDM ../datastreams/LVTpercentile ../datastreams/IMD_PRCP ../datastreams/APHRO_PRCP ../datastreams/GLASSlai ../datastreams/MODISsportLAI ../datastreams/FLUXCOM ../datastreams/HAR ../datastreams/OCO2_SIF ../datastreams/ECMWFforc ../datastreams/GDASforc ../datastreams/ASO_SWE ../runmodes/DataComp ../runmodes/557post ../runmodes/LISpost ../runmodes/DAstats ../runmodes/optUE ../runmodes/Benchmarking ../runmodes/USAFSIpost ../training/LinearRegression/ ../datastreams/GLASSalbedo ../datastreams/IMERG ../datastreams/UA_SNOW ../datastreams/OzFlux ../datastreams/jasmin ../datastreams/MCD15A2H ../datastreams/ERA5 ../datastreams/FluxSat_GPP ../datastreams/THySM/ ../datastreams/GRUNrunoff ../datastreams/UASMAP/ ../datastreams/SMAP_E_OPL/ - - - - - - +dirs := . ../main ../core ../metrics ../plugins ../interp ../lib/bil ../domains/UTM ../domains/lambert ../domains/latlon ../datastreams/template ../datastreams/LISout ../datastreams/LISDAobs ../datastreams/ISCCP_Tskin ../datastreams/CEOP ../datastreams/SCAN ../datastreams/SCANGMAO ../datastreams/NASMD ../datastreams/GHCN ../datastreams/SNOTEL ../datastreams/SURFRAD ../datastreams/WGPBMR ../datastreams/LSWG_Tb ../datastreams/FMI_SWE ../datastreams/FMI_SNWD ../datastreams/CMC_SNWD ../datastreams/SNODAS ../datastreams/NASA_AMSRE_sm ../datastreams/LPRM_AMSRE_sm ../datastreams/AMMA ../datastreams/Ameriflux ../datastreams/ARM ../datastreams/SMOSREX ../datastreams/AGRMET ../datastreams/GlobSnow ../datastreams/SNODEPmetobs ../datastreams/SNODEP ../datastreams/MOD10A1 ../datastreams/MODSCAG ../datastreams/MOD10A1V6 ../datastreams/ANSA_SNWD ../datastreams/ANSA_SWE ../datastreams/CPC_PRCP ../datastreams/USGS_streamflow_gridded ../datastreams/USGS_streamflow ../datastreams/Natural_streamflow ../datastreams/ISMN ../datastreams/FLUXNETmte ../datastreams/FLUXNET2015 ../datastreams/FLUXNET2015_NC ../datastreams/MOD16A2 ../datastreams/UWET ../datastreams/ARSsm ../datastreams/NLDAS2 ../datastreams/ALEXI ../datastreams/ALEXIesi ../datastreams/GRACE ../datastreams/simGRACE ../datastreams/USGS_GWwell ../datastreams/PBOH2O ../datastreams/SMOS_L2sm ../datastreams/SMOS_NESDIS ../datastreams/SMOS_L1TB ../datastreams/SMOS_CATDS_L3sm ../datastreams/GCOMW_AMSR2L3sm ../datastreams/GCOMW_AMSR2L3snd ../datastreams/SMOPS ../datastreams/MODIS_LST ../datastreams/GLERL_HydroData ../datastreams/JULESdata ../datastreams/JULES2Ddata ../datastreams/ESACCI_sm ../datastreams/GIMMS_AVHRR_NDVI ../datastreams/GIMMS_MODIS_NDVI ../datastreams/GLDAS1 ../datastreams/GLDAS2 ../datastreams/MERRA2 ../datastreams/MERRA2asm ../datastreams/MERRA-Land ../datastreams/SSEBop ../datastreams/GRDC ../datastreams/GOES_LST ../datastreams/ERAinterimLand ../datastreams/SMAPsm ../datastreams/SMAPvod ../datastreams/LPRMvod ../datastreams/SMAPvwc ../datastreams/SMAP_L3TB ../datastreams/SMAPTB ../datastreams/GOME2_SIF ../datastreams/LVTbenchmarkOUT ../datastreams/LIS6out ../datastreams/LISDAdiag ../datastreams/Daymet ../datastreams/CMORPH ../datastreams/CHIRPSv2 ../datastreams/3B42V7 ../datastreams/USCRNsm ../datastreams/GLEAM ../datastreams/USDM ../datastreams/LVTpercentile ../datastreams/IMD_PRCP ../datastreams/APHRO_PRCP ../datastreams/GLASSlai ../datastreams/MODISsportLAI ../datastreams/FLUXCOM ../datastreams/HAR ../datastreams/OCO2_SIF ../datastreams/ECMWFforc ../datastreams/GDASforc ../datastreams/ASO_SWE ../runmodes/DataComp ../runmodes/557post ../runmodes/LISpost ../runmodes/DAstats ../runmodes/optUE ../runmodes/Benchmarking ../runmodes/USAFSIpost ../training/LinearRegression/ ../datastreams/GLASSalbedo ../datastreams/IMERG ../datastreams/IMERG_monthly ../datastreams/UA_SNOW ../datastreams/OzFlux ../datastreams/jasmin ../datastreams/MCD15A2H ../datastreams/ERA5 ../datastreams/FluxSat_GPP ../datastreams/THySM/ ../datastreams/GRUNrunoff ../datastreams/UASMAP/ ../datastreams/COAMPSout/ ../datastreams/SMAP_E_OPL/ diff --git a/lvt/make/makedep.py b/lvt/make/makedep.py index a7d033e9c..77955a4c1 100755 --- a/lvt/make/makedep.py +++ b/lvt/make/makedep.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_ACCMod.F90 b/lvt/metrics/LVT_ACCMod.F90 index 98f72afe5..665eb3eb1 100644 --- a/lvt/metrics/LVT_ACCMod.F90 +++ b/lvt/metrics/LVT_ACCMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_AnomalyCorrMod.F90 b/lvt/metrics/LVT_AnomalyCorrMod.F90 index f02cd3ce0..6aa6d44d2 100644 --- a/lvt/metrics/LVT_AnomalyCorrMod.F90 +++ b/lvt/metrics/LVT_AnomalyCorrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_AnomalyMod.F90 b/lvt/metrics/LVT_AnomalyMod.F90 index c2297e9f3..19aba8740 100644 --- a/lvt/metrics/LVT_AnomalyMod.F90 +++ b/lvt/metrics/LVT_AnomalyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_AnomalyRMSEMod.F90 b/lvt/metrics/LVT_AnomalyRMSEMod.F90 index 21f24d016..951e282e4 100644 --- a/lvt/metrics/LVT_AnomalyRMSEMod.F90 +++ b/lvt/metrics/LVT_AnomalyRMSEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_AnomalyRnkCorrMod.F90 b/lvt/metrics/LVT_AnomalyRnkCorrMod.F90 index ec347ec32..e81cd5963 100644 --- a/lvt/metrics/LVT_AnomalyRnkCorrMod.F90 +++ b/lvt/metrics/LVT_AnomalyRnkCorrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_AreaMetricMod.F90 b/lvt/metrics/LVT_AreaMetricMod.F90 index 36af1a76b..de9867b59 100644 --- a/lvt/metrics/LVT_AreaMetricMod.F90 +++ b/lvt/metrics/LVT_AreaMetricMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_BIASMod.F90 b/lvt/metrics/LVT_BIASMod.F90 index 2ced85843..539661b01 100644 --- a/lvt/metrics/LVT_BIASMod.F90 +++ b/lvt/metrics/LVT_BIASMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_CSIMod.F90 b/lvt/metrics/LVT_CSIMod.F90 index fcb129c8e..e394a41b3 100644 --- a/lvt/metrics/LVT_CSIMod.F90 +++ b/lvt/metrics/LVT_CSIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_CSSMod.F90 b/lvt/metrics/LVT_CSSMod.F90 index 0f367c316..39b9512d9 100644 --- a/lvt/metrics/LVT_CSSMod.F90 +++ b/lvt/metrics/LVT_CSSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_ConditionalEntropyMod.F90 b/lvt/metrics/LVT_ConditionalEntropyMod.F90 index 8f2b65747..5e4ba7ce5 100644 --- a/lvt/metrics/LVT_ConditionalEntropyMod.F90 +++ b/lvt/metrics/LVT_ConditionalEntropyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_DFRMod.F90 b/lvt/metrics/LVT_DFRMod.F90 index fee9671c6..3f2e76f03 100644 --- a/lvt/metrics/LVT_DFRMod.F90 +++ b/lvt/metrics/LVT_DFRMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_EFMod.F90 b/lvt/metrics/LVT_EFMod.F90 index 16cb3fbe5..b6f59c957 100644 --- a/lvt/metrics/LVT_EFMod.F90 +++ b/lvt/metrics/LVT_EFMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_ETSMod.F90 b/lvt/metrics/LVT_ETSMod.F90 index 7d24ec2b8..26aa71307 100644 --- a/lvt/metrics/LVT_ETSMod.F90 +++ b/lvt/metrics/LVT_ETSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_EffectiveComplexityMod.F90 b/lvt/metrics/LVT_EffectiveComplexityMod.F90 index 0d15a51e8..9c468e46d 100644 --- a/lvt/metrics/LVT_EffectiveComplexityMod.F90 +++ b/lvt/metrics/LVT_EffectiveComplexityMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_FARMod.F90 b/lvt/metrics/LVT_FARMod.F90 index 5e4d0f947..5c01d89ba 100644 --- a/lvt/metrics/LVT_FARMod.F90 +++ b/lvt/metrics/LVT_FARMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_FBIASMod.F90 b/lvt/metrics/LVT_FBIASMod.F90 index 26957450f..1295f4aa9 100644 --- a/lvt/metrics/LVT_FBIASMod.F90 +++ b/lvt/metrics/LVT_FBIASMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_FFMod.F90 b/lvt/metrics/LVT_FFMod.F90 index db4056eb6..6b5b55986 100644 --- a/lvt/metrics/LVT_FFMod.F90 +++ b/lvt/metrics/LVT_FFMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_FluctuationComplexityMod.F90 b/lvt/metrics/LVT_FluctuationComplexityMod.F90 index c4036c7ae..c098ef00a 100644 --- a/lvt/metrics/LVT_FluctuationComplexityMod.F90 +++ b/lvt/metrics/LVT_FluctuationComplexityMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_HNMod.F90 b/lvt/metrics/LVT_HNMod.F90 index 630edcf5d..f1e506de1 100644 --- a/lvt/metrics/LVT_HNMod.F90 +++ b/lvt/metrics/LVT_HNMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_HSSMod.F90 b/lvt/metrics/LVT_HSSMod.F90 index 16d0aa3d4..ccc02effc 100644 --- a/lvt/metrics/LVT_HSSMod.F90 +++ b/lvt/metrics/LVT_HSSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_InformationEntropyMod.F90 b/lvt/metrics/LVT_InformationEntropyMod.F90 index e3e772674..6db0c1d01 100644 --- a/lvt/metrics/LVT_InformationEntropyMod.F90 +++ b/lvt/metrics/LVT_InformationEntropyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_InformationGainMod.F90 b/lvt/metrics/LVT_InformationGainMod.F90 index abef9ab88..1a105e3a3 100644 --- a/lvt/metrics/LVT_InformationGainMod.F90 +++ b/lvt/metrics/LVT_InformationGainMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_JointEntropyMod.F90 b/lvt/metrics/LVT_JointEntropyMod.F90 index fdcc9c5f2..5352fa0f9 100644 --- a/lvt/metrics/LVT_JointEntropyMod.F90 +++ b/lvt/metrics/LVT_JointEntropyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_KmeansMod.F90 b/lvt/metrics/LVT_KmeansMod.F90 index 15594a863..bc69dc03b 100644 --- a/lvt/metrics/LVT_KmeansMod.F90 +++ b/lvt/metrics/LVT_KmeansMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MAEMod.F90 b/lvt/metrics/LVT_MAEMod.F90 index b8ad588df..cd5045a8d 100644 --- a/lvt/metrics/LVT_MAEMod.F90 +++ b/lvt/metrics/LVT_MAEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MEANMod.F90 b/lvt/metrics/LVT_MEANMod.F90 index 76256fec4..ed34a16dd 100644 --- a/lvt/metrics/LVT_MEANMod.F90 +++ b/lvt/metrics/LVT_MEANMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MaxMod.F90 b/lvt/metrics/LVT_MaxMod.F90 index d4d24cf26..542c2b87a 100644 --- a/lvt/metrics/LVT_MaxMod.F90 +++ b/lvt/metrics/LVT_MaxMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MaxTimeMod.F90 b/lvt/metrics/LVT_MaxTimeMod.F90 index 4b9d70f87..4a11444f9 100644 --- a/lvt/metrics/LVT_MaxTimeMod.F90 +++ b/lvt/metrics/LVT_MaxTimeMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MetricEntropyMod.F90 b/lvt/metrics/LVT_MetricEntropyMod.F90 index 48f2c0b5c..df45cca66 100644 --- a/lvt/metrics/LVT_MetricEntropyMod.F90 +++ b/lvt/metrics/LVT_MetricEntropyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MinMod.F90 b/lvt/metrics/LVT_MinMod.F90 index 1c49788bf..24c67237d 100644 --- a/lvt/metrics/LVT_MinMod.F90 +++ b/lvt/metrics/LVT_MinMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MinTimeMod.F90 b/lvt/metrics/LVT_MinTimeMod.F90 index c5804b0cf..9bd886e1a 100644 --- a/lvt/metrics/LVT_MinTimeMod.F90 +++ b/lvt/metrics/LVT_MinTimeMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_MutualInformationMod.F90 b/lvt/metrics/LVT_MutualInformationMod.F90 index 396a41242..c5feb72a7 100644 --- a/lvt/metrics/LVT_MutualInformationMod.F90 +++ b/lvt/metrics/LVT_MutualInformationMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_NSEMod.F90 b/lvt/metrics/LVT_NSEMod.F90 index ce51d9fac..c00e47580 100644 --- a/lvt/metrics/LVT_NSEMod.F90 +++ b/lvt/metrics/LVT_NSEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_PODNMod.F90 b/lvt/metrics/LVT_PODNMod.F90 index c17e81ee1..e3b681e5b 100644 --- a/lvt/metrics/LVT_PODNMod.F90 +++ b/lvt/metrics/LVT_PODNMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_PODYMod.F90 b/lvt/metrics/LVT_PODYMod.F90 index e987a1b19..8bf4d8ec3 100644 --- a/lvt/metrics/LVT_PODYMod.F90 +++ b/lvt/metrics/LVT_PODYMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_POFDMod.F90 b/lvt/metrics/LVT_POFDMod.F90 index d8a0ff3a1..0633845df 100644 --- a/lvt/metrics/LVT_POFDMod.F90 +++ b/lvt/metrics/LVT_POFDMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_PSSMod.F90 b/lvt/metrics/LVT_PSSMod.F90 index ab7e9714a..666275943 100644 --- a/lvt/metrics/LVT_PSSMod.F90 +++ b/lvt/metrics/LVT_PSSMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RELMod.F90 b/lvt/metrics/LVT_RELMod.F90 index cc5a29689..ce04bd1ad 100644 --- a/lvt/metrics/LVT_RELMod.F90 +++ b/lvt/metrics/LVT_RELMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RESMod.F90 b/lvt/metrics/LVT_RESMod.F90 index 9b95d7df0..f011bd80f 100644 --- a/lvt/metrics/LVT_RESMod.F90 +++ b/lvt/metrics/LVT_RESMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RFVMod.F90 b/lvt/metrics/LVT_RFVMod.F90 index c551d1229..1a237640c 100644 --- a/lvt/metrics/LVT_RFVMod.F90 +++ b/lvt/metrics/LVT_RFVMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RMSEMod.F90 b/lvt/metrics/LVT_RMSEMod.F90 index 17c0cbc89..039e3a191 100644 --- a/lvt/metrics/LVT_RMSEMod.F90 +++ b/lvt/metrics/LVT_RMSEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RawCorrMod.F90 b/lvt/metrics/LVT_RawCorrMod.F90 index 9eb0738af..25fec1cdd 100644 --- a/lvt/metrics/LVT_RawCorrMod.F90 +++ b/lvt/metrics/LVT_RawCorrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RelativeEntropy.F90 b/lvt/metrics/LVT_RelativeEntropy.F90 index ad3bf56d4..ff9ca097a 100644 --- a/lvt/metrics/LVT_RelativeEntropy.F90 +++ b/lvt/metrics/LVT_RelativeEntropy.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_RnkCorrMod.F90 b/lvt/metrics/LVT_RnkCorrMod.F90 index 37d13955f..78d5a1601 100644 --- a/lvt/metrics/LVT_RnkCorrMod.F90 +++ b/lvt/metrics/LVT_RnkCorrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_SGWIMod.F90 b/lvt/metrics/LVT_SGWIMod.F90 index 62127077b..b342bb88d 100644 --- a/lvt/metrics/LVT_SGWIMod.F90 +++ b/lvt/metrics/LVT_SGWIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_SPIMod.F90 b/lvt/metrics/LVT_SPIMod.F90 index 9a27cbf7e..6dd614c3c 100644 --- a/lvt/metrics/LVT_SPIMod.F90 +++ b/lvt/metrics/LVT_SPIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_SRIMod.F90 b/lvt/metrics/LVT_SRIMod.F90 index 24bc08209..b14aef521 100644 --- a/lvt/metrics/LVT_SRIMod.F90 +++ b/lvt/metrics/LVT_SRIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_SSWIMod.F90 b/lvt/metrics/LVT_SSWIMod.F90 index 1577e8d4d..affe88546 100644 --- a/lvt/metrics/LVT_SSWIMod.F90 +++ b/lvt/metrics/LVT_SSWIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_SdSIMod.F90 b/lvt/metrics/LVT_SdSIMod.F90 index c95ba816e..55eb9fe90 100644 --- a/lvt/metrics/LVT_SdSIMod.F90 +++ b/lvt/metrics/LVT_SdSIMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_StdevMod.F90 b/lvt/metrics/LVT_StdevMod.F90 index 485ffef63..7fffb8a6e 100644 --- a/lvt/metrics/LVT_StdevMod.F90 +++ b/lvt/metrics/LVT_StdevMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_SumMod.F90 b/lvt/metrics/LVT_SumMod.F90 index a455b5fa0..57259908c 100644 --- a/lvt/metrics/LVT_SumMod.F90 +++ b/lvt/metrics/LVT_SumMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_TCMod.F90 b/lvt/metrics/LVT_TCMod.F90 index 7b8bda8c6..783bbf9b2 100644 --- a/lvt/metrics/LVT_TCMod.F90 +++ b/lvt/metrics/LVT_TCMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_TFBMod.F90 b/lvt/metrics/LVT_TFBMod.F90 index 6fe4ffb39..39b18e0c4 100644 --- a/lvt/metrics/LVT_TFBMod.F90 +++ b/lvt/metrics/LVT_TFBMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_THBMod.F90 b/lvt/metrics/LVT_THBMod.F90 index 6cfffd682..4d878bd13 100644 --- a/lvt/metrics/LVT_THBMod.F90 +++ b/lvt/metrics/LVT_THBMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_TMBMod.F90 b/lvt/metrics/LVT_TMBMod.F90 index 2ad1e6e17..bfe91f276 100644 --- a/lvt/metrics/LVT_TMBMod.F90 +++ b/lvt/metrics/LVT_TMBMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_TendencyCorrMod.F90 b/lvt/metrics/LVT_TendencyCorrMod.F90 index a129d2b7d..bee9b1c96 100644 --- a/lvt/metrics/LVT_TendencyCorrMod.F90 +++ b/lvt/metrics/LVT_TendencyCorrMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_TendencyMod.F90 b/lvt/metrics/LVT_TendencyMod.F90 index 5b99177e4..a9eaa914f 100644 --- a/lvt/metrics/LVT_TendencyMod.F90 +++ b/lvt/metrics/LVT_TendencyMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_TrendMod.F90 b/lvt/metrics/LVT_TrendMod.F90 index efd7cfef7..2dca55aef 100644 --- a/lvt/metrics/LVT_TrendMod.F90 +++ b/lvt/metrics/LVT_TrendMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_VULMod.F90 b/lvt/metrics/LVT_VULMod.F90 index 8c1905887..7fdb98881 100644 --- a/lvt/metrics/LVT_VULMod.F90 +++ b/lvt/metrics/LVT_VULMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_VarianceMod.F90 b/lvt/metrics/LVT_VarianceMod.F90 index 7f521cb4e..7a1e70ac7 100644 --- a/lvt/metrics/LVT_VarianceMod.F90 +++ b/lvt/metrics/LVT_VarianceMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_ZscoreMod.F90 b/lvt/metrics/LVT_ZscoreMod.F90 index 62748ecba..83ab98661 100644 --- a/lvt/metrics/LVT_ZscoreMod.F90 +++ b/lvt/metrics/LVT_ZscoreMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_percentileMod.F90 b/lvt/metrics/LVT_percentileMod.F90 index edc007117..a9b1f8869 100644 --- a/lvt/metrics/LVT_percentileMod.F90 +++ b/lvt/metrics/LVT_percentileMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -717,7 +717,7 @@ subroutine diagnoseSinglepercentileParams(model, obs, stats,metric) elseif(trim(model%short_name).eq."TWS") then min_value = -10000 else - min_value = 0.0 !soil moisture + min_value = -100.0 endif do t=1,LVT_rc%ngrid @@ -926,7 +926,7 @@ subroutine diagnoseSinglepercentile(model,obs,stats,metric) elseif(trim(model%short_name).eq."TWS") then min_value = -10000 else - min_value = 0.0 !soil moisture + min_value = -100.0 endif do t=1,LVT_rc%ngrid diff --git a/lvt/metrics/LVT_ubRMSEMod.F90 b/lvt/metrics/LVT_ubRMSEMod.F90 index 07c04c2ac..e039f935e 100644 --- a/lvt/metrics/LVT_ubRMSEMod.F90 +++ b/lvt/metrics/LVT_ubRMSEMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/metrics/LVT_waveletStatMod.F90 b/lvt/metrics/LVT_waveletStatMod.F90 index 53ff03b06..de73da6cb 100644 --- a/lvt/metrics/LVT_waveletStatMod.F90 +++ b/lvt/metrics/LVT_waveletStatMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/plugins/LVT_datastream_pluginMod.F90 b/lvt/plugins/LVT_datastream_pluginMod.F90 index 634c5dab6..e2a06819a 100644 --- a/lvt/plugins/LVT_datastream_pluginMod.F90 +++ b/lvt/plugins/LVT_datastream_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -33,6 +33,7 @@ ! 17 Oct 2018 Mahdi Navari Enhanced the LVT reader to read the ! Veg. Water Content (VWC) from SMAP SM dataset ! ! 19 Nov 2018 Mahdi Navari added suport to read SMAP_L3 brightness temperature +! 10 Jan 2023 Mahdi Navari added suport for COAMPSout ! !EOP module LVT_datastream_pluginMod @@ -171,6 +172,7 @@ subroutine LVT_datastream_plugin use GDASforc_dataMod, only : GDASforc_datainit use ASOSWE_obsMod, only : ASOSWE_obsinit use IMERG_dataMod, only : IMERG_datainit + use IMERG_monthly_dataMod, only : IMERG_monthly_datainit use UASNOW_obsMod, only : UASNOW_obsinit use OzFlux_obsMod, only : OzFlux_obsinit use JASMINsm_obsMod, only : JASMINsm_obsInit @@ -180,6 +182,7 @@ subroutine LVT_datastream_plugin use THySM_obsMod, only : THySM_obsinit use UASMAP_obsMod, only : UASMAP_obsinit use GRUNrunoff_obsMod, only : GRUNrunoffInit + use COAMPSout_dataMod, only : COAMPSout_datainit use SMAPEOPLSMobsMod, only : SMAPEOPLSMobsinit external readtemplateObs @@ -282,6 +285,7 @@ subroutine LVT_datastream_plugin external readGDASforcdata external readASOSWEObs external readIMERGdata + external readIMERGmonthlydata external readUASNOWObs external readOzFluxObs external readJASMINsmobs @@ -291,6 +295,7 @@ subroutine LVT_datastream_plugin external readTHySMobs external readUASMAPobs external readGRUNrunoffobs + external readCOAMPSoutdata external readSMAPEOPL_SMObs call registerobsread(trim(LVT_LVTbenchmarkobsId)//char(0),& @@ -697,7 +702,12 @@ subroutine LVT_datastream_plugin readASOSWEObs) call registerobssetup(trim(LVT_IMERGdataId)//char(0), IMERG_datainit) - call registerobsread(trim(LVT_IMERGdataId)//char(0) , readIMERGdata) + call registerobsread(trim(LVT_IMERGdataId)//char(0), readIMERGdata) + + call registerobssetup(trim(LVT_IMERGmonthlydataId)//char(0), & + IMERG_monthly_datainit) + call registerobsread(trim(LVT_IMERGmonthlydataId)//char(0), & + readIMERGmonthlydata) call registerobssetup(trim(LVT_UASNOWdataId)//char(0), UASNOW_obsinit) call registerobsread(trim(LVT_UASNOWdataId)//char(0) , readUASNOWObs) @@ -740,6 +750,10 @@ subroutine LVT_datastream_plugin call registerobsread(trim(LVT_GRUNobsId)//char(0),& readGRUNrunoffobs) + call registerobssetup(trim(LVT_COAMPSoutId)//char(0), & + COAMPSout_datainit) + call registerobsread(trim(LVT_COAMPSoutId)//char(0),& + readCOAMPSoutdata) call registerobssetup(trim(LVT_SMAP_E_OPLId)//char(0), & SMAPEOPLSMobsinit) call registerobsread(trim(LVT_SMAP_E_OPLId)//char(0),& diff --git a/lvt/plugins/LVT_domain_pluginMod.F90 b/lvt/plugins/LVT_domain_pluginMod.F90 index 3ecb1b63d..a6845074d 100644 --- a/lvt/plugins/LVT_domain_pluginMod.F90 +++ b/lvt/plugins/LVT_domain_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/plugins/LVT_metric_pluginMod.F90 b/lvt/plugins/LVT_metric_pluginMod.F90 index 8edf8a291..5655899db 100644 --- a/lvt/plugins/LVT_metric_pluginMod.F90 +++ b/lvt/plugins/LVT_metric_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/plugins/LVT_pluginIndices.F90 b/lvt/plugins/LVT_pluginIndices.F90 index fc0f796f9..7a75c38af 100644 --- a/lvt/plugins/LVT_pluginIndices.F90 +++ b/lvt/plugins/LVT_pluginIndices.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- @@ -40,6 +40,7 @@ ! 17 Oct 2018 Mahdi Navari Enhanced the LVT reader to read the ! Veg. Water Content (VWC) from SMAP SM dataset ! ! 19 Nov 2018 Mahdi Navari added suport to read SMAP_L3 brightness temperature +! 10 Jan 2023 Mahdi Navari added suport for COAMPSout ! !EOP module LVT_pluginIndices @@ -261,6 +262,8 @@ module LVT_pluginIndices character*50, public, parameter :: LVT_GDASdataId = "GDAS" character*50, public, parameter :: LVT_ASOSWEdataId = "ASO SWE" character*50, public, parameter :: LVT_IMERGdataId = "GPM IMERG" + character*50, public, parameter :: LVT_IMERGMonthlydataId = & + "GPM IMERG Monthly" character*50, public, parameter :: LVT_UASNOWdataId = "UA SNOW" character*50, public, parameter :: LVT_ozFluxdataId = "OzFlux" character*50, public, parameter :: LVT_JASMINsmobsId = "JASMIN soil moisture" @@ -270,6 +273,7 @@ module LVT_pluginIndices character*50, public, parameter :: LVT_THySMobsId = "THySM" character*50, public, parameter :: LVT_UASMAPobsId = "UA SMAP" character*50, public, parameter :: LVT_GRUNobsId = "GRUN runoff" + character*50, public, parameter :: LVT_COAMPSoutId = "COAMPSout" character*50, public, parameter :: LVT_SMAP_E_OPLId = "OPL E SMAP soil moisture retrieval" !------------------------------------------------------------------------- ! Training algorithms diff --git a/lvt/plugins/LVT_runmode_pluginMod.F90 b/lvt/plugins/LVT_runmode_pluginMod.F90 index b119bae03..aeab63bc2 100644 --- a/lvt/plugins/LVT_runmode_pluginMod.F90 +++ b/lvt/plugins/LVT_runmode_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/plugins/LVT_trainingAlg_pluginMod.F90 b/lvt/plugins/LVT_trainingAlg_pluginMod.F90 index 4ae13f199..5e34051cf 100644 --- a/lvt/plugins/LVT_trainingAlg_pluginMod.F90 +++ b/lvt/plugins/LVT_trainingAlg_pluginMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/557post/LVT_557post_ps41_snowMod.F90 b/lvt/runmodes/557post/LVT_557post_ps41_snowMod.F90 index d466d486c..91732482a 100644 --- a/lvt/runmodes/557post/LVT_557post_ps41_snowMod.F90 +++ b/lvt/runmodes/557post/LVT_557post_ps41_snowMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/557post/LVT_init_557post.F90 b/lvt/runmodes/557post/LVT_init_557post.F90 index 1c84c92b8..032a8770a 100644 --- a/lvt/runmodes/557post/LVT_init_557post.F90 +++ b/lvt/runmodes/557post/LVT_init_557post.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/557post/LVT_run_557post.F90 b/lvt/runmodes/557post/LVT_run_557post.F90 index a053755f1..1891d37dc 100644 --- a/lvt/runmodes/557post/LVT_run_557post.F90 +++ b/lvt/runmodes/557post/LVT_run_557post.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/557post/lis_jules_en_snow.F90 b/lvt/runmodes/557post/lis_jules_en_snow.F90 index 01345a578..d679f82c8 100644 --- a/lvt/runmodes/557post/lis_jules_en_snow.F90 +++ b/lvt/runmodes/557post/lis_jules_en_snow.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/Benchmarking/LVT_init_Benchmarking.F90 b/lvt/runmodes/Benchmarking/LVT_init_Benchmarking.F90 index b605e039e..72201935f 100644 --- a/lvt/runmodes/Benchmarking/LVT_init_Benchmarking.F90 +++ b/lvt/runmodes/Benchmarking/LVT_init_Benchmarking.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/Benchmarking/LVT_run_Benchmarking.F90 b/lvt/runmodes/Benchmarking/LVT_run_Benchmarking.F90 index fbdb130d8..cb5f7927d 100644 --- a/lvt/runmodes/Benchmarking/LVT_run_Benchmarking.F90 +++ b/lvt/runmodes/Benchmarking/LVT_run_Benchmarking.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/DAobs/LVT_init_DAobs.F90 b/lvt/runmodes/DAobs/LVT_init_DAobs.F90 index 85e8fab99..495d378b3 100644 --- a/lvt/runmodes/DAobs/LVT_init_DAobs.F90 +++ b/lvt/runmodes/DAobs/LVT_init_DAobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/DAobs/LVT_run_DAobs.F90 b/lvt/runmodes/DAobs/LVT_run_DAobs.F90 index a165aa58d..34d0dbfde 100644 --- a/lvt/runmodes/DAobs/LVT_run_DAobs.F90 +++ b/lvt/runmodes/DAobs/LVT_run_DAobs.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/DAstats/LVT_init_DAstats.F90 b/lvt/runmodes/DAstats/LVT_init_DAstats.F90 index 5548aebda..6221f01b2 100644 --- a/lvt/runmodes/DAstats/LVT_init_DAstats.F90 +++ b/lvt/runmodes/DAstats/LVT_init_DAstats.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/DAstats/LVT_run_DAstats.F90 b/lvt/runmodes/DAstats/LVT_run_DAstats.F90 index 971720c09..e91988718 100644 --- a/lvt/runmodes/DAstats/LVT_run_DAstats.F90 +++ b/lvt/runmodes/DAstats/LVT_run_DAstats.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/DataComp/LVT_init_DataComp.F90 b/lvt/runmodes/DataComp/LVT_init_DataComp.F90 index 7e31233fe..193e3f0ce 100644 --- a/lvt/runmodes/DataComp/LVT_init_DataComp.F90 +++ b/lvt/runmodes/DataComp/LVT_init_DataComp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/DataComp/LVT_run_DataComp.F90 b/lvt/runmodes/DataComp/LVT_run_DataComp.F90 index 65c26e196..cca9a9276 100644 --- a/lvt/runmodes/DataComp/LVT_run_DataComp.F90 +++ b/lvt/runmodes/DataComp/LVT_run_DataComp.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/LISpost/LVT_init_LISpost.F90 b/lvt/runmodes/LISpost/LVT_init_LISpost.F90 index 5928ecbaa..d3c27d088 100644 --- a/lvt/runmodes/LISpost/LVT_init_LISpost.F90 +++ b/lvt/runmodes/LISpost/LVT_init_LISpost.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/LISpost/LVT_run_LISpost.F90 b/lvt/runmodes/LISpost/LVT_run_LISpost.F90 index 0d1cfb4db..7947877df 100644 --- a/lvt/runmodes/LISpost/LVT_run_LISpost.F90 +++ b/lvt/runmodes/LISpost/LVT_run_LISpost.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/USAFSIpost/LVT_USAFSIpostMod.F90 b/lvt/runmodes/USAFSIpost/LVT_USAFSIpostMod.F90 index 5d9ee37dd..ae7a2b87b 100644 --- a/lvt/runmodes/USAFSIpost/LVT_USAFSIpostMod.F90 +++ b/lvt/runmodes/USAFSIpost/LVT_USAFSIpostMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/USAFSIpost/LVT_gribWrapperMod.F90 b/lvt/runmodes/USAFSIpost/LVT_gribWrapperMod.F90 index ea8f81373..3dd88bd1d 100644 --- a/lvt/runmodes/USAFSIpost/LVT_gribWrapperMod.F90 +++ b/lvt/runmodes/USAFSIpost/LVT_gribWrapperMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/USAFSIpost/LVT_init_USAFSIpost.F90 b/lvt/runmodes/USAFSIpost/LVT_init_USAFSIpost.F90 index 2abc2bf87..cf3676f62 100644 --- a/lvt/runmodes/USAFSIpost/LVT_init_USAFSIpost.F90 +++ b/lvt/runmodes/USAFSIpost/LVT_init_USAFSIpost.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/USAFSIpost/LVT_run_USAFSIpost.F90 b/lvt/runmodes/USAFSIpost/LVT_run_USAFSIpost.F90 index 55a924817..75843bc18 100644 --- a/lvt/runmodes/USAFSIpost/LVT_run_USAFSIpost.F90 +++ b/lvt/runmodes/USAFSIpost/LVT_run_USAFSIpost.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/optUE/LVT_init_optUE.F90 b/lvt/runmodes/optUE/LVT_init_optUE.F90 index 9960542d7..38f1815ac 100644 --- a/lvt/runmodes/optUE/LVT_init_optUE.F90 +++ b/lvt/runmodes/optUE/LVT_init_optUE.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/runmodes/optUE/LVT_run_optUE.F90 b/lvt/runmodes/optUE/LVT_run_optUE.F90 index ba7e4dd6b..c0f66a70c 100644 --- a/lvt/runmodes/optUE/LVT_run_optUE.F90 +++ b/lvt/runmodes/optUE/LVT_run_optUE.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/training/LinearRegression/LinearRegressionMod.F90 b/lvt/training/LinearRegression/LinearRegressionMod.F90 index 18b646bef..caef00533 100644 --- a/lvt/training/LinearRegression/LinearRegressionMod.F90 +++ b/lvt/training/LinearRegression/LinearRegressionMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/gnuplot/ADC/plotADC.F90 b/lvt/utils/gnuplot/ADC/plotADC.F90 index 906532f8c..1e801a9ae 100644 --- a/lvt/utils/gnuplot/ADC/plotADC.F90 +++ b/lvt/utils/gnuplot/ADC/plotADC.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/gnuplot/scatter/plotScatter.F90 b/lvt/utils/gnuplot/scatter/plotScatter.F90 index 87624ea40..8eec13ff9 100644 --- a/lvt/utils/gnuplot/scatter/plotScatter.F90 +++ b/lvt/utils/gnuplot/scatter/plotScatter.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/gnuplot/timeseries/plotTS.F90 b/lvt/utils/gnuplot/timeseries/plotTS.F90 index a364bb296..a659af6dc 100644 --- a/lvt/utils/gnuplot/timeseries/plotTS.F90 +++ b/lvt/utils/gnuplot/timeseries/plotTS.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/gnuplot/timeseries/plotTS.py b/lvt/utils/gnuplot/timeseries/plotTS.py index b369c04d5..4f311cc97 100755 --- a/lvt/utils/gnuplot/timeseries/plotTS.py +++ b/lvt/utils/gnuplot/timeseries/plotTS.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/LVTpreproc.F90 b/lvt/utils/input_proc/LVTpreproc.F90 index 718f13c81..e30e8c358 100755 --- a/lvt/utils/input_proc/LVTpreproc.F90 +++ b/lvt/utils/input_proc/LVTpreproc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/map_utils.F90 b/lvt/utils/input_proc/map_utils.F90 index 1da5c928d..226f86bd3 100755 --- a/lvt/utils/input_proc/map_utils.F90 +++ b/lvt/utils/input_proc/map_utils.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/preprocMod.F90 b/lvt/utils/input_proc/preprocMod.F90 index 9bd8ecde2..8cf2dfd42 100644 --- a/lvt/utils/input_proc/preprocMod.F90 +++ b/lvt/utils/input_proc/preprocMod.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/readConfigFile.F90 b/lvt/utils/input_proc/readConfigFile.F90 index 432141e1f..c6708ce9b 100755 --- a/lvt/utils/input_proc/readConfigFile.F90 +++ b/lvt/utils/input_proc/readConfigFile.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/read_IGBP_MODISlc.F90 b/lvt/utils/input_proc/read_IGBP_MODISlc.F90 index a5cb085d0..86fcd84cb 100755 --- a/lvt/utils/input_proc/read_IGBP_MODISlc.F90 +++ b/lvt/utils/input_proc/read_IGBP_MODISlc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/read_UMDlc.F90 b/lvt/utils/input_proc/read_UMDlc.F90 index 3da546b0c..fd3df05eb 100755 --- a/lvt/utils/input_proc/read_UMDlc.F90 +++ b/lvt/utils/input_proc/read_UMDlc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/read_USGSlc.F90 b/lvt/utils/input_proc/read_USGSlc.F90 index 799b7e40e..0f80f05dd 100755 --- a/lvt/utils/input_proc/read_USGSlc.F90 +++ b/lvt/utils/input_proc/read_USGSlc.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/readinput_lambert.F90 b/lvt/utils/input_proc/readinput_lambert.F90 index 781becb16..c51a94f42 100755 --- a/lvt/utils/input_proc/readinput_lambert.F90 +++ b/lvt/utils/input_proc/readinput_lambert.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/readinput_latlon.F90 b/lvt/utils/input_proc/readinput_latlon.F90 index f5e82055b..b636f0eba 100755 --- a/lvt/utils/input_proc/readinput_latlon.F90 +++ b/lvt/utils/input_proc/readinput_latlon.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/input_proc/readinput_polar.F90 b/lvt/utils/input_proc/readinput_polar.F90 index ca3d3a5b0..1ea01a2f0 100755 --- a/lvt/utils/input_proc/readinput_polar.F90 +++ b/lvt/utils/input_proc/readinput_polar.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/ncl/ADC/plotADC.F90 b/lvt/utils/ncl/ADC/plotADC.F90 index ebc9a4663..9602357ed 100644 --- a/lvt/utils/ncl/ADC/plotADC.F90 +++ b/lvt/utils/ncl/ADC/plotADC.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/ncl/scatter/plotScatter.F90 b/lvt/utils/ncl/scatter/plotScatter.F90 index e1e24faf9..58d6ba741 100644 --- a/lvt/utils/ncl/scatter/plotScatter.F90 +++ b/lvt/utils/ncl/scatter/plotScatter.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/ncl/timeseries/plotTS.F90 b/lvt/utils/ncl/timeseries/plotTS.F90 index 42ff615a3..ca0178695 100644 --- a/lvt/utils/ncl/timeseries/plotTS.F90 +++ b/lvt/utils/ncl/timeseries/plotTS.F90 @@ -1,9 +1,9 @@ !-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- ! NASA Goddard Space Flight Center ! Land Information System Framework (LISF) -! Version 7.4 +! Version 7.5 ! -! Copyright (c) 2022 United States Government as represented by the +! Copyright (c) 2024 United States Government as represented by the ! Administrator of the National Aeronautics and Space Administration. ! All Rights Reserved. !-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/scripts/doc.csh b/lvt/utils/scripts/doc.csh index 8d7cfb3ed..a1104ca60 100755 --- a/lvt/utils/scripts/doc.csh +++ b/lvt/utils/scripts/doc.csh @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/cat_lvt_grib2.py b/lvt/utils/usaf/cat_lvt_grib2.py index 8311ca10d..3793b5ecd 100755 --- a/lvt/utils/usaf/cat_lvt_grib2.py +++ b/lvt/utils/usaf/cat_lvt_grib2.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/convert_nc2surf.py b/lvt/utils/usaf/convert_nc2surf.py index b1d3d765d..dd017a547 100755 --- a/lvt/utils/usaf/convert_nc2surf.py +++ b/lvt/utils/usaf/convert_nc2surf.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/make_sm_geotiff.py b/lvt/utils/usaf/make_sm_geotiff.py index ae37eb34c..7f27f4c35 100755 --- a/lvt/utils/usaf/make_sm_geotiff.py +++ b/lvt/utils/usaf/make_sm_geotiff.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/nafpa/biasratio.cfg b/lvt/utils/usaf/nafpa/biasratio.cfg new file mode 100644 index 000000000..c8ea41fa9 --- /dev/null +++ b/lvt/utils/usaf/nafpa/biasratio.cfg @@ -0,0 +1,17 @@ +# +# Entries for calc_gfsgalwem_biasratios_multiyear.py +# + +[Input] +gfsdir: /discover/nobackup/projects/usaf_lis/emkemp/AFWA/lis76_imergf_biascorr/data/GFS_NAFPA_Monthly_all + +galwemdir: /discover/nobackup/projects/usaf_lis/emkemp/AFWA/lis76_imergf_biascorr/data/GALWEM_NAFPA_Monthly_all + +imergdir: /discover/nobackup/projects/usaf_lis/emkemp/AFWA/lis76_imergf_biascorr/data/IMERGF_V07A_NAFPA_Monthly + +[Output] +outdir: biasratios + + + + diff --git a/lvt/utils/usaf/nafpa/calc_gfsgalwem_biasratios_multiyear.py b/lvt/utils/usaf/nafpa/calc_gfsgalwem_biasratios_multiyear.py new file mode 100755 index 000000000..2c7d3c6e2 --- /dev/null +++ b/lvt/utils/usaf/nafpa/calc_gfsgalwem_biasratios_multiyear.py @@ -0,0 +1,365 @@ +#!/usr/bin/env python3 + +#-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- +# NASA Goddard Space Flight Center +# Land Information System Framework (LISF) +# Version 7.5 +# +# Copyright (c) 2024 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +#-------------------------END NOTICE -- DO NOT EDIT----------------------- + +""" +SCRIPT: calc_gfsgalwem_biasratios_multiyear.py + +Calculates bias ratio fields using monthly IMERG-FR V07A, GFS, and GALWEM +data, all already interpolated to the NAFPA grid and summed to monthly +totals via LVT. Outputs 12 fields total, each covering a month based +on multiple years of data. + +REVISION HISTORY: +04 Oct 2023: Eric Kemp: Initial specification. +06 Oct 2023: Eric Kemp: Added log10 transform to output for plotting. + Refactored to please pylint. +""" + +import configparser +import datetime +import os +import sys + +# Disable false alarm in pylint (Dataset is not visible in netCDF4 module +# because it is not implemented in python) +# pylint: disable=no-name-in-module +from netCDF4 import Dataset as nc4_dataset +# pylint: enable=no-name-in-module +import numpy as np + +def _usage(): + """Print usage message for this script.""" + print(f"Usage: {sys.argv[0]} CFGFILE BACKSOURCE STARTDATE ENDDATE") + print(" CFGFILE is path to config file") + print(" BACKSOURCE is GFS or GALWEM") + print(" STARTDATE is start date of calculation (YYYYMM)") + print(" ENDDATE is end date of calculateion (YYYYMM)") + +def _process_cmd_line(): + """Process command line arguments.""" + if len(sys.argv) != 5: + _usage() + sys.exit(1) + + cfgfile = sys.argv[1] + if not os.path.exists(cfgfile): + print(f"[ERR] {cfgfile} does not exist!") + sys.exit(1) + + backsource = sys.argv[2] + if backsource not in ["GFS", "GALWEM"]: + print(f"[ERR] {backsource} is not a valid background source") + print("[ERR] Only GFS and GALWEM recognized") + sys.exit(1) + + yyyymm = sys.argv[3] + year = int(yyyymm[0:4]) + month = int(yyyymm[4:6]) + startdate = datetime.datetime(year, month, 1) + + yyyymm = sys.argv[4] + year = int(yyyymm[0:4]) + month = int(yyyymm[4:6]) + enddate = datetime.datetime(year, month, 1) + + if startdate > enddate: + print("[ERR] STARTDATE is beyond ENDDATE!") + sys.exit(1) + + return cfgfile, backsource, startdate, enddate + +def _process_cfg_file(cfgfile, backsource): + """Processes config file for this script.""" + config = configparser.ConfigParser() + config.read(cfgfile) + + if backsource == "GFS": + backindir = config.get('Input', 'gfsdir') + elif backsource == "GALWEM": + backindir = config.get('Input', 'galwemdir') + imergdir = config.get('Input', 'imergdir') + outdir = config.get('Output', 'outdir') + + return backindir, imergdir, outdir + +def _create_arrays(): + """Allocate and zero out numpy arrays""" + nlat = 1920 + nlon = 2560 + nmon = 12 + sum_blended = np.zeros([nmon,nlat,nlon]) + sum_back = np.zeros([nmon,nlat,nlon]) + precip_ratio = np.zeros([nmon,nlat,nlon]) + return sum_blended, sum_back, precip_ratio + +def _read_imerg_file(imergdir, nextdate): + """Read the interpolated monthly IMERG file.""" + filename = f"{imergdir}/SUM_TS." + filename += f"{nextdate.year:04d}{nextdate.month:02d}" + filename += f"{nextdate.day:02d}0000.d01.nc" + ncid_imerg = nc4_dataset(filename, mode='r', \ + format="NETCDF4_CLASSIC") + precip_imerg = ncid_imerg.variables['TotalPrecip'][:,:] + del ncid_imerg + return precip_imerg + +def _read_imerg_file_latlondims(imergdir, startdate): + """Read the interpolated monthly IMERG file.""" + nextdate = _get_nextdate(startdate) + filename = f"{imergdir}/SUM_TS." + filename += f"{nextdate.year:04d}{nextdate.month:02d}" + filename += f"{nextdate.day:02d}0000.d01.nc" + ncid_imerg = nc4_dataset(filename, mode='r', \ + format="NETCDF4_CLASSIC") + lats_imerg = ncid_imerg.variables["latitude"][:,:] + lons_imerg = ncid_imerg.variables["longitude"][:,:] + north_south = ncid_imerg.dimensions['north_south'].size + east_west = ncid_imerg.dimensions['east_west'].size + del ncid_imerg + return lats_imerg, lons_imerg, north_south, east_west + +def _read_background_file(backindir, nextdate): + """Read interpolated monthly background file.""" + filename = f"{backindir}/SUM_TS." + filename += f"{nextdate.year:04d}{nextdate.month:02d}" + filename += f"{nextdate.day:02d}0000.d01.nc" + ncid_back = nc4_dataset(filename, mode='r', \ + format="NETCDF4_CLASSIC") + precip_back = ncid_back.variables['TotalPrecip'][:,:] + del ncid_back + return precip_back + +def _calc_precip_blended(lats_imerg, precip_imerg, precip_back): + """Calculate weighted blend of IMERG and background precip""" + + # Use IMERG from 40S to 71N; use linear tapers from 40S to 60S, + # and 51N to 71N; and don't use IMERG south of 60S and north of + # 71N. Rationale: No IR and little gauge data is available + # south of 60S, so we don't expect IMERG to be useful here for + # bias correction. In the northern hemisphere, there is no IR data + # north of 60N, but there is good GPCC gauge density in Scandinavia + # up to 71N. Finally, the 20 degree latitude linear tapers mimicks + # MERRA-2 usage of CPCU gauge analyses. + precip_imerg_weights = np.ones(np.shape(lats_imerg)) + precip_imerg_weights = np.where(lats_imerg < -60, + 0, + precip_imerg_weights) + precip_imerg_weights = np.where( (lats_imerg >= -60) & + (lats_imerg < -40), + ( (lats_imerg + 60.) / 20.), + precip_imerg_weights) + precip_imerg_weights = np.where( (lats_imerg > 51) & + (lats_imerg <= 71), + ( (71. - lats_imerg) / 20.), + precip_imerg_weights) + precip_imerg_weights = np.where(lats_imerg > 71, + 0, + precip_imerg_weights) + + # Conservative alternative: Linear taper from 40N to 60N, and + # screen out everything north of 60N. We'll do this as a backup + # if we find unphysical IMERG patterns north of 60N + #precip_imerg_weights = np.where( (lats_imerg > 40) & + # (lats_imerg <= 60), + # ( (60. - lats_imerg) / 20.), + # precip_imerg_weights) + #precip_imerg_weights = np.where(lats_imerg > 60, + # 0, + # precip_imerg_weights) + + precip_blended = precip_imerg_weights[:,:]*precip_imerg[:,:] + \ + (1. - precip_imerg_weights[:,:])*precip_back[:,:] + + return precip_blended + +def _get_nextdate(curdate): + """Determine next date (first of next month)""" + # LVT output files have data from the prior month, so we must + # advance one month to find the appropriate file, e.g., data + # for May 2020 will be in SUM_TS.202006010000.d01.nc. Python's + # timedelta object isn't smart enough to jump a whole month, so + # we loop through each day instead. + timedelta = datetime.timedelta(days=1) + nextdate = curdate + timedelta + while nextdate.day != 1: + nextdate += timedelta + return nextdate + +def _calc_biasratios(imergdir, backindir, startdate, enddate, lats_imerg): + """Calculate the bias ratios from the input data files.""" + + sum_blended, sum_back, precip_ratio = _create_arrays() + + # Loop through each month + curdate = startdate + while curdate <= enddate: + + # LVT output files have data from the prior month, so we must + # advance one month to find the appropriate file, e.g., data + # for May 2020 will be in SUM_TS.202006010000.d01.nc. + nextdate = _get_nextdate(curdate) + + # First, the IMERG file + precip_imerg = \ + _read_imerg_file(imergdir, nextdate) + + # Next, the background data (GFS or GALWEM) + precip_back = _read_background_file(backindir, nextdate) + + # Calculate blended precipitation (weighted average of IMERG + # and background, varying by latitude). + precip_blended = \ + _calc_precip_blended(lats_imerg, precip_imerg, precip_back) + + # Updated precip sums. Add trace precipitation every month to + # prevent undefined ratios in deserts. + sum_blended[(curdate.month-1),:,:] += precip_blended[:,:] + 0.05 + sum_back[(curdate.month-1),:,:] += precip_back[:,:] + 0.05 + + # Move on to next month + curdate = nextdate + + # Finish calculation + precip_ratio[:,:,:] = sum_blended[:,:,:] / sum_back[:,:,:] + precip_ratio[:,:,:] = np.where(precip_ratio == 0, 1, precip_ratio) + + return precip_ratio + +def _create_output_filename(outdir, backsource, startdate, enddate): + """Create output netCDF file name""" + filename = f"{outdir}" + filename += f"/{backsource}_pcp_biasratios_" + filename += f"{startdate.year:04d}{startdate.month:02d}_" + filename += f"{enddate.year:04d}{enddate.month:02d}.nc" + return filename + +def _create_latitude(rootgrp): + """Create latitude dataset in output file""" + latitude = rootgrp.createVariable("latitude", "f4", \ + ("north_south", "east_west",)) + latitude.units = "degree_north" + latitude.standard_name = "latitude" + latitude.long_name = "latitude" + latitude.scale_factor = np.float32("1.") + latitude.add_offset = np.float32("0.") + latitude.missing_value = np.float32("-9999.") + return latitude + +def _create_longitude(rootgrp): + """Create longitude dataset in output file.""" + longitude = rootgrp.createVariable("longitude", "f4", \ + ("north_south", "east_west",)) + longitude.units = "degree_east" + longitude.standard_name = "longitude" + longitude.long_name = "longitude" + longitude.scale_factor = np.float32("1.") + longitude.add_offset = np.float32("0.") + longitude.missing_value = np.float32("-9999.") + return longitude + +def _create_bias_ratio(rootgrp, backsource): + """Create the biasRatio dataset in the output file.""" + bias_ratio = rootgrp.createVariable("biasRatio", "f4", \ + ("months", "north_south", "east_west",)) + bias_ratio.units = "-" + bias_ratio.long_name = \ + f"bias_ratio_for_{backsource}_precipitation" + bias_ratio.scale_factor = np.float32("1.") + bias_ratio.add_offset = np.float32("0.") + bias_ratio.missing_value = np.float32("-9999.") + return bias_ratio + +def _create_log10_bias_ratio(rootgrp, backsource): + """Create the log10BiasRatio dataset in the output file.""" + log10_bias_ratio = rootgrp.createVariable("log10BiasRatio", "f4", \ + ("months", "north_south", "east_west",)) + log10_bias_ratio.units = "-" + log10_bias_ratio.long_name = \ + f"log10_bias_ratio_for_{backsource}_precipitation" + log10_bias_ratio.scale_factor = np.float32("1.") + log10_bias_ratio.add_offset = np.float32("0.") + log10_bias_ratio.missing_value = np.float32("-9999.") + return log10_bias_ratio + +def _write_biasratios(args): + """Write out bias ratios to netCDF file""" + + os.makedirs(args['outdir'], exist_ok=True) + + now = datetime.datetime.utcnow() + + history = "created on date: " + history += f"{now.year:04d}-{now.month:02d}-{now.day:02d}" + history += f"T{now.hour:02d}:{now.minute:02d}:{now.second:02d}" + + rootgrp = nc4_dataset(args['outfile'], "w", format="NETCDF4") + rootgrp.missing_value = np.float32("-9999.") + rootgrp.title = f"Monthly bias ratio for IMERG / {args['backsource']}" + rootgrp.institution = "NASA GSFC" + + rootgrp.history = f"created on date: {history}" + rootgrp.comment = "website: http://lis.gsfc.nasa.gov/" + rootgrp.MAP_PROJECTION = "EQUIDISTANT CYLINDRICAL" + rootgrp.SOUTH_WEST_CORNER_LAT = np.float32("-89.95312") + rootgrp.SOUTH_WEST_CORNER_LON = np.float32("-179.9297") + rootgrp.DX = np.float32("0.140625") + rootgrp.DY = np.float32("0.09375") + + # Define dimensions + rootgrp.createDimension("months", 12) + rootgrp.createDimension("north_south", \ + args['north_south']) + rootgrp.createDimension("east_west", \ + args['east_west']) + + # Define output variables + latitude = _create_latitude(rootgrp) + longitude = _create_longitude(rootgrp) + bias_ratio = _create_bias_ratio(rootgrp, args['backsource']) + log10_bias_ratio = _create_log10_bias_ratio(rootgrp, + args['backsource']) + + latitude[:,:] = args['lats_imerg'][:,:] + longitude[:,:] = args['lons_imerg'][:,:] + bias_ratio[:,:,:] = args['precip_ratio'][:,:,:] + log10_bias_ratio[:,:,:] = np.log10(args['precip_ratio'][:,:,:]) + + rootgrp.close() + +def _main(): + """Main driver""" + + cfgfile, backsource, startdate, enddate = _process_cmd_line() + backindir, imergdir, outdir = \ + _process_cfg_file(cfgfile, backsource) + lats_imerg, lons_imerg, north_south, east_west = \ + _read_imerg_file_latlondims(imergdir, startdate) + precip_ratio = \ + _calc_biasratios(imergdir, backindir, startdate, enddate, \ + lats_imerg) + outfile = _create_output_filename(outdir, backsource, + startdate, enddate) + # To satisfy pylint.... + args = { + "outfile" : outfile, + "outdir" : outdir, + "backsource" : backsource, + "north_south" : north_south, + "east_west" : east_west, + "lats_imerg" : lats_imerg, + "lons_imerg" : lons_imerg, + "precip_ratio" : precip_ratio, + } + _write_biasratios(args) + +if __name__ == "__main__": + _main() diff --git a/lvt/utils/usaf/read_surf.py b/lvt/utils/usaf/read_surf.py index fc64e538a..3c189e4ee 100755 --- a/lvt/utils/usaf/read_surf.py +++ b/lvt/utils/usaf/read_surf.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/run_ncks.py b/lvt/utils/usaf/run_ncks.py index dd823cb77..bd90f847a 100755 --- a/lvt/utils/usaf/run_ncks.py +++ b/lvt/utils/usaf/run_ncks.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/run_ncks_galwem.py b/lvt/utils/usaf/run_ncks_galwem.py index ed40209c2..268998a28 100755 --- a/lvt/utils/usaf/run_ncks_galwem.py +++ b/lvt/utils/usaf/run_ncks_galwem.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/surf2lisnc_3_10km.py b/lvt/utils/usaf/surf2lisnc_3_10km.py index 760c4ca39..a4a6123a0 100755 --- a/lvt/utils/usaf/surf2lisnc_3_10km.py +++ b/lvt/utils/usaf/surf2lisnc_3_10km.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/surf2lisnc_3_17km.py b/lvt/utils/usaf/surf2lisnc_3_17km.py index 263fc635e..46f981dfd 100755 --- a/lvt/utils/usaf/surf2lisnc_3_17km.py +++ b/lvt/utils/usaf/surf2lisnc_3_17km.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_24hr_jules.py b/lvt/utils/usaf/templates/make_lvt_config_24hr_jules.py index 5337283bf..20a42c683 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_24hr_jules.py +++ b/lvt/utils/usaf/templates/make_lvt_config_24hr_jules.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_24hr_noah.py b/lvt/utils/usaf/templates/make_lvt_config_24hr_noah.py index 8870eb841..a0bbcea04 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_24hr_noah.py +++ b/lvt/utils/usaf/templates/make_lvt_config_24hr_noah.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_24hr_noahmp.py b/lvt/utils/usaf/templates/make_lvt_config_24hr_noahmp.py index 4defa1c92..953d95772 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_24hr_noahmp.py +++ b/lvt/utils/usaf/templates/make_lvt_config_24hr_noahmp.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_3hr_jules.py b/lvt/utils/usaf/templates/make_lvt_config_3hr_jules.py index 0353f2450..6db6b4c97 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_3hr_jules.py +++ b/lvt/utils/usaf/templates/make_lvt_config_3hr_jules.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_3hr_jules_galwem.py b/lvt/utils/usaf/templates/make_lvt_config_3hr_jules_galwem.py index aa2fb275c..2b934b00e 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_3hr_jules_galwem.py +++ b/lvt/utils/usaf/templates/make_lvt_config_3hr_jules_galwem.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_3hr_noah.py b/lvt/utils/usaf/templates/make_lvt_config_3hr_noah.py index 1245d232d..2c427bd35 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_3hr_noah.py +++ b/lvt/utils/usaf/templates/make_lvt_config_3hr_noah.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_3hr_noahmp.py b/lvt/utils/usaf/templates/make_lvt_config_3hr_noahmp.py index b6210e4ef..ce295bad5 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_3hr_noahmp.py +++ b/lvt/utils/usaf/templates/make_lvt_config_3hr_noahmp.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/make_lvt_config_sm_anomaly_00z.py b/lvt/utils/usaf/templates/make_lvt_config_sm_anomaly_00z.py index b8b0d4a99..94d004fcb 100755 --- a/lvt/utils/usaf/templates/make_lvt_config_sm_anomaly_00z.py +++ b/lvt/utils/usaf/templates/make_lvt_config_sm_anomaly_00z.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_24hr_jules.py b/lvt/utils/usaf/templates/submit_lvt_discover_24hr_jules.py index 27cba0e98..9ffa8ae5c 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_24hr_jules.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_24hr_jules.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noah.py b/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noah.py index d06b383dd..fd8ae973a 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noah.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noah.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noahmp.py b/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noahmp.py index 2a43a9646..8566d31ef 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noahmp.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_24hr_noahmp.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules.py b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules.py index 218620797..3986e8c2e 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules_galwem.py b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules_galwem.py index 25f40ae79..16866fc28 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules_galwem.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_jules_galwem.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noah.py b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noah.py index d82f903cf..0fe10292d 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noah.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noah.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noahmp.py b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noahmp.py index fd0d9d401..d8281dc98 100755 --- a/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noahmp.py +++ b/lvt/utils/usaf/templates/submit_lvt_discover_3hr_noahmp.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_jules.py b/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_jules.py index 6cb33cb42..6e25c7614 100755 --- a/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_jules.py +++ b/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_jules.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noah.py b/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noah.py index 5d6ec65ec..c2766ef9c 100755 --- a/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noah.py +++ b/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noah.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noahmp.py b/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noahmp.py index 7ec60ccc3..b3dbb1bef 100755 --- a/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noahmp.py +++ b/lvt/utils/usaf/templates/submit_lvt_hpc11_3hr_noahmp.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/usafsipost/make_lvt_config_usafsipost.py b/lvt/utils/usaf/usafsipost/make_lvt_config_usafsipost.py index b7865ce7c..25ca4f0a5 100755 --- a/lvt/utils/usaf/usafsipost/make_lvt_config_usafsipost.py +++ b/lvt/utils/usaf/usafsipost/make_lvt_config_usafsipost.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT----------------------- diff --git a/lvt/utils/usaf/usafsipost/submit_lvt_usafsipost_discover.py b/lvt/utils/usaf/usafsipost/submit_lvt_usafsipost_discover.py index 71239fedf..e78430915 100755 --- a/lvt/utils/usaf/usafsipost/submit_lvt_usafsipost_discover.py +++ b/lvt/utils/usaf/usafsipost/submit_lvt_usafsipost_discover.py @@ -3,9 +3,9 @@ #-----------------------BEGIN NOTICE -- DO NOT EDIT----------------------- # NASA Goddard Space Flight Center # Land Information System Framework (LISF) -# Version 7.4 +# Version 7.5 # -# Copyright (c) 2022 United States Government as represented by the +# Copyright (c) 2024 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. #-------------------------END NOTICE -- DO NOT EDIT-----------------------