Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/hera.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export GDAS_CI_ROOT=/scratch3/NCEPDEV/da/Russ.Treadon/CI/GDASApp
export GDAS_CI_ROOT=/scratch3/NCEPDEV/da/$USER/CI/GDASApp
export GDAS_CI_HOST='hera'
export GDAS_MODULE_USE=$GDAS_CI_ROOT/repo/modulefiles
export SLURM_ACCOUNT=da-cpu
Expand Down
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
2 changes: 1 addition & 1 deletion sorc/ioda
Submodule ioda updated 43 files
+2 −0 cmake/compiler_flags_NAG_Fortran.cmake
+3 −0 cmake/ioda_compiler_flags.cmake
+15 −4 src/CMakeLists.txt
+314 −430 src/ObsSpace.cc
+38 −148 src/ObsSpace.h
+92 −0 src/containers/FrameMetadata.cpp
+102 −0 src/containers/FrameMetadata.h
+1 −0 src/containers/IFrame.h
+5 −1 src/core/IodaUtils.cc
+55 −0 src/core/ObsDimInfo.cc
+64 −0 src/core/ObsDimInfo.h
+42 −0 src/core/ObsSourceStats.h
+1 −2 src/engines/Examples/Basic/00-Strings.f90
+2 −3 src/engines/Examples/Basic/00-VecStrings.f90
+1 −4 src/engines/Examples/Basic/01-GroupsAndObsSpaces.f90
+2 −3 src/engines/Examples/Basic/02-Attributes.f90
+5 −1 src/engines/Examples/Basic/CMakeLists.txt
+1 −1 src/engines/ioda/fortran/CMakeLists.txt
+1 −2 src/engines/ioda/fortran/cxx_vector_string_mod.f90
+0 −5 src/engines/ioda/fortran/f_c_string_mod.f90
+0 −2 src/engines/ioda/fortran/ioda_engines_mod.f90
+0 −1 src/engines/ioda/fortran/ioda_has_attributes_mod.f90
+0 −1 src/engines/ioda/fortran/ioda_has_variables_mod.f90
+3 −3 src/obsdatavector_int_mod.f90
+0 −1 src/obsspace_mod.F90
+63 −0 src/reader/ObsReader.cpp
+61 −0 src/reader/ObsReader.hpp
+47 −0 src/reader/distribute/distributeObs.cpp
+42 −0 src/reader/distribute/distributeObs.hpp
+39 −7 src/reader/filter/filterObs.cpp
+17 −3 src/reader/filter/filterObs.hpp
+146 −0 src/reader/load/loadObs.cpp
+44 −0 src/reader/load/loadObs.hpp
+0 −51 src/reader/load/loadObsContainerFromNetcdf.hpp
+84 −57 src/reader/load/loadObsFromNetcdf.cpp
+39 −0 src/reader/load/loadObsFromNetcdf.hpp
+11 −11 test/CMakeLists.txt
+50 −3 test/ioda/ReaderFilter.h
+35 −55 test/ioda/ReaderLoad.h
+2 −2 test/mains/TestReaderLoad.cc
+11 −4 test/testinput/iodatest_obsspace_osdf.yaml
+7 −0 test/testinput/iodatest_reader_filter.yaml
+2 −0 test/testinput/iodatest_reader_load.yaml
2 changes: 1 addition & 1 deletion sorc/soca
2 changes: 1 addition & 1 deletion sorc/vader
2 changes: 1 addition & 1 deletion test/atm/global-workflow/jjob_ens_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ for imem in $(seq 1 $NMEM_ENS); do

source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
target=$COMIN_ATMOS_HISTORY_PREV_ENS
flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
for file in "${flist[@]}"; do
rm -rf $target/enkf${gprefix}.${file}
ln -fs $source/enkf${gprefix}.${file} $target/
Expand Down
2 changes: 1 addition & 1 deletion test/atm/global-workflow/jjob_ens_init_split.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ for imem in $(seq 1 $NMEM_ENS); do

source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
target=$COMIN_ATMOS_HISTORY_PREV_ENS
flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
for file in "${flist[@]}"; do
rm -rf $target/enkf${gprefix}.${file}
ln -fs $source/enkf${gprefix}.${file} $target/enkf${gprefix}.${file}
Expand Down
4 changes: 2 additions & 2 deletions test/atm/global-workflow/jjob_var_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ for file in $flist; do
done

# Link atmospheric histories on native cubed-sphere grid
flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
for file in "${flist[@]}"; do
ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${gprefix}.${file} $COMIN_ATMOS_HISTORY_PREV/${gprefix}.${file}
done
Expand All @@ -108,7 +108,7 @@ for imem in $(seq 1 $NMEM_ENS); do

source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
target=$COMIN_ATMOS_HISTORY_PREV_ENS
flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
flist=("csg_atm.f006.nc" "csg_sfc.f006.nc")
for file in "${flist[@]}"; do
rm -rf $target/enkf${gprefix}.${file}
ln -fs $source/enkf${gprefix}.${file} $target/
Expand Down