Skip to content

Commit

Permalink
Minor updates.
Browse files Browse the repository at this point in the history
Fixes #944.
  • Loading branch information
George Gayno committed Nov 14, 2024
1 parent e4a2f33 commit 8c79cbe
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
4 changes: 2 additions & 2 deletions sorc/ocean_merge.fd/merge.F90
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
!! @param[in] lat2d Latitude of the model grid points.
!! @param[in] ocn_frac Fraction of the grid point that is ocean.
!! @param[inout] lake_frac Fraction of the grid point that is lake.
!! @param[inout] lake_depth Lake depth.
!! @param[inout] lake_depth Lake depth in meters.
!! @param[out] land_frac Fraction of the grid point that is land.
!! @param[out] slmsk Land/sea mask. '1' if less than 50% land. Otherwise, '1'.
!! @param[out] slmsk Land/sea mask. '0' if less than 50% land. Otherwise, '1'.
!!
!! @author Shan Sun
!! @author Rahul Mahajan
Expand Down
4 changes: 3 additions & 1 deletion sorc/ocean_merge.fd/namelist.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
!! @param[out] out_dir Directory where output file will be written.
!! @param[out] atmres Atmosphere grid resolution.
!! @param[out] ocnres Ocean grid resolution.
!! @param[out] binary_lake or fractional lake
!! @param[out] binary_lake or fractional lake.
!! @author Rahul Mahajan
!! @author Sanath Kumar
subroutine read_nml(ocean_mask_dir, lake_mask_dir, atmres,ocnres,out_dir,binary_lake)

implicit none

integer :: unit=7, io_status

character(len=120), intent(out) :: ocean_mask_dir
Expand Down
18 changes: 9 additions & 9 deletions sorc/ocean_merge.fd/read_write.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!!
!! @param[in] pth1 Directory path to file.
!! @param[in] atmres Atmospheric resolution.
!! @param[in] ocnres Ocean resolution.
!! @param[in] ocnres Ocean resolution in decimal percent.
!! @param[in] tile Tile number.
!! @param[out] lon E/W dimension of tile.
!! @param[out] lat N/S dimension of tile.
Expand Down Expand Up @@ -52,7 +52,7 @@ end subroutine read_grid_dims
!! @param[in] tile Tile number.
!! @param[in] lon E/W dimension of tile.
!! @param[in] lat N/S dimension of tile.
!! @param[out] ocn_frac ocean fraction
!! @param[out] ocn_frac ocean fraction in decimal percent.
!!
!! @author Shan Sun
!! @author Rahul Mahajan
Expand Down Expand Up @@ -100,9 +100,9 @@ end subroutine read_ocean_frac
!! @param[in] tile Tile number.
!! @param[in] lon E/W dimension of tile.
!! @param[in] lat N/S dimension of tile.
!! @param[out] lake_frac Lake fraction
!! @param[out] lake_depth Lake depth
!! @param[out] lat2d Latitude
!! @param[out] lake_frac Lake fraction in decimal percent.
!! @param[out] lake_depth Lake depth in meters.
!! @param[out] lat2d Latitude in degrees.
!!
!! @author Shan Sun
!! @author Rahul Mahajan
Expand Down Expand Up @@ -151,10 +151,10 @@ end subroutine read_lake_mask
!! @param[in] tile Tile number.
!! @param[in] lon E/W dimension of tile.
!! @param[in] lat N/S dimension of tile.
!! @param[in] land_frac Land fraction.
!! @param[in] lake_frac Lake fraction.
!! @param[in] lake_depth Lake depth.
!! @param[in] slmsk Land/sea mask.
!! @param[in] land_frac Land fraction in decimal percent.
!! @param[in] lake_frac Lake fraction in decimal percent.
!! @param[in] lake_depth Lake depth in meters.
!! @param[in] slmsk Land/sea mask - 0-non-land; 1-land.
!!
!! @author Shan Sun
!! @author Rahul Mahajan
Expand Down
1 change: 1 addition & 0 deletions sorc/ocean_merge.fd/utils.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
!! @author Shan Sun
subroutine handle_err (ret)
use netcdf
implicit none
integer, intent(in) :: ret

if (ret /= NF90_NOERR) then
Expand Down

0 comments on commit 8c79cbe

Please sign in to comment.