merge mixedmode

NOAA-GFDL · Aug 2, 2023 · 76f0378 · 76f0378
2 parents b131a3f + f7b7544
commit 76f0378
Show file tree

Hide file tree

Showing 17 changed files with 1,629 additions and 2,539 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,6 @@ and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is releas
 `rr` is a sequential release number (starting from `01`), and an optional two-digit
 sequential patch number (starting from `01`).
 
-<<<<<<< HEAD
-=======
 ## [2023.01.01] - 2023-06-06
 ### Changed
 - FMS2_IO: Performance changes for domain_reads_2d and domain_reads_3d:
@@ -23,7 +21,6 @@ sequential patch number (starting from `01`).
 - FMS2_IO: Extended mpp_scatter and mpp_gather to work for int8; added a kludge for scatter since the data is assumed to be (x,y,z)
 
 
->>>>>>> origin/mixedmode_base
 ## [2023.01] - 2023-04-03
 ### Known Issues
 - If using GCC 10 or higher as well as MPICH, compilation errors will occur unless `-fallow-argument-mismatch` is included in the Fortran compiler flags(the flag will now be added automatically if building with autotools or CMake).

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -304,6 +304,7 @@ foreach(kind ${kinds})
                                                  fms2_io/include
                                                  string_utils/include
                                                  mpp/include
+                                                 monin_obukhov/include
                                                  sat_vapor_pres/include
                                                  horiz_interp/include
                                                  random_numbers/include
@@ -350,8 +351,8 @@ foreach(kind ${kinds})
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/astronomy/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/monin_obukhov/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sat_vapor_pres/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
@@ -362,6 +363,7 @@ foreach(kind ${kinds})
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tracer_manager/include>)
 
+
   target_include_directories(${libTgt} INTERFACE
     $<BUILD_INTERFACE:${moduleDir}>
     $<INSTALL_INTERFACE:${includeDir}>)

diff --git a/axis_utils/include/axis_utils2.inc b/axis_utils/include/axis_utils2.inc
@@ -177,14 +177,11 @@
   !!        lon = 0 1 2 3 4 5  ...  358 359; lon_strt = 3
   !!    ==> lon = 3 4 5 6 7 8  ...  359 360 361 362; istrt = 4
   !!
-  !!        lon = 0 1 2 3 4 5  ...  358 359; lon_strt = 0
-  !!    ==> lon = 0 1 2 3 4 5  ...  358 359; istrt = 0
 
   subroutine TRANLON_(lon, lon_start, istrt)
     real(kind=FMS_AU_KIND_), intent(inout), dimension(:) :: lon
     real(kind=FMS_AU_KIND_), intent(in)                  :: lon_start
     integer, intent(out)                                 :: istrt
-
     integer                 :: len, i
     real(kind=FMS_AU_KIND_) :: lon_strt, tmp(size(lon(:))-1)
 

diff --git a/monin_obukhov/Makefile.am b/monin_obukhov/Makefile.am
@@ -22,24 +22,39 @@
 
 # Ed Hartnett 2/22/19
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/monin_obukhov/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 noinst_LTLIBRARIES = libmonin_obukhov.la
 
 libmonin_obukhov_la_SOURCES = \
-  monin_obukhov.F90 \
-  monin_obukhov_inter.F90
-
-monin_obukhov_mod.$(FC_MODEXT): monin_obukhov_inter.$(FC_MODEXT)
+        monin_obukhov.F90 \
+        monin_obukhov_inter.F90 \
+        include/monin_obukhov_r4.fh \
+        include/monin_obukhov_r8.fh \
+        include/monin_obukhov.inc \
+        include/monin_obukhov_inter_r4.fh \
+        include/monin_obukhov_inter_r8.fh \
+        include/monin_obukhov_inter.inc
+
+monin_obukhov_inter.$(FC_MODEXT): \
+        include/monin_obukhov_inter_r4.fh \
+        include/monin_obukhov_inter_r8.fh \
+        include/monin_obukhov_inter.inc
+
+monin_obukhov_mod.$(FC_MODEXT): \
+        monin_obukhov_inter.$(FC_MODEXT) \
+        include/monin_obukhov_r4.fh \
+        include/monin_obukhov_r8.fh \
+        include/monin_obukhov.inc
 
 # Mod files are built and then installed as headers.
 MODFILES = \
-  monin_obukhov_inter.$(FC_MODEXT) \
-  monin_obukhov_mod.$(FC_MODEXT)
+        monin_obukhov_mod.$(FC_MODEXT) \
+        monin_obukhov_inter.$(FC_MODEXT)
 nodist_include_HEADERS = $(MODFILES)
 BUILT_SOURCES = $(MODFILES)
 
 EXTRA_DIST = monin_obukhov.tech.ps
 
-include $(top_srcdir)/mkmods.mk
+include $(top_srcdir)/mkmods.mk