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

Jump to bottom

[production/AQM.v7] To improve AQMv7 package to meet NCO implementation stardards #983

Merged
merged 24 commits into from
Dec 1, 2023
Merged

[production/AQM.v7] To improve AQMv7 package to meet NCO implementation stardards #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d39c2ca
create a feature branch AQMv7_release_v7 to update J-job and ex-scripts
JianpingHuang-NOAA Nov 17, 2023
145e2dd
update J-job and ex-sripts for forecast, post, ics, and lbcs
JianpingHuang-NOAA Nov 17, 2023
87704a9
modiy ecf and J-job scirpts to meet EE2 requirements for AQMv7
JianpingHuang-NOAA Nov 18, 2023
6a09a21
revised ecflow scripts and update J-job and ex-scripts and delete unr…
JianpingHuang-NOAA Nov 19, 2023
9d1d029
update ecflow job card for forecast job
JianpingHuang-NOAA Nov 20, 2023
b3f14c2
update make_ics, make_lbcs, job_preamble
JianpingHuang-NOAA Nov 20, 2023
d6963f3
update make_ics.ecf and delete nexus_emission_00-06.ecf
JianpingHuang-NOAA Nov 20, 2023
ab2815d
upate J-jobs and delete unused module files
JianpingHuang-NOAA Nov 21, 2023
a5d882d
delete ~//wmo for 00z and 12z cycle
JianpingHuang-NOAA Nov 21, 2023
b2d9a6a
update data for J-job scripts
JianpingHuang-NOAA Nov 22, 2023
c4e4c14
get rid of preamble.sh and DATE_UTIL, refine run.ver and build.ver
JianpingHuang-NOAA Nov 24, 2023
3b9c77f
updaet J-job scripts with COMaqm
JianpingHuang-NOAA Nov 24, 2023
5b0ad09
clean up J-job scripts
JianpingHuang-NOAA Nov 24, 2023
29bf087
clean J-job scripts and delete rocoto related information
JianpingHuang-NOAA Nov 25, 2023
3afe49b
correct J-job script for Post_Stat_PM2.5
JianpingHuang-NOAA Nov 25, 2023
cc21936
update forecast job/script provided by Lin to get rid of harward in f…
JianpingHuang-NOAA Nov 29, 2023
a417c77
add deleting in J-job scripts and rm cleanup excript and add more cy…
JianpingHuang-NOAA Nov 30, 2023
37988a6
update J-job scripts and exscript for post
JianpingHuang-NOAA Nov 30, 2023
1dfdaed
clean up J-Post script
JianpingHuang-NOAA Nov 30, 2023
086733b
updated UPP jobs by Lin and move pgout from J-job to exscripts
JianpingHuang-NOAA Nov 30, 2023
660b82f
update hash number for UFSWM
JianpingHuang-NOAA Dec 1, 2023
9f1da80
correct a typo in exaqm_post_stat_o3.sh
JianpingHuang-NOAA Dec 1, 2023
125c67e
update hash numbers with Externals.cfg
JianpingHuang-NOAA Dec 1, 2023
8eaada3
update External.cfg
JianpingHuang-NOAA Dec 1, 2023
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
22 changes: 13 additions & 9 deletions ecf/defs/aqm_cycled.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
suite nco_aqm
family primary
edit aqm_ver 'v7.0.0'
edit aqm_ver 'v7.0.1'
edit PACKAGEHOME '/lfs/h2/emc/global/noscrub/%EMC_USER%/para/packages/aqm.%aqm_ver%'
edit NET 'aqm'
edit RUN 'aqm'
Expand All @@ -13,6 +13,9 @@ suite nco_aqm
edit OUTPUTDIR '/lfs/h2/emc/ptmp/%EMC_USER%/ecflow_aqm/para/output/prod/today'
family 00
edit CYC '00'
task cycle_end
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
cron 23:00
family aqm
family v1.0
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
Expand Down Expand Up @@ -57,8 +60,6 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
task jaqm_forecast_data_cleanup
trigger ./jaqm_forecast==complete
endfamily
family post
task jaqm_post_f000
Expand Down Expand Up @@ -100,6 +101,9 @@ suite nco_aqm
endfamily # 00
family 06
edit CYC '06'
task cycle_end
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
cron 05:00
family aqm
family v1.0
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
Expand Down Expand Up @@ -144,8 +148,6 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
task jaqm_forecast_data_cleanup
trigger ./jaqm_forecast==complete
endfamily
family post
task jaqm_post_f000
Expand Down Expand Up @@ -385,6 +387,9 @@ suite nco_aqm
endfamily # 06
family 12
edit CYC '12'
task cycle_end
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
cron 11:00
family aqm
family v1.0
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
Expand Down Expand Up @@ -429,8 +434,6 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
task jaqm_forecast_data_cleanup
trigger ./jaqm_forecast==complete
endfamily
family post
task jaqm_post_f000
Expand Down Expand Up @@ -670,6 +673,9 @@ suite nco_aqm
endfamily # 12
family 18
edit CYC '18'
task cycle_end
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
cron 17:00
family aqm
family v1.0
edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
Expand Down Expand Up @@ -714,8 +720,6 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
task jaqm_forecast_data_cleanup
trigger ./jaqm_forecast==complete
endfamily
family post
task jaqm_post_f000
Expand Down
11 changes: 1 addition & 10 deletions ecf/scripts/forecast/jaqm_forecast.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load jasper/${jasper_ver}
module load zlib/${zlib_ver}
module load libpng/${libpng_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load fms/${fms_ver}
module load bacio/${bacio_ver}
module load crtm/${crtm_ver}
module load g2/${g2_ver}
module load g2tmpl/${g2tmpl_ver}
Expand All @@ -38,18 +34,13 @@ module load pio/${pio_ver}
module load esmf/${esmf_ver}
module load libjpeg/${libjpeg_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}

module list

export subcyc=0
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
############################################################
${HOMEaqm}/jobs/JAQM_RUN_FCST
${HOMEaqm}/jobs/JAQM_FORECAST

%include <tail.h>

Expand Down
8 changes: 1 addition & 7 deletions ecf/scripts/forecast/jaqm_forecast_data_cleanup.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,11 @@ model=aqm
module list

export cyc=%CYC%
export cycle=t${cyc}z
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
############################################################
${HOMEaqm}/jobs/JDATA_CLEANUP
${HOMEaqm}/jobs/JAQM_DATA_CLEANUP

%include <tail.h>
%manual
Expand Down
14 changes: 0 additions & 14 deletions ecf/scripts/nexus/jaqm_nexus_emission_master.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,16 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load esmf/${esmf_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}
module load udunits/${udunits_ver}
module load gsl/${gsl_ver}
module load nco/${nco_ver}

module list

export nspt="%NSPT%"
export subcyc=0
export SLASH_ENSMEM_SUBDIR=''
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
Expand Down
13 changes: 0 additions & 13 deletions ecf/scripts/nexus/jaqm_nexus_post_split.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,15 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}
module load udunits/${udunits_ver}
module load gsl/${gsl_ver}
module load nco/${nco_ver}

