From 8871332331be9aab480547b1f44ec27573c5bc0f Mon Sep 17 00:00:00 2001 From: "James V. Geiger" Date: Fri, 3 Jun 2022 18:50:47 +0000 Subject: [PATCH 1/3] Correct typo in documentation --- lis/utils/usaf/retune_bratseth/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lis/utils/usaf/retune_bratseth/src/Makefile b/lis/utils/usaf/retune_bratseth/src/Makefile index 352aa697e..3d5bc53b5 100644 --- a/lis/utils/usaf/retune_bratseth/src/Makefile +++ b/lis/utils/usaf/retune_bratseth/src/Makefile @@ -1,6 +1,6 @@ # Makefile for Fortran utilities # -# To use, first run lvt/configure script to generate configure.lis in lis/make. +# To use, first run lis/configure script to generate configure.lis in lis/make. # # Eric Kemp, SSAI and NASA/GSFC, 26 Oct 2020 #------------------------------------------------------------------------------ From 7c8d42916c4bf685c6872a0dffc716171dd35fcf Mon Sep 17 00:00:00 2001 From: "James V. Geiger" Date: Fri, 3 Jun 2022 18:52:09 +0000 Subject: [PATCH 2/3] Remove multiple uses of ESMF within program files Do not `use ESMF` both at the top of a program and within subroutines it `contains`. That leads to this error: .... ftn-487 crayftn: ERROR READFILES, File = procOBA_NWP.F90, Line = 700, Column = 11 The specific interfaces for "ESMF_INFOINQUIRE" and "ESMF_INFOGETI4" make the GENERIC interface "ESMF_INFOGET" ambiguous. .... --- lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 | 1 - lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 | 1 - 2 files changed, 2 deletions(-) diff --git a/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 b/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 index d919cb680..b684a7c98 100644 --- a/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 +++ b/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 @@ -697,7 +697,6 @@ subroutine readfiles(myid, numprocs, starttime, endtime, deltatime, & use_blacklist, nstns, blacklist_stns) ! Imports - use esmf use mpi use USAF_ReportsMod, only: Reports, newReports, getNobs, getReport, & destroyReports, appendToReports, bcast_reports diff --git a/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 b/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 index 28b3206c5..1e685da63 100644 --- a/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 +++ b/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 @@ -867,7 +867,6 @@ subroutine readfiles(myid,numprocs, starttime, endtime, deltatime, & use_blacklist, nstns, blacklist_stns) ! Imports - use esmf use mpi use USAF_GridHashMod, only: GridHash, newGridHash, destroyGridHash, & insertIntoGridHash, getObindexVectorFromGridHash, & From 537b63cb79ad301a1429494681c1f566ab101a60 Mon Sep 17 00:00:00 2001 From: "James V. Geiger" Date: Fri, 3 Jun 2022 18:54:16 +0000 Subject: [PATCH 3/3] Remove redundant `use mpi` statement The MPI module was already used at the top of the program. --- lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 | 1 - lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 | 1 - 2 files changed, 2 deletions(-) diff --git a/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 b/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 index b684a7c98..cdd93106d 100644 --- a/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 +++ b/lis/utils/usaf/retune_bratseth/src/procOBA_NWP.F90 @@ -697,7 +697,6 @@ subroutine readfiles(myid, numprocs, starttime, endtime, deltatime, & use_blacklist, nstns, blacklist_stns) ! Imports - use mpi use USAF_ReportsMod, only: Reports, newReports, getNobs, getReport, & destroyReports, appendToReports, bcast_reports use USAF_StationsMod, only: great_circle_distance diff --git a/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 b/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 index 1e685da63..ab34e705b 100644 --- a/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 +++ b/lis/utils/usaf/retune_bratseth/src/procOBA_Sat.F90 @@ -867,7 +867,6 @@ subroutine readfiles(myid,numprocs, starttime, endtime, deltatime, & use_blacklist, nstns, blacklist_stns) ! Imports - use mpi use USAF_GridHashMod, only: GridHash, newGridHash, destroyGridHash, & insertIntoGridHash, getObindexVectorFromGridHash, & createIJForGridHash