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

Ccs config cps #6

Open
wants to merge 5 commits into
base: cmcc-cm
Choose a base branch
from
Open

Ccs config cps #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb5c4ab
Moddifications to tailor the scripts according to CPS chain
antosanna Mar 22, 2023
d1860cd
Development for CPS
antosanna Apr 4, 2023
e4ecd79
Modified prereq for nemo_rebuild script from env_workflow.xml
antosanna Apr 4, 2023
a961574
Merge branch 'CMCC-Foundation:cmcc-cm' into ccs_config_cps
antosanna Apr 4, 2023
5545bd7
environment-dependent paths definition in config_machines.xml
antosanna May 15, 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
25 changes: 4 additions & 21 deletions machines/config_batch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
<directive > -J {{ job_id }} </directive>
<directive > -n {{ total_tasks }} </directive>
<directive > -W $JOB_WALLCLOCK_TIME </directive>
<directive default="cesm.stdout" > -o {{ job_id }}.%J </directive>
<directive default="cesm.stderr" > -e {{ job_id }}.%J </directive>
<directive > -o {{ job_id }}.out.%J </directive>
<directive > -e {{ job_id }}.err.%J </directive>
</directives>
</batch_system>

Expand Down Expand Up @@ -533,25 +533,6 @@
</queues>
</batch_system>

Copy link
Collaborator

Choose a reason for hiding this comment

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

Please keep the changes for Juno

<batch_system MACH="juno" type="lsf">
<batch_env>-env</batch_env>
<submit_args>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-W" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-P" name="$PROJECT"/>
<arg flag="-M" name="300GB"/>
<arg flag="-x" />
</submit_args>
<directives>
<directive > -R "span[ptile={{ tasks_per_node }}]"</directive>
</directives>
<queues>
<queue walltimemin="00:00" walltimemax="02:00" default="true">p_short</queue>
<queue walltimemin="02:00" walltimemax="04:00">p_medium</queue>
<queue walltimemin="04:00" walltimemax="08:00">p_long</queue>
</queues>
</batch_system>

<batch_system MACH="laramie" type="pbs">
<directives>
<directive default="/bin/bash" > -S {{ shell }} </directive>
Expand Down Expand Up @@ -780,6 +761,8 @@
<queue walltimemin="00:00" walltimemax="02:00" default="true">p_short</queue>
<queue walltimemin="02:00" walltimemax="04:00">p_medium</queue>
<queue walltimemin="04:00" walltimemax="08:00">p_long</queue>
<queue walltimemin="00:00" walltimemax="00:30">s_short</queue>
<queue walltimemin="00:30" walltimemax="06:00">s_medium</queue>
</queues>
</batch_system>

Expand Down
5 changes: 3 additions & 2 deletions machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ This allows using a different mpirun command to launch unit tests
<OS>LINUX</OS>
<COMPILERS>intel,intel15</COMPILERS>
<MPILIBS>mpich2</MPILIBS>
<CIME_OUTPUT_ROOT>/work/$USER/CESM2</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/users/home/dp16116/CESM2/inputdata</DIN_LOC_ROOT>
<CIME_OUTPUT_ROOT>/work/$USER/CMCC-CM</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>$DIN_LOC_ROOT/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>$ENV{CESMDATAROOT}/ccsm_baselines</BASELINE_ROOT>
Expand Down Expand Up @@ -3651,6 +3651,7 @@ This allows using a different mpirun command to launch unit tests
<MPILIBS>impi,mpi-serial</MPILIBS>
<PROJECT>R000</PROJECT>
<CIME_OUTPUT_ROOT>/work/$ENV{DIVISION}/$ENV{USER}/CESM2</CIME_OUTPUT_ROOT>
<NEMO_REBUILD_ROOT>$ENV{HOME}/NEMO_REBUILD</NEMO_REBUILD_ROOT>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Put the NEMO_REBUILD tool in a shared folder since the HOME is user dependent

<DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>$DIN_LOC_ROOT/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
Expand Down
10 changes: 10 additions & 0 deletions machines/config_workflow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@
<walltime>0:20:00</walltime>
</runtime_parameters>
</job>
<job name="case.nemo_rebuild">
<template>$NEMO_REBUILD_ROOT/template.nemo_rebuild4cmcc-cm</template>
<dependency>case.st_archive</dependency>
<prereq>$NEMO_REBUILD</prereq>
<runtime_parameters>
<task_count>1</task_count>
<tasks_per_node>1</tasks_per_node>
<walltime>1:00:00</walltime>
</runtime_parameters>
</job>
</workflow_jobs>

<workflow_jobs id="timeseries" prepend="default">
Expand Down