From cb8036a8bb19b07cf8b2eb12632047a5933ab735 Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Mon, 20 May 2024 21:55:12 +0000 Subject: [PATCH 1/4] add letkf yaml --- parm/soca/letkf/letkf.yaml.j2 | 85 ++++++++++++++++++++++++++++ test/soca/gw/CMakeLists.txt | 2 +- test/soca/gw/run_gdas_apps.yaml.test | 2 +- test/soca/gw/run_jjobs.yaml.test | 2 +- 4 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 parm/soca/letkf/letkf.yaml.j2 diff --git a/parm/soca/letkf/letkf.yaml.j2 b/parm/soca/letkf/letkf.yaml.j2 new file mode 100644 index 000000000..6428c8bc3 --- /dev/null +++ b/parm/soca/letkf/letkf.yaml.j2 @@ -0,0 +1,85 @@ +# copied from sorc/soca/test/testinput/letkf.yml +geometry: + #geom_grid_file: data_generated/gridgen/soca_gridspec.72x35x25.nc + #mom6_input_nml: data_static/72x35x25/input.nml + #fields metadata: data_static/fields_metadata.yml + geom_grid_file: soca_gridspec.nc + mom6_input_nml: mom_input.nml + fields metadata: fields_metadata.yaml + +time window: + #begin: &date 2018-04-14T00:00:00Z + #length: P2D + begin: '{{ ATM_WINDOW_BEGIN }}' + length: PT6H + +background: + members from template: +# template: +# date: 2018-04-15T00:00:00Z +# ocn_filename: MOM.res.ens.%mem%.nc +# read_from_file: 1 +# basename: data_static/72x35x25/restarts_ens/ +# state variables: [socn, tocn, ssh, uocn, vocn, hocn, chl, biop] +# pattern: '%mem%' +# nmembers: 4 + template: + #date: 2018-04-15T00:00:00Z + date: '{{ ATM_WINDOW_MIDDLE }}' + ocn_filename: enkfgdas.ocean.t06z.inst.f009.nc + ice_filename: enkfgdas.ice.t06z.inst.f009.nc + read_from_file: 1 + basename: ./ens/mem%mem% + state variables: [socn, tocn, ssh, uocn, vocn, cicen] + pattern: '%mem%' + nmembers: '{{ NMEM_ENS }}' + +observations: + observers: +# insert obs spaces here + +driver: + do posterior observer: true + save posterior mean increment: true + save posterior mean: true + save posterior variance: true + save prior mean: true + save prior variance: true + +local ensemble DA: + solver: LETKF + inflation: + rtps: 0.5 + rtpp: 0.6 + mult: 1.1 + +output: + datadir: data_output/ + date: *date + exp: letkf + type: ens + +output mean prior: + datadir: data_output/ + date: *date + exp: letkf + type: fc + +output variance prior: + datadir: data_output/ + date: *date + exp: letkf + type: fc + +output variance posterior: + datadir: data_output/ + date: *date + exp: letkf + type: an + +output increment: + datadir: data_output/ + date: *date + exp: letkf.inc + type: an + diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt index 38cea0d23..7fc792320 100644 --- a/test/soca/gw/CMakeLists.txt +++ b/test/soca/gw/CMakeLists.txt @@ -46,7 +46,7 @@ set(jjob_list "JGLOBAL_PREP_OCEAN_OBS" "JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT" "JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN" "JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN" -# "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF" + "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF" "JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT" "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST") # TODO(WaterPeople) Add back to the list of tested jobs once fixed diff --git a/test/soca/gw/run_gdas_apps.yaml.test b/test/soca/gw/run_gdas_apps.yaml.test index 8b4cca66e..602b9471b 100644 --- a/test/soca/gw/run_gdas_apps.yaml.test +++ b/test/soca/gw/run_gdas_apps.yaml.test @@ -6,7 +6,7 @@ ctest command: job options: account: da-cpu - qos: batch + qos: debug output: @TEST@.out nodes: 1 ntasks: 1 diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test index f2331b07a..2c97aa926 100644 --- a/test/soca/gw/run_jjobs.yaml.test +++ b/test/soca/gw/run_jjobs.yaml.test @@ -66,7 +66,7 @@ setup_expt config: job options: account: da-cpu - qos: batch + qos: debug output: @JJOB@.out nodes: 1 ntasks: 16 From 5f593b9a1ffa5f445181850852c7dfaf8ba76def Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Tue, 28 May 2024 16:59:20 +0000 Subject: [PATCH 2/4] tweaks --- parm/soca/letkf/letkf.yaml.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parm/soca/letkf/letkf.yaml.j2 b/parm/soca/letkf/letkf.yaml.j2 index 6428c8bc3..0662f270b 100644 --- a/parm/soca/letkf/letkf.yaml.j2 +++ b/parm/soca/letkf/letkf.yaml.j2 @@ -8,9 +8,9 @@ geometry: fields metadata: fields_metadata.yaml time window: - #begin: &date 2018-04-14T00:00:00Z + # begin: &date 2018-04-14T00:00:00Z #length: P2D - begin: '{{ ATM_WINDOW_BEGIN }}' + begin: &date '{{ ATM_WINDOW_BEGIN }}' length: PT6H background: @@ -32,7 +32,7 @@ background: basename: ./ens/mem%mem% state variables: [socn, tocn, ssh, uocn, vocn, cicen] pattern: '%mem%' - nmembers: '{{ NMEM_ENS }}' + nmembers: {{ NMEM_ENS }} observations: observers: From e917155076848551f7c7c6ea0eeddb2f335fa0fe Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Wed, 29 May 2024 12:52:21 +0000 Subject: [PATCH 3/4] full merge with develop --- test/soca/gw/CMakeLists.txt | 2 +- test/soca/gw/run_gdas_apps.yaml.test | 2 +- test/soca/gw/run_jjobs.yaml.test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt index 8fbeed71f..f96a3aec5 100644 --- a/test/soca/gw/CMakeLists.txt +++ b/test/soca/gw/CMakeLists.txt @@ -50,7 +50,7 @@ set(jjob_list "JGLOBAL_PREP_OCEAN_OBS" "JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT" "JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN" "JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN" - "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF" +# "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF" "JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT" "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST" "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY") diff --git a/test/soca/gw/run_gdas_apps.yaml.test b/test/soca/gw/run_gdas_apps.yaml.test index 602b9471b..8b4cca66e 100644 --- a/test/soca/gw/run_gdas_apps.yaml.test +++ b/test/soca/gw/run_gdas_apps.yaml.test @@ -6,7 +6,7 @@ ctest command: job options: account: da-cpu - qos: debug + qos: batch output: @TEST@.out nodes: 1 ntasks: 1 diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test index 2c97aa926..f2331b07a 100644 --- a/test/soca/gw/run_jjobs.yaml.test +++ b/test/soca/gw/run_jjobs.yaml.test @@ -66,7 +66,7 @@ setup_expt config: job options: account: da-cpu - qos: debug + qos: batch output: @JJOB@.out nodes: 1 ntasks: 16 From 848a8efeaaf294d35465516146368b0342c91a6c Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA Date: Wed, 29 May 2024 14:37:22 +0000 Subject: [PATCH 4/4] removed comments --- parm/soca/letkf/letkf.yaml.j2 | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/parm/soca/letkf/letkf.yaml.j2 b/parm/soca/letkf/letkf.yaml.j2 index 0662f270b..3cf0284df 100644 --- a/parm/soca/letkf/letkf.yaml.j2 +++ b/parm/soca/letkf/letkf.yaml.j2 @@ -1,30 +1,15 @@ -# copied from sorc/soca/test/testinput/letkf.yml geometry: - #geom_grid_file: data_generated/gridgen/soca_gridspec.72x35x25.nc - #mom6_input_nml: data_static/72x35x25/input.nml - #fields metadata: data_static/fields_metadata.yml geom_grid_file: soca_gridspec.nc mom6_input_nml: mom_input.nml fields metadata: fields_metadata.yaml time window: - # begin: &date 2018-04-14T00:00:00Z - #length: P2D begin: &date '{{ ATM_WINDOW_BEGIN }}' length: PT6H background: members from template: -# template: -# date: 2018-04-15T00:00:00Z -# ocn_filename: MOM.res.ens.%mem%.nc -# read_from_file: 1 -# basename: data_static/72x35x25/restarts_ens/ -# state variables: [socn, tocn, ssh, uocn, vocn, hocn, chl, biop] -# pattern: '%mem%' -# nmembers: 4 template: - #date: 2018-04-15T00:00:00Z date: '{{ ATM_WINDOW_MIDDLE }}' ocn_filename: enkfgdas.ocean.t06z.inst.f009.nc ice_filename: enkfgdas.ice.t06z.inst.f009.nc @@ -36,7 +21,6 @@ background: observations: observers: -# insert obs spaces here driver: do posterior observer: true