From 6cfc0bbd829a34f2b47564db8dfd247ab0514b5f Mon Sep 17 00:00:00 2001 From: HenryWinterbottom-NOAA Date: Mon, 15 Apr 2024 19:35:05 +0000 Subject: [PATCH 1/8] Update hash. --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 7fdb58cad0..4f32a4b5e6 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 7fdb58cad0dad2f62ce7813c6719554d1c5a17af +Subproject commit 4f32a4b5e6b17c85c6abf52ffd5b44a38d250c3b From d4c54fd3e6ba1957d6b1218b7988c0ed4560c141 Mon Sep 17 00:00:00 2001 From: HenryWinterbottom-NOAA Date: Thu, 18 Apr 2024 17:42:24 +0000 Subject: [PATCH 2/8] Updated UFS hash. --- sorc/ufs_model.fd | 2 +- ush/parsing_namelists_CICE.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 4f32a4b5e6..8a5f711297 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 4f32a4b5e6b17c85c6abf52ffd5b44a38d250c3b +Subproject commit 8a5f7112970b835f110493532ab85fd57ddaa20d diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index ec44c7cdca..ae60889b98 100755 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -59,6 +59,13 @@ local CICE_RUNID="unknown" local CICE_USE_RESTART_TIME=${use_restart_time} local CICE_RESTART_DIR="./CICE_RESTART/" local CICE_RESTART_FILE="cice_model.res" +local CICE_RESTART_DEFLATE=0 +local CICE_RESTART_CHUNK=0,0 +local CICE_RESTART_STRIDE=-99 +local CICE_RESTART_ROOT=-99 +local CICE_RESTART_REARR="box" +local CICE_RESTART_IOTASKS=-99 +local CICE_RESTART_FORMAT="pnetcdf2" local CICE_DUMPFREQ="y" # "h","d","m" or "y" for restarts at intervals of "hours", "days", "months" or "years" local CICE_DUMPFREQ_N=10000 # Set this to a really large value, as cice, mom6 and cmeps restart interval is controlled by ufs.configure local CICE_DIAGFREQ=$(( 86400 / DT_CICE )) # frequency of diagnostic output in timesteps, recommended for 1x per day @@ -68,8 +75,16 @@ if [[ "${RUN}" =~ "gdas" ]]; then else local CICE_HIST_AVG=".true., .true., .true., .true., .true." # GFS long forecaset wants averaged over CICE_HISTFREQ_N fi +local CICE_HISTORY_FORMAT="pnetcdf2" local CICE_HISTORY_DIR="./CICE_OUTPUT/" local CICE_INCOND_DIR="./CICE_OUTPUT/" +local CICE_HISTORY_IOTASKS=-99 +local CICE_HISTORY_REARR="box" +local CICE_HISTORY_ROOT=-99 +local CICE_HISTORY_STRIDE=-99 +local CICE_HISTORY_CHUNK=0,0 +local CICE_HISTORY_DEFLATE=0 +local CICE_HISTORY_PREC=4 # grid_nml section # CICE_GRID # CICE_MASK From 183ef6b0b1d74a8735644bd169677b95cdcbea2d Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 19 Apr 2024 14:19:30 +0000 Subject: [PATCH 3/8] add c768 and c1152 tests --- ci/cases/weekly/C1152_S2SW.yaml | 14 ++++++++++++++ ci/cases/weekly/C768_S2SW.yaml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 ci/cases/weekly/C1152_S2SW.yaml create mode 100644 ci/cases/weekly/C768_S2SW.yaml diff --git a/ci/cases/weekly/C1152_S2SW.yaml b/ci/cases/weekly/C1152_S2SW.yaml new file mode 100644 index 0000000000..29e1f00bbe --- /dev/null +++ b/ci/cases/weekly/C1152_S2SW.yaml @@ -0,0 +1,14 @@ +experiment: + system: gfs + mode: forecast-only + +arguments: + pslot: {{ 'pslot' | getenv }} + app: S2SW + resdetatmos: 1152 + resdetocean: 0.25 + comroot: {{ 'RUNTESTS' | getenv }}/COMROOT + expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR + idate: 2019120300 + edate: 2019120300 + yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml diff --git a/ci/cases/weekly/C768_S2SW.yaml b/ci/cases/weekly/C768_S2SW.yaml new file mode 100644 index 0000000000..ad314bb75b --- /dev/null +++ b/ci/cases/weekly/C768_S2SW.yaml @@ -0,0 +1,14 @@ +experiment: + system: gfs + mode: forecast-only + +arguments: + pslot: {{ 'pslot' | getenv }} + app: S2SW + resdetatmos: 768 + resdetocean: 0.25 + comroot: {{ 'RUNTESTS' | getenv }}/COMROOT + expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR + idate: 2019120300 + edate: 2019120300 + yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml From 3870c86b35840b15f4f6dcede6ae2ac9e0804766 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 19 Apr 2024 14:19:45 +0000 Subject: [PATCH 4/8] update ufs-weather-model to latest --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 8a5f711297..47c0099570 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 8a5f7112970b835f110493532ab85fd57ddaa20d +Subproject commit 47c00995706380f9827a7e98bd242ffc6e4a7f01 From 1f1e5ab2a95533da60dd631310dadb7d6dc17c9a Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 31 May 2024 19:26:46 +0000 Subject: [PATCH 5/8] update UFS --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 47c0099570..5bec704243 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 47c00995706380f9827a7e98bd242ffc6e4a7f01 +Subproject commit 5bec704243286421fc613838fc67a2129e96acd6 From 77b4ff03408fd4b3a00c5f9cae14bc397d33888e Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Tue, 4 Jun 2024 10:20:40 -0500 Subject: [PATCH 6/8] move weekly -> hires (two were copies and tehrefore deleted) --- ci/cases/{weekly => hires}/C384C192_hybatmda.yaml | 0 ci/cases/{weekly => hires}/C384_S2SWA.yaml | 0 ci/cases/{weekly => hires}/C384_atm3DVar.yaml | 0 ci/cases/weekly/C1152_S2SW.yaml | 14 -------------- ci/cases/weekly/C768_S2SW.yaml | 14 -------------- 5 files changed, 28 deletions(-) rename ci/cases/{weekly => hires}/C384C192_hybatmda.yaml (100%) rename ci/cases/{weekly => hires}/C384_S2SWA.yaml (100%) rename ci/cases/{weekly => hires}/C384_atm3DVar.yaml (100%) delete mode 100644 ci/cases/weekly/C1152_S2SW.yaml delete mode 100644 ci/cases/weekly/C768_S2SW.yaml diff --git a/ci/cases/weekly/C384C192_hybatmda.yaml b/ci/cases/hires/C384C192_hybatmda.yaml similarity index 100% rename from ci/cases/weekly/C384C192_hybatmda.yaml rename to ci/cases/hires/C384C192_hybatmda.yaml diff --git a/ci/cases/weekly/C384_S2SWA.yaml b/ci/cases/hires/C384_S2SWA.yaml similarity index 100% rename from ci/cases/weekly/C384_S2SWA.yaml rename to ci/cases/hires/C384_S2SWA.yaml diff --git a/ci/cases/weekly/C384_atm3DVar.yaml b/ci/cases/hires/C384_atm3DVar.yaml similarity index 100% rename from ci/cases/weekly/C384_atm3DVar.yaml rename to ci/cases/hires/C384_atm3DVar.yaml diff --git a/ci/cases/weekly/C1152_S2SW.yaml b/ci/cases/weekly/C1152_S2SW.yaml deleted file mode 100644 index 29e1f00bbe..0000000000 --- a/ci/cases/weekly/C1152_S2SW.yaml +++ /dev/null @@ -1,14 +0,0 @@ -experiment: - system: gfs - mode: forecast-only - -arguments: - pslot: {{ 'pslot' | getenv }} - app: S2SW - resdetatmos: 1152 - resdetocean: 0.25 - comroot: {{ 'RUNTESTS' | getenv }}/COMROOT - expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR - idate: 2019120300 - edate: 2019120300 - yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml diff --git a/ci/cases/weekly/C768_S2SW.yaml b/ci/cases/weekly/C768_S2SW.yaml deleted file mode 100644 index ad314bb75b..0000000000 --- a/ci/cases/weekly/C768_S2SW.yaml +++ /dev/null @@ -1,14 +0,0 @@ -experiment: - system: gfs - mode: forecast-only - -arguments: - pslot: {{ 'pslot' | getenv }} - app: S2SW - resdetatmos: 768 - resdetocean: 0.25 - comroot: {{ 'RUNTESTS' | getenv }}/COMROOT - expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR - idate: 2019120300 - edate: 2019120300 - yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml From 8107575a7e3b20b79ba8c01208b16ed5ca631c2d Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Tue, 4 Jun 2024 11:55:25 -0500 Subject: [PATCH 7/8] Revert "move weekly -> hires (two were copies and tehrefore deleted)" This reverts commit 77b4ff03408fd4b3a00c5f9cae14bc397d33888e. --- ci/cases/weekly/C1152_S2SW.yaml | 14 ++++++++++++++ ci/cases/{hires => weekly}/C384C192_hybatmda.yaml | 0 ci/cases/{hires => weekly}/C384_S2SWA.yaml | 0 ci/cases/{hires => weekly}/C384_atm3DVar.yaml | 0 ci/cases/weekly/C768_S2SW.yaml | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 ci/cases/weekly/C1152_S2SW.yaml rename ci/cases/{hires => weekly}/C384C192_hybatmda.yaml (100%) rename ci/cases/{hires => weekly}/C384_S2SWA.yaml (100%) rename ci/cases/{hires => weekly}/C384_atm3DVar.yaml (100%) create mode 100644 ci/cases/weekly/C768_S2SW.yaml diff --git a/ci/cases/weekly/C1152_S2SW.yaml b/ci/cases/weekly/C1152_S2SW.yaml new file mode 100644 index 0000000000..29e1f00bbe --- /dev/null +++ b/ci/cases/weekly/C1152_S2SW.yaml @@ -0,0 +1,14 @@ +experiment: + system: gfs + mode: forecast-only + +arguments: + pslot: {{ 'pslot' | getenv }} + app: S2SW + resdetatmos: 1152 + resdetocean: 0.25 + comroot: {{ 'RUNTESTS' | getenv }}/COMROOT + expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR + idate: 2019120300 + edate: 2019120300 + yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml diff --git a/ci/cases/hires/C384C192_hybatmda.yaml b/ci/cases/weekly/C384C192_hybatmda.yaml similarity index 100% rename from ci/cases/hires/C384C192_hybatmda.yaml rename to ci/cases/weekly/C384C192_hybatmda.yaml diff --git a/ci/cases/hires/C384_S2SWA.yaml b/ci/cases/weekly/C384_S2SWA.yaml similarity index 100% rename from ci/cases/hires/C384_S2SWA.yaml rename to ci/cases/weekly/C384_S2SWA.yaml diff --git a/ci/cases/hires/C384_atm3DVar.yaml b/ci/cases/weekly/C384_atm3DVar.yaml similarity index 100% rename from ci/cases/hires/C384_atm3DVar.yaml rename to ci/cases/weekly/C384_atm3DVar.yaml diff --git a/ci/cases/weekly/C768_S2SW.yaml b/ci/cases/weekly/C768_S2SW.yaml new file mode 100644 index 0000000000..ad314bb75b --- /dev/null +++ b/ci/cases/weekly/C768_S2SW.yaml @@ -0,0 +1,14 @@ +experiment: + system: gfs + mode: forecast-only + +arguments: + pslot: {{ 'pslot' | getenv }} + app: S2SW + resdetatmos: 768 + resdetocean: 0.25 + comroot: {{ 'RUNTESTS' | getenv }}/COMROOT + expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR + idate: 2019120300 + edate: 2019120300 + yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml From 207cf44e82c82f84abc34b59d498f374a02467e7 Mon Sep 17 00:00:00 2001 From: JessicaMeixner-NOAA Date: Tue, 4 Jun 2024 11:56:46 -0500 Subject: [PATCH 8/8] remove the duplicate yamls from weekly, just keep in hires dir --- ci/cases/weekly/C1152_S2SW.yaml | 14 -------------- ci/cases/weekly/C768_S2SW.yaml | 14 -------------- 2 files changed, 28 deletions(-) delete mode 100644 ci/cases/weekly/C1152_S2SW.yaml delete mode 100644 ci/cases/weekly/C768_S2SW.yaml diff --git a/ci/cases/weekly/C1152_S2SW.yaml b/ci/cases/weekly/C1152_S2SW.yaml deleted file mode 100644 index 29e1f00bbe..0000000000 --- a/ci/cases/weekly/C1152_S2SW.yaml +++ /dev/null @@ -1,14 +0,0 @@ -experiment: - system: gfs - mode: forecast-only - -arguments: - pslot: {{ 'pslot' | getenv }} - app: S2SW - resdetatmos: 1152 - resdetocean: 0.25 - comroot: {{ 'RUNTESTS' | getenv }}/COMROOT - expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR - idate: 2019120300 - edate: 2019120300 - yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml diff --git a/ci/cases/weekly/C768_S2SW.yaml b/ci/cases/weekly/C768_S2SW.yaml deleted file mode 100644 index ad314bb75b..0000000000 --- a/ci/cases/weekly/C768_S2SW.yaml +++ /dev/null @@ -1,14 +0,0 @@ -experiment: - system: gfs - mode: forecast-only - -arguments: - pslot: {{ 'pslot' | getenv }} - app: S2SW - resdetatmos: 768 - resdetocean: 0.25 - comroot: {{ 'RUNTESTS' | getenv }}/COMROOT - expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR - idate: 2019120300 - edate: 2019120300 - yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_defaults_ci.yaml