From f3e6646ab5a95c8df5ce17ceb2d30e1ae16e7eb2 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Wed, 4 Dec 2024 22:07:47 -0600 Subject: [PATCH] Update interface --- Source/LandSurfaceModel/NOAH/ERF_NOAH.H | 5 ++--- Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp | 4 ++-- Submodules/NOAH-MP | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/LandSurfaceModel/NOAH/ERF_NOAH.H b/Source/LandSurfaceModel/NOAH/ERF_NOAH.H index bbb0dc479..f88bcf5ae 100644 --- a/Source/LandSurfaceModel/NOAH/ERF_NOAH.H +++ b/Source/LandSurfaceModel/NOAH/ERF_NOAH.H @@ -33,9 +33,8 @@ public: private: - // C++ variable for NoahmpIO struct - NoahmpIO_struct noahmp_io; - NoahmpIO_arrays noahmp_arr; + // C++ variable for NoahmpIO type + NoahmpIO_type noahmpio; }; #endif diff --git a/Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp b/Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp index 0bb16b855..5dd035706 100644 --- a/Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp +++ b/Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp @@ -15,8 +15,8 @@ NOAH::Init (const MultiFab& cons_in, // Initialize Noahmp IO amrex::Print() << "Initializing Noahmp IO" << std::endl; - NoahmpIOVarInit(&noahmp_io, &noahmp_arr); - NoahmpInitMain(&noahmp_io); + NoahmpIOVarInitDefault(&noahmpio); + NoahmpInitMain(&noahmpio); amrex::Print() << "Noahmp IO Initialized" << std::endl; }; diff --git a/Submodules/NOAH-MP b/Submodules/NOAH-MP index 1f97b8680..c7ea25c7e 160000 --- a/Submodules/NOAH-MP +++ b/Submodules/NOAH-MP @@ -1 +1 @@ -Subproject commit 1f97b8680c75649fcb505cac18de274f588c35b1 +Subproject commit c7ea25c7eb2f36a256d32342f872c30dbb81efd0