Merge branch 'develop' into feature/aero-jcb

NOAA-EMC · Oct 28, 2024 · 3e9d131 · 3e9d131
2 parents 311ec15 + 34f894f
commit 3e9d131
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/parm/aero/obs/config/viirs_n20_aod.yaml.j2 b/parm/aero/obs/config/viirs_n20_aod.yaml.j2
@@ -3,7 +3,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: "{{ DATA }}/obs/{{ OPREFIX }}viirs_n20.{{ current_cycle | to_YMDH }}.nc4"
+        obsfile: "{{ DATA }}/obs/{{ OPREFIX }}viirs_n20_aod.tm00.nc"
     obsdataout:
       engine:
         type: H5File

diff --git a/parm/aero/obs/config/viirs_n21_aod.yaml.j2 b/parm/aero/obs/config/viirs_n21_aod.yaml.j2
@@ -3,7 +3,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: "{{ DATA }}/obs/{{ OPREFIX }}viirs_n21.{{ current_cycle | to_YMDH }}.nc4"
+        obsfile: "{{ DATA }}/obs/{{ OPREFIX }}viirs_n21_aod.tm00.nc"
     obsdataout:
       engine:
         type: H5File

diff --git a/parm/aero/obs/config/viirs_npp_aod.yaml.j2 b/parm/aero/obs/config/viirs_npp_aod.yaml.j2
@@ -3,7 +3,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: "{{ DATA }}/obs/{{ OPREFIX }}viirs_npp.{{ current_cycle | to_YMDH }}.nc4"
+        obsfile: "{{ DATA }}/obs/{{ OPREFIX }}viirs_npp_aod.tm00.nc"
     obsdataout:
       engine:
         type: H5File

diff --git a/test/atm/global-workflow/setup_workflow_exp.sh b/test/atm/global-workflow/setup_workflow_exp.sh
@@ -10,7 +10,7 @@ idate=2021032312
 edate=2021032318
 app=ATM
 starttype='warm'
-gfscyc='4'
+interval='6'
 resdetatmos='48'
 resensatmos='48'
 nens=3
@@ -37,7 +37,7 @@ $srcdir/../../workflow/setup_expt.py gfs cycled --idate $idate  \
                        --edate $edate \
                        --app $app \
                        --start $starttype \
-                       --gfs_cyc $gfscyc \
+                       --interval $interval \
                        --resdetatmos $resdetatmos \
                        --resensatmos $resensatmos \
                        --nens $nens \