Merge remote-tracking branch 'origin/mixedmode' into mixedmode-interp

mlee03 · Aug 7, 2023 · f2ccfe6 · f2ccfe6
2 parents a27219f + 0501ed2
commit f2ccfe6
Show file tree

Hide file tree

Showing 21 changed files with 961 additions and 1,836 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -307,12 +307,14 @@ foreach(kind ${kinds})
                                                  monin_obukhov/include
                                                  sat_vapor_pres/include
                                                  horiz_interp/include
+                                                 diag_integral/include
                                                  random_numbers/include
                                                  diag_manager/include
                                                  constants4
                                                  constants
                                                  axis_utils/include
                                                  field_manager/include
+                                                 time_interp/include
                                                  tracer_manager/include)
 
   target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
@@ -356,9 +358,9 @@ foreach(kind ${kinds})
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/random_numbers/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_integral/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/random_numbers/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tracer_manager/include>)
 
 

diff --git a/FMS.pc b/FMS.pc
@@ -24,12 +24,12 @@ includedir=${prefix}/include
 
 # Including the following, as they may be useful when building other components
 # and as a way to better record how the library was built.
-ccompiler=mpiicc
-fccompiler=mpiifort
+ccompiler=mpicc
+fccompiler=mpif90
 cppflagss.compiled= -fopenmp
-cflags.compiled=-I/opt/netcdf/4.9.2/ONEAPI/2023.1/include -I/opt/hdf5/1.14.1-2/ONEAPI/2023.1/include -fopenmp
-fcflags.compiled=-O0 -g -traceback -I/opt/netcdf/4.9.2/ONEAPI/2023.1/include -I/opt/netcdf/4.9.2/ONEAPI/2023.1/include  -FR -real-size 64 -fopenmp
-ldflags.compiled=-L/opt/netcdf/4.9.2/ONEAPI/2023.1/lib64 -lnetcdf
+cflags.compiled=-I/opt/netcdf/4.9.2/GCC/13.1.0/include -I/opt/libyaml/0.2.5/GNU/13.1.0/include -fopenmp
+fcflags.compiled=-I/opt/netcdf/4.9.2/GCC/13.1.0/include -I/opt/netcdf/4.9.2/GCC/13.1.0/include -g -fbacktrace -fopenmp -Wall -Wconversion-extra -I/opt/libyaml/0.2.5/GNU/13.1.0/include  -ffree-form -ffree-line-length-none -fdefault-real-8 -fcray-pointer
+ldflags.compiled= -L/opt/netcdf/4.9.2/GCC/13.1.0/lib64 -lnetcdf -L/opt/mpich/4.0.3/GNU/12.2.0/lib -L/opt/libyaml/0.2.5/GNU/13.1.0/lib
 
 Name: FMS
 Description: The Flexible Modeling System Infrastructure Library

diff --git a/axis_utils/include/axis_utils2.inc b/axis_utils/include/axis_utils2.inc
@@ -171,32 +171,17 @@
   !! the range from lon_start to lon_start + 360), then istrt is set to 0. If
   !! any entries are moved, then istrt is set to the original index of the entry
   !! which becomes lon(1).
-<<<<<<< HEAD
   !!
   !! e.g.,
   !!
   !!        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
-=======
-  !!
-  !! e.g.,
-  !!
-  !!        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
-  !!
->>>>>>> origin/mixedmode
 
   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
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/mixedmode
     integer                 :: len, i
     real(kind=FMS_AU_KIND_) :: lon_strt, tmp(size(lon(:))-1)
 

diff --git a/configure.ac b/configure.ac
@@ -496,8 +496,10 @@ AC_CONFIG_FILES([
   test_fms/parser/Makefile
   test_fms/string_utils/Makefile
   test_fms/sat_vapor_pres/Makefile
+  test_fms/diag_integral/Makefile
   test_fms/tracer_manager/Makefile
   test_fms/random_numbers/Makefile
+
   FMS.pc
   ])
 

diff --git a/diag_integral/Makefile.am b/diag_integral/Makefile.am
@@ -23,14 +23,22 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/diag_integral/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libdiag_integral.la
 
 # The convenience library depends on its source.
-libdiag_integral_la_SOURCES = diag_integral.F90
+libdiag_integral_la_SOURCES = diag_integral.F90\
+															include/diag_integral.inc\
+															include/diag_integral_r4.fh\
+															include/diag_integral_r8.fh
+
+diag_integral_mod.$(FC_MODEXT): include/diag_integral.inc\
+																include/diag_integral_r4.fh\
+																include/diag_integral_r8.fh
+
 
 nodist_include_HEADERS = diag_integral_mod.$(FC_MODEXT)
 BUILT_SOURCES = diag_integral_mod.$(FC_MODEXT)