Skip to content

Clean up e3sm_coupling script and config #506

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

Merged
mark-petersen merged 5 commits into from
Apr 6, 2020
Merged

Clean up e3sm_coupling script and config #506

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
6a1aac9
Fix tabs
xylar Apr 2, 2020
ef998c2
Move cull_mesh.py to the scripts directory
xylar Apr 2, 2020
10c8042
Switch E3SM coupling to mesh file
xylar Apr 2, 2020
c2f0b72
Clean up e3sm_coupling script and config
xylar Apr 3, 2020
6e53aa1
Pick fields for sea-ice initial condition
xylar Apr 3, 2020
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
2 changes: 1 addition & 1 deletion testing_and_setup/compass/ocean/global_ocean/config_files/config_culled_mesh.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config case="culled_mesh">

<add_link source="../base_mesh/base_mesh.nc" dest="base_mesh.nc"/>
<add_link source_path="script_configuration_dir" source="cull_mesh.py" dest="cull_mesh.py"/>
<add_link source_path="script_configuration_dir" source="scripts/cull_mesh.py" dest="cull_mesh.py"/>

<run_script name="run.py">
<step executable="./cull_mesh.py">
Expand Down
8 changes: 4 additions & 4 deletions testing_and_setup/compass/ocean/global_ocean/config_files/config_e3sm_coupling.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<config case="e3sm_coupling">

<add_link source="../initial_state/initial_state.nc" dest="init.nc"/>
<add_link source="../initial_state/initial_state.nc" dest="mesh.nc"/>
<add_link source="../initial_state/graph.info" dest="graph.info"/>
<add_link source_path="script_configuration_dir" source="scripts/create_E3SM_coupling_files.py" dest="create_E3SM_coupling_files.py"/>
<copy_file source_path="script_configuration_dir" source="scripts/config_E3SM_coupling_files.ini" dest="config_E3SM_coupling_files.ini"/>
<add_link source_path="script_configuration_dir" source="scripts/readme_E3SM_coupling_files" dest="readme"/>
<add_link source_path="script_configuration_dir" source="scripts/create_E3SM_coupling_files.py" dest="create_E3SM_coupling_files.py"/>
<copy_file source_path="script_configuration_dir" source="scripts/config_E3SM_coupling_files.ini" dest="config_E3SM_coupling_files.ini"/>
<add_link source_path="script_configuration_dir" source="scripts/readme_E3SM_coupling_files" dest="readme"/>

<run_script name="run.py">
<step executable="python">
Expand Down
2 changes: 1 addition & 1 deletion testing_and_setup/compass/ocean/global_ocean/config_files_ISC/config_culled_mesh.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config case="culled_mesh">

<add_link source="../base_mesh/base_mesh.nc" dest="base_mesh.nc"/>
<add_link source_path="script_configuration_dir" source="cull_mesh.py" dest="cull_mesh.py"/>
<add_link source_path="script_configuration_dir" source="scripts/cull_mesh.py" dest="cull_mesh.py"/>

<run_script name="run.py">
<step executable="./cull_mesh.py">
Expand Down
2 changes: 1 addition & 1 deletion testing_and_setup/compass/ocean/global_ocean/config_files_ISC/config_e3sm_coupling.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<config case="e3sm_coupling">

<add_link source="../ssh_adjustment/init.nc" dest="init.nc"/>
<add_link source="../initial_state/initial_state.nc" dest="mesh.nc"/>
<add_link source="../initial_state/graph.info" dest="graph.info"/>
<add_link source="../culled_mesh/no_ISC_culled_mesh.nc" dest="no_ISC_culled_mesh.nc"/>
<add_link source_path="script_configuration_dir" source="scripts/create_E3SM_coupling_files.py" dest="create_E3SM_coupling_files.py"/>
Expand Down
12 changes: 7 additions & 5 deletions testing_and_setup/compass/ocean/global_ocean/scripts/config_E3SM_coupling_files.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[main]
mesh_name = autodetect
date_string = autodetect
nprocs = 36
nprocs = 1
Copy link
Collaborator Author

@xylar xylar Apr 3, 2020

Choose a reason for hiding this comment

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

Until we get the MPICH compass environment working (hopefully soon!) I think this is safer.

atm_scrip_path = /lustre/scratch3/turquoise/mpeterse/E3SM/input_data/share/scripgrids
# compiled executable gen_domain, code in E3SM repo:
domain_exe = /usr/projects/climate/mpeterse/repos/E3SM/compiled_cime_tools/cime/tools/mapping/gen_domain_files/src/gen_domain
# the file name of the initial condition, possibly after spin-up
initial_condition = ../initial_state/initial_state.nc
Comment on lines +8 to +9
Copy link
Collaborator Author

@xylar xylar Apr 3, 2020

Choose a reason for hiding this comment

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

For now, the initial condition is the same as the mesh. This will remain the default but will change for individual test cases in a subsequent pr.


[initial_condition_ocean]
enable = true
Expand Down Expand Up @@ -36,7 +38,7 @@ comparisonArcticStereoWidth = 6000.
comparisonArcticStereoResolution = 10.

[mapping_CORE_Gcase]
enable = true
enable = false
Copy link
Collaborator Author

@xylar xylar Apr 3, 2020

Choose a reason for hiding this comment

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

I turned off a few of these (CORE_Gcase and salinity_restoring) by default because they depend on files and executables that are currently only available on LANL IC.

atm_scrip_tag = T62_040121

[mapping_JRA_Gcase]
Expand All @@ -50,7 +52,7 @@ enable = false
atm_scrip_tag = ne30

[domain_CORE_Gcase]
enable = true
enable = false

[domain_JRA_Gcase]
enable = false
Expand All @@ -68,15 +70,15 @@ runoff_map_exe = /usr/projects/climate/mpeterse/repos/E3SM/compiled_cime_tools/c
runoff_map_lnd_file = /lustre/scratch3/turquoise/mpeterse/E3SM/input_data/lnd/dlnd7/RX1/runoff.daitren.annual.090225.nc

[salinity_restoring]
enable = true
enable = false
# This file needs to be added to a standard repo. Local copy for now:
grid_Levitus_1x1_scrip_file = /usr/projects/climate/mpeterse/mapping_files/test_SSS_mapping_190821/EC60to30Rev4/genRemapFiles/grid_Levitus_1x1_scrip.nc
# This file needs to be added to a standard repo. Local copy for now:
salinity_restoring_input_file = /usr/projects/climate/mpeterse/mapping_files/test_SSS_mapping_190821/EC60to30Rev4/interpSSS/PHC2_salx.2004_08_03.filled_double_precision.nc

[prescribed_ismf]
# does nothing if ice-shelf cavities are not present
enable = true
enable = false
Copy link
Collaborator Author

@xylar xylar Apr 3, 2020

Choose a reason for hiding this comment

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

I turned off prescribed ISMF for now because it is very slow without parallel mapping-file generation (waiting for compass MPI env.)

# path to the Rignot2013 data set.
# The default is a symlink to the initial conditions database
rignot_2013_file = ../MeltRatesRignot2013.nc
Loading