Skip to content

Commit

Permalink
Merge branch 'NOAA-EMC:develop' into feature/gsibec
Browse files Browse the repository at this point in the history
  • Loading branch information
RussTreadon-NOAA committed Oct 20, 2023
2 parents 3ca1e08 + 3f2b79d commit d9d22af
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ if(BUILD_GDASBUNDLE)
ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" BRANCH develop)
ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop )
ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop )
option(ENABLE_IODA_DATA "Obtain ioda test data from ioda-data repository (vs tarball)" ON)
ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" BRANCH develop )
option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON)
ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH develop )

# FMS and FV3 dynamical core
Expand All @@ -87,6 +89,7 @@ if(BUILD_GDASBUNDLE)
# fv3-jedi and associated repositories
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" BRANCH develop )
ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" BRANCH develop )
option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON)
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" BRANCH develop )

# SOCA associated repositories
Expand Down
6 changes: 6 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
WORKFLOW_BUILD=${WORKFLOW_BUILD:-"OFF"}
CMAKE_OPTS+=" -DWORKFLOW_TESTS=${WORKFLOW_BUILD}"

# JCSDA changed test data things, need to make a dummy CRTM directory
if [[ $BUILD_TARGET == 'hera' ]]; then
mkdir -p $dir_root/test-data-release/
ln -sf $GDASAPP_TESTDATA/crtm $dir_root/test-data-release/crtm
fi

# Configure
echo "Configuring ..."
set -x
Expand Down
1 change: 1 addition & 0 deletions parm/aero/obs/config/viirs_n20_aod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ obs space:
channels: 4
get values:
interpolation method: barycentric
time interpolation: linear
obs operator:
name: AodCRTM
Absorbers: [H2O,O3]
Expand Down
1 change: 1 addition & 0 deletions parm/aero/obs/config/viirs_npp_aod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ obs space:
channels: 4
get values:
interpolation method: barycentric
time interpolation: linear
obs operator:
name: AodCRTM
Absorbers: [H2O,O3]
Expand Down
112 changes: 112 additions & 0 deletions parm/aero/variational/3dvar_fgat_gfs_aero.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
cost function:
cost type: 3D-FGAT
window begin: '{{ AERO_WINDOW_BEGIN | to_isotime }}'
window length: $(AERO_WINDOW_LENGTH)
analysis variables: &3dvars
[mass_fraction_of_sulfate_in_air,
mass_fraction_of_hydrophobic_black_carbon_in_air,
mass_fraction_of_hydrophilic_black_carbon_in_air,
mass_fraction_of_hydrophobic_organic_carbon_in_air,
mass_fraction_of_hydrophilic_organic_carbon_in_air,
mass_fraction_of_dust001_in_air, mass_fraction_of_dust002_in_air,
mass_fraction_of_dust003_in_air, mass_fraction_of_dust004_in_air,
mass_fraction_of_dust005_in_air, mass_fraction_of_sea_salt001_in_air,
mass_fraction_of_sea_salt002_in_air, mass_fraction_of_sea_salt003_in_air,
mass_fraction_of_sea_salt004_in_air]
geometry:
fms initialization:
namelist filename: ./fv3jedi/fmsmpp.nml
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
model:
name: PSEUDO
datapath: ./bkg
filetype: fms restart
filename is datetime templated: true
tstep: PT3H
filename_core: '%yyyy%mm%dd.%hh%MM%ss.fv_core.res.nc'
filename_trcr: '%yyyy%mm%dd.%hh%MM%ss.fv_tracer.res.nc'
filename_cplr: '%yyyy%mm%dd.%hh%MM%ss.coupler.res'
background:
datapath: ./bkg
filetype: fms restart
datetime: '{{ AERO_WINDOW_BEGIN | to_isotime }}'
filename_core: '{{ AERO_WINDOW_BEGIN | to_fv3time }}.fv_core.res.nc'
filename_trcr: '{{ AERO_WINDOW_BEGIN | to_fv3time }}.fv_tracer.res.nc'
filename_cplr: '{{ AERO_WINDOW_BEGIN | to_fv3time }}.coupler.res'
state variables: [t,delp,sphum,so4,bc1,bc2,oc1,oc2,
dust1,dust2,dust3,dust4,dust5,
seas1,seas2,seas3,seas4]
background error: !INC ${BERROR_YAML}
observations: !INC ${OBS_LIST}
variational:
minimizer:
algorithm: DRIPCG
iterations:
- ninner: 35
gradient norm reduction: 1e-10
test: on
geometry:
fms initialization:
namelist filename: ./fv3jedi/fmsmpp.nml
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_anl)
npy: $(npy_anl)
npz: $(npz_anl)
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
diagnostics:
departures: bkgmob
- ninner: 35
gradient norm reduction: 1e-10
test: on
geometry:
fms initialization:
namelist filename: ./fv3jedi/fmsmpp.nml
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_anl)
npy: $(npy_anl)
npz: $(npz_anl)
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
diagnostics:
departures: bkgmob1
final:
diagnostics:
departures: anlmob
increment:
geometry:
fms initialization:
namelist filename: ./fv3jedi/fmsmpp.nml
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
output:
datapath: ./anl
prefix: aeroinc
filetype: fms restart
filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
filename_trcr: '{{ current_cycle | to_fv3time }}.fv_tracer.res.nc'
filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
state variables: [t,delp,sphum,so4,bc1,bc2,oc1,oc2,
dust1,dust2,dust3,dust4,dust5,
seas1,seas2,seas3,seas4]

0 comments on commit d9d22af

Please sign in to comment.