module list

export subcyc=0
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
############################################################
Expand Down
10 changes: 1 addition & 9 deletions ecf/scripts/post/jaqm_post_master.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
Expand All @@ -25,22 +24,15 @@ module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load libjpeg/${libjpeg_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}

module list

export subcyc=0
export fhr="%FHR%"
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
############################################################
${HOMEaqm}/jobs/JAQM_RUN_POST
${HOMEaqm}/jobs/JAQM_POST

%include <tail.h>

Expand Down
18 changes: 1 addition & 17 deletions ecf/scripts/prep/jaqm_ics.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,22 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}
module load udunits/${udunits_ver}
module load gsl/${gsl_ver}
module load nco/${nco_ver}

module list

export subcyc=0
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

#SDATE=$($NDATE -6 ${PDY}${cyc})
#PDYS_P1=$(echo $SDATE | cut -c1-8)
#cycs_p1=$(echo $SDATE | cut -c9-10)
#export PREV_CYCLE_DIR=$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDYS_P1}/${cycs_p1})
#export GLOBAL_VAR_DEFNS_FP="$HOMEaqm/parm/config/var_defns.sh"

############################################################
# CALL executable job script here
############################################################
${HOMEaqm}/jobs/JAQM_AQM_ICS
${HOMEaqm}/jobs/JAQM_ICS

%include <tail.h>

Expand Down
21 changes: 1 addition & 20 deletions ecf/scripts/prep/jaqm_lbcs.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,25 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load jasper/${jasper_ver}
module load zlib/${zlib_ver}
module load libpng/${libpng_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load bacio/${bacio_ver}
module load bufr/${bufr_ver}
module load g2/${g2_ver}
module load nemsio/${nemsio_ver}
module load nemsiogfs/${nemsiogfs_ver}
module load sigio/${sigio_ver}
module load wgrib2/${wgrib2_ver}
module load w3emc/${w3emc_ver}
module load w3nco/${w3nco_ver}
module load udunits/${udunits_ver}
module load gsl/${gsl_ver}
module load nco/${nco_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}

module list

export subcyc=0
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
############################################################
${HOMEaqm}/jobs/JAQM_AQM_LBCS
${HOMEaqm}/jobs/JAQM_LBCS

%include <tail.h>

Expand Down
22 changes: 1 addition & 21 deletions ecf/scripts/prep/jaqm_make_ics.ecf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=4:mpiprocs=12:ncpus=12
#PBS -l select=1:mpiprocs=128:ncpus=128
#PBS -l place=vscatter:exclhost
#PBS -l debug=true

Expand All @@ -16,36 +16,16 @@ export cyc="%CYC%"
############################################################
# Load modules
############################################################
module load PrgEnv-intel/${PrgEnv_intel_ver}
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load libjpeg/${libjpeg_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load bacio/${bacio_ver}
module load nemsio/${nemsio_ver}
module load w3emc/${w3emc_ver}
module load w3nco/${w3nco_ver}
module load udunits/${udunits_ver}
module load gsl/${gsl_ver}
module load nco/${nco_ver}
module load python/${python_ver}
module load prod_util/${prod_util_ver}

module list

export subcyc='00'
export SLASH_ENSMEM_SUBDIR=''
export ENSMEM_INDX='##'

export pid=${pid:-$$}
export outid=${outid:-"LL$job"}
export DATA=${DATA:-${DATAROOT}/${jobid:?}}
. ${HOMEaqm}/parm/config/var_defns.sh
. ${HOMEaqm}/ush/source_util_funcs.sh

############################################################
# CALL executable job script here
############################################################
Expand Down
Loading