From c2aec3a062c386cee4537e76345645f30a9e58f9 Mon Sep 17 00:00:00 2001 From: gmao-msienkie Date: Thu, 10 Aug 2023 17:50:35 -0400 Subject: [PATCH 1/4] Modified 'if' test to only do calculation if pob > 0.0 - avoiding divide by zero --- .../NCEP_Paqc/GMAOprev/gblevents_gmao.f | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/Applications/NCEP_Paqc/GMAOprev/gblevents_gmao.f b/src/Applications/NCEP_Paqc/GMAOprev/gblevents_gmao.f index 978a0811..5fa43769 100644 --- a/src/Applications/NCEP_Paqc/GMAOprev/gblevents_gmao.f +++ b/src/Applications/NCEP_Paqc/GMAOprev/gblevents_gmao.f @@ -1,6 +1,6 @@ C$$$ SUBPROGRAM DOCUMENTATION BLOCK C -C SUBPROGRAM: GBLEVENTS PRE/POST PROCESSING OF PREPBUFR EVENTS +C SUBPROGRAM: GBLEVENTS PRE/POST PROCESSING OF PREPBUFR EVENTS C PRGMMR: J.Whiting ORG: EMC DATE: 2014-05-08 C C ABSTRACT: RUNS IN TWO MODES: "PREVENTS" AND "POSTEVENTS". IN THE @@ -70,7 +70,7 @@ C TYPES FOR WHICH FORECAST VALUES MUST BE ENCODED, EVEN WHEN C DOFCST=FALSE (NECESSARY BECAUSE THE NEW PROGRAM CQCVAD NEEDS THE C BACKGROUND DATA) -C 1999-09-09 D. A. KEYSER -- CHANGES TO MAKE CODE MORE PORTABLE; +C 1999-09-09 D. A. KEYSER -- CHANGES TO MAKE CODE MORE PORTABLE; C 'TFC' NOW GENERATED FOR VADWND MESSAGE TYPES EVEN THOUGH TOB IS C MISSING (NEEDED BY CQCVAD PROGRAM) C 1999-12-01 D. A. KEYSER -- SPEC. HUMIDITY AND VIRT. TEMPERATURE ARE @@ -129,8 +129,8 @@ C SGES FILES HAD A 226-WORD HEADER (T254), BUT THIS IS VALID ONLY C FOR GFS SGES) C 2006-05-05 R. E. TREADON -- CHANGE VERTICAL INTERPOLATION TO DIRECTLY -C USE PRESSURE PROFILE, NOT PRESSURE PROFILE CONVERTED TO SIGMA. -C THIS CHANGE IS IN SUBROUTINE GBLEVN03. AS A RESULT OF THIS +C USE PRESSURE PROFILE, NOT PRESSURE PROFILE CONVERTED TO SIGMA. +C THIS CHANGE IS IN SUBROUTINE GBLEVN03. AS A RESULT OF THIS C CHANGE, SUBROUTINE GBLEVN07 WAS REMOVED. C 2006-07-14 D. A. KEYSER -- ADDED NEW NAMELIST SWITCH "SOME_FCST" C WHICH APPLIES ONLY WHEN EXISTING SWITCH "DOFCST" IS FALSE: IF @@ -229,7 +229,7 @@ C {I.E., OBTAINS BUFRLIB MISSING (BMISS) VIA CALL TO GETBMISS C RATHER THAN HARDWIRING IT TO 10E10 (10E10 CAN CAUSE INTEGER C OVERFLOW ON WCOSS - SEE CALLING PROGRAM FOR MORE INFO)} -C 2013-01-25 M.SIENKIEWICZ (GMAO) FIX PROBLEM WITH "QTOP_REJ" +C 2013-01-25 M.SIENKIEWICZ (GMAO) FIX PROBLEM WITH "QTOP_REJ" C FILTERING - NEEDED TO DECLARE SOME VARIABLES IN COMMON /GBEVCC/ C AS LOGICAL TYPE (PREVIOUSLY NOT DECLARED IN SOME ROUTINES). C 2013-02-13 D. A. KEYSER -- FINAL CHANGES TO RUN ON WCOSS: USE @@ -253,13 +253,13 @@ C SUBROUTINE GBLEVN02, SFCSHP REPORTS WITH CALM WINDS AND NON- C MISSING BACKGROUND U- OR V-COMPONENT WIND .GE. 5 M/SEC ARE C FLAGGED WITH Q.M. 8 (EVENT PGM "PREVENT", REASON CODE 8). -C 2014-05-08 JWhiting -- altered print statement (2 format) in GBLEVN10 -C subroutine; increased field width for spectral resolution to +C 2014-05-08 JWhiting -- altered print statement (2 format) in GBLEVN10 +C subroutine; increased field width for spectral resolution to C accommodate models w/ up to 5-digit resolution (I3 to I5). C 2016-10-25 M. Sienkiewicz - REPLACE INCORRECT HEIGHTS FOR ACARS OBS C ABOVE 226.3HPA. (INCORRECT CALCULATION IN MERRA PREPDATA PROCESSING C PRIOR TO WCOSS TRANSITION.) CONTROL BY NAMELIST SWITCH 'ACARSH'. -C 2020-11-19 M.SIENKIEWICZ -- IN GBLEVN06, MODIFY INTERPOLATION TO +C 2020-11-19 M.SIENKIEWICZ -- IN GBLEVN06, MODIFY INTERPOLATION TO C CORRECT ARRAY ACCESS FOR SP STATION. (AFTER CHANGE TO PREPDATA C AND/OR BUFR LIBRARY THE SP LATITUDE LOADED IN YOB WAS SLIGHTLY C LESS THAN -90 AND THUS LED TO TRY TO ACCESS INDEX 0 INSTEAD OF 1.) @@ -293,7 +293,7 @@ C NEWTYP - INDICATOR IF THE BUFR MESSAGE TABLE A ENTRY HAS C - CHANGED FROM THAT OF THE PREVIOUS REPORT (=0 - NO, C - =1 - YES) -C +C C C INPUT FILES: C UNIT 05 - STANDARD INPUT (DATA CARDS - SEE NAMELIST @@ -327,7 +327,7 @@ C C SUBPROGRAMS CALLED: C UNIQUE: GBLEVN02 GBLEVN03 GBLEVN04 -C GBLEVN06 OEFG01 +C GBLEVN06 OEFG01 C GBLEVN08 GBLEVN10 GBLEVN11 C MODULE: GBLEVN_MODULE C LIBRARY: @@ -489,14 +489,14 @@ C WAS DERIVED RATHER THAN OBSERVED.} C PG4243 - ALLOW INDIAN RAOB MASS REPORTS (BLOCK 42,43)? C PG4243 =.FALSE. ---> DO NOT CHANGE REPORTS -C PG4243 =.TRUE. ---> GIVE ALL MASS VARIABLES A +C PG4243 =.TRUE. ---> GIVE ALL MASS VARIABLES A C PREPBUFR TBL. VAL. 15 C (DEFAULT=.TRUE.) -C ACARSH - RECALCULATE HEIGHTS FOR ACARS DATA WHEN P<226.3 MB +C ACARSH - RECALCULATE HEIGHTS FOR ACARS DATA WHEN 0.0 DO NOT CHANGE REPORTS C ACARSH =.TRUE. ---> RECALCULATE STD. ATM. HEIGHT ABOVE 226.3 MB C (DEFAULT=.TRUE.) -C +C C CC C @@ -1096,7 +1096,7 @@ SUBROUTINE GBLEVN02(IUNITP,IUNITS,NEWTYP,subset) C - OBSERVATION ERROR IS MISSING (AND SWITCH DOBERR=TRUE) -- C "PREVENT" PGM REASON CODE 3 C - PRESSURE IS MORE THAN 100 MB ABOVE OR BELOW MODEL (GUESS) -C SURFACE PRESSURE (AND SWITCH FCST=TRUE) -- +C SURFACE PRESSURE (AND SWITCH FCST=TRUE) -- C "PREVENT" PGM REASON CODE 4 C - PRESSURE IS REPORTED ABOVE 450 MB OR BELOW 1100 MB -- "PREVENT" C PGM REASON CODE 2 (NOTE: DOES NOT APPLY TO SURFACE REPORTS, @@ -1675,7 +1675,7 @@ SUBROUTINE GBLEVN03(SUBSET) ! FORMERLY SUBROUTINE GETFC C -------------------------------- CALL GBLEVN06(XOB,YOB) - + C INTERPOLATE GUESS PROFILES TO OB PRESSURES C ------------------------------------------ @@ -1698,7 +1698,7 @@ SUBROUTINE GBLEVN03(SUBSET) ! FORMERLY SUBROUTINE GETFC IF(POB.LE.0. .OR. POB.GE.BMISS) GOTO 10 poblog = log(pob) - + la = -999 lb = -999 do k=1,kmax-1 @@ -1715,7 +1715,7 @@ SUBROUTINE GBLEVN03(SUBSET) ! FORMERLY SUBROUTINE GETFC lb = la+1 wt = 0.0 endif - + li=0 do k=1,kmax-1 if (poblog<=pintlog(k) .and. poblog>pintlog(k+1)) then @@ -2187,7 +2187,7 @@ FUNCTION OEFG01(P,TYP,IE,OEMIN) C CONDITIONS EXIST: REPORTED PRESSURE OBS IS MISSING, REPORTED C (SENSIBLE) TEMPERATURE OBS IS MISSING, OR REPORTED DEWPOINT OBS IS C MISSING. -C +C C ATTRIBUTES: C LANGUAGE: FORTRAN 90 C MACHINE: NCEP WCOSS @@ -2346,7 +2346,7 @@ SUBROUTINE GBLEVN08(IUNITP,SUBSET) ! FORMERLY SUBROUTINE VTPEVN $ .OR. POB.LE.700.) THEN BAKV_8(2,L) = TQM_8(L) ! Tv qm same as for T when ! q ok or q flagged by - ! PREPRO (but not bad) + ! PREPRO (but not bad) BAKV_8(4,L) = 0 ! Tv gets unique reason code 0 ELSE BAKV_8(2,L) = 3 !Tv qm susp for bad moist below @@ -2647,6 +2647,7 @@ subroutine acarsfix(IUNITP) ! !REVISION HISTORY: ! ! 25Oct2016 M.Sienkiewicz Initial version +! 10Aug2023 M.Sienkiewicz Modify code to avoid divide by zero ! !EOP !----------------------------------------------------------------------- @@ -2662,7 +2663,7 @@ subroutine acarsfix(IUNITP) if (nlev.eq.1) then pob = obs_8(1,1) - if (pob .lt. 226.3) then + if (pob .lt. 226.3 .and. pob .gt. 0.0) then zob = hgtf_hi(pob) zev_8(1) = zob zev_8(2) = qms_8(4,1) @@ -2674,4 +2675,4 @@ subroutine acarsfix(IUNITP) end if return end - + From 8cc833d622e4f24c03fa9c9739bbf7de83b1ac14 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 4 Nov 2024 11:17:26 -0500 Subject: [PATCH 2/4] Fix up ADAS CI --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 6f34808b..a73c0520 100644 --- a/components.yaml +++ b/components.yaml @@ -41,7 +41,7 @@ GMAO_Shared: GMAOpyobs: local: ./src/Shared/@GMAO_Shared/@GMAO_pyobs remote: ../GMAOpyobs.git - tag: v1.0.6 + tag: v1.0.6.1 develop: develop AeroML: From 4dea21a1b0abc0ff45d8106b633e241f16e30c65 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 4 Nov 2024 11:20:07 -0500 Subject: [PATCH 3/4] Back off the v2 orb --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2932598e..70a07fef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,10 @@ version: 2.1 # Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.25.0 +baselibs_version: &baselibs_version v7.23.0 orbs: - ci: geos-esm/circleci-tools@2 + ci: geos-esm/circleci-tools@2.10 workflows: build-test: From 0b6319b8db195ef827bf2dac035d17b389d8cce7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 12 Nov 2024 11:39:50 -0500 Subject: [PATCH 4/4] Fix up slow CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70a07fef..3d5a4c07 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,5 +21,5 @@ workflows: repo: GEOSadas persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra mepodevelop: false - rebuild_procs: 1 + rebuild_procs: 4 build_type: Release