Skip to content

Commit

Permalink
Merge branch 'support/lisf-557ww-7.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
jvgeiger committed May 15, 2023
2 parents d716d79 + c907335 commit c27f211
Show file tree
Hide file tree
Showing 199 changed files with 47,766 additions and 3,269 deletions.
4 changes: 2 additions & 2 deletions docs/LIS_users_guide/LIS_users_guide.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= Land Information System (LIS): LIS {lisfrevision} Users`' Guide
:revnumber: 2.1
:revdate: 30 Nov 2022
:revnumber: 2.2
:revdate: 5 May 2023
:doctype: book
:sectnums:
:toc:
Expand Down
1 change: 1 addition & 0 deletions docs/LIS_users_guide/revision_table.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
|====
|Revision | Summary of Changes | Date

|2.2 | LISF 557WW 7.5.4 release | May 5, 2023
|2.1 | LISF 557WW 7.5.0 release | Nov 30, 2022
|2.0 | LISF Public 7.4.0 release | Jun 22, 2022
|1.19 | LISF Public 7.3.4 release | May 27, 2022
Expand Down
4 changes: 2 additions & 2 deletions docs/LVT_users_guide/LVT_users_guide.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= Land surface Verification Toolkit (LVT): LVT {lisfrevision} Users`' Guide
:revnumber: 2.1
:revdate: 30 Nov 2022
:revnumber: 2.2
:revdate: 5 May 2023
:doctype: book
:sectnums:
:toc:
Expand Down
1 change: 1 addition & 0 deletions docs/LVT_users_guide/revision_table.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
|===
| Revision | Summary of Changes | Date

