diff --git a/README.md b/README.md index 8372fa61fa..3d8b3350ab 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,9 @@ cd coupled-workflow git checkout feature/coupled-crow git submodule update --init --recursive #Update submodules cd sorc -``` -For coupled: -``` sh checkout.sh -c #Check out forecast model with COUPLED=YES ``` -For aerosols: -``` -sh checkout.sh -a #Check out forecast model with active aerosols -``` + ## Compile code needed to run prototype and link fixed files and executable programs: For coupled (UFS APP=S2SW): ``` diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 2e0ef03ca4..68b7233371 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -41,7 +41,7 @@ else if [[ ! -d ufs_coupled.fd ]] ; then git clone https://github.com/ufs-community/ufs-weather-model ufs_coupled.fd >> ${topdir}/checkout-ufs_coupled.log 2>&1 cd ufs_coupled.fd - git checkout 22613e8 + git checkout 9bbb6d466368d46797e2c72a9d08955fda39cf33 git submodule update --init --recursive cd ${topdir} else diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index bd224e4b0d..684d5a5080 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -807,8 +807,8 @@ CICE_postdet() { cice_hist_avg=${cice_hist_avg:-".true."} FRAZIL_FWSALT=${FRAZIL_FWSALT:-".true."} - ktherm=${ktherm:-1} - tfrz_option=${tfrz_option:-"linear_salt"} + ktherm=${ktherm:-2} + tfrz_option=${tfrz_option:-"mushy"} tr_pond_lvl=${tr_pond_lvl:-".true."} # Use level melt ponds tr_pond_lvl=true # restart_pond_lvl (if tr_pond_lvl=true): diff --git a/ush/nems_configure.sh b/ush/nems_configure.sh index 9d65adc2b0..32c4c1b3ca 100755 --- a/ush/nems_configure.sh +++ b/ush/nems_configure.sh @@ -47,6 +47,11 @@ CHMPETS=${CHMPETS:-${ATMPETS}} USE_MOMMESH=${USE_MOMMESH:-"true"} +if [[ $OCNRES = "100" ]]; then + EPS_IMESH='2.5e-1' +else + EPS_IMESH='1.0e-1' +fi rm -f $DATA/nems.configure @@ -83,7 +88,7 @@ if [ $cplflx = .true. ]; then sed -i -e "s;@\[coupling_interval_fast_sec\];$CPL_FAST;g" tmp1 sed -i -e "s;@\[RESTART_N\];$restart_interval_nems;g" tmp1 sed -i -e "s;@\[use_mommesh\];$USE_MOMMESH;g" tmp1 - sed -i -e "s;@\[eps_imesh\];$ICERESdec;g" tmp1 + sed -i -e "s;@\[eps_imesh\];$EPS_IMESH;g" tmp1 fi if [ $cplwav = .true. ]; then sed -i -e "s;@\[wav_model\];ww3;g" tmp1 diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh index f58594fe0a..515e00d825 100755 --- a/ush/parsing_model_configure_FV3.sh +++ b/ush/parsing_model_configure_FV3.sh @@ -19,29 +19,20 @@ fi rm -f model_configure cat >> model_configure < input.nml < input.nml < input.nml < input.nml < input.nml <> input.nml << EOF iovr = ${iovr:-"3"} - ltaerosol = ${ltaerosol:-".F."} ! In config.fcst - lradar = ${lradar:-".F."} ! In config.fcst - ttendlim = ${ttendlim:-0.005} ! In config.fcst + ltaerosol = ${ltaerosol:-".F."} + lradar = ${lradar:-".F."} + ttendlim = ${ttendlim:-0.005} oz_phys = ${oz_phys:-".false."} oz_phys_2015 = ${oz_phys_2015:-".true."} lsoil_lsm = ${lsoil_lsm:-"4"} do_mynnedmf = ${do_mynnedmf:-".false."} do_mynnsfclay = ${do_mynnsfclay:-".false."} - icloud_bl = ${icloud_bl:-"1"} ! In config.fcst - bl_mynn_edmf = ${bl_mynn_edmf:-"1"} ! In config.fcst - bl_mynn_tkeadvect=${bl_mynn_tkeadvect:-".true."} ! In config.fcst - bl_mynn_edmf_mom=${bl_mynn_edmf_mom:-"1"} ! In config.fcst + icloud_bl = ${icloud_bl:-"1"} + bl_mynn_edmf = ${bl_mynn_edmf:-"1"} + bl_mynn_tkeadvect=${bl_mynn_tkeadvect:-".true."} + bl_mynn_edmf_mom=${bl_mynn_edmf_mom:-"1"} min_lakeice = ${min_lakeice:-"0.15"} min_seaice = ${min_seaice:-"0.15"} EOF @@ -248,19 +243,19 @@ cat >> input.nml <> input.nml <> input.nml <> input.nml << EOF cplchm = ${cplchem:-".false."} cplflx = $cplflx - cplwav2atm = ${cplwav2atm} ! CROW configured + cplwav2atm = ${cplwav2atm} EOF fi diff --git a/workflow/cases/coupled_free_forecast_wave.yaml b/workflow/cases/coupled_free_forecast_wave.yaml index 408c318646..58415e3896 100644 --- a/workflow/cases/coupled_free_forecast_wave.yaml +++ b/workflow/cases/coupled_free_forecast_wave.yaml @@ -39,11 +39,11 @@ case: fv3_gfs_settings: CASE: C384 LEVS: 128 - DELTIM: 225 + DELTIM: 300 min_lakeice: 0.15 min_seaice: 1.0e-11 SEEDLET: 10 - CCPP_SUITE: FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 + CCPP_SUITE: 'FV3_GFS_v16_coupled_nsstNoahmpUGWPv1' CPL_ATMIC: GEFSwithNOAHMP nst_anl: yes psm_bc: 1 diff --git a/workflow/cases/prototype7.yaml b/workflow/cases/prototype7.yaml index cda49551aa..994ad4c281 100644 --- a/workflow/cases/prototype7.yaml +++ b/workflow/cases/prototype7.yaml @@ -39,11 +39,11 @@ case: fv3_gfs_settings: CASE: C384 LEVS: 128 - DELTIM: 225 + DELTIM: 300 min_lakeice: 0.15 min_seaice: 1.0e-11 SEEDLET: 10 - CCPP_SUITE: FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 + CCPP_SUITE: 'FV3_GFS_v16_coupled_nsstNoahmpUGWPv1' CPL_ATMIC: GEFSwithNOAHMP nst_anl: yes psm_bc: 1 diff --git a/workflow/schema/ocn.yaml b/workflow/schema/ocn.yaml index b9830e848b..f6426f00a7 100644 --- a/workflow/schema/ocn.yaml +++ b/workflow/schema/ocn.yaml @@ -9,7 +9,7 @@ ocn_settings_template: !Template &ocn_settings_template description: "model selection for ocean" OCNRES: type: string - allowed: [ '025', '050' ] + allowed: [ '025', '050', '100' ] CPL_OCNIC: type: string allowed: [ 'CFSR', 'CPC3Dvar' ]