Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OOPS and use reduce obs space filter action for pre-filters #209

Closed
wants to merge 4 commits into from
Closed

Update OOPS and use reduce obs space filter action for pre-filters #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3417600
Oops oops and use reduce obs space filter action
SamuelDegelia-NOAA Oct 23, 2024
66c8e66
Merge branch 'develop' into feature/update_oops
SamuelDegelia-NOAA Oct 23, 2024
72efe9f
fix spaces from merging conflict
SamuelDegelia-NOAA Oct 23, 2024
62bfc29
Merge branch 'develop' into feature/update_oops
SamuelDegelia-NOAA Oct 24, 2024
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
58 changes: 26 additions & 32 deletions rrfs-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ set (src_yaml "${CMAKE_SOURCE_DIR}/rrfs-test/testinput")
if(FV3_DYCORE)

message(STATUS "MACHINE_ID is " ${MACHINE_ID})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(RESTORE_MPI_ARGS ${MPI_ARGS})
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
set(RESTORE_MPI_ARGS ${MPI_ARGS})

get_all_keys(rrfs_fv3jedi_tests caselist)
foreach(case ${caselist})
Expand All @@ -51,29 +47,24 @@ if(FV3_DYCORE)
file(CREATE_LINK ${CMAKE_SOURCE_DIR}/rrfs-test/testoutput ${casedir}/testoutput SYMBOLIC)
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir} )
set(target_test ${case})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
ecbuild_add_test( TARGET ${target_test}
MPI 80
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
COMMAND ${exe} )
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endforeach()

if("${MACHINE_ID}" STREQUAL "orion")
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endif()

endif()

if(MPAS_DYCORE)

message(STATUS "MACHINE_ID is " ${MACHINE_ID})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(RESTORE_MPI_ARGS ${MPI_ARGS})
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
set(MPI_ARGS "${MPI_ARGS} --ntasks-per-node=4")
set(MPI_ARGS "${MPI_ARGS} --time=00:30:00")
set(RESTORE_MPI_ARGS ${MPI_ARGS})

get_all_keys(rrfs_mpasjedi_tests caselist)
foreach(case ${caselist})
Expand All @@ -96,26 +87,29 @@ if(MPAS_DYCORE)
file(COPY ${bl_FILES} DESTINATION ${casedir})
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir})
set(target_test ${case})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
if ("${target_test}" STREQUAL "rrfs_mpasjedi_2024052700_getkf_solver")
ecbuild_add_test( TARGET ${target_test}
MPI 120
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
TEST_DEPENDS "rrfs_mpasjedi_2024052700_getkf_observer"
COMMAND ${exe} )
set(MPI_ARGS "${MPI_ARGS} --time=00:15:00 --ntasks-per-node=4")
ecbuild_add_test( TARGET ${target_test}
MPI 120
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
TEST_DEPENDS "rrfs_mpasjedi_2024052700_getkf_observer"
COMMAND ${exe} )
else()
ecbuild_add_test( TARGET ${target_test}
MPI 120
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
COMMAND ${exe} )
set(MPI_ARGS "${MPI_ARGS} --time=00:10:00 --ntasks-per-node=4")
ecbuild_add_test( TARGET ${target_test}
MPI 120
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
COMMAND ${exe} )
endif()
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endforeach()

if("${MACHINE_ID}" STREQUAL "orion")
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endif()

########################
### Bufr2ioda ctests ###
########################
Expand Down Expand Up @@ -144,7 +138,7 @@ if(MPAS_DYCORE)
ioda_mesonet.nc
${IODA_CONV_COMP_TOL}
DEPENDS bufr2ioda.x )

set(MPI_ARGS ${RESTORE_MPI_ARGS})

endif()

65 changes: 65 additions & 0 deletions rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.75
maxvalue: 0.75
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -426,13 +430,17 @@ cost function:
is_in: 233
action:
name: reject
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -589,13 +597,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.75
maxvalue: 0.75
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -737,13 +749,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.75
maxvalue: 0.75
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -885,13 +901,18 @@ cost function:
name: MetaData/timeOffset
minvalue: -1.00
maxvalue: 1.00
action:
name: reduce obs space


- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -1033,13 +1054,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.75
maxvalue: 0.75
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -1181,13 +1206,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.75
maxvalue: 0.75
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -1341,13 +1370,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.75
maxvalue: 0.75
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -1567,13 +1600,17 @@ cost function:
is_in: 230
action:
name: reject
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -1796,13 +1833,17 @@ cost function:
is_in: 231
action:
name: reject
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -2025,13 +2066,17 @@ cost function:
is_in: 234
action:
name: reject
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -2254,13 +2299,17 @@ cost function:
is_in: 235
action:
name: reject
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -2400,13 +2449,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.10
maxvalue: 0.10
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -2544,13 +2597,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.10
maxvalue: 0.10
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -2685,13 +2742,17 @@ cost function:
name: MetaData/timeOffset
minvalue: -0.10
maxvalue: 0.10
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down Expand Up @@ -2899,13 +2960,17 @@ cost function:
is_in: 288
action:
name: reject
action:
name: reduce obs space

- filter: Temporal Thinning
apply at iterations: 0,1
min_spacing: PT30M
seed_time: *analysisDate
category_variable:
name: MetaData/stationIdentification
action:
name: reduce obs space

## Print filter data
#- filter: Print Filter Data
Expand Down
Loading
Loading