forked from ufs-community/ufs-weather-model
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #126 from grantfirl/ufs-dev-PR94
UFS-dev PR#94
- Loading branch information
Showing
62 changed files
with
2,396 additions
and
2,289 deletions.
There are no files selected for viewing
Submodule CDEPS
updated
35 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule CMEPS
updated
7 files
+1 −3 | cesm/driver/ensemble_driver.F90 | |
+1 −0 | cesm/driver/esm.F90 | |
+0 −1 | cesm/driver/esm_time_mod.F90 | |
+44 −18 | mediator/esmFldsExchange_ufs_mod.F90 | |
+0 −3 | mediator/med.F90 | |
+1 −0 | mediator/med_map_mod.F90 | |
+350 −329 | ufs/ufs_io_mod.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule FV3
updated
19 files
+15 −9 | .github/workflows/GCC.yml | |
+14 −1 | CMakeLists.txt | |
+1 −1 | atmos_cubed_sphere | |
+260 −6 | atmos_model.F90 | |
+1 −0 | ccpp/config/ccpp_prebuild_config.py | |
+86 −25 | ccpp/data/GFS_typedefs.F90 | |
+167 −3 | ccpp/data/GFS_typedefs.meta | |
+216 −13 | ccpp/driver/GFS_diagnostics.F90 | |
+7 −17 | ccpp/driver/GFS_restart.F90 | |
+1 −1 | ccpp/physics | |
+1 −0 | ccpp/suites/suite_FV3_GFS_v17_p8.xml | |
+18 −4 | cpl/module_cplfields.F90 | |
+17 −0 | docs/CMakeLists.txt | |
+2,665 −0 | docs/Doxyfile.in | |
+5 −0 | docs/user_guide.md | |
+118 −28 | io/module_fv3_io_def.F90 | |
+57 −47 | io/module_write_internal_state.F90 | |
+52 −8 | io/module_write_netcdf.F90 | |
+36 −16 | module_fv3_config.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule noahmp
updated
30 files
Submodule WW3
updated
4 files
+1 −0 | model/src/cmake/src_list.cmake | |
+15 −3 | model/src/w3fld1md.F90 | |
+41 −5 | model/src/wav_comp_nuopc.F90 | |
+119 −0 | model/src/wav_wrapper_mod.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
export BL_DATE=20240111 | ||
export BL_DATE=20240124 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -82,7 +82,6 @@ else | |
cp $RFILE INPUT/${RFILE_NEW} | ||
done | ||
fi | ||
|
||
fi | ||
|
||
if [ $TILEDFIX = .true. ]; then | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
mkdir -p RESTART INPUT | ||
|
||
cd INPUT | ||
rsync -arv @[INPUTDATA_ROOT]/DATM_ERA5_input_data_v2/. . | ||
cd - | ||
|
||
SUFFIX=${RT_SUFFIX} | ||
# restart | ||
if [ $WARM_START = .true. ]; then | ||
# NoahMP restart files | ||
cp ../${DEP_RUN}${SUFFIX}/ufs.cpld.lnd.out.${RESTART_FILE_SUFFIX_SECS}.tile*.nc RESTART/. | ||
|
||
# CMEPS restart and pointer files | ||
RFILE1=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc | ||
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE1} RESTART/. | ||
ls -1 "RESTART/${RFILE1}">rpointer.cpl | ||
|
||
# CDEPS restart and pointer files | ||
RFILE2=ufs.cpld.datm.r.${RESTART_FILE_SUFFIX_SECS}.nc | ||
cp ../${DEP_RUN}${SUFFIX}/${RFILE2} RESTART/. | ||
ls -1 "RESTART/${RFILE2}">rpointer.atm | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,64 @@ | ||
mkdir -p INPUT RESTART | ||
|
||
cd INPUT | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile1.nc C96.initial.tile1.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile2.nc C96.initial.tile2.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile3.nc C96.initial.tile3.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile4.nc C96.initial.tile4.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile5.nc C96.initial.tile5.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/ufs-land_C96_init_fields.tile6.nc C96.initial.tile6.nc | ||
if [ "$LNDRES" = "C96" ]; then | ||
inputdir=FV3_input_data | ||
elif [ "$LNDRES" = "C48" ]; then | ||
inputdir=FV3_input_data48 | ||
elif [ "$LNDRES" = "C192" ]; then | ||
inputdir=FV3_input_data192 | ||
elif [ "$LNDRES" = "C384" ]; then | ||
inputdir=FV3_input_data384 | ||
elif [ "$LNDRES" = "C768" ]; then | ||
inputdir=FV3_input_data768 | ||
fi | ||
echo "inputdir=$inputdir,LNDRES=$LNDRES" | ||
|
||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.maximum_snow_albedo.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.slope_type.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.soil_type.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.soil_color.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.substrate_temperature.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.vegetation_greenness.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/C96.vegetation_type.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/oro_C96.mx100.tile1.nc oro_data.tile1.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/oro_C96.mx100.tile2.nc oro_data.tile2.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/oro_C96.mx100.tile3.nc oro_data.tile3.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/oro_C96.mx100.tile4.nc oro_data.tile4.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/oro_C96.mx100.tile5.nc oro_data.tile5.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/C96/oro_C96.mx100.tile6.nc oro_data.tile6.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_input_data/INPUT/C96_grid.tile*.nc . | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_input_data/INPUT/grid_spec.nc C96_mosaic.nc | ||
cd - | ||
if [ $DATM_CDEPS == true ]; then | ||
targetdir="./INPUT" | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/$atm_datamode/ufs-land_@[LNDRES]_init_fields.tile1.nc ./${targetdir}/@[LNDRES].initial.tile1.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/$atm_datamode/ufs-land_@[LNDRES]_init_fields.tile2.nc ./${targetdir}/@[LNDRES].initial.tile2.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/$atm_datamode/ufs-land_@[LNDRES]_init_fields.tile3.nc ./${targetdir}/@[LNDRES].initial.tile3.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/$atm_datamode/ufs-land_@[LNDRES]_init_fields.tile4.nc ./${targetdir}/@[LNDRES].initial.tile4.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/$atm_datamode/ufs-land_@[LNDRES]_init_fields.tile5.nc ./${targetdir}/@[LNDRES].initial.tile5.nc | ||
rsync -arv @[INPUTDATA_ROOT]/NOAHMP_IC/$atm_datamode/ufs-land_@[LNDRES]_init_fields.tile6.nc ./${targetdir}/@[LNDRES].initial.tile6.nc | ||
else | ||
if [ "$ATMRES" = "$LNDRES" ]; then | ||
targetdir="./INPUT" | ||
cd ${targetdir} | ||
ln -sf grid_spec.nc @[LNDRES]_mosaic.nc | ||
cd - | ||
else | ||
mkdir -p INPUT/$LNDRES | ||
targetdir="./INPUT/$LNDRES" | ||
fi | ||
|
||
if [ $WARM_START = .false. ]; then | ||
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127/sfc_data.tile*.nc ${targetdir}/. | ||
else | ||
# land restart file | ||
cp ../${DEP_RUN}${SUFFIX}/ufs.cpld.lnd.out.${RESTART_FILE_SUFFIX_SECS}.tile*.nc RESTART/. | ||
# CMEPS restart and pointer files | ||
RFILE=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc | ||
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} . | ||
ls -1 ${RFILE}>rpointer.cpl | ||
# link grid spec file | ||
fi | ||
fi | ||
|
||
if [ "$ATMRES" != "$LNDRES" ]; then | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].maximum_snow_albedo.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].slope_type.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].soil_type.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].soil_color.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].substrate_temperature.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].vegetation_greenness.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/@[LNDRES].vegetation_type.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/oro_@[LNDRES].mx*.tile1.nc ${targetdir}/oro_data.tile1.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/oro_@[LNDRES].mx*.tile2.nc ${targetdir}/oro_data.tile2.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/oro_@[LNDRES].mx*.tile3.nc ${targetdir}/oro_data.tile3.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/oro_@[LNDRES].mx*.tile4.nc ${targetdir}/oro_data.tile4.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/oro_@[LNDRES].mx*.tile5.nc ${targetdir}/oro_data.tile5.nc | ||
rsync -arv @[INPUTDATA_ROOT]/FV3_fix_tiled/@[LNDRES]/oro_@[LNDRES].mx*.tile6.nc ${targetdir}/oro_data.tile6.nc | ||
rsync -arv @[INPUTDATA_ROOT]/${inputdir}/INPUT/@[LNDRES]_grid.tile*.nc ${targetdir}/. | ||
rsync -arv @[INPUTDATA_ROOT]/${inputdir}/INPUT/grid_spec.nc ${targetdir}/@[LNDRES]_mosaic.nc | ||
fi |
Oops, something went wrong.