Skip to content

Commit 2c66821

Browse files
authored
Merge pull request #58 from GEOS-ESM/feature/mmanyin/better_vector_reading
GMI with Lyman-alpha, more chem mechanisms
2 parents 7e616f7 + 1b06876 commit 2c66821

File tree

5 files changed

+10
-42
lines changed

5 files changed

+10
-42
lines changed

README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/Applications/GEOSctm_App/README

components.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ TR:
104104
GMI:
105105
local: ./src/Components/GEOSctm_GridComp/@GEOSchem_GridComp/@GMI
106106
remote: ../GMI.git
107-
tag: v1.3.0
107+
tag: v1.5.0
108108
develop: develop
109109

110110
StratChem:

src/Applications/GEOSctm_App/MERRA2_ExtData.yaml.tmpl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,11 @@ Exports:
7676
SLP: { variable: SLP, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
7777
TROPP: { variable: TROPPB, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
7878
T10M: { variable: T10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
79-
U10M: { variable: U10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
80-
V10M: { variable: V10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
79+
U10M;V10M: { variable: U10M;V10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
8180
Q10M: { variable: QV10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
82-
U2M: { variable: U2M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
83-
V2M: { variable: V2M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
81+
U2M;V2M: { variable: U2M;V2M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
8482
Q2M: { variable: QV2M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
85-
U10N: { variable: U10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
86-
V10N: { variable: V10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
83+
U10N;V10N: { variable: U10M;V10M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
8784
TS: { variable: TS, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
8885
T2M: { variable: T2M, collection: TAVG1_2D_SLV_NX, regrid: BILINEAR, sample: MERRA2.timestep }
8986
PHIS: { variable: PHIS, collection: INST3_3D_ASM_NV, regrid: BILINEAR, sample: MERRA2.timestep }

src/Applications/GEOSctm_App/README

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
As of September 2, 2025:
1+
As of November 7, 2025:
22

33
Requires modifications in these repo's:
44

@@ -50,10 +50,10 @@ NOTE: EXTDATA_CF in CAP.rc only works for ExtData1G; it is kept
5050
since it is part of the logic when running non-MERRA2 met fields.
5151

5252
GMI:
53-
GMI needs imports RI and RL for CloudJ. It requests the imports
54-
even when it doesn't need them, so we compensate with NULL entries;
55-
search the run-script for 'Until GMI accounts for Imports'
56-
A future release of GMI will handle RI and RL better.
53+
Starting with GMI v1.5.0, CloudJ is the default for photolysis,
54+
but since CTM does not yet have a way to provide RI and RL, you need to change to FastJX 6.5:
55+
in RC/GMI_GridComp.rc uncomment the fastj_opt = 4 section and
56+
comment out the fastj_opt = 5 section.
5757

5858
GMI can supply aerosols; if this option is selected during setup,
5959
optics filenames are appended to GEOSCTM.rc

src/Applications/GEOSctm_App/ctm_run.j

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -328,36 +328,6 @@ cat TempFile | sed -e "/Exports/a $NULL_NULL" > $file
328328
cat TempFile | sed -e "/Exports/a $NULL_ZLFC" > $file
329329
/bin/rm TempFile
330330

331-
#######################################################################
332-
# Until GMI accounts for Imports that CTM does not have :
333-
#######################################################################
334-
335-
### rc
336-
set NULL_RI = "RI '1' N Y - none none UNUSED /dev/null"
337-
set NULL_RL = "RL '1' N Y - none none UNUSED /dev/null"
338-
339-
# Add the lines to this file, after the line that includes 'ACET_FIXED'
340-
set file = GMI_ExtData.rc
341-
342-
/bin/mv $file TempFile
343-
cat TempFile | sed -e "/ACET_FIXED/a $NULL_RI" > $file
344-
/bin/mv $file TempFile
345-
cat TempFile | sed -e "/ACET_FIXED/a $NULL_RL" > $file
346-
/bin/rm TempFile
347-
348-
### yaml
349-
set NULL_RI = "\ \ RI: { collection: /dev/null }"
350-
set NULL_RL = "\ \ RL: { collection: /dev/null }"
351-
352-
# Add the lines to this file, after the line that includes 'Exports'
353-
set file = GMI_ExtData.yaml
354-
355-
/bin/mv $file TempFile
356-
cat TempFile | sed -e "/Exports/a $NULL_RI" > $file
357-
/bin/mv $file TempFile
358-
cat TempFile | sed -e "/Exports/a $NULL_RL" > $file
359-
/bin/rm TempFile
360-
361331
# Driving datasets
362332
setenv DRIVING_DATASETS @DRIVING_DATASETS
363333

0 commit comments

Comments
 (0)