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

Add jjob stub for prospective ocean analysis prep observation task #1831

Merged
merged 10 commits into from
Sep 11, 2023
Merged

Add jjob stub for prospective ocean analysis prep observation task #1831

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ccf5405
adding development branch for GDASApp
AndrewEichmann-NOAA Aug 31, 2023
a37eb81
minimalmist stub for ocean prep obs
AndrewEichmann-NOAA Aug 31, 2023
f9b6e8a
removed some commented-out code
AndrewEichmann-NOAA Aug 31, 2023
97fc7b7
removed unwanted change to checkout.sh
AndrewEichmann-NOAA Aug 31, 2023
af7a213
Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS
AndrewEichmann-NOAA Sep 7, 2023
1debc9d
Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS
AndrewEichmann-NOAA Sep 7, 2023
aeb0474
Merge branch 'develop' into feature/add-ocn-prep-obs
AndrewEichmann-NOAA Sep 11, 2023
be6c46a
Update jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS
AndrewEichmann-NOAA Sep 11, 2023
8ffd748
Merge branch 'feature/add-ocn-prep-obs' of github.com:AndrewEichmann-…
AndrewEichmann-NOAA Sep 11, 2023
94b1393
review modifications
AndrewEichmann-NOAA Sep 11, 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
43 changes: 43 additions & 0 deletions jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP_OBS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets call this job:
JGLOBAL_PREP_OCEAN_OBS to be consistent with how jobs are named.
This job will be called for both gdas and gfs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

export STRICT="NO"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this NO?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have an outstanding issue with variables not getting assigned (I suspect because we don't use them) - this is being worked on

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1837

source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprepobs" -c "base ocnanal ocnanalprepobs"
AndrewEichmann-NOAA marked this conversation as resolved.
Show resolved Hide resolved


##############################################
# Set variables used in the script
##############################################
export CDUMP=${CDUMP:-${RUN:-"gfs"}}
AndrewEichmann-NOAA marked this conversation as resolved.
Show resolved Hide resolved
# Ignore possible spelling error (nothing is misspelled)
# shellcheck disable=SC2153
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is being ignored?

Suggested change
# Ignore possible spelling error (nothing is misspelled)
# shellcheck disable=SC2153

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed


##############################################
# Begin JOB SPECIFIC work
##############################################

# Add UFSDA to PYTHONPATH
export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/:${HOMEgfs}/sorc/gdas.cd/ush/eva:${PYTHONPATH}
export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/soca:${PYTHONPATH}
AndrewEichmann-NOAA marked this conversation as resolved.
Show resolved Hide resolved

###############################################################
# Run relevant script

# the relevant script goes here

##############################################
# End JOB SPECIFIC work
##############################################

##############################################
# Final processing
##############################################
if [[ -e "${pgmout}" ]] ; then
cat "${pgmout}"
fi

##########################################
# Do not remove the Temporary working directory (do this in POST)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Do not remove the Temporary working directory (do this in POST)
# Remove the temporary working directory

Probably a residual from a previous copy-paste.
We do wan't to remove job specific run directories at the end of the job.

##########################################
cd "${DATAROOT}" || exit 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do want to remove the data directory at the end of the job.

Suggested change
cd "${DATAROOT}" || exit 1
cd "${DATAROOT}" || (echo "FATAL ERROR: ${DATAROOT} does not exist. ABORT!"; exit 1)
[[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}"


exit 0
10 changes: 10 additions & 0 deletions parm/config/gfs/config.ocnanalprepobs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would prefer this config to be config.prepoceanobs
We currently have config.prep
Newer components would be config.prep<component>obs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update elsewhere as necessary.


########## config.ocnanalprep ##########
# Pre Ocn Analysis specific

echo "BEGIN: config.ocnanalprepobs"

# Get task specific resources
. "${EXPDIR}/config.resources" ocnanalprepobs
echo "END: config.ocnanalprepobs"
12 changes: 11 additions & 1 deletion parm/config/gfs/config.resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if [[ $# -ne 1 ]]; then
echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt"
echo "wavegempak waveawipsbulls waveawipsgridded"
echo "postsnd awips gempak"
echo "ocnanalprep ocnanalbmat ocnanalrun ocnanalchkpt ocnanalpost ocnanalvrfy"
echo "ocnanalprep ocnanalprepobs ocnanalbmat ocnanalrun ocnanalchkpt ocnanalpost ocnanalvrfy"
exit 1

fi
Expand Down Expand Up @@ -328,6 +328,16 @@ elif [[ "${step}" = "ocnanalprep" ]]; then
export npe_node_ocnanalprep
export memory_ocnanalprep="24GB"

elif [[ "${step}" = "ocnanalprepobs" ]]; then

export wtime_ocnanalprepobs="00:10:00"
export npe_ocnanalprepobs=1
export nth_ocnanalprepobs=1
npe_node_ocnanalprepobs=$(echo "${npe_node_max} / ${nth_ocnanalprepobs}" | bc)
export npe_node_ocnanalprepobs
export memory_ocnanalprepobs="24GB"


elif [[ "${step}" = "ocnanalbmat" ]]; then
npes=16
case ${CASE} in
Expand Down