Skip to content

Commit

Permalink
Merge pull request #73 from GEOS-ESM/bugFix/sanAkel/read_Reynolds-mask
Browse files Browse the repository at this point in the history
Remove mask from read_Reynolds
  • Loading branch information
sdrabenh committed May 29, 2024
2 parents 04f0e60 + f934445 commit c9407a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

- mask from `read_reynolds.F90`

### Deprecated

## [2.0.8] - 2024-03-29
Expand Down
17 changes: 3 additions & 14 deletions pre/NSIDC-OSTIA_SST-ICE_blend/read_Reynolds.F90
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
!
SUBROUTINE read_Reynolds(ncFileName, maskFileName, NLAT, NLON, LAT, LON, &
SST, ICE, MASK, myUNDEF)
SUBROUTINE read_Reynolds(ncFileName, NLAT, NLON, LAT, LON, &
SST, ICE, myUNDEF)
!---------------------------------------------------------------------------
USE netcdf
IMPLICIT NONE

CHARACTER (LEN = *), INTENT(IN) :: ncFileName
CHARACTER (LEN = *), INTENT(IN) :: maskFileName
INTEGER, INTENT(IN) :: NLAT, NLON
REAL, INTENT(IN) :: myUNDEF
REAL, DIMENSION(NLAT), INTENT(OUT) :: LAT
REAL, DIMENSION(NLON), INTENT(OUT) :: LON
REAL, DIMENSION(NLON,NLAT), INTENT(OUT) :: SST
REAL, DIMENSION(NLON,NLAT), INTENT(OUT) :: ICE
REAL, DIMENSION(NLON,NLAT), INTENT(OUT) :: MASK

! GET TO KNOW THESE BY ncdump -h
REAL, PARAMETER :: sst_FillValue = -999
Expand All @@ -22,10 +20,9 @@ SUBROUTINE read_Reynolds(ncFileName, maskFileName, NLAT, NLON, LAT, LON, &
REAL, PARAMETER :: ice_FillValue = -999
REAL, PARAMETER :: ice_offset = 0.0
REAL, PARAMETER :: ice_scale_factor = 0.01


! netCDF ID for the file and data variable.
INTEGER :: ncid, varid1, varid2, varid3, varid4, varid_mask
INTEGER :: ncid, varid1, varid2, varid3, varid4
! INTEGER :: iLON
! REAL :: dLon
!---------------------------------------------------------------------------
Expand Down Expand Up @@ -67,14 +64,6 @@ SUBROUTINE read_Reynolds(ncFileName, maskFileName, NLAT, NLON, LAT, LON, &
ENDWHERE

! .....................................................................
! Read a land sea mask

print*, 'Reading mask from: ', maskFileName
CALL check( nf90_open(maskFileName, nf90_nowrite, ncid))
CALL check( nf90_inq_varid(ncid, "lsmaski", varid_mask))
CALL check( nf90_get_var(ncid, varid_mask, MASK))
CALL check( nf90_close(ncid))
! .....................................................................

! Reynolds has lon: (0, 360).
! IF lon needs to be between (-180, 180) -> Flip.
Expand Down

0 comments on commit c9407a0

Please sign in to comment.