Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UFS-dev PR#16 #76

Merged
merged 30 commits into from
Dec 13, 2022
Merged

UFS-dev PR#16 #76

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
105748f
Adjust GFS diagnostic ADO output to the exact 550nm in ccpp/physics
ChunxiZhang-NOAA Oct 26, 2022
083e905
Adjust GFS diagnostic AOD output to the exact 550nm in ccpp/physics
ChunxiZhang-NOAA Oct 26, 2022
b71ae9d
Modify a few lines of code in FV3/ccpp/physics/physics/radiation_aero…
ChunxiZhang-NOAA Nov 4, 2022
a57a1dd
Improve radiative fluxes and cloud cover in FV3 for HR1 (#1481)
ChunxiZhang-NOAA Nov 8, 2022
ad8da86
Rt hires (#1471)
RatkoVasic-NOAA Nov 10, 2022
6374fe0
Merge remote-tracking branch 'upstream/develop' into bug/aod550
ChunxiZhang-NOAA Nov 10, 2022
c607636
add new BL_DATE
jkbk2004 Nov 10, 2022
edac63b
Update Jenkinsfile
zach1221 Nov 10, 2022
b80bfc0
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Nov 11, 2022
e2f61c5
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Nov 11, 2022
ccc3206
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Nov 11, 2022
b002f8c
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Nov 11, 2022
5a63569
WCOSS2 Intel RT Log
BrianCurtis-NOAA Nov 11, 2022
6164071
Acorn Intel RT Log
BrianCurtis-NOAA Nov 11, 2022
40715cd
add cheyenne intel/gnu RT logs: passed
jkbk2004 Nov 11, 2022
13ac725
add orion.intel RT log: passed
jkbk2004 Nov 11, 2022
adbcdd3
Revert the submodule pointer to fv3atm and update the hash
ChunxiZhang-NOAA Nov 14, 2022
8d90fe7
Adjust GFS diagnostic Aerosol Optical Depth (AOD) output to the exact…
ChunxiZhang-NOAA Nov 14, 2022
304dab3
Merge branch 'bug/aod550' into ufs-dev-PR16
Nov 16, 2022
281c7e2
update FV3
Nov 30, 2022
f6c5199
Merge branch 'main' into ufs-dev-PR16
Nov 30, 2022
289ab1f
update BL_DATE in rt.ncar.sh
Dec 1, 2022
f88bbe3
[AutoRT] cheyenne.gnu Job Completed.
Dec 5, 2022
9604d10
[AutoRT] cheyenne.intel Job Completed.
Dec 5, 2022
aca69cb
Merge commit '8d90fe' into ufs-dev-PR16
Dec 12, 2022
ff5fe8a
update rt.ncar.sh with new 'compute_petbounds_and_tasks' command
Dec 12, 2022
6b68442
[AutoRT] hera.intel Job Completed.
Dec 12, 2022
25a3126
temporarily increase wallclock time for cpld_control_p8 for testing
Dec 13, 2022
be8acbc
[AutoRT] hera.gnu Job Completed.
Dec 13, 2022
0109d92
update FV3 submodule
Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 1 files
+1 −1 ccpp/physics
2 changes: 1 addition & 1 deletion tests/ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pipeline {

axis {
name 'TEST_CASE'
values 'mpi', 'dcp', 'rst', 'bit', 'thr' // TODO: Remove thr case from cpld_control_nowave_noaero_p8 exclusions when it is passing again
values 'mpi', 'dcp', 'bit', 'thr' // TODO: Remove thr case from cpld_control_nowave_noaero_p8 exclusions when it is passing again
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/fv3_conf/fv3_qsub.IN_cheyenne
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -N @[JBNME]
#PBS -A @[ACCNR]
#PBS -q @[QUEUE]
#PBS -l select=@[NODES]:ncpus=@[TPN]:mpiprocs=@[TPN]
#PBS -l select=@[NODES]:ncpus=@[TPN]:mpiprocs=@[TPN]:ompthreads=@[THRD]
#PBS -l walltime=00:@[WLCLK]:00

set -eux
Expand Down Expand Up @@ -34,7 +34,7 @@ export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

mpiexec_mpt -p %g: -np @[TASKS] ./fv3.exe
mpiexec_mpt -p %g: -np @[TASKS] omplace ./fv3.exe

echo "Model ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/fv3_slurm.IN_jet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

srun --label -n @[TASKS] ./fv3.exe
srun --label -n @[TASKS] --cpus-per-task=@[THRD] ./fv3.exe

echo "Model ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
39 changes: 0 additions & 39 deletions tests/fv3_conf/gfdlmp_run.IN
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions tests/fv3_conf/gsd_run.IN
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions tests/fv3_conf/regional_3km_run.IN
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/fv3_conf/regional_rrfs_a_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[INPUTDATA_ROOT]/fv3_regional_rrfs_a/INPUT/. INPUT/.
rsync -arv @[INPUTDATA_ROOT]/FV3_regional_rrfs_a/INPUT/. INPUT/.

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
Expand Down
47 changes: 31 additions & 16 deletions tests/fv3_conf/regional_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,41 @@
rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .

rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[INPUTDATA_ROOT]/fv3_regional_control/INPUT/. INPUT/.
rsync -arv @[INPUTDATA_ROOT]/FV3_regional/INPUT/. INPUT/.

cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m11.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat

if [ $WARM_START = .true. ]; then
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res INPUT/coupler.res
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc INPUT/fv_core.res.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc INPUT/fv_core.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc INPUT/fv_tracer.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc INPUT/phy_data.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc INPUT/sfc_data.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.coupler.res INPUT/coupler.res
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_core.res.nc INPUT/fv_core.res.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_core.res.tile1.nc INPUT/fv_core.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_tracer.res.tile1.nc INPUT/fv_tracer.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.phy_data.nc INPUT/phy_data.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.sfc_data.nc INPUT/sfc_data.nc
fi
if [ $WRITE_RESTART_WITH_BCS = .true. ]; then
cp @[INPUTDATA_ROOT]/fv3_regional_control/RESTART/fv_core.res.tile1_new.nc RESTART/fv_core.res.tile1_new.nc
cp @[INPUTDATA_ROOT]/fv3_regional_control/RESTART/fv_tracer.res.tile1_new.nc RESTART/fv_tracer.res.tile1_new.nc
cp @[INPUTDATA_ROOT]/FV3_regional/RESTART/fv_core.res.tile1_new.nc RESTART/fv_core.res.tile1_new.nc
cp @[INPUTDATA_ROOT]/FV3_regional/RESTART/fv_tracer.res.tile1_new.nc RESTART/fv_tracer.res.tile1_new.nc
fi

if [[ $POSTAPP = 'lam' ]]; then
Expand All @@ -25,7 +44,3 @@ if [[ $POSTAPP = 'lam' ]]; then
cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT_FH00.txt
cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
fi

if [ $DO_RRTMGP = .true. ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
fi
2 changes: 1 addition & 1 deletion tests/opnReqTest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ fi
mkdir -p ${STMP}/${USER}
NEW_BASELINE=${STMP}/${USER}/FV3_OPNREQ_TEST/OPNREQ_TEST
RTPWD=${NEW_BASELINE}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20221101}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20220624/
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}

Expand Down
1 change: 0 additions & 1 deletion tests/parm/datm_cdeps_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ start_minute: 0
start_second: 0
nhours_fcst: @[FHMAX]
dt_atmos: @[DT_ATMOS]
calendar: 'julian'
fhrot: @[FHROT]
nfhout: @[NFHOUT]
nfhmax_hf: -1
Expand Down
Loading