Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This section provides instructions for running all tests in the main obsForge re

2. **Load modules** (on supported HPC systems):
```bash
source ush/of_setup.sh
source dev/ush/of_setup.sh
```

3. **Set up Python environment** for pytest:
Expand Down Expand Up @@ -141,7 +141,7 @@ pytest ush/python/pyobsforge/tests/ --disable-warnings -v

## Workflow Usage
```console
cd ush
cd dev/ush
source of_setup.sh
setup_xml.py --config ../parm/config.yaml --template ../parm/obsforge_rocoto_template.xml.j2 --output obsforge.xml
rocotorun -d obsforge.db -w obsforge.xml
Expand Down
2 changes: 1 addition & 1 deletion jobs/rocoto/aoddump.sh → dev/job_cards/rocoto/aoddump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_AOD_DUMP"
"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_AOD_DUMP"
status=$?
exit "${status}"
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP"
"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP"
status=$?
exit "${status}"
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA"
"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_GSI_TO_IODA"
status=$?
exit "${status}"
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP"
"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_MARINE_BUFR_DUMP"
status=$?
exit "${status}"
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP"
"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_MARINE_DUMP"
status=$?
exit "${status}"
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT"
"${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_STAGE_OUTPUT"
status=$?
exit "${status}"
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions jobs
10 changes: 5 additions & 5 deletions parm/gdas_realtime.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "{{ PSLOT }}">
<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -27,7 +27,7 @@
-->
<task name="gcdas_aod_dump" cycledefs="gcdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gcdas_aod_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -65,7 +65,7 @@
-->
<task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -103,7 +103,7 @@
-->
<task name="gdas_marine_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>

<jobname><cyclestr>obsforge_gdas_marine_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -141,7 +141,7 @@
-->
<task name="gdas_marine_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_marine_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down
8 changes: 4 additions & 4 deletions parm/gfs_realtime.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "{{ PSLOT }}">
<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -25,7 +25,7 @@
-->
<task name="gfs_atmos_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>

<jobname><cyclestr>obsforge_gfs_atmos_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -63,7 +63,7 @@
-->
<task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -101,7 +101,7 @@
-->
<task name="gfs_marine_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down
8 changes: 4 additions & 4 deletions parm/gsi_to_ioda.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "{{ PSLOT }}">
<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -28,7 +28,7 @@
-->
<task name="gdas_gsi_to_ioda" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/gsitoioda.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/gsitoioda.sh</command>

<jobname><cyclestr>obsforge_gdas_gsi_to_ioda_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -68,7 +68,7 @@
-->
<task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -107,7 +107,7 @@
-->
<task name="gdas_stage_output" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/stageout.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/stageout.sh</command>

<jobname><cyclestr>obsforge_gdas_stage_output_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down
14 changes: 7 additions & 7 deletions parm/obsforge_rocoto_template.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "{{ PSLOT }}">
<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -27,7 +27,7 @@
-->
<task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -66,7 +66,7 @@
-->
<task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -105,7 +105,7 @@
-->
<task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -140,7 +140,7 @@
-->
<task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -178,7 +178,7 @@
-->
<task name="gfs_marine_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -217,7 +217,7 @@
-->
<task name="gdas_marine_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_marine_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down
14 changes: 7 additions & 7 deletions parm/obsforge_rocoto_template_pbspro.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "{{ PSLOT }}">
<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -27,7 +27,7 @@
-->
<task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -66,7 +66,7 @@

<task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -100,7 +100,7 @@
-->
<task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -138,7 +138,7 @@
-->
<task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -176,7 +176,7 @@
-->
<task name="gfs_marine_bufr_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -214,7 +214,7 @@
-->
<task name="gdas_marine_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinebufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinebufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_marine_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down
8 changes: 4 additions & 4 deletions parm/obsforge_rocoto_template_pbspro_realtime.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "{{ PSLOT }}">
<!ENTITY ROTDIR "{{ COMROOT }}/{{ PSLOT }}">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/jobs/rocoto">
<!ENTITY JOBS_DIR "{{ HOMEobsforge }}/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -28,7 +28,7 @@
-->
<task name="gcdas_aod_dump" cycledefs="gcdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/aoddump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gcdas_aod_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -66,7 +66,7 @@
-->
<task name="gdas_atmos_bufr_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/atmosbufrdump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/atmosbufrdump.sh</command>

<jobname><cyclestr>obsforge_gdas_atmos_bufr_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down Expand Up @@ -101,7 +101,7 @@
-->
<task name="gfs_marine_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>{{ HOMEobsforge }}/jobs/rocoto/marinedump.sh</command>
<command>{{ HOMEobsforge }}/dev/job_cards/rocoto/marinedump.sh</command>

<jobname><cyclestr>obsforge_gfs_marine_dump_@H</cyclestr></jobname>
<account>{{ ACCOUNT }}</account>
Expand Down
6 changes: 3 additions & 3 deletions parm/obsforge_test_hera.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<!ENTITY PSLOT "obsforge">
<!ENTITY ROTDIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/obsforge/COMROOT/obsforge">
<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto">
<!ENTITY JOBS_DIR "/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/dev/job_cards/rocoto">
<!ENTITY MAXTRIES "2">
]>

Expand All @@ -22,7 +22,7 @@

<task name="gfs_aod_dump" cycledefs="gfs" maxtries="&MAXTRIES;">

<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto/aoddump.sh</command>
<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gfs_aod_dump_@H</cyclestr></jobname>
<account>da-cpu</account>
Expand Down Expand Up @@ -56,7 +56,7 @@

<task name="gdas_aod_dump" cycledefs="gdas" maxtries="&MAXTRIES;">

<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/jobs/rocoto/aoddump.sh</command>
<command>/scratch2/NCEPDEV/stmp1/Cory.R.Martin/mar2025/obsforge/dev/job_cards/rocoto/aoddump.sh</command>

<jobname><cyclestr>obsforge_gdas_aod_dump_@H</cyclestr></jobname>
<account>da-cpu</account>
Expand Down
4 changes: 2 additions & 2 deletions test/atmos/run_test_obsforge_global_atmos_bufr_dump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ nodes: 1
ntasks_per_node: 24
threads_per_task: 1
memory: ${memory}
command: ${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
command: ${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
filename: submit_${type}.sh
EOF

Expand All @@ -108,5 +108,5 @@ elif [[ $SCHEDULER = 'pbspro' ]]; then
$HOMEobsforge/test/generate_job_script.py ${config_yaml}
qsub -V -W block=true submit_${type}.sh
else
${HOMEobsforge}/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
${HOMEobsforge}/dev/jobs/JOBSFORGE_GLOBAL_ATMOS_BUFR_DUMP
fi
Loading
Loading