From 6db6128e7d9a08b4b1a70b4d72a2cb8902207e96 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 4 Jan 2024 19:37:22 +0000 Subject: [PATCH] Revert ./sfc_climo_gen.fd/model_grid.F90 to match 'develop'. Fixes #123. --- sorc/sfc_climo_gen.fd/model_grid.F90 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sorc/sfc_climo_gen.fd/model_grid.F90 b/sorc/sfc_climo_gen.fd/model_grid.F90 index b2c8f8fc4..abc6b4b37 100644 --- a/sorc/sfc_climo_gen.fd/model_grid.F90 +++ b/sorc/sfc_climo_gen.fd/model_grid.F90 @@ -370,16 +370,16 @@ subroutine get_model_info(orog_file, mask, land_frac, lat2d, lon2d, idim, jdim) ! surface data will not be mapped to it. !----------------------------------------------------------------------- -!error=nf90_inq_varid(ncid, 'lake_frac', id_var) -!if (error /= 0) then -! print*,"- READ LAND MASK (SLMSK)" -! error=nf90_inq_varid(ncid, 'slmsk', id_var) -! call netcdf_err(error, "READING SLMSK ID") -! error=nf90_get_var(ncid, id_var, dummy) -! call netcdf_err(error, "READING SLMSK") -! mask = nint(dummy) -! land_frac = -999. -!else + error=nf90_inq_varid(ncid, 'lake_frac', id_var) + if (error /= 0) then + print*,"- READ LAND MASK (SLMSK)" + error=nf90_inq_varid(ncid, 'slmsk', id_var) + call netcdf_err(error, "READING SLMSK ID") + error=nf90_get_var(ncid, id_var, dummy) + call netcdf_err(error, "READING SLMSK") + mask = nint(dummy) + land_frac = -999. + else print*,"- READ LAND FRACTION" error=nf90_inq_varid(ncid, 'land_frac', id_var) call netcdf_err(error, "READING LAND_FRAC ID") @@ -393,7 +393,7 @@ subroutine get_model_info(orog_file, mask, land_frac, lat2d, lon2d, idim, jdim) endif enddo enddo -!endif + endif print*,"- READ LATITUDE" error=nf90_inq_varid(ncid, 'geolat', id_var)