From 9f323276f06693cf39398f65a9e4e4ac98ae9e49 Mon Sep 17 00:00:00 2001
From: vbuchard <48135170+vbuchard@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:11:58 -0400
Subject: [PATCH 1/2] Updated GAAS_GridComp_ExtData.yaml to match the one in
 OPS emissions

---
 GAAS_GridComp/AMIP/GAAS_GridComp_ExtData.yaml | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/GAAS_GridComp/AMIP/GAAS_GridComp_ExtData.yaml b/GAAS_GridComp/AMIP/GAAS_GridComp_ExtData.yaml
index 8996379..4afa1c6 100644
--- a/GAAS_GridComp/AMIP/GAAS_GridComp_ExtData.yaml
+++ b/GAAS_GridComp/AMIP/GAAS_GridComp_ExtData.yaml
@@ -1,29 +1,33 @@
 Collections:
-  GAAS_d5124_m2_jan10.aod_a.sfc.%y4%m2%d2_%h2%n2z.nc4:
-    template: /discover/nobackup/projects/gmao/merra2/data/chem/d5124_m2_jan10/Y%y4/M%m2/d5124_m2_jan10.aod_a.sfc.%y4%m2%d2_%h2%n2z.nc4
+  aod_a.sfc.%y4%m2%d2_%h2%n2z.nc4:
+    template: das.aod_a.sfc.%y4%m2%d2_%h2%n2z.nc4
     freq: PT3H
-  GAAS_d5124_m2_jan10.aod_f.sfc.%y4%m2%d2_%h2%n2z.nc4:
-    template: /discover/nobackup/projects/gmao/merra2/data/chem/d5124_m2_jan10/Y%y4/M%m2/d5124_m2_jan10.aod_f.sfc.%y4%m2%d2_%h2%n2z.nc4
+  aod_f.sfc.%y4%m2%d2_%h2%n2z.nc4:
+    template: das.aod_f.sfc.%y4%m2%d2_%h2%n2z.nc4
     freq: PT3H
-  GAAS_d5124_m2_jan10.aod_k.sfc.%y4%m2%d2_%h2%n2z.nc4:
-    template: /discover/nobackup/projects/gmao/merra2/data/chem/d5124_m2_jan10/Y%y4/M%m2/d5124_m2_jan10.aod_k.sfc.%y4%m2%d2_%h2%n2z.nc4
+  aod_k.sfc.%y4%m2%d2_%h2%n2z.nc4:
+    template: das.aod_k.sfc.%y4%m2%d2_%h2%n2z.nc4
     freq: PT3H
 
 Samplings:
   GAAS_sample_0:
-    time_interpolation: False
+    update_offset: PT450S
+    exact: True
 
 Exports:
   aod_a:
-    collection: GAAS_d5124_m2_jan10.aod_a.sfc.%y4%m2%d2_%h2%n2z.nc4
+    collection: aod_a.sfc.%y4%m2%d2_%h2%n2z.nc4
     sample: GAAS_sample_0
     variable: AOD
+    fail_on_missing_file: false
   aod_f:
-    collection: GAAS_d5124_m2_jan10.aod_f.sfc.%y4%m2%d2_%h2%n2z.nc4
+    collection: aod_f.sfc.%y4%m2%d2_%h2%n2z.nc4
     sample: GAAS_sample_0
     variable: AOD
+    fail_on_missing_file: false
   aod_k:
-    collection: GAAS_d5124_m2_jan10.aod_k.sfc.%y4%m2%d2_%h2%n2z.nc4
+    collection: aod_k.sfc.%y4%m2%d2_%h2%n2z.nc4
     sample: GAAS_sample_0
     variable: AOD
+    fail_on_missing_file: false
 

From 0afc0ef5f1356de795f7e024ad609fd51b0f10c9 Mon Sep 17 00:00:00 2001
From: vbuchard <48135170+vbuchard@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:49:44 -0400
Subject: [PATCH 2/2] CAHNGELOG updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab39954..214b47d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update ESMF CMake target to `ESMF::ESMF`
 
 ### Fixed
+- Updated GAAS_Gridcomp_Extdata.yaml in AMIP/ to avoid the model to crash when GAAS is turned on and AMIP emissions chosen.
 ### Deprecated