From 4abc697456137015efb4c29abcc01f937b5d8a87 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 11:44:09 +0000
Subject: [PATCH] Update documentation
---
latest/_modules/compass/ocean/mesh/remap_topography.html | 6 +++---
.../tests/global_ocean/files_for_e3sm/diagnostic_maps.html | 7 +++----
.../files_for_e3sm/remap_iceberg_climatology.html | 4 ++--
.../remap_sea_surface_salinity_restoring.html | 4 ++--
.../files_for_e3sm/seaice_graph_partition.html | 6 +++---
.../tests/global_ocean/init/remap_ice_shelf_melt.html | 4 ++--
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/latest/_modules/compass/ocean/mesh/remap_topography.html b/latest/_modules/compass/ocean/mesh/remap_topography.html
index 2da35859cf..347e9d64c9 100644
--- a/latest/_modules/compass/ocean/mesh/remap_topography.html
+++ b/latest/_modules/compass/ocean/mesh/remap_topography.html
@@ -116,7 +116,7 @@
import
xarray as xr
from mpas_tools.io import write_netcdf
-
from pyremap import LatLonGridDescriptor, MpasCellMeshDescriptor, Remapper
+
from pyremap import LatLonGridDescriptor, MpasMeshDescriptor, Remapper
from compass.step import Step
@@ -222,8 +222,8 @@
Source code for compass.ocean.mesh.remap_topography
in_mesh_name = in_descriptor.meshName
out_mesh_name = self.mesh_name
- out_descriptor = MpasCellMeshDescriptor(fileName='base_mesh.nc',
- meshName=self.mesh_name)
+ out_descriptor = MpasMeshDescriptor(fileName='base_mesh.nc',
+ meshName=self.mesh_name)
mapping_file_name = \
f'map_{in_mesh_name}_to_{out_mesh_name}_{method}.nc'
diff --git a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/diagnostic_maps.html b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/diagnostic_maps.html
index 0ae3a6e1ad..6c91a5aec1 100644
--- a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/diagnostic_maps.html
+++ b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/diagnostic_maps.html
@@ -120,8 +120,7 @@
Source code for compass.ocean.tests.global_ocean.files_for_e3sm.diagnostic_m
import numpy
import pyproj
from pyremap import (
- MpasCellMeshDescriptor,
- MpasVertexMeshDescriptor,
+ MpasMeshDescriptor,
ProjectionGridDescriptor,
Remapper,
get_lat_lon_descriptor,
@@ -322,7 +321,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.diagnostic_m
parallel_executable = config.get('parallel', 'parallel_executable')
- in_descriptor = MpasCellMeshDescriptor(mesh_filename, mesh_name)
+ in_descriptor = MpasMeshDescriptor(mesh_filename, mesh_name)
mapping_file_name = f'map_{mesh_name}_to_{out_grid_name}_bilinear.nc'
@@ -333,7 +332,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.diagnostic_m
esmf_parallel_exec=parallel_executable)
# now the same on vertices (e.g. for streamfunctions)
- in_descriptor = MpasVertexMeshDescriptor(mesh_filename, mesh_name)
+ in_descriptor = MpasMeshDescriptor(mesh_filename, mesh_name, vertices=True)
mapping_file_name = \
f'map_{mesh_name}_vertices_to_{out_grid_name}_bilinear.nc'
diff --git a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_iceberg_climatology.html b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_iceberg_climatology.html
index 43a916181d..222cbccbf0 100644
--- a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_iceberg_climatology.html
+++ b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_iceberg_climatology.html
@@ -119,7 +119,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.remap_iceber
import numpy as np
import xarray as xr
from mpas_tools.io import write_netcdf
-from pyremap import LatLonGridDescriptor, MpasCellMeshDescriptor, Remapper
+from pyremap import LatLonGridDescriptor, MpasMeshDescriptor, Remapper
from compass.io import symlink
from compass.ocean.tests.global_ocean.files_for_e3sm.files_for_e3sm_step import ( # noqa: E501
@@ -258,7 +258,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.remap_iceber
src_mesh_name = src_descriptor.meshName
logger.info('Creating the destination MPAS mesh descriptor...')
- dst_descriptor = MpasCellMeshDescriptor(mesh_filename, mesh_name)
+ dst_descriptor = MpasMeshDescriptor(mesh_filename, mesh_name)
mapping_filename = \
f'{mapping_directory}/map_{src_mesh_name}_to_{mesh_name}_{method}.nc'
diff --git a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_sea_surface_salinity_restoring.html b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_sea_surface_salinity_restoring.html
index d27f1dc7a8..ef67ed9e54 100644
--- a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_sea_surface_salinity_restoring.html
+++ b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/remap_sea_surface_salinity_restoring.html
@@ -118,7 +118,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.remap_sea_su
import xarray as xr
from mpas_tools.io import write_netcdf
-from pyremap import LatLonGridDescriptor, MpasCellMeshDescriptor, Remapper
+from pyremap import LatLonGridDescriptor, MpasMeshDescriptor, Remapper
from compass.io import symlink
from compass.ocean.tests.global_ocean.files_for_e3sm.files_for_e3sm_step import ( # noqa: E501
@@ -227,7 +227,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.remap_sea_su
src_descriptor = LatLonGridDescriptor.read(fileName=in_filename)
src_mesh_name = src_descriptor.meshName
- dst_descriptor = MpasCellMeshDescriptor(mesh_filename, mesh_name)
+ dst_descriptor = MpasMeshDescriptor(mesh_filename, mesh_name)
mapping_filename = \
f'{mapping_directory}/map_{src_mesh_name}_to_{mesh_name}_{method}.nc'
diff --git a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/seaice_graph_partition.html b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/seaice_graph_partition.html
index 5f3e7a2c19..76c5e6a7aa 100644
--- a/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/seaice_graph_partition.html
+++ b/latest/_modules/compass/ocean/tests/global_ocean/files_for_e3sm/seaice_graph_partition.html
@@ -121,7 +121,7 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.seaice_graph
import xarray as xr
from mpas_tools.io import write_netcdf
from mpas_tools.logging import check_call
-from pyremap import MpasCellMeshDescriptor, Remapper
+from pyremap import MpasMeshDescriptor, Remapper
from compass.io import symlink
from compass.ocean.tests.global_ocean.files_for_e3sm.files_for_e3sm_step import ( # noqa: E501
@@ -270,8 +270,8 @@ Source code for compass.ocean.tests.global_ocean.files_for_e3sm.seaice_graph
mapping_file_name = f'map_{in_mesh_name}_to_{out_mesh_name}_{method}.nc'
- in_descriptor = MpasCellMeshDescriptor(in_mesh_filename, in_mesh_name)
- out_descriptor = MpasCellMeshDescriptor(out_mesh_filename, out_mesh_name)
+ in_descriptor = MpasMeshDescriptor(in_mesh_filename, in_mesh_name)
+ out_descriptor = MpasMeshDescriptor(out_mesh_filename, out_mesh_name)
remapper = Remapper(in_descriptor, out_descriptor, mapping_file_name)
diff --git a/latest/_modules/compass/ocean/tests/global_ocean/init/remap_ice_shelf_melt.html b/latest/_modules/compass/ocean/tests/global_ocean/init/remap_ice_shelf_melt.html
index b772d2bfd0..81b2151b78 100644
--- a/latest/_modules/compass/ocean/tests/global_ocean/init/remap_ice_shelf_melt.html
+++ b/latest/_modules/compass/ocean/tests/global_ocean/init/remap_ice_shelf_melt.html
@@ -120,7 +120,7 @@ Source code for compass.ocean.tests.global_ocean.init.remap_ice_shelf_melt
import xarray as xr
from mpas_tools.cime.constants import constants
from mpas_tools.io import write_netcdf
-from pyremap import MpasCellMeshDescriptor, ProjectionGridDescriptor, Remapper
+from pyremap import MpasMeshDescriptor, ProjectionGridDescriptor, Remapper
from compass.step import Step
@@ -288,7 +288,7 @@ Source code for compass.ocean.tests.global_ocean.init.remap_ice_shelf_melt
write_netcdf(ds, 'Adusumilli_2020_ismf_2010-2018_v0.nc')
logger.info('done.')
- out_descriptor = MpasCellMeshDescriptor(mesh_filename, mesh_name)
+ out_descriptor = MpasMeshDescriptor(mesh_filename, mesh_name)
mapping_filename = \
f'{mapping_directory}/map_{in_grid_name}_to_{mesh_name}.nc'