diff --git a/modulefiles/module_base.hera b/modulefiles/module_base.hera index 32d9c72d5a..b77fbe6e86 100644 --- a/modulefiles/module_base.hera +++ b/modulefiles/module_base.hera @@ -36,4 +36,7 @@ module load z/1.2.11 #Load from emc.nemspara module use -a /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles -module load esmf/8.0.0 +module load netcdf_parallel/4.7.4.release +module load esmf/8.1.0bs27 +module load hdf5_parallel/1.10.6.release + diff --git a/modulefiles/module_base.orion b/modulefiles/module_base.orion index 4c790db468..2f78059706 100644 --- a/modulefiles/module_base.orion +++ b/modulefiles/module_base.orion @@ -50,7 +50,7 @@ module load prod_util/1.2.0 ## module use /apps/contrib/NCEPLIBS/lib/modulefiles module load netcdfp/4.7.4.release -module load esmflocal/8.1.0.21bs.release +module load esmflocal/8.1.0.27bs.release module load post-intel-sandybridge/8.0.5 module load wgrib/2.0.8 diff --git a/sorc/build_fv3_coupled.sh b/sorc/build_fv3_coupled.sh index d33992c74c..5aee3e911e 100755 --- a/sorc/build_fv3_coupled.sh +++ b/sorc/build_fv3_coupled.sh @@ -22,6 +22,6 @@ if [ $target = orion ]; then target=orion.intel ; fi cd fv3_coupled.fd/ FV3=$( pwd -P )/FV3 cd tests/ -./compile.sh "$FV3" "$target" "CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y WW3=Y CMEPS=Y" 1 +./compile.sh "$FV3" "$target" "CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE6=Y WW3=Y CMEPS=Y" 1 mv -f fcst_1.exe ../NEMS/exe/nems_fv3_ccpp_mom6_cice5_ww3.x diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 98fcd2c3af..431a3afba8 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -16,7 +16,7 @@ rm -f ${topdir}/checkout-fv3_coupled.log if [[ ! -d fv3_coupled.fd ]] ; then git clone https://github.com/ufs-community/ufs-s2s-model fv3_coupled.fd >> ${topdir}/checkout-fv3_coupled.log 2>&1 cd fv3_coupled.fd - git checkout d7b7081f410eb84902a43c7479e14d44dfed0144 + git checkout s2s_prototype5.0 git submodule update --init --recursive cd ${topdir} else diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh index a991d28590..3b4acb0e26 100755 --- a/ush/forecast_postdet.sh +++ b/ush/forecast_postdet.sh @@ -746,6 +746,7 @@ CICE_postdet() echo "Link CICE fixed files" $NLN -sf $FIXcice/${ice_grid_file} $DATA/ $NLN -sf $FIXcice/${ice_kmt_file} $DATA/ + $NLN -sf $FIXcice/$MESHICE $DATA/ } CICE_nml() diff --git a/ush/nems.configure.med_atm_ocn_ice_wav.IN b/ush/nems.configure.med_atm_ocn_ice_wav.IN index 239ab765fe..703ae4b89e 100644 --- a/ush/nems.configure.med_atm_ocn_ice_wav.IN +++ b/ush/nems.configure.med_atm_ocn_ice_wav.IN @@ -31,7 +31,6 @@ OCN_attributes:: DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true - dbug_flag = 0 :: # ICE # @@ -42,7 +41,10 @@ ICE_attributes:: DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true - dbug_flag = 0 + mesh_ice = @[MESHICE] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: # WAV # @@ -109,4 +111,6 @@ ALLCOMP_attributes:: restart_n = @[restart_interval_hours] restart_option = nhours restart_ymd = -999 + dbug_flag = 0 + use_coldstart = .true. :: diff --git a/ush/nems.configure.medcold_atm_ocn_ice_wav.IN b/ush/nems.configure.medcold_atm_ocn_ice_wav.IN index 7e8629bf3c..cd011889e3 100644 --- a/ush/nems.configure.medcold_atm_ocn_ice_wav.IN +++ b/ush/nems.configure.medcold_atm_ocn_ice_wav.IN @@ -31,7 +31,6 @@ OCN_attributes:: DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true - dbug_flag = 0 :: # ICE # @@ -42,7 +41,10 @@ ICE_attributes:: DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true - dbug_flag = 0 + mesh_ice = @[MESHICE] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: # WAV # @@ -109,4 +111,5 @@ ALLCOMP_attributes:: restart_n = 1 restart_option = nhours restart_ymd = -999 + dbug_flag = 0 :: diff --git a/ush/nems_configure.sh b/ush/nems_configure.sh index 840cb685d7..d6ed6a5e5f 100755 --- a/ush/nems_configure.sh +++ b/ush/nems_configure.sh @@ -74,6 +74,8 @@ fi if [ $cplice = .true. ]; then sed -i -e "s;@\[ice_model\];$ICE_model;g" tmp1 sed -i -e "s;@\[ice_petlist_bounds\];$ice_petlist_bounds;g" tmp1 + sed -i -e "s;@\[MESHICE\];$MESHICE;g" tmp1 + sed -i -e "s;@\[FHMAX\];$FHMAX_GFS;g" tmp1 fi if [ $cplchem = .true. ]; then sed -i -e "s;@\[chem_model\];gsd;g" tmp1 diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh index 26e7527cda..66edff5251 100644 --- a/ush/parsing_namelists_CICE.sh +++ b/ush/parsing_namelists_CICE.sh @@ -4,371 +4,594 @@ CICE_namelists(){ cat > ice_in <