Skip to content

Commit

Permalink
Merge branch 'mark-petersen/update_mpas_200817' into next (PR #3776)
Browse files Browse the repository at this point in the history
Update MPAS-Source: COMPASS and Documentation files

This PRi brings in a new mpas-source submdoule with changes only to the ocean
core. It updates files unrelated to the E3SM forward model, including:
* Move load_compass_env.sh to the ocean dir  (MPAS-Dev/MPAS-Model#618);
* Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC
  (MPAS-Dev/MPAS-Model#653);
* Fix path to docs in Travis CI  (MPAS-Dev/MPAS-Model#644);
* atmosphere core init changes  (MPAS-Dev/MPAS-Model#637);
* New Mesh: WC14to60kmL60E3SMv2r03  (MPAS-Dev/MPAS-Model#628);
* Fix ISOMIP+ viz scripts  (MPAS-Dev/MPAS-Model#642);
* Add support for custom critical passages and land blockages
  (MPAS-Dev/MPAS-Model#586); and
* New Mesh: WC12to60kmL60E3SMv2r01  (MPAS-Dev/MPAS-Model#555)

[BFB]
  • Loading branch information
jonbob committed Aug 18, 2020
2 parents 833de0c + 6e141de commit 72e0ed9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/mpas-source
Submodule mpas-source updated 45 files
+386 −1 docs/compass/ocean_testcases/isomip_plus.rst
+142 −104 docs/compass/ocean_testcases/isomip_plus_at_lanl.rst
+6 −2 src/core_init_atmosphere/Makefile
+1,038 −0 src/core_init_atmosphere/mpas_geotile_manager.F
+2 −2 testing_and_setup/compass/README_ocean.md
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/coastline_CUSP.geojson
+1 −1 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_E3SM_coupling_files.ini
+1 −1 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_base_mesh.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_culled_mesh.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_driver.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_e3sm_coupling.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_initial_state.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_initial_state_60_layers.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/config_mesh_metrics.xml
+4 −4 testing_and_setup/compass/ocean/global_ocean/WC12/init/define_base_mesh.py
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/define_vertical_grid.py
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/land_mask_Kamchatka.geojson
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/land_mask_Mexico.geojson
+10 −10 testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Arctic_Ocean.geojson
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Bering_Sea.geojson
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Central_America.geojson
+8 −8 testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_Stream_extension.geojson
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_of_Mexico.geojson
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up1.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up2.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up3.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up4.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up5.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up6.xml
+0 −1 testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_test_final_settings.xml
+0 −0 testing_and_setup/compass/ocean/global_ocean/WC12/template_forward.xml
+3 −3 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini
+0 −1 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml
+57 −0 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml
+0 −1 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_60_layers.xml
+66 −0 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_64_layers.xml
+4 −4 testing_and_setup/compass/ocean/global_ocean/WC14/init/define_base_mesh.py
+2 −2 testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_test_final_settings.xml
+68 −35 testing_and_setup/compass/ocean/global_ocean/scripts/cull_mesh.py
+0 −553 testing_and_setup/compass/ocean/isomip_plus/README_Ocean0_IC.md
+1 −1 testing_and_setup/compass/ocean/isomip_plus/viz/__main__.py
+2 −2 testing_and_setup/compass/ocean/isomip_plus/viz/plot.py
+3 −2 testing_and_setup/compass/ocean/isomip_plus/viz/streamfunction.py
+1 −1 testing_and_setup/compass/ocean/load_compass_env.sh
+1 −1 travis_ci/test_docs.bash

0 comments on commit 72e0ed9

Please sign in to comment.