| 2.2 | LISF 557WW 7.5.4 release | May 5, 2023
| 2.1 | LISF 557WW 7.5.0 release | Nov 30, 2022
| 2.0 | LISF Public 7.4.0 release | Jun 22, 2022
| 1.9 | LISF Public 7.3.2 release | Dec 06, 2021
Expand Down
5 changes: 4 additions & 1 deletion env/discover/lisf_7.5_intel_2021.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ proc ModulesHelp { } {
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"
Expand Down Expand Up @@ -100,6 +101,7 @@ set def_lvt_proj /discover/nobackup/projects/lis/libs/sles-12.3/proj/9.
set def_lvt_gdal /discover/nobackup/projects/lis/libs/sles-12.3/gdal/3.5.2_intel-2021.4.0
set def_lvt_fortrangis /discover/nobackup/projects/lis/libs/sles-12.3/fortrangis/2.6_gdal-3.5.2_intel-2021.4.0
set def_ldt_libgeotiff /discover/nobackup/projects/lis/libs/sles-12.3/geotiff/1.7.0_proj-9.1.0_intel-2021.4.0
set def_lis_petsc /discover/nobackup/projects/lis/libs/sles-12.3/petsc/3.16.1_intel-2021.4.0

setenv DEV_ENV LISF_7_5_INTEL_2021_4_0
setenv LIS_ARCH linux_ifc
Expand All @@ -120,7 +122,7 @@ 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
Expand Down Expand Up @@ -165,4 +167,5 @@ 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"
5 changes: 4 additions & 1 deletion env/discover/lisf_7.5_intel_2021.4.0_s2s
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ proc ModulesHelp { } {
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"
Expand Down Expand Up @@ -100,6 +101,7 @@ set def_lvt_proj /discover/nobackup/projects/lis/libs/sles-12.3/proj/9.
set def_lvt_gdal /discover/nobackup/projects/lis/libs/sles-12.3/gdal/3.5.2_intel-2021.4.0
set def_lvt_fortrangis /discover/nobackup/projects/lis/libs/sles-12.3/fortrangis/2.6_gdal-3.5.2_intel-2021.4.0
set def_ldt_libgeotiff /discover/nobackup/projects/lis/libs/sles-12.3/geotiff/1.7.0_proj-9.1.0_intel-2021.4.0
set def_lis_petsc /discover/nobackup/projects/lis/libs/sles-12.3/petsc/3.16.1_intel-2021.4.0

setenv DEV_ENV LISF_7_5_INTEL_2021_4_0
setenv LIS_ARCH linux_ifc
Expand All @@ -120,7 +122,7 @@ 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
Expand Down Expand Up @@ -165,6 +167,7 @@ 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"

# EMK Miniconda3 environment for S2S
Expand Down
4 changes: 3 additions & 1 deletion env/discover/lisf_7_intel_2021.4.0_petsc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ proc ModulesHelp { } {
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"
Expand Down Expand Up @@ -120,7 +121,7 @@ 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 LIS_PETSC $def_lis_petsc

setenv LDT_ARCH linux_ifc
setenv LDT_FC mpiifort
Expand Down Expand Up @@ -164,4 +165,5 @@ 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"
16 changes: 10 additions & 6 deletions ldt/DAobs/SMOS_NRTNN_L2sm/readSMOSNRTNNL2smObs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
! not work with optimization level -1 and -2
! 21 Feb. 2021: Mahdi Navari, code modified to write the DGG
! lookup table into a netCDF file
!
! 3 Apr. 2023: Mahdi Navari, Bugfix: issue in grid finding
! period (Issue #1301)
!
! !INTERFACE:
subroutine readSMOSNRTNNL2smObs(n)
! !USES:
Expand Down Expand Up @@ -279,11 +281,12 @@ subroutine read_SMOSNRTL2sm_data(n, fname, smobs_inp)
lat2d(c,r)-dy/2 <= max_lat_dgg) then


if (SMOSNRTNNsmobs(n)%count_day <= 30) then
! assume that during 30 days after the simulation start date
if (SMOSNRTNNsmobs(n)%count_day <= 150) then
! assume that during 150 days after the simulation start date
! all land grids have assigned dgg_id_number
! in order to avoid looping over ocean grids for every files

! originally count_day was set to 30 days, but it seems that this
! period was not enough to assign all SMOS grids to the LIS grids.
if (.not. SMOSNRTNNsmobs(n)%SMOS_lookup(c,r)%dgg_assign) then
call find_SMOS_Dgg_id_number(n,c,r, lon_dgg, lat_dgg, &
dgg_length, i_dgg, DGG_id_number, &
Expand Down Expand Up @@ -381,9 +384,10 @@ subroutine read_SMOSNRTL2sm_data(n, fname, smobs_inp)
call LDT_verify(ios,'Error closing file '//trim(fname))


! assume that during 30 days after the simulation start date
! assume that during 150 days after the simulation start date
! all land grids have assigned dgg_id_number
if (SMOSNRTNNsmobs(n)%count_day .eq. 31) then

if (SMOSNRTNNsmobs(n)%count_day .eq. 151) then

total_length = 0
do r = 1, LDT_rc%lnr(n)
Expand Down
34 changes: 34 additions & 0 deletions lis/LICENSES/RAPID_License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Component name: RAPID router

Contributing organization/individuals: Jet Propulsion Laboratory, Pasadena, CA.

POC: Cedric H. David; Jet Propulsion Laboratory, ph: 818.354.4416

License:

From https://github.com/c-h-david/rapid/master/LICENSE commit 3508728c6c4e08fa31949bd4f035bf07dfbce752.

Copyright (c) 2007-2021, Cedric H. David

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.
* The name Cedric H. David may not 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 CEDRIC H. DAVID 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.
14 changes: 7 additions & 7 deletions lis/arch/Config.pl
Original file line number Diff line number Diff line change
Expand Up @@ -857,8 +857,8 @@
}

if($use_petsc == 1) {
if(defined($ENV{LIS_PETSc})){
$sys_petsc_path = $ENV{LIS_PETSc};
if(defined($ENV{LIS_PETSC})){
$sys_petsc_path = $ENV{LIS_PETSC};
$inc = "/include/";
$lib = "/lib/";
$inc_petsc=$sys_petsc_path.$inc;
Expand All @@ -867,7 +867,7 @@
else {
print "--------------ERROR---------------------\n";
print "Please specify the PETSc path using\n";
print "the LIS_PETsc variable.\n";
print "the LIS_PETSC variable.\n";
print "Configuration exiting ....\n";
print "--------------ERROR---------------------\n";
exit 1;
Expand Down Expand Up @@ -1069,8 +1069,8 @@
}

if($use_petsc == 1){
$fflags = $fflags." -I\$(INC_PETSc)";
$ldflags = $ldflags." -L\$(LIB_PETSc) -Wl,-rpath,\$(LIB_PETSc) -lpetsc -lm";
$fflags = $fflags." -I\$(INC_PETSC)";
$ldflags = $ldflags." -L\$(LIB_PETSC) -lpetsc -lm";
}

if($use_esmf_trace == 1){
Expand Down Expand Up @@ -1159,8 +1159,8 @@
printf conf_file "%s%s\n","INC_CMEM = $inc_cmem";
printf conf_file "%s%s\n","LIB_CMEM = $lib_cmem";
printf conf_file "%s%s\n","LIB_LAPACK = $lib_lapack";
printf conf_file "%s%s\n","INC_PETSc = $inc_petsc";
printf conf_file "%s%s\n","LIB_PETSc = $lib_petsc";
printf conf_file "%s%s\n","INC_PETSC = $inc_petsc";
printf conf_file "%s%s\n","LIB_PETSC = $lib_petsc";
printf conf_file "%s%s\n","CFLAGS = $cflags";
printf conf_file "%s%s\n","FFLAGS77 = $fflags77";
printf conf_file "%s%s\n","FFLAGS = $fflags";
Expand Down
140 changes: 140 additions & 0 deletions lis/configs/557WW-7.5-FOC/MRF_GHI/ldt.config.mr.jules50.ensemble
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
# Overall driver options
LDT running mode: "Ensemble restart processing"
Processed LSM parameter filename: ./output/lis_input.mr.jules50.nc

LIS number of nests: 1
Number of surface model types: 2
Surface model types: "LSM" "Openwater"
Land surface model: "JULES.5.0"
Routing model: none
Lake model: none
Water fraction cutoff value: 0.5
Incorporate crop information: .false.
Number of met forcing sources: 0
Met forcing sources: none
LDT diagnostic file: ldtlog.mr.jules50
Mask-parameter fill diagnostic file: MaskParamFill.mr.jules50.log
LDT output directory: OUTPUT
Undefined value: -9999.0

#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

#Runtime options
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

# Ensemble restart options
LIS restart source: "LSM"
Ensemble restart generation mode: "upscale"
Number of ensembles per tile (input restart): 12
Number of ensembles per tile (output restart): 18
Ensemble restart generation sampling strategy: "random sampling"

Input restart filename: ./ensemble/jules50/LIS_RST_JULES50_202303271200.d01.nc
Output restart filename: ./ensemble/jules50/LIS_RST_JULES50_202303271200_EN18.d01.nc

# ________________

#Landcover parameter inputs
Landcover data source: "UM_Native_Ancillary"
Landcover classification: "JULES_PFT"
Landcover file: ./data/cap2ldt_ps41.nc
Landcover spatial transform: none
Landcover map projection: latlon
Landcover fill option: none

#Landmask parameter inputs
Create or readin landmask: "create"
Landmask data source: "UM_Ancillary"

#Soil parameter inputs
Soil fraction data source: none
Soils spatial transform: none
Soils map projection: latlon
Soils fill option: none
Porosity data source: none
Porosity map: none

#Topography parameter inputs
Elevation data source: "MERIT_1K"
Elevation number of bands: 1
Elevation map: ./input/LS_PARAMETERS/topo_parms/MERIT
Elevation fill option: average
Elevation fill radius: 5
Elevation fill value: 300.

Slope data source: "MERIT_1K"
Slope number of bands: 1
Slope map: ./input/LS_PARAMETERS/topo_parms/MERIT
Slope fill option: average
Slope fill radius: 5
Slope fill value: 0

Aspect data source: "MERIT_1K"
Aspect number of bands: 1
Aspect map: ./input/LS_PARAMETERS/topo_parms/MERIT
Aspect fill option: average
Aspect fill radius: 5
Aspect fill value: 3.14159

Topography spatial transform: average
Topography map projection: latlon

#Albedo inputs
Albedo data source: "NCEP_Native"
Albedo map: ./input/LS_PARAMETERS/noah_2dparms/albedo
Albedo climatology interval: monthly
Albedo spatial transform: "budget-bilinear"
Albedo map projection: latlon
Albedo fill option: neighbor
Albedo fill radius: 5
Albedo fill value: 0.15

#Maximum snow albedo inputs
Max snow albedo data source: "Barlage_Native"
Max snow albedo map: ./input/LS_PARAMETERS/noah_2dparms/maximum_snow_albedo.hdf
Max snow albedo spatial transform: average
Max snow albedo map projection: latlon
Max snow albedo fill option: neighbor
Max snow albedo fill radius: 5
Max snow albedo fill value: 0.3

#Greenness inputs
Greenness data source: "NCEP_Native"
Greenness fraction map: ./input/LS_PARAMETERS/noah_2dparms/gfrac
Greenness climatology interval: monthly
Calculate min-max greenness fraction: .false.
Greenness maximum map: ./input/LS_PARAMETERS/noah_2dparms/gfrac_max.asc
Greenness minimum map: ./input/LS_PARAMETERS/noah_2dparms/gfrac_min.asc
Greenness spatial transform: "budget-bilinear"
Greenness map projection: latlon
Greenness fill option: neighbor
Greenness fill radius: 5
Greenness fill value: 0.3
Greenness maximum fill value: 1.0
Greenness minimum fill value: 0.0

#JULES LSM inputs
JULES soil parameter mode: readin
JULES ancillary file: ./data/cap2ldt_ps41.nc

Loading

0 comments on commit c27f211

Please sign in to comment.