From 7e13f9322a08afd605f0106c3f1cc1ab37be1fc9 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Wed, 30 Oct 2024 17:09:59 +0000 Subject: [PATCH] for restart --- SFS_baseline-c96/SFS.yaml | 8 ++------ SFS_baseline-c96/SFS_options.yaml | 14 +++++++------- jobs/JGLOBAL_STAGE_IC | 2 +- parm/config/gefs/config.base | 4 ++-- ush/forecast_det.sh | 4 ++-- ush/forecast_predet.sh | 5 +++++ workflow/hosts/awspw.yaml | 2 +- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/SFS_baseline-c96/SFS.yaml b/SFS_baseline-c96/SFS.yaml index 5f20944d33..b61decd0f2 100644 --- a/SFS_baseline-c96/SFS.yaml +++ b/SFS_baseline-c96/SFS.yaml @@ -12,15 +12,11 @@ arguments: resensatmos: 96 resdetocean: 1.0 nens: 10 - gfs_cyc: 1 - start: restart + start: cold comroot: {{ 'RUNTESTS' | getenv }}/COMROOT expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR idate: 1994050100 - #edate: 1994053100 - #idate: 1994053100 - rdate: 1994053100 - edate: 1994070100 + edate: 1994050100 yaml: {{ HOMEgfs }}/SFS_baseline-c96/SFS_options.yaml skip_ci_on_hosts: diff --git a/SFS_baseline-c96/SFS_options.yaml b/SFS_baseline-c96/SFS_options.yaml index 27d68ab780..2487cff4ec 100644 --- a/SFS_baseline-c96/SFS_options.yaml +++ b/SFS_baseline-c96/SFS_options.yaml @@ -7,16 +7,16 @@ base: DO_BUFRSND: "NO" DO_GEMPAK: "NO" DO_AWIPS: "NO" - DO_RESTART: "YES" + DO_RESTART: "NO" KEEPDATA: "YES" DO_EXTRACTVARS: "NO" - FHMAX: 1440 - FHMIN: 744 - FHMAX_GFS: 1464 - FHMIN_GFS: 744 - FHMAX_HF_GFS: 1464 + FHMAX: 120 + FHMIN: 0 + FHMAX_GFS: 120 + FHMIN_GFS: 0 + FHMAX_HF_GFS: 120 FHOUT_HF_GFS: 24 - FHMAX_GFS: 1440 + FHMAX_GFS: 120 FHOUT: 24 FHOUT_HF: 24 FHOUT_GFS: 24 diff --git a/jobs/JGLOBAL_STAGE_IC b/jobs/JGLOBAL_STAGE_IC index b8126f8efe..1350812bff 100755 --- a/jobs/JGLOBAL_STAGE_IC +++ b/jobs/JGLOBAL_STAGE_IC @@ -4,7 +4,7 @@ source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/ush/jjob_header.sh" -e "stage_ic" -c "base stage_ic" # Execute staging -"${SCRgfs}/exglobal_stage_ic.py" +${SCRgfs}/exglobal_stage_ic.py err=$? ############################################################### diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base index c7a558e847..302667d647 100644 --- a/parm/config/gefs/config.base +++ b/parm/config/gefs/config.base @@ -269,8 +269,8 @@ export FHOUT_OCN=${FHOUT_OCN_GFS} export FHOUT_ICE=${FHOUT_ICE_GFS} # GFS restart interval in hours -export restart_interval_gfs=1464 -export restart_interval_enkfgfs=1464 +export restart_interval_gfs=${FHMAX_GFS} +export restart_interval_enkfgfs=${FHMAX_GFS} # NOTE: Do not set this to zero. Instead set it to $FHMAX_GFS # TODO: Remove this variable from config.base and reference from config.fcst # TODO: rework logic in config.wave and push it to parsing_nameslist_WW3.sh where it is actually used diff --git a/ush/forecast_det.sh b/ush/forecast_det.sh index 3a28e1e498..17372eeb06 100755 --- a/ush/forecast_det.sh +++ b/ush/forecast_det.sh @@ -9,9 +9,9 @@ UFS_det(){ echo "model_start_date_current_cycle: $model_start_date_current_cycle" # Determine if the current cycle is a warm start (based on the availability of restarts) - if [[ -f "${COMIN_ATMOS_RESTART_PREV}/${model_start_date_current_cycle:0:8}.${model_start_date_current_cycle:8:2}0000.coupler.res" ]]; then + #if [[ -f "${COMIN_ATMOS_RESTART_PREV}/${model_start_date_current_cycle:0:8}.${model_start_date_current_cycle:8:2}0000.coupler.res" ]]; then warm_start=".true." - fi + #fi # If restarts were not available, this is likely a cold start if [[ "${warm_start}" == ".false." ]]; then diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh index 093f97749c..37c8a2df2c 100755 --- a/ush/forecast_predet.sh +++ b/ush/forecast_predet.sh @@ -317,6 +317,11 @@ FV3_predet(){ make_nh=".false." # running in hydrostatic mode fi + hydrostatic=".true." + phys_hydrostatic=".false." # ignored when hydrostatic = T + use_hydro_pressure=".false." # ignored when hydrostatic = T + make_nh=".false." # running in hydrostatic mode + # Conserve total energy as heat globally consv_te=${consv_te:-1.} # range 0.-1., 1. will restore energy to orig. val. before physics if [[ "${DO_NEST:-NO}" == "YES" ]] ; then diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml index 99c9c3becf..6c3c61346f 100644 --- a/workflow/hosts/awspw.yaml +++ b/workflow/hosts/awspw.yaml @@ -25,4 +25,4 @@ LOCALARCH: 'NO' ATARDIR: '' # TODO: This will not yet work from AWS. MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' -SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C768'] # TODO: Test and support all cubed-sphere resolutions. +SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C384', 'C768'] # TODO: Test and support all cubed-sphere resolutions.