Skip to content

Commit 7fda4a5

Browse files
jedwards4bjedwards4b
authored
Merge pull request #266 from jedwards4b/add_cmip7_workflow_amon_basic
Add cmip7 workflow amon basic
2 parents 89ce3d0 + ce41889 commit 7fda4a5

File tree

4 files changed

+37
-81
lines changed

4 files changed

+37
-81
lines changed

‎machines/config_workflow.xml‎

Lines changed: 22 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,34 @@
6262
</job>
6363
</workflow_jobs>
6464

65-
<workflow_jobs id="timeseries" prepend="default">
66-
<job name="timeseries">
67-
<template>$ENV{POSTPROCESS_PATH}/timeseries/template.timeseries</template>
65+
<workflow_jobs id="cmip7" prepend="default">
66+
<job name="amon">
67+
<template>template.amon</template>
6868
<dependency>case.st_archive</dependency>
69-
<prereq>1</prereq>
70-
<runtime_parameters MACH="aleph">
71-
<task_count>200</task_count>
72-
<tasks_per_node>10</tasks_per_node>
73-
<walltime>12:00:00</walltime>
69+
<prereq>True</prereq>
70+
<runtime_parameters MACH="derecho">
71+
<task_count>128</task_count>
72+
<tasks_per_node>128</tasks_per_node>
73+
<mem_per_task>10</mem_per_task>
74+
<walltime>0:40:00</walltime>
7475
</runtime_parameters>
75-
<runtime_parameters MACH="cheyenne">
76-
<task_count>72</task_count>
77-
<tasks_per_node>9</tasks_per_node>
78-
<walltime>0:20:00</walltime>
76+
</job>
77+
<job name="lmon">
78+
<template>template.Lmon</template>
79+
<dependency>case.st_archive</dependency>
80+
<prereq>True</prereq>
81+
<runtime_parameters MACH="derecho">
82+
<task_count>4</task_count>
83+
<tasks_per_node>128</tasks_per_node>
84+
<mem_per_task>10</mem_per_task>
85+
<walltime>0:40:00</walltime>
7986
</runtime_parameters>
8087
</job>
88+
8189
</workflow_jobs>
90+
8291

92+
8393
<!-- THIS CREATES THE JOB FOR THE LAUNCHING OF THE SMARTSIM ORCHESTRATOR -->
8494
<workflow_jobs id="smartsim_db" prepend="default">
8595
<job name="smartsim_db"> <!-- name here corresponds with scripts -->
@@ -94,72 +104,4 @@
94104
</job>
95105
</workflow_jobs>
96106

97-
<workflow_jobs id="timeseries_transfer" prepend="timeseries">
98-
<job name="timeseries_transfer">
99-
<template>$ENV{POSTPROCESS_PATH}/timeseries/template.timeseries_transfer</template>
100-
<dependency>timeseries</dependency>
101-
<prereq>1</prereq>
102-
<runtime_parameters>
103-
<task_count>1</task_count>
104-
<tasks_per_node>1</tasks_per_node>
105-
<walltime>1:00:00</walltime>
106-
</runtime_parameters>
107-
</job>
108-
</workflow_jobs>
109-
<workflow_jobs id="diagnostics" prepend="timeseries">
110-
<job name="xconform">
111-
<template>$CASEROOT/postprocess/xconform</template>
112-
<dependency>timeseriesL</dependency>
113-
<prereq>$CASEROOT/postprocess/pp_config -value --get STANDARDIZE_TIMESERIES</prereq>
114-
</job>
115-
116-
<job name="atm_averages">
117-
<template>$CASEROOT/postprocess/atm_averages</template>
118-
<dependency>timeseries or case.st_archive</dependency>
119-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
120-
</job>
121-
122-
<job name="lnd_averages">
123-
<template>$CASEROOT/postprocess/lnd_averages</template>
124-
<dependency>:lnd_avg(args)
125-
timeseries or case.st_archive</dependency>
126-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
127-
</job>
128-
129-
<job name="ice_averages">
130-
<template>$CASEROOT/postprocess/ice_averages</template>
131-
<dependency>timeseries or case.st_archive</dependency>
132-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
133-
</job>
134-
135-
136-
<job name="ocn_averages">
137-
<template>$CASEROOT/postprocess/ocn_averages</template>
138-
<dependency>timeseries or case.st_archive</dependency>
139-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
140-
</job>
141-
142-
<job name="atm_diagnostics">
143-
<template>$CASEROOT/postprocess/atm_diagnostics</template>
144-
<dependency>atm_averages</dependency>
145-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
146-
</job>
147-
148-
<job name="lnd_diagnostics">
149-
<template>$CASEROOT/postprocess/lnd_diagnostics</template>
150-
<dependency>lnd_averages</dependency>
151-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
152-
</job>
153-
<job name="ice_diagnostics">
154-
<template>$CASEROOT/postprocess/ice_diagnostics</template>
155-
<dependency>ice_averages</dependency>
156-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
157-
</job>
158-
<job name="ocn_diagnostics">
159-
<template>$CASEROOT/postprocess/ocn_diagnostics</template>
160-
<dependency>ocn_averages</dependency>
161-
<prereq>$CASEROOT/postprocess/pp_config -value --get GENERATE_AVGS_ATM</prereq>
162-
</job>
163-
164-
</workflow_jobs>
165107
</config_workflow>

‎machines/derecho/config_machines.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<!-- DEBUG FALSE and then true: with any MPI and NOT gnu compiler -->
136136
<modules DEBUG="FALSE" compiler="!gnu">
137137
<command name="load">parallelio/2.6.6</command>
138-
<command name="load">esmf/8.8.1</command>
138+
<command name="load">esmf/8.9.0</command>
139139
</modules>
140140
<modules DEBUG="TRUE" compiler="!gnu">
141141
<command name="load">parallelio/2.6.6-debug</command>

‎machines/template.Lmon‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
{{ batchdirectives }}
3+
4+
module load conda
5+
conda activate /glade/work/cmip7/conda-envs/CMOR
6+
NCPUS=$(cat $PBS_NODEFILE | wc -l)
7+
python /glade/work/cmip7/cmip7-prep/scripts/monthly_cmor.py --realm lnd --workers $NCPUS --caseroot {{ caseroot }} --cimeroot {{ cimeroot }}

‎machines/template.amon‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
{{ batchdirectives }}
3+
4+
module load conda
5+
conda activate /glade/work/cmip7/conda-envs/CMOR
6+
NCPUS=$(cat $PBS_NODEFILE | wc -l)
7+
python /glade/work/cmip7/cmip7-prep/scripts/monthly_cmor.py --realm atm --workers $NCPUS --caseroot {{ caseroot }} --cimeroot {{ cimeroot }}

0 commit comments

Comments
 (0)