Skip to content

Commit

Permalink
Merge branch 'develop' into feature/update_hashes
Browse files Browse the repository at this point in the history
  • Loading branch information
RussTreadon-NOAA authored Oct 4, 2024
2 parents 3a4616e + f49e2e6 commit 1c70c4a
Show file tree
Hide file tree
Showing 10 changed files with 114 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ set -x
if [[ $BUILD_JCSDA == 'YES' ]]; then
make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
else
builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils bufr-query"
builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils bufr-query da-utils"
for b in $builddirs; do
cd $b
make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
Expand Down
1 change: 1 addition & 0 deletions modulefiles/GDAS/hera.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ load("fckit/0.11.0")
load("fiat/1.2.0")
--load("ectrans/1.2.0")
load("fms/2023.04")
load("esmf/8.6.0")
load("atlas/0.35.1")
load("sp/2.5.0")
load("gsl-lite/0.37.0")
Expand Down
1 change: 1 addition & 0 deletions modulefiles/GDAS/hercules.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ load("fckit/0.11.0")
load("fiat/1.2.0")
load("ectrans/1.2.0")
load("fms/2023.04")
load("esmf/8.6.0")
load("atlas/0.35.1")
load("sp/2.5.0")
load("gsl-lite/0.37.0")
Expand Down
1 change: 1 addition & 0 deletions modulefiles/GDAS/orion.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ load("fckit/0.11.0")
load("fiat/1.2.0")
load("ectrans/1.2.0")
load("fms/2023.04")
load("esmf/8.6.0")
load("atlas/0.35.1")
load("sp/2.5.0")
load("gsl-lite/0.37.0")
Expand Down
1 change: 1 addition & 0 deletions modulefiles/GDAS/wcoss2.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ load("gsl/2.7")
load("prod_util/2.0.14")
load("bufr/12.0.1")
load("fms-C/2023.04")
load("esmf-C/8.6.0")

-- hack for pybind11
setenv("pybind11_ROOT", "/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib/python3.8/site-packages/pybind11/share/cmake/pybind11")
Expand Down
45 changes: 45 additions & 0 deletions parm/soca/obs/config/icec_viirs_n20_l2_north.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
obs space:
name: icec_viirs_n20_l2_north
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}icec_viirs_n20_l2_north.{PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/icec_viirs_n20_l2_north.${PDY}${cyc}.nc4
simulated variables: [seaIceFraction]
io pool:
max pool size: 1
get values:
time interpolation: linear
obs operator:
name: Identity
observation alias file: obsop_name_map.yaml
obs error:
covariance model: diagonal
obs filters:
- filter: Domain Check
where:
- variable: {name: GeoVaLs/sea_area_fraction}
minvalue: 0.9
- filter: Bounds Check
minvalue: 0.0
maxvalue: 1.0
#- filter: Background Check
# threshold: 5.0
- filter: Domain Check
where:
- variable: { name: GeoVaLs/sea_surface_temperature}
maxvalue: 2.0
- filter: Domain Check
where:
- variable: { name: GeoVaLs/sea_surface_temperature}
maxvalue: 0.0
action:
name: inflate error
inflation factor: 2.0
- filter: Domain Check
where:
- variable: {name: GeoVaLs/distance_from_coast}
minvalue: 100e3
45 changes: 45 additions & 0 deletions parm/soca/obs/config/icec_viirs_n20_l2_south.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
obs space:
name: icec_viirs_n20_l2_south
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}icec_viirs_n20_l2_south.{PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/icec_viirs_n20_l2_south.${PDY}${cyc}.nc4
simulated variables: [seaIceFraction]
io pool:
max pool size: 1
get values:
time interpolation: linear
obs operator:
name: Identity
observation alias file: obsop_name_map.yaml
obs error:
covariance model: diagonal
obs filters:
- filter: Domain Check
where:
- variable: {name: GeoVaLs/sea_area_fraction}
minvalue: 0.9
- filter: Bounds Check
minvalue: 0.0
maxvalue: 1.0
#- filter: Background Check
# threshold: 5.0
- filter: Domain Check
where:
- variable: { name: GeoVaLs/sea_surface_temperature}
maxvalue: 2.0
- filter: Domain Check
where:
- variable: { name: GeoVaLs/sea_surface_temperature}
maxvalue: 0.0
action:
name: inflate error
inflation factor: 2.0
- filter: Domain Check
where:
- variable: {name: GeoVaLs/distance_from_coast}
minvalue: 100e3
2 changes: 2 additions & 0 deletions parm/soca/obs/obs_list.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ observers:
# Ice concentration
- !INC ${MARINE_OBS_YAML_DIR}/icec_amsr2_north.yaml
- !INC ${MARINE_OBS_YAML_DIR}/icec_amsr2_south.yaml
#- !INC ${MARINE_OBS_YAML_DIR}/icec_viirs_n20_l2_north.yaml
#- !INC ${MARINE_OBS_YAML_DIR}/icec_viirs_n20_l2_south.yaml
#- !INC ${MARINE_OBS_YAML_DIR}/icec_amsu_mb_l2.yaml
#- !INC ${MARINE_OBS_YAML_DIR}/icec_atms_n20_l2.yaml
#- !INC ${MARINE_OBS_YAML_DIR}/icec_atms_n21_l2.yaml
Expand Down
16 changes: 16 additions & 0 deletions parm/soca/obsprep/obsprep_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,22 @@ observations:
dmpdir regex: 'AMSR2-SEAICE-SH_v2r2_GW1_s*.nc'
ocean basin: RECCAP2_region_masks_all_v20221025.nc

- obs space:
name: icec_viirs_n20_l2_north
provider: JPSSRR
dmpdir subdir: ocean/icec/NH
type: nc
dmpdir regex: 'JRR-IceConcentration_v2r3_j01_s*.nc'
ocean basin: RECCAP2_region_masks_all_v20221025.nc

- obs space:
name: icec_viirs_n20_l2_south
provider: JPSSRR
dmpdir subdir: ocean/icec/SH
type: nc
dmpdir regex: 'JRR-IceConcentration_v2r3_j01_s*.nc'
ocean basin: RECCAP2_region_masks_all_v20221025.nc

- obs space:
name: icec_amsu_mb_l2
provider: MIRS
Expand Down

0 comments on commit 1c70c4a

Please sign in to comment.