From 17dfb4e2a5aaf33e1997cf0990f1f07dbe19c724 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Thu, 4 Jul 2024 10:37:15 -0400 Subject: [PATCH 1/3] merge pr #73 here --- pre/NSIDC-OSTIA_SST-ICE_blend/read_Reynolds.F90 | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pre/NSIDC-OSTIA_SST-ICE_blend/read_Reynolds.F90 b/pre/NSIDC-OSTIA_SST-ICE_blend/read_Reynolds.F90 index eb16d792..12aa0fb0 100644 --- a/pre/NSIDC-OSTIA_SST-ICE_blend/read_Reynolds.F90 +++ b/pre/NSIDC-OSTIA_SST-ICE_blend/read_Reynolds.F90 @@ -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 @@ -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 !--------------------------------------------------------------------------- @@ -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. From bf99c125401e40aab1311828e3473df7b33cf006 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Tue, 28 Jan 2025 17:38:50 -0500 Subject: [PATCH 2/3] temporary fix for esmf bad handling of logical output --- post/time_ave.F | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/post/time_ave.F b/post/time_ave.F index 5fb90ffa..457d706c 100644 --- a/post/time_ave.F +++ b/post/time_ave.F @@ -258,6 +258,9 @@ program time_ave quadratics = quadtmp endif deallocate (quadtmp) + if (rc/=0) then ! this should not be needed but it is + tend=.true. + endif enddo nquad = m @@ -288,6 +291,9 @@ program time_ave aliases = aliastmp endif deallocate (aliastmp) + if (rc/=0) then ! this should not be needed but it is + tend=.true. + endif enddo nalias = m endif From 70bea9b083436aa4dc1c49b4ede25df45b2bcf34 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Tue, 11 Mar 2025 11:27:49 -0400 Subject: [PATCH 3/3] missing for milan --- post/g5fcst_stats.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/post/g5fcst_stats.pl b/post/g5fcst_stats.pl index e764b141..2b4c40d9 100755 --- a/post/g5fcst_stats.pl +++ b/post/g5fcst_stats.pl @@ -754,6 +754,11 @@ sub submit_calcjob { $ntspn = 42; $qos = "#SBATCH --qos=dastest"; # wired for now since only way to use CAS $partition = "#SBATCH --partition=preops"; # wired for now since only way to use CAS + } elsif ( $npn == 128 ) { + $mynodes = "mil"; + $ntspn = 42; + $qos = "#SBATCH --qos=dastest"; # wired for now since only way to use MIL + $partition = "#SBATCH --partition=preops"; # wired for now since only way to use MIL } else { $mynodes = "hasw"; $ntspn = 24;