Merge pull request #3012 from GEOS-ESM/merge/handmerge/develop-to-map…

…l3-2024Sep06 GitFlow: Handmerge develop into MAPL3
GEOS-ESM · Sep 8, 2024 · 3d5e5e0 · 3d5e5e0
2 parents 54aba22 + 43dc547
commit 3d5e5e0
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 199 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Start implementing changes for vertical regridding in ExtData
 - Add ability to connect export of the MAPL hierachy to ExtData via CAP.rc file
 - Added new driver, CapDriver.x, to excerise the MAPL_Cap with the configuratable component also used by ExtDataDriver.x
 - Added Fortran interface to UDUNITS2

diff --git a/gridcomps/ExtData2G/CMakeLists.txt b/gridcomps/ExtData2G/CMakeLists.txt
@@ -20,6 +20,8 @@ set (srcs
      ExtData_IOBundleMod.F90
      ExtData_IOBundleVectorMod.F90
      ExtDataMasking.F90
+     ExtDataPrimaryExportVector.F90
+     ExtDataDerivedExportVector.F90
     )
 
 

diff --git a/gridcomps/ExtData2G/ExtDataDerivedExportVector.F90 b/gridcomps/ExtData2G/ExtDataDerivedExportVector.F90
@@ -0,0 +1,13 @@
+module MAPL_ExtDataDerivedExportVectorMod
+   use MAPL_ExtDataTypeDef
+#define T DerivedExport
+#define Vector DerivedExportVector
+#define VectorIterator DerivedExportVectorIterator
+
+#include "vector/template.inc"
+
+#undef T
+#undef Vector
+#undef VectorIterator
+
+end module MAPL_ExtDataDerivedExportVectorMod