diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt index eae9931a8..5b4de13a2 100644 --- a/test/soca/gw/CMakeLists.txt +++ b/test/soca/gw/CMakeLists.txt @@ -37,7 +37,7 @@ add_test(NAME test_gdasapp_soca_run_clean # Test JGDAS_GLOBAL_OCEAN_ANALYSIS_* set(jjob_list "JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP" "JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT" -# "JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY" + "JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY" "JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN" "JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT" "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST" diff --git a/ush/ufsda/dirac_yaml.py b/ush/ufsda/dirac_yaml.py index 62783ceaf..c8c8a707f 100755 --- a/ush/ufsda/dirac_yaml.py +++ b/ush/ufsda/dirac_yaml.py @@ -34,9 +34,17 @@ def var2dirac(args): # Overwrite variables state_vars = ['cicen', 'hicen', 'hsnon', 'socn', 'tocn', 'ssh', 'hocn', 'mld', 'layer_depth'] diracconfig['initial condition']['state variables'] = state_vars - for sub_bmat in range(len(diracconfig['background error']['components'])): - diracconfig['background error']['components'][sub_bmat]['covariance']['linear variable change']['input variables'] = state_vars - diracconfig['background error']['components'][sub_bmat]['covariance']['linear variable change']['output variables'] = state_vars + + # str to integer + nmem=int(diracconfig['background error']['components'][1]['covariance']['members from template']['nmembers'] ) + diracconfig['background error']['components'][1]['covariance']['members from template']['nmembers'] = nmem + + # Set date to the middle of the window + window_middle = diracconfig['background error']['components'][1]['weight']['date'] + diracconfig['initial condition']['date'] = window_middle + + # Remove static B + diracconfig['background error'] = diracconfig['background error']['components'][1]['covariance'] # Generate impulse indices ds = xr.open_dataset(grid)