Skip to content

Commit

Permalink
minor reorg of the marine obs
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillaumevernieres
guillaumevernieres committed Jan 24, 2024
1 parent 839e8a2 commit a78877a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 26 deletions.
27 changes: 15 additions & 12 deletions parm/soca/obsprep/obsprep_config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
observations:
- obs space:
name: sss_smap
dmpdir subdir: SSS
dmpdir regex: SMAP_L2B_SSS_NRT_?????_[AD]_????????T??????.h5
dmpdir subdir: ocean/sss
dmpdir regex: SMAP_L2B_SSS_NRT_*.h5
provider: SMAP
output file: sss_smap.ioda.nc
- obs space:
name: sss_smos
provider: SMOS
dmpdir subdir: SSS
dmpdir subdir: ocean/sss
output file: sss_smos.ioda.nc
dmpdir regex: SM_OPER_MIR_OSUDP2_????????T??????_????????T??????_700_001_1.nc
dmpdir regex: SM_OPER_MIR_OSUDP2_*.nc
- obs space:
name: adt_rads_all
dmpdir subdir: ADT
dmpdir regex: rads_adt_??_???????.nc
dmpdir subdir: ocean/adt
dmpdir regex: rads_adt_*.nc
provider: RADS
output file: adt_rads_all.nc4
- obs space:
name: icec_amsr2_north
provider: AMSR2
dmpdir subdir: icec
dmpdir subdir: ocean/icec
output file: icec_amsr2_north.ioda.nc
dmpdir regex: AMSR2-SEAICE-NH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc
dmpdir regex: AMSR2-SEAICE-NH_v2r2_GW1_s*.nc
- obs space:
name: icec_amsr2_south
provider: AMSR2
dmpdir subdir: icec
dmpdir subdir: ocean/icec
output file: icec_amsr2_south.ioda.nc
dmpdir regex: AMSR2-SEAICE-SH_v2r2_GW1_s???????????????_e???????????????_c???????????????.nc
dmpdir regex: AMSR2-SEAICE-SH_v2r2_GW1_s*.nc
- obs space:
name: sst_metopb_l3u
provider: GHRSST
dmpdir subdir: 'sst'
dmpdir subdir: 'ocean/sst'
output file: sst_metopb_l3u.ioda.nc
dmpdir regex: '??????????????-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc'
dmpdir regex: '*-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V*.nc'
bounds:
units: C
min: -3.0
max: 50.0
binning:
stride: 5
min number of obs: 10
2 changes: 1 addition & 1 deletion sorc/gsibec
Submodule gsibec updated 5 files
+1 −1 CMakeLists.txt
+3 −80 src/gsibec/gsi/guess_grids.f90
+3 −3 src/gsibec/gsi/jfunc.f90
+14 −21 src/gsibec/gsi/prewgt.F90
+3 −2 src/gsibec/gsi/write_bkgvars_grid.F90
2 changes: 1 addition & 1 deletion sorc/soca
Submodule soca updated 4 files
+227 −113 src/soca/VariableChange/Soca2Cice/soca_ciceutils_mod.F90
+14 −21 src/soca/VariableChange/Soca2Cice/soca_soca2cice_mod.F90
+3 −3 test/CMakeLists.txt
+17 −17 test/testref/convertstate_soca2cice.test
18 changes: 9 additions & 9 deletions test/soca/gw/prepdata.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ project_source_dir=$1
cdldir=${project_source_dir}/test/soca/testdata

# GHRSST
cdl2nc4 sst/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
cdl2nc4 ocean/sst/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
${cdldir}/20180415114000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
cdl2nc4 sst/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
cdl2nc4 ocean/sst/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
${cdldir}/20180415132000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl
cdl2nc4 sst/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
cdl2nc4 ocean/sst/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.nc \
${cdldir}/20180415095000-STAR-L3U_GHRSST-SSTsubskin-AVHRRF_MB-ACSPO_V2.80-v02.0-fv01.0.cdl

# Fake AMSR2 icec
cdl2nc4 icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
cdl2nc4 ocean/icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
${project_source_dir}/test/soca/testdata/icec_amsr2_north_1.cdl
cdl2nc4 icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
cdl2nc4 ocean/icec/AMSR2-SEAICE-NH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
${project_source_dir}/test/soca/testdata/icec_amsr2_north_2.cdl
cdl2nc4 icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
cdl2nc4 ocean/icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804150835180_e201804151014170_c201804151052280.nc \
${project_source_dir}/test/soca/testdata/icec_amsr2_south_1.cdl
cdl2nc4 icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
cdl2nc4 ocean/icec/AMSR2-SEAICE-SH_v2r2_GW1_s201804151014190_e201804151150170_c201804151309570.nc \
${project_source_dir}/test/soca/testdata/icec_amsr2_south_2.cdl

# Fake RADS ADT
cdl2nc4 ADT/rads_adt_3a_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3a_2018105.cdl
cdl2nc4 ADT/rads_adt_3b_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3b_2018105.cdl
cdl2nc4 ocean/adt/rads_adt_3a_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3a_2018105.cdl
cdl2nc4 ocean/adt/rads_adt_3b_2018105.nc ${project_source_dir}/test/soca/testdata/rads_adt_3b_2018105.cdl
4 changes: 1 addition & 3 deletions test/soca/gw/setup_obsprep.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ mkdir -p ${test_dmpdir}

cd ${test_dmpdir}

mkdir SSS ADT icec sst
mkdir -p ocean/sss ocean/adt ocean/icec ocean/sst

${project_source_dir}/test/soca/gw/prepdata.sh ${project_source_dir}



0 comments on commit a78877a

Please sign in to comment.