Skip to content

Add check for consistency in land cover and soil #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GreyREvenson merged 12 commits into from
May 22, 2024
Merged

Add check for consistency in land cover and soil #100

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e390ab4
Add logic check for vegtyp and isltyp water categories
Feb 22, 2024
b852687
Fix typo
Feb 22, 2024
d77fd3d
Add checks for ice land cover and soil
Feb 22, 2024
c5125a8
Moving checks to new section of initialize_from_file and rename tmp->…
Feb 22, 2024
e85d337
sum -> any
Feb 22, 2024
41df585
Merge branch 'noah_om_grid' of https://github.com/NOAA-OWP/noah-owp-m…
Mar 18, 2024
59a0908
Check mask value in land use /soil checks
Mar 18, 2024
bd2e694
Cleanup
Mar 18, 2024
772c21e
Deallocate the err_grid
Mar 26, 2024
624680d
Add ix, iy to error messages for land use and soil mismatch
Mar 27, 2024
b58d5ba
Update error msg for land use / soils checks
Apr 9, 2024
44434aa
Cleanup
Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/RunModule.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ SUBROUTINE initialize_from_file(model, config_filename)

type (noahowpgrid_type), intent (out) :: model
character(len=*), intent (in) :: config_filename ! config file from command line argument
integer :: forcing_timestep ! integer time step (set to dt) for some subroutine calls
integer :: ii, ix, iy
integer :: forcing_timestep ! integer time step (set to dt) for some subroutine calls
integer :: ii ! indices
integer, allocatable, dimension(:,:) :: err_grid ! to catch land use vs. soil inconsistencies
integer, dimension(2) :: err_indices ! to hold ix, iy for err_grid

@GreyREvenson GreyREvenson May 22, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: it may be preferable to move these error-related objects to the ErrorCheckModule if PR #108 elects to make greater use of that module for error checking and messaging purposes.


associate(namelist => model%namelist, &
attributes => model%attributes, &
Expand Down Expand Up @@ -245,15 +247,29 @@ SUBROUTINE initialize_from_file(model, config_filename)
do ii = 1, namelist%nsoil
domaingrid%zsnso(:,:,ii) = namelist%zsoil(ii)
end do
domaingrid%IST(:,:) = 1 ! 1 = soil
where (domaingrid%vegtyp == parametersgrid%ISWATER) domaingrid%IST = 2 ! 2 = lake
domaingrid%IST(:,:) = 1 ! 1 = soil
where (domaingrid%vegtyp.eq.parametersgrid%ISWATER) domaingrid%IST = 2 ! 2 = lake

! time variables
domaingrid%nowdate = domaingrid%startdate ! start the model with nowdate = startdate
forcing_timestep = domaingrid%dt ! integer timestep for some subroutine calls
domaingrid%itime = 1 ! initialize the time loop counter at 1
domaingrid%time_dbl = 0.d0 ! start model run at t = 0

!---------------------------------------------------------------------
!--- check consistency of domain land use and soil attributes ---
!---------------------------------------------------------------------
allocate(err_grid(domaingrid%n_x,domaingrid%n_y)); err_grid(:,:) = 0
where (domaingrid%mask.eq.1.and.domaingrid%vegtyp.ne.parametersgrid%ISWATER.and.domaingrid%isltyp.eq.14) err_grid = 1
if(any(err_grid.eq.1)) then; err_indices = maxloc(err_grid); write(*,*) 'ERROR: vegtyp is not water but isltyp is water - lat=',domaingrid%lat(err_indices(1),err_indices(2)),' lon=',domaingrid%lon(err_indices(1),err_indices(2)); stop; end if
where (domaingrid%mask.eq.1.and.domaingrid%vegtyp.eq.parametersgrid%ISWATER.and.domaingrid%isltyp.ne.14) err_grid = 1
if(any(err_grid.eq.1)) then; err_indices = maxloc(err_grid); write(*,*) 'ERROR: vegtyp is water but isltyp is not water - lat=',domaingrid%lat(err_indices(1),err_indices(2)),' lon=',domaingrid%lon(err_indices(1),err_indices(2)); stop; end if
where (domaingrid%mask.eq.1.and.domaingrid%vegtyp.ne.parametersgrid%ISICE.and.domaingrid%isltyp.eq.16) err_grid = 1
if(any(err_grid.eq.1)) then; err_indices = maxloc(err_grid); write(*,*) 'ERROR: vegtyp is not ice but isltyp is ice - lat=',domaingrid%lat(err_indices(1),err_indices(2)),' lon=',domaingrid%lon(err_indices(1),err_indices(2)); stop; end if
where (domaingrid%mask.eq.1.and.domaingrid%vegtyp.eq.parametersgrid%ISICE.and.domaingrid%isltyp.ne.16) err_grid = 1
if(any(err_grid.eq.1)) then; err_indices = maxloc(err_grid); write(*,*) 'ERROR: vegtyp is ice but isltyp is not ice - lat=',domaingrid%lat(err_indices(1),err_indices(2)),' lon=',domaingrid%lon(err_indices(1),err_indices(2)); stop; end if
deallocate(err_grid)

!---------------------------------------------------------------------
!--- set a time vector for simulation ---
!---------------------------------------------------------------------
Expand Down