Merge branch 'develop' into bugfix/soca_vrfy

NOAA-EMC · Apr 16, 2024 · 03b1b2d · 03b1b2d
2 parents cb56589 + 52c0d2d
commit 03b1b2d
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 22 deletions.
diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua
@@ -88,6 +88,7 @@ setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv("CRTM_FIX","/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data")
+setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data/test")
 --prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin")
 
 whatis("Name: ".. pkgName)

diff --git a/modulefiles/GDAS/hercules.intel.lua b/modulefiles/GDAS/hercules.intel.lua
@@ -81,6 +81,7 @@ setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data")
+setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/cmartin/CI/GDASApp/data/test/")
 prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")
 
 execute{cmd="ulimit -s unlimited",modeA={"load"}}

diff --git a/modulefiles/GDAS/orion.intel.lua b/modulefiles/GDAS/orion.intel.lua
@@ -80,6 +80,7 @@ setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data")
+setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/cmartin/CI/GDASApp/data/test/")
 prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")
 
 execute{cmd="ulimit -s unlimited",modeA={"load"}}

diff --git a/parm/snow/obs/config/adpsfc_snow.yaml.j2 b/parm/snow/obs/config/adpsfc_snow.yaml.j2
@@ -6,7 +6,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: '{{ DATA }}/obs/{{ OPREFIX }}adpsfc_snow.nc4'
+        obsfile: '{{ DATA }}/obs/{{ OPREFIX_OUT }}adpsfc_snow.nc4'
     obsdataout:
       engine:
         type: H5File

diff --git a/parm/snow/obs/config/ims_snow.yaml.j2 b/parm/snow/obs/config/ims_snow.yaml.j2
@@ -6,7 +6,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: '{{ DATA }}/obs/{{ OPREFIX }}ims_snow.nc4'
+        obsfile: '{{ DATA }}/obs/{{ OPREFIX_OUT }}ims_snow.{{ CASE }}.nc4'
     obsdataout:
       engine:
         type: H5File

diff --git a/parm/snow/obs/config/snocvr_snow.yaml.j2 b/parm/snow/obs/config/snocvr_snow.yaml.j2
@@ -6,7 +6,7 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: '{{ DATA }}/obs/{{ OPREFIX }}snocvr_snow.nc4'
+        obsfile: '{{ DATA }}/obs/{{ OPREFIX_OUT }}snocvr_snow.nc4'
     obsdataout:
       engine:
         type: H5File

diff --git a/parm/snow/prep/prep_gts.yaml.j2 b/parm/snow/prep/prep_gts.yaml.j2
@@ -2,9 +2,17 @@ gtsbufr:
   mkdir:
     - '{{ DATA }}/obs'
   copy:
-    - ['{{ COM_OBS }}/{{ OPREFIX }}adpsfc.tm00.bufr_d', '{{ DATA }}/obs/']
+    - ['{{ COMIN_OBS }}/{{ OPREFIX_IN }}adpsfc.tm00.bufr_d', '{{ DATA }}/obs/']
 gtsioda:
-  copy:
-    - ['{{ DATA }}/{{ OPREFIX }}adpsfc_snow.nc4', '{{ COM_OBS }}/{{ OPREFIX }}adpsfc_snow.nc4']
+  gfs:
+    copy:
+      - ['{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4']
+  gdas:
+    copy:
+      - ['{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4']
+  enkfgdas:
+    copy:
+      - ['{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4']
+      - ['{{ COMIN_OBS }}/{{ OPREFIX_IN }}snocvr_snow.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}snocvr_snow.nc4']
 bufr2ioda:
      adpsfc: '{{ HOMEgfs }}/sorc/gdas.cd/test/testinput/bufr_adpsfc_snow.yaml'
diff --git a/parm/snow/prep/prep_ims.yaml.j2 b/parm/snow/prep/prep_ims.yaml.j2
@@ -2,9 +2,9 @@ calcfims:
   mkdir:
     - '{{ DATA }}/obs'
   copy:
-    - ['{{ COM_OBS }}/{{ OPREFIX }}ims{{ current_cycle | to_julian }}_4km_v1.3.nc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.nc']
+    - ['{{ COMIN_OBS }}/{{ OPREFIX_IN }}ims{{ current_cycle | to_julian }}_4km_v1.3.nc', '{{ DATA }}/obs/ims{{ current_cycle | to_julian }}_4km_v1.3.nc']
     - ['{{ FIXgfs }}/gdas/obs/ims/IMS_4km_to_{{ CASE }}.mx{{ OCNRES }}.nc', '{{ DATA }}/obs/IMS4km_to_FV3_mapping.{{ CASE }}_oro_data.nc']
 ims2ioda:
   copy:
-    - ['{{ DATA }}/ims_snow_{{ current_cycle | to_YMDH }}.nc4', '{{ COM_OBS }}/{{ OPREFIX }}ims_snow.nc4']
+    - ['{{ DATA }}/ims_snow_{{ current_cycle | to_YMDH }}.nc4', '{{ COMOUT_OBS }}/{{ OPREFIX_OUT }}ims_snow.{{ CASE }}.nc4']
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -4,20 +4,24 @@ set(URL "https://ftp.emc.ncep.noaa.gov/static_files/public/GDASApp")
 set(SHA "bda76f96666405f72abef56ad4d7d5b93ca153cd7d675853fbdb199096949f8a")
 string(SUBSTRING ${SHA} 0 6 SHORTSHA)
 set(TAR "gdasapp-fix-${SHORTSHA}.tgz")
-# download test files
-file(DOWNLOAD
-  ${URL}/${TAR}
-  ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
-  INACTIVITY_TIMEOUT 30
-  TIMEOUT 90
-  SHOW_PROGRESS
-  STATUS status
-  EXPECTED_HASH SHA256=${SHA}
-  )
-# Extract downloaded tarball.
+IF(DEFINED ENV{GDASAPP_UNIT_TEST_DATA_PATH})
+  set(GDASAPP_UNIT_TEST_DATA_PATH "$ENV{GDASAPP_UNIT_TEST_DATA_PATH}")
+  file(COPY ${GDASAPP_UNIT_TEST_DATA_PATH}/${TAR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ELSE()
+  # download test files
+  file(DOWNLOAD
+    ${URL}/${TAR}
+    ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
+    INACTIVITY_TIMEOUT 30
+    TIMEOUT 90
+    SHOW_PROGRESS
+    STATUS status
+    EXPECTED_HASH SHA256=${SHA}
+    )
+ENDIF()
+# Extract tarball.
 file(ARCHIVE_EXTRACT INPUT ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
 # list of test binary/data files to install
 list(APPEND test_data
   ${CMAKE_CURRENT_BINARY_DIR}/testdata/atminc_compress.nc4

diff --git a/test/testinput/bufr_adpsfc_snow.yaml b/test/testinput/bufr_adpsfc_snow.yaml
@@ -5,7 +5,7 @@ observations:
   - obs space:
       name: bufr
 
-      obsdatain: '{{ DATA }}/obs/{{ OPREFIX }}adpsfc.tm00.bufr_d'
+      obsdatain: '{{ DATA }}/obs/{{ OPREFIX_IN }}adpsfc.tm00.bufr_d'
 
       exports:
         variables:
@@ -39,7 +39,7 @@ observations:
 
     ioda:
       backend: netcdf
-      obsdataout: '{{ DATA }}/{{ OPREFIX }}adpsfc_snow.nc4'
+      obsdataout: '{{ DATA }}/{{ OPREFIX_OUT }}adpsfc_snow.nc4'
 
       variables: