Update interface

AIEADA · Dec 5, 2024 · f3e6646 · f3e6646
1 parent 7224bb4
commit f3e6646
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
+37 −9		drivers/hrldas/NoahmpIO.H
+17 −4		drivers/hrldas/NoahmpIO.cpp
+2 −16		drivers/hrldas/NoahmpIOVarInitMod.F90
+5 −24		drivers/hrldas/NoahmpIOVarType.F90
+0 −12		drivers/hrldas/NoahmpIO_data.F90
+66 −0		drivers/hrldas/NoahmpIO_fi.F90
+3 −6		drivers/hrldas/NoahmpInitMainMod.F90