Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PULL REQUEST] Add advected species wildcard for ObsPack diagnostics + point to SAMPLE_BCs/v2021-09 folder #922

Merged
merged 5 commits into from
Sep 28, 2021
Merged

[PULL REQUEST] Add advected species wildcard for ObsPack diagnostics + point to SAMPLE_BCs/v2021-09 folder #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bc8159
Add option for wildcard input in ObsPack output species menu of input…
jhaskinsPhD Apr 9, 2021
1f19248
Add warning/stop if too many obspack output species inputs.
jhaskinsPhD Apr 9, 2021
4286413
delete accidental duplicate of code
jhaskinsPhD Apr 9, 2021
e928809
Merge branch 'feature/ObsPack_wildcard' of ssh://github.com/jdhask/ge…
yantosca Sep 27, 2021
1495964
Update HEMCO_Config.fullchem & HEMCO_Config.aerosol templates for new…
yantosca Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 21 additions & 1 deletion GeosCore/input_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3850,6 +3850,7 @@ SUBROUTINE READ_OBSPACK_MENU( Input_Opt, RC )
!
USE ErrCode_Mod
USE Input_Opt_Mod, ONLY : OptInput
USE ERROR_MOD, ONLY : GEOS_CHEM_STOP
!
! !INPUT/OUTPUT PARAMETERS:
!
Expand Down Expand Up @@ -3932,7 +3933,26 @@ SUBROUTINE READ_OBSPACK_MENU( Input_Opt, RC )
CALL GC_Error( ErrMsg, RC, ThisLoc )
RETURN
ENDIF


IF ( N > 85 .AND. Input_Opt%amIRoot) THEN
WRITE( 6, '(/,a)' ) 'OBSPACK_MENU'
WRITE( 6, '( a)' ) '----------------'
WRITE( 6, '(a)') 'WARNING: Too many ObsPack individual output species detected on one line input.'
WRITE( 6, '(a)') 'Consider using wildcard SpeciesConc_?ALL? to track all advected species.'
CALL GEOS_CHEM_STOP
ENDIF

! Test if there is an "?ALL" wildcard present as the FIRST substring
! argument to the ObsPack output Species Line.
IF ( N==1 .AND. INDEX( SUBSTRS(1) , '?ALL' ) > 0) THEN
! If wildcard for all species is requested then update the
! list of species to track to be the list of advected species
SUBSTRS= Input_Opt%AdvectSpc_Name

! And update the number of species to track with ObsPack as the # of advected species.
N =Input_Opt%N_ADVECT
ENDIF

! Populate the ObsPack species name list
Input_Opt%ObsPack_nSpc = N
DO S = 1, Input_Opt%ObsPack_nSpc
Expand Down
2 changes: 1 addition & 1 deletion run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.aerosol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ Warnings: 1
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/v2020-03/tropchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1980-2021/1-12/1-31/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/v2021-09/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1980-2021/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs

(((CHEMISTRY_INPUT
Expand Down
2 changes: 1 addition & 1 deletion run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2899,7 +2899,7 @@ Warnings: 1
# --- GEOS-Chem boundary condition file ---
#==============================================================================
(((GC_BCs
* BC_ $ROOT/SAMPLE_BCs/v2021-07/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1980-2021/1-12/1-31/* EFY xyz 1 * - 1 1
* BC_ $ROOT/SAMPLE_BCs/v2021-09/fullchem/GEOSChem.BoundaryConditions.$YYYY$MM$DD_$HH$MNz.nc4 SpeciesBC_?ADV? 1980-2021/1-12/1-31/* EFY xyz 1 * - 1 1
)))GC_BCs

(((CHEMISTRY_INPUT
Expand Down